Merge pull request #755 from leoeuclids/feature-keycombo-plus

Feature: Plus sign support
adopted-ember-addons · Mar 8, 2024 · f173e2c · f173e2c
2 parents 7f73884 + 7629bd5
commit f173e2c
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 20 deletions.
diff --git a/addon/src/utils/keyboard-listener.js b/addon/src/utils/keyboard-listener.js
@@ -25,30 +25,42 @@ export default class KeyboardListener {
     keyCombo = keyCombo.join(':'); // allow keyCombo contain semicolon
     keyboardListener.type = eventType;
 
-    if (keyCombo === '+') {
-      keyboardListener.keyOrCode = keyCombo;
-      return keyboardListener;
-    }
+    let maybePlus = false;
+    keyCombo
+      .split('+')
+      .reduce((result, part) => {
+        if (part === '') {
+          if (maybePlus) {
+            result.push('+');
+          }
 
-    keyCombo.split('+').forEach((part) => {
-      if (ALT_REGEX.test(part)) {
-        keyboardListener.altKey = true;
-      } else if (CTRL_REGEX.test(part)) {
-        keyboardListener.ctrlKey = true;
-      } else if (META_REGEX.test(part)) {
-        keyboardListener.metaKey = true;
-      } else if (SHIFT_REGEX.test(part)) {
-        keyboardListener.shiftKey = true;
-      } else if (CMD_REGEX.test(part)) {
-        if (platform.indexOf('Mac') > -1) {
-          keyboardListener.metaKey = true;
+          maybePlus = !maybePlus;
         } else {
+          result.push(part);
+        }
+
+        return result;
+      }, [])
+      .forEach((part) => {
+        if (ALT_REGEX.test(part)) {
+          keyboardListener.altKey = true;
+        } else if (CTRL_REGEX.test(part)) {
           keyboardListener.ctrlKey = true;
+        } else if (META_REGEX.test(part)) {
+          keyboardListener.metaKey = true;
+        } else if (SHIFT_REGEX.test(part)) {
+          keyboardListener.shiftKey = true;
+        } else if (CMD_REGEX.test(part)) {
+          if (platform.indexOf('Mac') > -1) {
+            keyboardListener.metaKey = true;
+          } else {
+            keyboardListener.ctrlKey = true;
+          }
+        } else {
+          keyboardListener.keyOrCode = part;
         }
-      } else {
-        keyboardListener.keyOrCode = part;
-      }
-    });
+      });
+
     return keyboardListener;
   }
 

diff --git a/test-app/app/controllers/test-scenario/on-key-helper-examples.js b/test-app/app/controllers/test-scenario/on-key-helper-examples.js
@@ -5,4 +5,5 @@ export default class extends Controller {
   wasSPressed = false;
   wasSlashPressed = false;
   wasQuestionMarkPressed = false;
+  wasCtrlPlusPressed = false;
 }
diff --git a/test-app/app/templates/test-scenario/on-key-helper-examples.hbs b/test-app/app/templates/test-scenario/on-key-helper-examples.hbs
@@ -30,3 +30,12 @@
 </span>
 
 {{on-key 'shift+Slash' (fn (mut this.wasQuestionMarkPressed) true)}}
+
+<hr />
+
+
+<span data-test-ctrl-plus>
+  {{if this.wasCtrlPlusPressed 'Ctrl++ pressed' 'Ctrl++ not pressed'}}
+</span>
+
+{{on-key 'ctrl++' (fn (mut this.wasCtrlPlusPressed) true)}}
diff --git a/test-app/tests/acceptance/on-key-helper-test.js b/test-app/tests/acceptance/on-key-helper-test.js
@@ -84,4 +84,25 @@ module('Acceptance | on-key helper ', function (hooks) {
       }
     );
   });
+
+  test('Ctrl++', async function (assert) {
+    assert.expect(3);
+
+    await textChanged(
+      assert,
+      () =>
+        triggerEvent(document.body, 'keydown', {
+          code: 'Equal',
+          key: '+',
+          keyCode: 43,
+          which: 43,
+          ctrlKey: true,
+        }),
+      {
+        selectorName: 'ctrl-plus',
+        beforeValue: 'Ctrl++ not pressed',
+        afterValue: 'Ctrl++ pressed',
+      }
+    );
+  });
 });