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
17 changes: 15 additions & 2 deletions packages/react-hotkeys-hook/src/lib/validators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,21 @@ export const isHotkeyMatchingKeyboardEvent = (e: KeyboardEvent, hotkey: Hotkey,

const mappedCode = mapCode(code)

if (useKey && keys?.length === 1 && keys.includes(producedKey)) {
return true
if (useKey) {
if (keys?.length === 1 && keys.includes(producedKey.toLowerCase())) {
if (!ignoreModifiers) {
if (alt !== altKey) return false
if (shift !== shiftKey) return false
if (mod) {
if (!metaKey && !ctrlKey) return false
} else {
if (meta !== metaKey) return false
if (ctrl !== ctrlKey) return false
}
}
return true
}
return false
}

if (
Expand Down
26 changes: 25 additions & 1 deletion packages/react-hotkeys-hook/src/test/useHotkeys.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1650,4 +1650,28 @@ test('Should trigger only produced key hotkeys', async () => {
await user.keyboard('Y')
expect(callbackZ).toHaveBeenCalledTimes(1)
expect(callbackY).toHaveBeenCalledTimes(2)
})
})

test('Should trigger only produced key hotkeys with Dvorak layout', async () => {
const callbackDWithUseKey = vi.fn()

renderHook(() => useHotkeys('h', callbackDWithUseKey, { useKey: true }))

const keyDownEventUSLayout = createEvent.keyDown(document, {
key: 'h',
code: 'KeyH',
keyCode: 72
})

fireEvent(document, keyDownEventUSLayout)

const keyDownEventDvorakLayout = createEvent.keyDown(document, {
key: 'd',
code: 'KeyH',
keyCode: 68
})

fireEvent(document, keyDownEventDvorakLayout)

expect(callbackDWithUseKey).toHaveBeenCalledTimes(1)
})