Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/mosaic-menu-press-open-hover-race.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/mosaic': patch
---

Fix hover-enabled menus, such as the `UserButton` account and settings flyouts, sometimes closing when the pointer moved toward an item after the menu was opened with a click.
3 changes: 2 additions & 1 deletion packages/mosaic/src/primitives/menu/menu-root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
useTypeahead,
} from '@floating-ui/react';
import { type ReactNode, useContext, useEffect, useMemo, useRef, useState } from 'react';
import { flushSync } from 'react-dom';

import { useDirection } from '../direction-provider';
import { useControllableState } from '../hooks/use-controllable-state';
Expand Down Expand Up @@ -156,7 +157,7 @@ function MenuInner(props: MenuProps) {
const nativeEvent = event.nativeEvent;
openFrameRef.current = requestAnimationFrame(() => {
openFrameRef.current = null;
floatingContext.onOpenChange(true, nativeEvent, 'click');
flushSync(() => floatingContext.onOpenChange(true, nativeEvent, 'click'));
});
},
},
Expand Down
27 changes: 27 additions & 0 deletions packages/mosaic/src/primitives/menu/menu.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,33 @@ describe('Menu', () => {
expect(screen.getByText('Actions')).toHaveAttribute('data-open', '');
});

it('stays open when the mouse leaves a menu pressed open just before the hover delay ran out', () => {
vi.useFakeTimers();
try {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
renderHoverMenu();
const trigger = screen.getByText('Actions');

fireEvent.pointerEnter(trigger, { pointerType: 'mouse' });
fireEvent.mouseEnter(trigger);
fireEvent.pointerDown(trigger, { pointerType: 'mouse' });
fireEvent.mouseDown(trigger, { button: 0 });
act(() => {
vi.advanceTimersByTime(100);
});
expect(trigger).toHaveAttribute('data-open', '');

fireEvent.pointerLeave(trigger, { pointerType: 'mouse' });
fireEvent.mouseLeave(trigger, { relatedTarget: screen.getByText('Elsewhere') });
act(() => {
vi.runAllTimers();
});

expect(trigger).toHaveAttribute('data-open', '');
} finally {
vi.useRealTimers();
}
});

it('closes on a second press of the trigger', async () => {
const user = userEvent.setup();
renderHoverMenu();
Expand Down
Loading