fix: handle dead keys in matchesKeyboardEvent#40
Merged
KevinVandy merged 6 commits intoTanStack:mainfrom Mar 3, 2026
Merged
Conversation
When event.key is 'Dead' (length 4), the existing event.code fallback (gated behind eventKey.length === 1) was never reached, causing hotkeys to silently fail. This most commonly affects macOS, where Option+letter combinations like Option+E, Option+I, Option+U, and Option+N produce dead keys for accent composition. It also affects Windows and Linux users with international keyboard layouts (e.g., US-International, German, French) where certain key combinations produce dead keys. Adds an early check: when event.key normalizes to 'Dead', immediately fall back to event.code to extract the physical key via the Key*/Digit* prefixes. Punctuation dead keys (e.g., apostrophe on US-International, where event.code is 'Quote') correctly return false since their codes don't match letter or digit patterns. Includes 10 tests covering dead key scenarios for letter keys, digit keys, modifier combinations, mismatches, and missing/invalid codes. Co-authored-by: Cursor <cursoragent@cursor.com>
jgill333
approved these changes
Feb 23, 2026
@tanstack/hotkeys
@tanstack/hotkeys-devtools
@tanstack/preact-hotkeys
@tanstack/preact-hotkeys-devtools
@tanstack/react-hotkeys
@tanstack/react-hotkeys-devtools
@tanstack/solid-hotkeys
@tanstack/solid-hotkeys-devtools
commit: |
KevinVandy
reviewed
Feb 27, 2026
packages/hotkeys/src/match.ts
Outdated
| } | ||
|
|
||
| // For single letters, compare case-insensitively | ||
| if (eventKey.length === 1 && hotkeyKey.length === 1) { |
Member
There was a problem hiding this comment.
there's now some redundant code here. I think it can be refactored a bit. I'll check it out tonight.
Contributor
Author
There was a problem hiding this comment.
Yeah, thanks for pointing that out. Fixed.
…ar mismatches Address review feedback by consolidating the dead key handler and the existing single-character event.code fallback into a single code path. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎯 Changes
When
event.keyis'Dead'(length 4), the existingevent.codefallback—gated behindeventKey.length === 1—was never reached, causing hotkeys to silently fail.This most commonly affects macOS, where
Option+lettercombinations likeOption+E,Option+I,Option+U, andOption+Nproduce dead keys for accent composition. It also affects Windows and Linux users with international keyboard layouts (e.g., US-International, German, French) where certain key combinations produce dead keys.Added an early check: when
event.keynormalizes to'Dead', immediately fall back toevent.codeto extract the physical key via theKey*/Digit*prefixes. Punctuation dead keys (e.g.,'on US-International, whereevent.codeis'Quote') correctly returnfalsesince their codes don't match letter or digit patterns.✅ Checklist
pnpm run test:pr.🚀 Release Impact