Skip to content

Build your personal knowledge base with Trilium Notes

fix(menu): close a context submenu once the keys move off its row

Elian Doran7eaded4db077
diff --git a/apps/client/src/menus/context_menu.spec.ts b/apps/client/src/menus/context_menu.spec.ts
index 628fba596c..8ec88c9cf4 100644
--- a/apps/client/src/menus/context_menu.spec.ts
+++ b/apps/client/src/menus/context_menu.spec.ts
@@ -742,6 +742,20 @@ describe("contextMenu", () => {
vi.restoreAllMocks();
});
+ it("closes a submenu the pointer opened once the keys move off its row", async () => {
+ await openMenu();
+ const templates = [ ...menuElement()?.querySelectorAll<HTMLElement>("li.dropdown-item") ?? [] ]
+ .find((row) => row.querySelector(":scope > span")?.textContent === "Templates");
+ templates?.dispatchEvent(new PointerEvent("pointerenter"));
+ await vi.waitFor(() => expect(menuElement()?.querySelector("div.dropdown-submenu")).not.toBeNull());
+
+ key("ArrowUp");
+ await vi.waitFor(() => expect(activeRow()).toBe("Paste"));
+ // As a native menu: the submenu goes with its row's highlight, until Right opens it again.
+ expect(menuElement()?.querySelector("div.dropdown-submenu")).toBeNull();
+ expect(templates?.classList.contains("submenu-open")).toBe(false);
+ });
+
it("goes on from the row the pointer last pointed at", async () => {
await openMenu();
const paste = [ ...menuElement()?.querySelectorAll<HTMLElement>("li.dropdown-item") ?? [] ]
diff --git a/apps/client/src/widgets/react/Menu.tsx b/apps/client/src/widgets/react/Menu.tsx
index 95c0ba289f..5a84258aad 100644
--- a/apps/client/src/widgets/react/Menu.tsx
+++ b/apps/client/src/widgets/react/Menu.tsx
@@ -123,9 +123,14 @@ export default function Menu<T>({ id, className, x, y, orientation, bottomSheet,
const levelRows = runnableRows(level === 0 ? items : submenus[level - 1]?.item.items ?? []);
const index = active ? levelRows.indexOf(active.item) : -1;
const count = levelRows.length;
+ // A submenu goes with its row's highlight, as in a native menu, until Right opens it again.
+ const moveTo = (item: MenuCommandItem<T>) => {
+ if (submenus[level]?.item !== item) openSubmenu(level);
+ setActive(level, item);
+ };
const goTo = (position: number) => {
const item = levelRows[((position % count) + count) % count];
- if (item) setActive(level, item);
+ if (item) moveTo(item);
};
const openActive = () => {
const item = active?.item;
@@ -147,7 +152,7 @@ export default function Menu<T>({ id, className, x, y, orientation, bottomSheet,
const boxes = levelRows.map((item) => rows.get(item)?.getBoundingClientRect());
const target = rowInNextColumn(boxes, index, towards);
const item = target !== undefined ? levelRows[target] : undefined;
- if (item) setActive(level, item);
+ if (item) moveTo(item);
return !!item;
};
@@ -189,7 +194,7 @@ export default function Menu<T>({ id, className, x, y, orientation, bottomSheet,
for (let step = skip; step < count + skip; step++) {
const item = levelRows[(index + step + count) % count];
if (item && rows.get(item)?.textContent?.trim().toLowerCase().startsWith(typed.text)) {
- setActive(level, item);
+ moveTo(item);
break;
}
}