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
12 changes: 10 additions & 2 deletions src/__tests__/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,15 @@ describe('react-keybind', () => {
fireEvent.keyDown(node, { key: 'a', metaKey: true });
fireEvent.keyUp(node, { key: 'a', metaKey: true });

expect(method).toHaveBeenCalledTimes(4);
// NOTE: in macos while the meta key is pressed no other key's keyup event is fired
fireEvent.keyDown(node, { key: 'Meta' })
fireEvent.keyDown(node, { key: 'a' })
fireEvent.keyUp(node, { key: 'Meta' });

fireEvent.keyDown(node, { key: 'z', altKey: true });
fireEvent.keyUp(node, { key: 'z', altKey: true });

expect(method).toHaveBeenCalledTimes(6);
});

it('detects alternative modifier keys', () => {
Expand Down Expand Up @@ -564,7 +572,7 @@ describe('react-keybind', () => {

it('executes a shortcut when an element is being dragged', () => {
const DragComponent = () => {
const onDragStart = useCallback((event) => {}, []) as DragEventHandler<HTMLDivElement>;
const onDragStart = useCallback(() => {}, []) as DragEventHandler<HTMLDivElement>;
return (
<div data-testid="drag" draggable="true" onDragStart={onDragStart}>Drag this</div>
)
Expand Down
2 changes: 2 additions & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@ export const ShortcutProvider = memo(
}
if (key === 'meta' || e.metaKey) {
keysUp.push('meta');
// NOTE: in macos if meta key is pressed no other key's keyup is fired
keysDown.current = []
}
if (key === 'shift' || e.shiftKey) {
keysUp.push('shift');
Expand Down