diff --git a/components/aside-panel.test.ts b/components/aside-panel.test.ts new file mode 100644 index 000000000..9ff8fc420 --- /dev/null +++ b/components/aside-panel.test.ts @@ -0,0 +1,23 @@ +import test from "node:test"; +import assert from "node:assert/strict"; + +import { invokeAsideActionMenuItemClick } from "./ui/aside-panel.tsx"; + +test("AsideActionMenuItem closes its menu before running the action", () => { + const events: string[] = []; + + invokeAsideActionMenuItemClick( + () => events.push("close"), + () => events.push("action"), + ); + + assert.deepEqual(events, ["close", "action"]); +}); + +test("AsideActionMenuItem still closes when no action is provided", () => { + const events: string[] = []; + + invokeAsideActionMenuItemClick(() => events.push("close")); + + assert.deepEqual(events, ["close"]); +}); diff --git a/components/notes/NotesManager.tsx b/components/notes/NotesManager.tsx index 3481fb206..04220b619 100644 --- a/components/notes/NotesManager.tsx +++ b/components/notes/NotesManager.tsx @@ -127,7 +127,7 @@ export interface NotesManagerProps { } type HoverActionMenuProps = { - children: React.ReactNode; + children: React.ReactNode | ((closeMenu: () => void) => React.ReactNode); className?: string; }; @@ -149,6 +149,11 @@ const HoverActionMenu: React.FC = ({ children, className } useEffect(() => () => cancelClose(), []); + const closeMenu = () => { + cancelClose(); + setOpen(false); + }; + return ( @@ -180,7 +185,7 @@ const HoverActionMenu: React.FC = ({ children, className } onMouseEnter={cancelClose} onMouseLeave={scheduleClose} > - {children} + {typeof children === "function" ? children(closeMenu) : children} ); @@ -937,7 +942,7 @@ export const NotesManager: React.FC = ({ resetTreeDragState(); }; - const renderNoteActions = (note: VaultNote, mode: "dropdown" | "context") => { + const renderNoteActions = (note: VaultNote, mode: "dropdown" | "context", closeMenu?: () => void) => { const actions = [ { label: t("common.rename"), @@ -979,6 +984,7 @@ export const NotesManager: React.FC = ({ className={cn(menuItemClass, action.destructive && "text-destructive hover:bg-destructive/10")} onClick={(event) => { event.stopPropagation(); + closeMenu?.(); action.action(); }} > @@ -987,7 +993,7 @@ export const NotesManager: React.FC = ({ )); }; - const renderGroupActions = (groupPath: string, mode: "dropdown" | "context") => { + const renderGroupActions = (groupPath: string, mode: "dropdown" | "context", closeMenu?: () => void) => { const actions = [ { label: t("notes.action.newNote"), @@ -1040,6 +1046,7 @@ export const NotesManager: React.FC = ({ className={cn(menuItemClass, action.destructive && "text-destructive hover:bg-destructive/10")} onClick={(event) => { event.stopPropagation(); + closeMenu?.(); action.action(); }} > @@ -1076,7 +1083,7 @@ export const NotesManager: React.FC = ({ return ( - = ({ setSelectedGroup(nextSelection.selectedGroup); setOverlayNoteId(nextSelection.overlayNoteId); }} - actions={( - - {renderNoteActions(note, "dropdown")} - - )} + actions={( + + {(closeMenu) => renderNoteActions(note, "dropdown", closeMenu)} + + )} /> @@ -1229,11 +1236,11 @@ export const NotesManager: React.FC = ({ setOverlayNoteId(nextSelection.overlayNoteId); if (hasChildren) toggleGroup(node.path); }} - actions={( - - {renderGroupActions(node.path, "dropdown")} - - )} + actions={( + + {(closeMenu) => renderGroupActions(node.path, "dropdown", closeMenu)} + + )} /> diff --git a/components/ui/aside-panel.tsx b/components/ui/aside-panel.tsx index ffe1b7489..9a6664bdd 100644 --- a/components/ui/aside-panel.tsx +++ b/components/ui/aside-panel.tsx @@ -62,6 +62,7 @@ interface AsidePanelContextType { } const AsidePanelContext = createContext(null); +const AsideActionMenuContext = createContext<(() => void) | null>(null); export const useAsidePanel = () => { const context = useContext(AsidePanelContext); @@ -172,20 +173,33 @@ interface AsideActionMenuProps { } export const AsideActionMenu: React.FC = ({ children }) => { + const [open, setOpen] = useState(false); + const close = useCallback(() => setOpen(false), []); + return ( - + - {children} + + {children} + ); }; +export const invokeAsideActionMenuItemClick = ( + closeMenu: (() => void) | null, + onClick?: () => void, +) => { + closeMenu?.(); + onClick?.(); +}; + // Action Menu Item export const AsideActionMenuItem: React.FC<{ icon?: ReactNode; @@ -193,9 +207,11 @@ export const AsideActionMenuItem: React.FC<{ onClick?: () => void; variant?: 'default' | 'destructive'; }> = ({ icon, children, onClick, variant = 'default' }) => { + const closeMenu = useContext(AsideActionMenuContext); + return ( @@ -72,15 +80,20 @@ export const VaultDeleteConfirmDialog: React.FC = onOpenChange, onConfirm, }) => { + const { t } = useI18n(); + const descriptionId = React.useId(); + return ( { if (!disabled) onOpenChange(nextOpen); }}> - + onOpenChange(false)} onConfirm={onConfirm}