An open source design system that's fully customizable and agent ready
TypeScript
fix(dropdown-menu): restore trigger focus on dismiss (#4666)
Cindy Zhang1ec1a4d2e49a
diff --git a/.changeset/dropdown-menu-focus-restore.md b/.changeset/dropdown-menu-focus-restore.mdnew file mode 100644index 0000000000..2a68a10caf--- /dev/null+++ b/.changeset/dropdown-menu-focus-restore.md@@ -0,0 +1,6 @@+---+'@astryxdesign/core': patch+---++[fix] DropdownMenu now reports uncontrolled native open/close transitions and restores focus to the trigger after native popover dismissals.+@cixzhangdiff --git a/packages/core/src/DropdownMenu/DropdownMenu.test.tsx b/packages/core/src/DropdownMenu/DropdownMenu.test.tsxindex 156292952f..1b7471d7c5 100644--- a/packages/core/src/DropdownMenu/DropdownMenu.test.tsx+++ b/packages/core/src/DropdownMenu/DropdownMenu.test.tsx@@ -164,6 +164,77 @@ describe('DropdownMenu', () => {expect(HTMLElement.prototype.showPopover).toHaveBeenCalled();});+ it('calls onOpenChange for uncontrolled native open and close transitions', async () => {+ const user = userEvent.setup();+ const handleOpenChange = vi.fn();+ render(+ <DropdownMenu+ button={{label: 'Actions'}}+ items={[{label: 'Item 1'}]}+ onOpenChange={handleOpenChange}+ />,+ );++ await user.click(screen.getByRole('button', {name: /Actions/}));+ expect(handleOpenChange).toHaveBeenCalledWith(true);++ handleOpenChange.mockClear();+ const popoverEl = screen+ .getByRole('menu', {hidden: true})+ .closest('[popover]');+ expect(popoverEl).not.toBeNull();+ const toggleEvent = new Event('toggle');+ Object.defineProperty(toggleEvent, 'newState', {value: 'closed'});+ fireEvent(popoverEl as HTMLElement, toggleEvent);++ expect(handleOpenChange).toHaveBeenCalledWith(false);+ expect(screen.getByRole('button', {name: /Actions/})).toHaveAttribute(+ 'aria-expanded',+ 'false',+ );+ });++ it('restores focus to the trigger after native light dismiss', async () => {+ const raf = vi+ .spyOn(window, 'requestAnimationFrame')+ .mockImplementation(callback => {+ callback(0);+ return 0;+ });++ try {+ const user = userEvent.setup();+ render(+ <DropdownMenu+ button={{label: 'Actions'}}+ items={[{label: 'Edit'}, {label: 'Delete'}]}+ />,+ );++ const trigger = screen.getByRole('button', {name: /Actions/});+ trigger.focus();+ await user.click(trigger);+ expect(+ screen.getByRole('menuitem', {name: 'Edit', hidden: true}),+ ).toHaveFocus();++ const popoverEl = screen+ .getByRole('menu', {hidden: true})+ .closest('[popover]');+ expect(popoverEl).not.toBeNull();+ popoverEl?.addEventListener('toggle', () => {+ trigger.blur();+ });+ const toggleEvent = new Event('toggle');+ Object.defineProperty(toggleEvent, 'newState', {value: 'closed'});+ fireEvent(popoverEl as HTMLElement, toggleEvent);++ expect(trigger).toHaveFocus();+ } finally {+ raf.mockRestore();+ }+ });+it('closes the menu when Tab is pressed inside it (APG menu-button)', async () => {const user = userEvent.setup();render(diff --git a/packages/core/src/DropdownMenu/DropdownMenu.tsx b/packages/core/src/DropdownMenu/DropdownMenu.tsxindex 3a5f5fc5a3..6aeab84e6c 100644--- a/packages/core/src/DropdownMenu/DropdownMenu.tsx+++ b/packages/core/src/DropdownMenu/DropdownMenu.tsx@@ -243,28 +243,22 @@ export function DropdownMenu({// Close menu + return focus to triggerconst handleLayerHide = useCallback(() => {lastHideTimeRef.current = Date.now();- if (isControlled) {- onOpenChange?.(false);- } else {+ onOpenChange?.(false);+ if (!isControlled) {setInternalIsOpen(false);}buttonRef.current?.focus();}, [isControlled, onOpenChange]);- // Track whether to focus the first item when the menu opens+ // Defer item focus until the layer has committed open, so focus restore+ // captures the trigger instead of the first menu item.const shouldFocusOnOpenRef = useRef(false);const handleLayerShow = useCallback(() => {- if (isControlled) {- onOpenChange?.(true);- } else {+ onOpenChange?.(true);+ if (!isControlled) {setInternalIsOpen(true);}- if (shouldFocusOnOpenRef.current) {- shouldFocusOnOpenRef.current = false;- // focusFirst is called via openAndFocus below — defer to rAF- // so the popover content is rendered before we query for items- }}, [isControlled, onOpenChange]);const popover = usePopover({@@ -313,17 +307,26 @@ export function DropdownMenu({),});- // Sync controlled open state → popover, and focus first item on open+ // Sync controlled open state → popover.useEffect(() => {if (isControlled) {if (controlledIsOpen && !popover.isOpen) {+ shouldFocusOnOpenRef.current = true;popover.show();- requestAnimationFrame(() => focusFirst());} else if (!controlledIsOpen && popover.isOpen) {popover.hide();}}- }, [controlledIsOpen, isControlled, popover, focusFirst]);+ }, [controlledIsOpen, isControlled, popover]);++ // Move focus into the menu only after the layer has committed open.+ useEffect(() => {+ if (!popover.isOpen || !shouldFocusOnOpenRef.current) {+ return;+ }+ shouldFocusOnOpenRef.current = false;+ requestAnimationFrame(() => focusFirst());+ }, [popover.isOpen, focusFirst]);// Extend useListFocus with Enter/Space activation + typeaheadconst listKeyDown = useCallback(@@ -364,9 +367,9 @@ export function DropdownMenu({);const openAndFocus = useCallback(() => {+ shouldFocusOnOpenRef.current = true;popover.show();- requestAnimationFrame(() => focusFirst());- }, [popover, focusFirst]);+ }, [popover]);const handleButtonClick = useCallback(() => {// If the menu was just closed by light dismiss (e.g. iOS Safari fires