Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 00:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 698b18de61 into 7217c66636

Browse source
This commit is contained in:
Jeffrey Chen 2025-12-16 17:04:19 +08:00 • committed by GitHub
commit 21a44ea4ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/menus/Menu.ts
View file

@ -61,6 +61,9 @@ export class Menu {
} }
public showSubMenu(subMenuElement: HTMLElement) { public showSubMenu(subMenuElement: HTMLElement) {
subMenuElement.querySelectorAll(".b3-list-item--focus").forEach((item) => {
item.classList.remove("b3-list-item--focus");
});
const itemRect = subMenuElement.parentElement.getBoundingClientRect(); const itemRect = subMenuElement.parentElement.getBoundingClientRect();
subMenuElement.style.top = (itemRect.top - 8) + "px"; subMenuElement.style.top = (itemRect.top - 8) + "px";
subMenuElement.style.left = (itemRect.right + 8) + "px"; subMenuElement.style.left = (itemRect.right + 8) + "px";

12
app/src/menus/workspace.ts
View file

@ -350,7 +350,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
return a.name.localeCompare(b.name, undefined, {numeric: true}); return a.name.localeCompare(b.name, undefined, {numeric: true});
}).forEach((item: ISaveLayout) => { }).forEach((item: ISaveLayout) => {
if (inputElement.value === "" || item.name.toLowerCase().indexOf(inputElement.value.toLowerCase()) > -1) { 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> <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__meta">${item.time ? dayjs(item.time).format("YYYY-MM-DD HH:mm") : ""}</span>
<span class="b3-list-item__action"> <span class="b3-list-item__action">
@ -363,14 +363,18 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
}; };
const inputElement = menuElement.querySelector(".b3-text-field") as HTMLInputElement; const inputElement = menuElement.querySelector(".b3-text-field") as HTMLInputElement;
const listElement = menuElement.querySelector(".b3-list"); 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) => { inputElement.addEventListener("keydown", (event) => {
event.stopPropagation(); event.stopPropagation();
if (event.isComposing) { if (event.isComposing) {
return; return;
} }
upDownHint(listElement, event); upDownHint(listElement, event);
if (event.key === "Escape") { if (event.key === "Escape" || (event.key === "ArrowLeft" && inputElement.value === "")) {
window.siyuan.menus.menu.remove(); window.siyuan.menus.menu.remove(true);
} else if (event.key === "Enter") { } else if (event.key === "Enter") {
const currentElement = listElement.querySelector(".b3-list-item--focus"); const currentElement = listElement.querySelector(".b3-list-item--focus");
if (currentElement) { if (currentElement) {
@ -387,6 +391,8 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
} }
event.stopPropagation(); event.stopPropagation();
listElement.innerHTML = genListHTML(); listElement.innerHTML = genListHTML();
const listItemElement = inputElement.nextElementSibling?.querySelector(".b3-list-item");
listItemElement?.classList.add("b3-list-item--focus");
}); });
listElement.addEventListener("click", (event: MouseEvent) => { listElement.addEventListener("click", (event: MouseEvent) => {
if (window.siyuan.config.readonly) { if (window.siyuan.config.readonly) {