Skip to content

Build your personal knowledge base with Trilium Notes

fix(menu): unfold a context submenu from the keyboard on a phone

Elian Doranabefed68ede4
diff --git a/apps/client/src/menus/context_menu.spec.ts b/apps/client/src/menus/context_menu.spec.ts
index 52035cb029..a72edf903a 100644
--- a/apps/client/src/menus/context_menu.spec.ts
+++ b/apps/client/src/menus/context_menu.spec.ts
@@ -856,6 +856,34 @@ describe("contextMenu", () => {
document.removeEventListener("keydown", dialogHeard);
});
+ it("unfolds a submenu on a phone as Right and Enter open one, and folds it back on Escape", async () => {
+ layout.onMobile = true;
+ try {
+ await openMenu();
+ key("End");
+ await vi.waitFor(() => expect(activeRow()).toBe("Templates"));
+ const parent = menuElement()?.querySelector<HTMLElement>("li.dropdown-submenu");
+
+ key("Enter");
+ await vi.waitFor(() => expect(activeRow()).toBe("Meeting"));
+ expect(parent?.classList.contains("submenu-open")).toBe(true);
+ expect(parent?.querySelector(":scope > ul.dropdown-menu.show")?.textContent).toContain("Weekly");
+ // Unfolded in place, not as a layer beside it.
+ expect(menuElement()?.querySelector("div.dropdown-submenu")).toBeNull();
+
+ key("ArrowDown");
+ await vi.waitFor(() => expect(activeRow()).toBe("Weekly"));
+ key("Escape");
+ await vi.waitFor(() => expect(activeRow()).toBe("Templates"));
+ expect(parent?.classList.contains("submenu-open")).toBe(false);
+
+ key("ArrowRight");
+ await vi.waitFor(() => expect(activeRow()).toBe("Meeting"));
+ } finally {
+ layout.onMobile = false;
+ }
+ });
+
it("runs the active row on Enter, with focus back where it was", async () => {
const picked: string[] = [];
const { contextMenu, editor } = await openMenu((title) => {
diff --git a/apps/client/src/widgets/react/Menu.tsx b/apps/client/src/widgets/react/Menu.tsx
index 618bf0aed6..978c814083 100644
--- a/apps/client/src/widgets/react/Menu.tsx
+++ b/apps/client/src/widgets/react/Menu.tsx
@@ -175,7 +175,7 @@ export default function Menu<T>({ id, className, x, y, orientation, bottomSheet,
const openActive = () => {
const item = active && !isCustom(active.item) ? active.item : undefined;
const anchor = item && rows.get(item);
- if (!item?.items || !anchor || isMobile()) return;
+ if (!item?.items || !anchor) return;
openSubmenu(level, item, anchor, true);
const first = runnableRows(item.items)[0];
if (first) setActive(level + 1, first);
@@ -299,7 +299,8 @@ export default function Menu<T>({ id, className, x, y, orientation, bottomSheet,
</menu>
{/* Inside the menu, so the rules scoped to it apply, but none inside another: a fixed
layer escapes a scrolling menu only while no ancestor carries a filter. */}
- {submenus.map((submenu, index) => (
+ {/* A phone unfolds the open submenus under their rows instead (see MenuRow). */}
+ {!isMobile() && submenus.map((submenu, index) => (
<SubmenuLayer key={submenu.key} level={index + 1} submenu={submenu} state={state} />
))}
</div>
@@ -403,9 +404,7 @@ function MenuListRow<T>({ level, row, state }: { level: number, row: MenuItem<T>
function MenuRow<T>({ level, item, state }: { level: number, item: MenuCommandItem<T>, state: MenuState<T> }) {
const disabled = item.enabled === false;
const hasSubmenu = !!item.items;
- // A phone has no room beside the menu, so a submenu unfolds under its row instead.
- const [ unfolded, setUnfolded ] = useState(false);
- const open = isMobile() ? unfolded : state.openItems[level] === item;
+ const open = state.openItems[level] === item;
const active = state.active?.level === level && state.active.item === item;
const id = useId();
// As `MenuIconSlot` reads it: an item with a `checked` key is one that can be checked.
@@ -452,8 +451,9 @@ function MenuRow<T>({ level, item, state }: { level: number, item: MenuCommandIt
e.stopPropagation();
if (disabled) return;
+ // Pressed again, an unfolded row folds its submenu back.
if (hasSubmenu && isMobile()) {
- setUnfolded(!unfolded);
+ state.openSubmenu(level, open ? undefined : item, e.currentTarget, true);
return;
}
if (hasSubmenu) state.openSubmenu(level, item, e.currentTarget, true);
@@ -471,9 +471,10 @@ function MenuRow<T>({ level, item, state }: { level: number, item: MenuCommandIt
<MenuShortcut item={item} />
{item.trailingIcon && <span className={clsx(item.trailingIcon, "tn-icon", "menu-trailing-icon")} />}
</span>
+ {/* A phone has no room beside the menu, so an open submenu unfolds under its row. */}
{hasSubmenu && isMobile() && (
- <ul className={clsx("dropdown-menu", unfolded && "show")} role="menu" aria-labelledby={titleId(id)}>
- {unfolded && <MenuList level={level + 1} items={item.items ?? []} state={state} />}
+ <ul className={clsx("dropdown-menu", open && "show")} role="menu" aria-labelledby={titleId(id)}>
+ {open && <MenuList level={level + 1} items={item.items ?? []} state={state} />}
</ul>
)}
</li>