Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(menu): keep a dropdown open on a click on a submenu's row
Elian Doran4d0863e442bb
diff --git a/apps/client/src/widgets/react/Dropdown.spec.tsx b/apps/client/src/widgets/react/Dropdown.spec.tsxindex 8ba1402d7c..5d3e181fba 100644--- a/apps/client/src/widgets/react/Dropdown.spec.tsx+++ b/apps/client/src/widgets/react/Dropdown.spec.tsx@@ -280,6 +280,39 @@ describe("Dropdown", () => {expect(picked).toEqual([ "wrap", "title" ]);});+ it("stays open on a click on a submenu's row, which unfolds the submenu on a phone", async () => {+ const toggled = vi.fn();+ const content = (+ <FormDropdownSubmenu icon="bx bx-chip" title="Advanced" onDropdownToggleClicked={toggled}>+ <FormListItem>Show log</FormListItem>+ </FormDropdownSubmenu>+ );+ const submenuRow = () => popup()?.querySelector<HTMLElement>("li.dropdown-submenu");++ const { toggle } = renderDropdown({}, content);+ click(toggle);+ await vi.waitFor(() => expect(submenuRow()).toBeTruthy());+ submenuRow()?.click();+ expect(toggled).toHaveBeenCalledOnce();+ await new Promise((resolve) => setTimeout(resolve, 20));+ expect(popup()).not.toBeNull();++ render(null, host);+ layout.onMobile = true;+ const { toggle: phoneToggle } = renderDropdown({}, content);+ click(phoneToggle);+ await vi.waitFor(() => expect(submenuRow()).toBeTruthy());+ submenuRow()?.click();+ await vi.waitFor(() => expect(submenuRow()?.querySelector(":scope > .dropdown-menu.show")?.textContent)+ .toBe("Show log"));+ await new Promise((resolve) => setTimeout(resolve, 20));+ expect(popup()).not.toBeNull();++ // A row in the unfolded submenu still closes the menu.+ submenuRow()?.querySelector<HTMLElement>(".dropdown-menu li.dropdown-item")?.click();+ await vi.waitFor(() => expect(popup()).toBeNull());+ });+it("opens a nested submenu as a layer of its own, beside the scroller rather than in it", async () => {const { toggle } = renderDropdown({}, (<FormDropdownSubmenu icon="bx bx-chip" title="Advanced">diff --git a/apps/client/src/widgets/react/FormList.tsx b/apps/client/src/widgets/react/FormList.tsxindex db79decf93..0584c54c18 100644--- a/apps/client/src/widgets/react/FormList.tsx+++ b/apps/client/src/widgets/react/FormList.tsx@@ -7,7 +7,6 @@ import clsx from "clsx";import { ComponentChildren, RefObject } from "preact";import { createPortal, type CSSProperties, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "preact/compat";-import { CommandNames } from "../../components/app_context";import { getActionSync } from "../../services/keyboard_actions";import { handleRightToLeftPlacement, isMobile, openInAppHelpFromUrl } from "../../services/utils";import FormToggle from "./FormToggle";@@ -422,7 +421,10 @@ function MenuSubmenu({ menu, icon, title, children, onDropdownToggleClicked, colif (e.button === 0 && !inUnfoldedRows(e)) e.preventDefault();}}onClick={(e) => {- if (disabled || inUnfoldedRows(e)) return;+ if (inUnfoldedRows(e)) return;+ // The dropdown's `closeOnClickInside` would close the whole menu.+ e.stopPropagation();+ if (disabled) return;// Clicked again, an unfolded row folds its submenu back.if (isMobile()) {menu.openSubmenu(level, open ? undefined : id, e.currentTarget, true);