refactor: Simplified key bindings controller

src/components/calendar/calendar.ts

@@ -248,7 +248,7 @@ export default class IgcCalendarComponent extends EventEmitterMixin<
     addKeybindings(this, {
       skip: this._shouldSkipKeyboardEvent,
       ref: this._contentRef,
-      bindingDefaults: { triggers: ['keydownRepeat'] },
+      bindingDefaults: { repeat: true },
     })
       .set(arrowLeft, this._handleArrowKey.bind(this, 'day', -1))
       .set(arrowRight, this._handleArrowKey.bind(this, 'day', 1))

src/components/combo/controllers/navigation.ts

@@ -207,9 +207,7 @@ export class ComboNavigationController<T extends object> {
     this.combo.addController(this as ReactiveController);
     this._config = config;
 
-    const bindingDefaults = {
-      triggers: ['keydownRepeat'],
-    } as KeyBindingOptions;
+    const bindingDefaults = { repeat: true } as KeyBindingOptions;
 
     const skip = (): boolean => this.combo.disabled;
 

src/components/common/controllers/key-bindings.spec.ts

@@ -17,153 +17,250 @@ import {
 } from './key-bindings.js';
 
 describe('Key bindings controller', () => {
-  let tag: string;
-  let instance: LitElement & {
-    key: string;
-    event: KeyboardEvent;
-    input: HTMLInputElement;
-  };
-
-  before(() => {
-    tag = defineCE(
-      class extends LitElement {
-        public key?: string;
-        public event?: KeyboardEvent;
-
-        public get input() {
-          return this.renderRoot.querySelector('input')!;
-        }
+  describe('addKeybindings', () => {
+    let tag: string;
+    let instance: LitElement & {
+      key: string;
+      event: KeyboardEvent;
+      input: HTMLInputElement;
+    };
+
+    before(() => {
+      tag = defineCE(
+        class extends LitElement {
+          public key?: string;
+          public event?: KeyboardEvent;
+
+          public get input() {
+            return this.renderRoot.querySelector('input')!;
+          }
 
-        constructor() {
-          super();
-          addKeybindings(this, {
-            skip: () => !!this.hidden,
-          })
-            .setActivateHandler(this.handleKeyboardEvent)
-            .set('a', this.handleKeyboardEvent, { triggers: ['keydown'] })
-            .set('s', this.handleKeyboardEvent, { triggers: ['keyup'] })
-            .set('k', this.handleKeyboardEvent)
-            .set('d', this.handleKeyboardEvent, {
-              triggers: ['keydown', 'keyup'],
-              preventDefault: true,
-              stopPropagation: true,
+          constructor() {
+            super();
+            addKeybindings(this, {
+              skip: () => !!this.hidden,
             })
-            .set([shiftKey, 'c'], this.handleKeyboardEvent)
-            .set([shiftKey, altKey, arrowUp], this.handleKeyboardEvent);
+              .setActivateHandler(this.handleKeyboardEvent)
+              .set('a', this.handleKeyboardEvent, { triggers: ['keydown'] })
+              .set('s', this.handleKeyboardEvent, { triggers: ['keyup'] })
+              .set('k', this.handleKeyboardEvent)
+              .set('d', this.handleKeyboardEvent, {
+                triggers: ['keydown', 'keyup'],
+                preventDefault: true,
+                stopPropagation: true,
+              })
+              .set([shiftKey, 'c'], this.handleKeyboardEvent)
+              .set([shiftKey, altKey, arrowUp], this.handleKeyboardEvent);
 
-          addKeybindings(this).set('x', this.handleKeyboardEvent);
-        }
+            addKeybindings(this).set('x', this.handleKeyboardEvent);
+          }
 
-        private handleKeyboardEvent(event: KeyboardEvent) {
-          this.key = event.key;
-          this.event = event;
-        }
+          private handleKeyboardEvent(event: KeyboardEvent) {
+            this.key = event.key;
+            this.event = event;
+          }
 
-        protected override render() {
-          return html`<input />`;
+          protected override render() {
+            return html`<input />`;
+          }
         }
-      }
-    );
-  });
+      );
+    });
 
-  function dispatch(node: Element, type: 'keydown' | 'keyup', key: string) {
-    node.dispatchEvent(
-      new KeyboardEvent(type, {
-        key,
-        bubbles: true,
-        composed: true,
-        cancelable: true,
-      })
-    );
-  }
-
-  beforeEach(async () => {
-    const tagName = unsafeStatic(tag);
-    instance = await fixture(html`<${tagName}></${tagName}>`);
-  });
+    beforeEach(async () => {
+      const tagName = unsafeStatic(tag);
+      instance = await fixture(html`<${tagName}></${tagName}>`);
+    });
 
-  describe('Triggers', () => {
-    it('keydown - keydown event works', async () => {
-      dispatch(instance, 'keydown', 'a');
-      expect(instance.key).to.equal('a');
-      expect(instance.event.type).to.equal('keydown');
+    describe('Triggers', () => {
+      it('keydown - keydown event works', async () => {
+        dispatch(instance, 'keydown', 'a');
+        expect(instance.key).to.equal('a');
+        expect(instance.event.type).to.equal('keydown');
+      });
+
+      it('keydown - keyup event is ignored', async () => {
+        dispatch(instance, 'keyup', 'a');
+        expect(instance.key).to.be.undefined;
+        expect(instance.event).to.be.undefined;
+      });
+
+      it('keyup - keyup event works', async () => {
+        dispatch(instance, 'keyup', 's');
+        expect(instance.key).to.equal('s');
+        expect(instance.event.type).to.equal('keyup');
+      });
+
+      it('keyup - keydown event is ignored', async () => {
+        dispatch(instance, 'keydown', 's');
+        expect(instance.key).to.be.undefined;
+        expect(instance.event).to.be.undefined;
+      });
     });
 
-    it('keydown - keyup event is ignored', async () => {
-      dispatch(instance, 'keyup', 'a');
+    it('should honor default skip condition', () => {
+      simulateKeyboard(instance.input, 'x');
       expect(instance.key).to.be.undefined;
       expect(instance.event).to.be.undefined;
     });
 
-    it('keyup - keyup event works', async () => {
-      dispatch(instance, 'keyup', 's');
-      expect(instance.key).to.equal('s');
+    it('should honor skip condition', () => {
+      instance.hidden = true;
+
+      simulateKeyboard(instance, 'k');
+      expect(instance.key).to.be.undefined;
+      expect(instance.event).to.be.undefined;
+    });
+
+    it('event handler modifiers - prevent default', () => {
+      dispatch(instance, 'keydown', 'd');
+      expect(instance.event.type).to.equal('keydown');
+      expect(instance.event.defaultPrevented).to.be.true;
+
+      dispatch(instance, 'keyup', 'd');
       expect(instance.event.type).to.equal('keyup');
+      expect(instance.event.defaultPrevented).to.be.true;
+    });
+
+    it('event handler modifiers - stop propagation', () => {
+      let parentHandlerCalled = false;
+      const handler = () => {
+        parentHandlerCalled = true;
+      };
+      const container = instance.parentElement!;
+      container.addEventListener('keydown', handler, { once: true });
+      container.addEventListener('keyup', handler, { once: true });
+
+      simulateKeyboard(instance, 'd');
+      expect(parentHandlerCalled).to.be.false;
+      expect(instance.key).to.equal('d');
+    });
+
+    it('activation keys', () => {
+      for (const key of [enterKey, spaceBar]) {
+        simulateKeyboard(instance, key);
+        expect(instance.key).to.equal(key.toLowerCase());
+      }
     });
 
-    it('keyup - keydown event is ignored', async () => {
-      dispatch(instance, 'keydown', 's');
+    it('combinations', () => {
+      simulateKeyboard(instance, shiftKey);
       expect(instance.key).to.be.undefined;
-      expect(instance.event).to.be.undefined;
+
+      simulateKeyboard(instance, 'c');
+      expect(instance.key).to.be.undefined;
+
+      simulateKeyboard(instance, [shiftKey, 'c']);
+      expect(instance.key).to.equal('c');
+
+      simulateKeyboard(instance, [shiftKey, altKey, arrowUp]);
+      expect(instance.key).to.equal(arrowUp.toLowerCase());
     });
   });
 
-  it('should honor default skip condition', () => {
-    simulateKeyboard(instance.input, 'x');
-    expect(instance.key).to.be.undefined;
-    expect(instance.event).to.be.undefined;
-  });
+  describe('multi non-modifier key combinations', () => {
+    let multiTag: string;
+    let multiInstance: LitElement & { callCount: number };
 
-  it('should honor skip condition', () => {
-    instance.hidden = true;
+    before(() => {
+      multiTag = defineCE(
+        class extends LitElement {
+          public callCount = 0;
 
-    simulateKeyboard(instance, 'k');
-    expect(instance.key).to.be.undefined;
-    expect(instance.event).to.be.undefined;
-  });
+          constructor() {
+            super();
+            addKeybindings(this).set(['x', 'z'], () => this.callCount++);
+          }
+        }
+      );
+    });
 
-  it('event handler modifiers - prevent default', () => {
-    dispatch(instance, 'keydown', 'd');
-    expect(instance.event.type).to.equal('keydown');
-    expect(instance.event.defaultPrevented).to.be.true;
+    beforeEach(async () => {
+      const tagName = unsafeStatic(multiTag);
+      multiInstance = await fixture(html`<${tagName}></${tagName}>`);
+    });
 
-    dispatch(instance, 'keyup', 'd');
-    expect(instance.event.type).to.equal('keyup');
-    expect(instance.event.defaultPrevented).to.be.true;
-  });
+    it('should not fire when only one of the keys is pressed', () => {
+      dispatch(multiInstance, 'keydown', 'x');
+      expect(multiInstance.callCount).to.equal(0);
 
-  it('event handler modifiers - stop propagation', () => {
-    let parentHandlerCalled = false;
-    const handler = () => {
-      parentHandlerCalled = true;
-    };
-    const container = instance.parentElement!;
-    container.addEventListener('keydown', handler, { once: true });
-    container.addEventListener('keyup', handler, { once: true });
+      dispatch(multiInstance, 'keyup', 'x');
 
-    simulateKeyboard(instance, 'd');
-    expect(parentHandlerCalled).to.be.false;
-    expect(instance.key).to.equal('d');
-  });
+      dispatch(multiInstance, 'keydown', 'z');
+      expect(multiInstance.callCount).to.equal(0);
+    });
 
-  it('activation keys', () => {
-    for (const key of [enterKey, spaceBar]) {
-      simulateKeyboard(instance, key);
-      expect(instance.key).to.equal(key.toLowerCase());
-    }
+    it('should fire when all keys are held simultaneously', () => {
+      dispatch(multiInstance, 'keydown', 'x');
+      dispatch(multiInstance, 'keydown', 'z');
+      expect(multiInstance.callCount).to.equal(1);
+    });
+
+    it('should clear pressed keys on window blur', () => {
+      // Hold 'x', then switch away without releasing it
+      dispatch(multiInstance, 'keydown', 'x');
+      window.dispatchEvent(new FocusEvent('blur'));
+
+      // 'x' should no longer be tracked; pressing 'z' alone should not fire
+      dispatch(multiInstance, 'keydown', 'z');
+      expect(multiInstance.callCount).to.equal(0);
+    });
   });
 
-  it('combinations', () => {
-    simulateKeyboard(instance, shiftKey);
-    expect(instance.key).to.be.undefined;
+  describe('repeat option', () => {
+    let repeatTag: string;
+    let repeatInstance: LitElement & { callCount: number };
+
+    before(() => {
+      repeatTag = defineCE(
+        class extends LitElement {
+          public callCount = 0;
+
+          constructor() {
+            super();
+            addKeybindings(this)
+              .set('a', () => this.callCount++)
+              .set('b', () => this.callCount++, { repeat: true });
+          }
+        }
+      );
+    });
+
+    beforeEach(async () => {
+      const tagName = unsafeStatic(repeatTag);
+      repeatInstance = await fixture(html`<${tagName}></${tagName}>`);
+    });
 
-    simulateKeyboard(instance, 'c');
-    expect(instance.key).to.be.undefined;
+    it('should not fire on repeated keydown by default', () => {
+      dispatch(repeatInstance, 'keydown', 'a', true);
+      expect(repeatInstance.callCount).to.equal(0);
+    });
 
-    simulateKeyboard(instance, [shiftKey, 'c']);
-    expect(instance.key).to.equal('c');
+    it('should fire on initial keydown regardless of repeat option', () => {
+      dispatch(repeatInstance, 'keydown', 'b');
+      expect(repeatInstance.callCount).to.equal(1);
+    });
 
-    simulateKeyboard(instance, [shiftKey, altKey, arrowUp]);
-    expect(instance.key).to.equal(arrowUp.toLowerCase());
+    it('should fire on repeated keydown when repeat is enabled', () => {
+      dispatch(repeatInstance, 'keydown', 'b', true);
+      expect(repeatInstance.callCount).to.equal(1);
+    });
   });
 });
+
+function dispatch(
+  node: Element,
+  type: 'keydown' | 'keyup',
+  key: string,
+  repeat = false
+) {
+  node.dispatchEvent(
+    new KeyboardEvent(type, {
+      key,
+      bubbles: true,
+      composed: true,
+      cancelable: true,
+      repeat,
+    })
+  );
+}