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
5 changes: 5 additions & 0 deletions .changeset/key-state-tracker-capture-phase.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tanstack/hotkeys': patch
---

Register KeyStateTracker listeners in capture phase so held-key state stays accurate while a HotkeyRecorder / HotkeySequenceRecorder is active.
8 changes: 4 additions & 4 deletions packages/hotkeys/src/key-state-tracker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ export class KeyStateTracker {
}
}

document.addEventListener('keydown', this.#keydownListener)
document.addEventListener('keyup', this.#keyupListener)
document.addEventListener('keydown', this.#keydownListener, true)
document.addEventListener('keyup', this.#keyupListener, true)
window.addEventListener('blur', this.#blurListener)
}

Expand All @@ -174,12 +174,12 @@ export class KeyStateTracker {
}

if (this.#keydownListener) {
document.removeEventListener('keydown', this.#keydownListener)
document.removeEventListener('keydown', this.#keydownListener, true)
this.#keydownListener = null
}

if (this.#keyupListener) {
document.removeEventListener('keyup', this.#keyupListener)
document.removeEventListener('keyup', this.#keyupListener, true)
this.#keyupListener = null
}

Expand Down
32 changes: 32 additions & 0 deletions packages/hotkeys/tests/key-state-tracker.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/// <reference lib="dom" />
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { HotkeySequenceRecorder } from '../src/hotkey-sequence-recorder'
import { KeyStateTracker } from '../src/key-state-tracker'

/**
Expand Down Expand Up @@ -275,4 +276,35 @@ describe('KeyStateTracker', () => {
expect(tracker.isKeyHeld('A')).toBe(true)
})
})

describe('capture phase registration', () => {
// Regression: a HotkeySequenceRecorder registers a capture-phase keydown
// listener that calls stopPropagation. If the tracker is on the bubble
// phase, propagation halts before its listener runs and held-key state
// goes stale. Capture-phase registration ensures the tracker observes
// every key, even when a recorder is active.
it('tracks held keys while a HotkeySequenceRecorder is active', () => {
const tracker = KeyStateTracker.getInstance()
const recorder = new HotkeySequenceRecorder({ onRecord: () => {} })
recorder.start()

const child = document.createElement('div')
document.body.appendChild(child)

try {
child.dispatchEvent(
new KeyboardEvent('keydown', {
key: 'Control',
code: 'ControlLeft',
bubbles: true,
}),
)

expect(tracker.getHeldKeys()).toContain('Control')
} finally {
recorder.destroy()
child.remove()
}
})
})
})