Skip to content
Open
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
4 changes: 2 additions & 2 deletions src/hooks/useAccessibility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ export default function useAccessibility({

React.useEffect(() => {
if (open) {
window.addEventListener('keydown', handleKeyDown);
window.addEventListener('keydown', handleKeyDown, true);
if (autoFocus) {
// FIXME: hack with raf
raf(() => focusMenu({ preventScroll: true }), 3);
}
return () => {
window.removeEventListener('keydown', handleKeyDown);
window.removeEventListener('keydown', handleKeyDown, true);
focusMenuRef.current = false;
};
}
Expand Down
28 changes: 28 additions & 0 deletions tests/useAccessibility.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,31 @@ it('closes without consuming Tab when the overlay ref is omitted', () => {
trigger.remove();
}
});

it('closes and returns focus to trigger on Escape key', () => {
const trigger = document.createElement('button');
document.body.appendChild(trigger);
const onOpenChange = jest.fn();
const { unmount } = renderHook(() =>
useAccessibility({
open: true,
triggerRef: { current: trigger },
onOpenChange,
}),
);
try {
const event = new KeyboardEvent('keydown', {
keyCode: 27,
bubbles: true,
cancelable: true,
});
act(() => {
window.dispatchEvent(event);
});
expect(onOpenChange).toHaveBeenCalledWith(false);
expect(document.activeElement).toBe(trigger);
} finally {
unmount();
trigger.remove();
}
});
Loading