ensure combos can end with aliases

RobertWHurst · Dec 20, 2023 · c998f6a · c998f6a
1 parent a238c37
commit c998f6a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/packages/keystrokes/src/key-combo-state.ts b/packages/keystrokes/src/key-combo-state.ts
@@ -178,7 +178,11 @@ export class KeyComboState<OriginalEvent, KeyEventProps, KeyComboEventProps> {
   }
 
   executePressed(event: KeyEvent<OriginalEvent, KeyEventProps>) {
-    if (!this._isPressedWithFinalUnit?.has(event.key)) return
+    if (
+      !this._isPressedWithFinalUnit?.has(event.key) &&
+      !event.aliases?.some((a) => this._isPressedWithFinalUnit?.has(a))
+    )
+      return
     this._handlerState.executePressed(
       this._wrapEvent(this._lastActiveKeyPresses, {
         key: event.key,
@@ -189,7 +193,11 @@ export class KeyComboState<OriginalEvent, KeyEventProps, KeyComboEventProps> {
   }
 
   executeReleased(event: KeyEvent<OriginalEvent, KeyEventProps>) {
-    if (!this._isPressedWithFinalUnit?.has(event.key)) return
+    if (
+      !this._isPressedWithFinalUnit?.has(event.key) &&
+      !event.aliases?.some((a) => this._isPressedWithFinalUnit?.has(a))
+    )
+      return
     this._handlerState.executeReleased(
       this._wrapEvent(this._lastActiveKeyPresses, {
         key: event.key,

diff --git a/packages/keystrokes/src/tests/keystrokes.spec.ts b/packages/keystrokes/src/tests/keystrokes.spec.ts
@@ -320,6 +320,19 @@ describe('new Keystrokes(options)', () => {
       expect(handler2.onPressed).toBeCalledTimes(1)
       expect(handler2.onPressedWithRepeat).toBeCalledTimes(2)
       expect(handler2.onReleased).toBeCalledTimes(1)
+
+      expect(handler1.onPressed).toBeCalledWith(
+        expect.objectContaining({
+          finalKeyEvent: expect.objectContaining({ key: 'c' }),
+          keyCombo: 'a,b>c+d',
+          keyEvents: expect.arrayContaining([
+            expect.objectContaining({ key: 'a' }),
+            expect.objectContaining({ key: 'b' }),
+            expect.objectContaining({ key: 'c' }),
+            expect.objectContaining({ key: 'd' }),
+          ]),
+        }),
+      )
     })
 
     it('will not trigger a key combo handler if the keys are pressed in the wrong order', () => {