Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(DropdownMenu): light-dismiss + click-toggle race on touch browsers (#2186)

Alexander Blomb378ed2fbafc
diff --git a/.changeset/dropdown-light-dismiss-race.md b/.changeset/dropdown-light-dismiss-race.md
new file mode 100644
index 0000000000..8ef1951dbd
--- /dev/null
+++ b/.changeset/dropdown-light-dismiss-race.md
@@ -0,0 +1,5 @@
+---
+'@xds/core': patch
+---
+
+Fix XDSDropdownMenu light-dismiss + click-toggle race: on iOS Safari (and other touch browsers where pointerdown fires light-dismiss before the trigger's click event), tapping the trigger to close an open menu would close and then immediately re-open on the same tap. Stamp `lastHideTimeRef` whenever the menu is hidden and short-circuit `handleButtonClick` if it fires within 50ms of that stamp.
diff --git a/packages/core/src/DropdownMenu/XDSDropdownMenu.test.tsx b/packages/core/src/DropdownMenu/XDSDropdownMenu.test.tsx
index 1437fc5c4e..903c556177 100644
--- a/packages/core/src/DropdownMenu/XDSDropdownMenu.test.tsx
+++ b/packages/core/src/DropdownMenu/XDSDropdownMenu.test.tsx
@@ -10,7 +10,7 @@
*/
import {describe, it, expect, vi, beforeEach} from 'vitest';
-import {render, screen} from '@testing-library/react';
+import {render, screen, fireEvent} from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import {XDSDropdownMenu} from './XDSDropdownMenu';
import {XDSDropdownMenuItem} from './XDSDropdownMenuItem';
@@ -112,6 +112,28 @@ describe('XDSDropdownMenu', () => {
});
});
+describe('XDSDropdownMenu light-dismiss race', () => {
+ it('does not re-open the menu when a click follows a hide within the guard window', () => {
+ // Reproduces the iOS Safari race: pointerdown fires light-dismiss before
+ // the subsequent click on the trigger; without the guard, the click would
+ // immediately re-open the menu in the same tap.
+ render(
+ <XDSDropdownMenu
+ button={{label: 'Actions'}}
+ items={[{label: 'Edit'}]}
+ data-testid="xds-dropdown-menu"
+ />,
+ );
+
+ const trigger = screen.getByTestId('xds-dropdown-menu');
+ fireEvent.click(trigger); // open
+ fireEvent.click(trigger); // close (stamps guard)
+ fireEvent.click(trigger); // would re-open without guard
+ expect(HTMLElement.prototype.showPopover).toHaveBeenCalledTimes(1);
+ expect(HTMLElement.prototype.hidePopover).toHaveBeenCalledTimes(1);
+ });
+});
+
describe('XDSDropdownMenu controlled mode', () => {
it('respects isMenuOpen prop', async () => {
const handleToggle = vi.fn();
diff --git a/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx b/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx
index 52857d0a47..87ad6bcad2 100644
--- a/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx
+++ b/packages/core/src/DropdownMenu/XDSDropdownMenu.tsx
@@ -197,8 +197,14 @@ export function XDSDropdownMenu({
const isControlled = controlledIsOpen !== undefined;
const isOpen = isControlled ? controlledIsOpen : internalIsOpen;
+ // Track when the menu was last hidden so a near-simultaneous trigger
+ // click — e.g. on iOS Safari where pointerdown fires light-dismiss
+ // before the trigger's click event — can't immediately re-open it.
+ const lastHideTimeRef = useRef(0);
+
// Close menu + return focus to trigger
const handleLayerHide = useCallback(() => {
+ lastHideTimeRef.current = Date.now();
if (isControlled) {
onOpenChange?.(false);
} else {
@@ -284,6 +290,12 @@ export function XDSDropdownMenu({
}, [popover, hasAutoFocus, focusFirst]);
const handleButtonClick = useCallback(() => {
+ // If the menu was just closed by light dismiss (e.g. iOS Safari fires
+ // pointerdown → hide before the trigger's click), the click would
+ // otherwise immediately re-open it. Short-circuit within the guard window.
+ if (Date.now() - lastHideTimeRef.current < 50) {
+ return;
+ }
onClick?.();
if (isControlled) {
onOpenChange?.(!controlledIsOpen);