@tanstack/hotkeys 0.6.3 → 0.7.0

package/src/sequence-manager.ts

@@ -5,11 +5,10 @@ import { isModifierKey, parseHotkey } from './parse'
 import { matchesKeyboardEvent } from './match'
 import {
   defaultHotkeyOptions,
-  getActiveElementForListenerTarget,
   getDefaultIgnoreInputs,
   handleConflict,
   isEventForTarget,
-  isInputElement,
+  shouldIgnoreInputEvent,
 } from './manager.utils'
 import type { HotkeyOptions } from './hotkey-manager'
 import type {
@@ -80,6 +79,8 @@ export interface SequenceRegistrationView {
   options: SequenceOptions
   target: Target
   triggerCount: number
+  /** Whether this sequence has been triggered at least once. */
+  hasFired: boolean
   /** Steps matched in the current attempt (0 when idle or just completed). */
   matchedStepCount: number
   /** `Date.now()` when the last step in the current attempt matched; 0 if none. */
@@ -99,6 +100,7 @@ interface SequenceRegistration {
   currentIndex: number
   lastKeyTime: number
   triggerCount: number
+  hasFired: boolean
 }
 
 /**
@@ -161,6 +163,7 @@ function toRegistrationView(
     options: reg.options,
     target: reg.target,
     triggerCount: reg.triggerCount,
+    hasFired: reg.hasFired,
     matchedStepCount: inProgress ? reg.currentIndex : 0,
     partialMatchLastKeyTime: inProgress ? reg.lastKeyTime : 0,
   }
@@ -285,6 +288,7 @@ export class SequenceManager {
       currentIndex: 0,
       lastKeyTime: 0,
       triggerCount: 0,
+      hasFired: false,
     }
 
     this.#registrations.set(id, registration)
@@ -446,7 +450,7 @@ export class SequenceManager {
 
     const now = Date.now()
 
-    for (const id of targetRegs) {
+    registrationIds: for (const id of targetRegs) {
       const registration = this.#registrations.get(id)
       if (!registration) {
         continue
@@ -462,12 +466,8 @@ export class SequenceManager {
 
       // Check if we should ignore input elements (defaults to true)
       if (registration.options.ignoreInputs !== false) {
-        const focused = getActiveElementForListenerTarget(target)
-        const shouldIgnore = [focused, event.target].some(
-          (el) => isInputElement(el) && el !== registration.target,
-        )
-        if (shouldIgnore) {
-          continue
+        if (shouldIgnoreInputEvent(event, target, registration.target)) {
+          continue registrationIds
         }
       }
 
@@ -520,6 +520,7 @@ export class SequenceManager {
           }
 
           registration.triggerCount++
+          registration.hasFired = true
           registration.currentIndex = 0
 
           this.#syncRegistrationView(registration)
@@ -610,6 +611,7 @@ export class SequenceManager {
     )
 
     registration.triggerCount++
+    registration.hasFired = true
 
     this.#syncRegistrationView(registration)