Skip to content

Commit b22af69

Browse files
fix: use capture phase for keydown listener in useAccessibility
1 parent b4ea62f commit b22af69

2 files changed

Lines changed: 30 additions & 2 deletions

File tree

‎src/hooks/useAccessibility.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ export default function useAccessibility({
7575

7676
React.useEffect(() => {
7777
if (open) {
78-
window.addEventListener('keydown', handleKeyDown);
78+
window.addEventListener('keydown', handleKeyDown, true);
7979
if (autoFocus) {
8080
// FIXME: hack with raf
8181
raf(() => focusMenu({ preventScroll: true }), 3);
8282
}
8383
return () => {
84-
window.removeEventListener('keydown', handleKeyDown);
84+
window.removeEventListener('keydown', handleKeyDown, true);
8585
focusMenuRef.current = false;
8686
};
8787
}

‎tests/useAccessibility.test.tsx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,31 @@ it('closes without consuming Tab when the overlay ref is omitted', () => {
2828
trigger.remove();
2929
}
3030
});
31+
32+
it('closes and returns focus to trigger on Escape key', () => {
33+
const trigger = document.createElement('button');
34+
document.body.appendChild(trigger);
35+
const onOpenChange = jest.fn();
36+
const { unmount } = renderHook(() =>
37+
useAccessibility({
38+
open: true,
39+
triggerRef: { current: trigger },
40+
onOpenChange,
41+
}),
42+
);
43+
try {
44+
const event = new KeyboardEvent('keydown', {
45+
keyCode: 27,
46+
bubbles: true,
47+
cancelable: true,
48+
});
49+
act(() => {
50+
window.dispatchEvent(event);
51+
});
52+
expect(onOpenChange).toHaveBeenCalledWith(false);
53+
expect(document.activeElement).toBe(trigger);
54+
} finally {
55+
unmount();
56+
trigger.remove();
57+
}
58+
});

0 commit comments

Comments
 (0)