From 698b18de612b9a392a3c5bf65c909403c6a6845e Mon Sep 17 00:00:00 2001
From: Jeffrey Chen <78434827+TCOTC@users.noreply.github.com>
Date: Sat, 28 Jun 2025 06:43:16 +0800
Subject: [PATCH] :art: Improve layout selection menu

fix https://github.com/siyuan-note/siyuan/issues/15105 https://github.com/siyuan-note/siyuan/issues/14176
---
 app/src/menus/Menu.ts      |  3 +++
 app/src/menus/workspace.ts | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts
index bea149564..bc32c4669 100644
--- a/app/src/menus/Menu.ts
+++ b/app/src/menus/Menu.ts
@@ -61,6 +61,9 @@ export class Menu {
     }
 
     public showSubMenu(subMenuElement: HTMLElement) {
+        subMenuElement.querySelectorAll(".b3-list-item--focus").forEach((item) => {
+            item.classList.remove("b3-list-item--focus");
+        });
         const itemRect = subMenuElement.parentElement.getBoundingClientRect();
         subMenuElement.style.top = (itemRect.top - 8) + "px";
         subMenuElement.style.left = (itemRect.right + 8) + "px";
diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index fb6930b01..1dac78af3 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -357,7 +357,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
                             return a.name.localeCompare(b.name, undefined, {numeric: true});
                         }).forEach((item: ISaveLayout) => {
                             if (inputElement.value === "" || item.name.toLowerCase().indexOf(inputElement.value.toLowerCase()) > -1) {
-                                html += `<div data-name="${item.name}" class="b3-list-item b3-list-item--narrow b3-list-item--hide-action ${html ? "" : "b3-list-item--focus"}">
+                                html += `<div data-name="${item.name}" class="b3-list-item b3-list-item--narrow b3-list-item--hide-action">
     <div class="b3-list-item__text">${item.name}</div>
     <span class="b3-list-item__meta">${item.time ? dayjs(item.time).format("YYYY-MM-DD HH:mm") : ""}</span>
     <span class="b3-list-item__action">
@@ -370,14 +370,18 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
                     };
                     const inputElement = menuElement.querySelector(".b3-text-field") as HTMLInputElement;
                     const listElement = menuElement.querySelector(".b3-list");
+                    inputElement.addEventListener("focus", () => {
+                        const listItemElement = inputElement.nextElementSibling?.querySelector(".b3-list-item");
+                        listItemElement?.classList.add("b3-list-item--focus");
+                    });
                     inputElement.addEventListener("keydown", (event) => {
                         event.stopPropagation();
                         if (event.isComposing) {
                             return;
                         }
                         upDownHint(listElement, event);
-                        if (event.key === "Escape") {
-                            window.siyuan.menus.menu.remove();
+                        if (event.key === "Escape" || (event.key === "ArrowLeft" && inputElement.value === "")) {
+                            window.siyuan.menus.menu.remove(true);
                         } else if (event.key === "Enter") {
                             const currentElement = listElement.querySelector(".b3-list-item--focus");
                             if (currentElement) {
@@ -394,6 +398,8 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
                         }
                         event.stopPropagation();
                         listElement.innerHTML = genListHTML();
+                        const listItemElement = inputElement.nextElementSibling?.querySelector(".b3-list-item");
+                        listItemElement?.classList.add("b3-list-item--focus");
                     });
                     listElement.addEventListener("click", (event: MouseEvent) => {
                         if (window.siyuan.config.readonly) {