Skip to content

Improve layout selection menu #15159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TCOTC wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Improve layout selection menu #15159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/menus/Menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
12 changes: 9 additions & 3 deletions app/src/menus/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down