Merge pull request #26 from github/fix-support-for-meta-shift-plane-w…

…hile-retaining-short-upper-chars fix: support for meta+shift plane while retaining short upper chars
github · Apr 9, 2020 · c71a0c6 · c71a0c6
2 parents 13f210b + 2477610
commit c71a0c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/hotkey.js b/src/hotkey.js
@@ -28,6 +28,6 @@
 // Returns key character String or null.
 export default function hotkey(event: KeyboardEvent) {
   return `${event.ctrlKey ? 'Control+' : ''}${event.altKey ? 'Alt+' : ''}${event.metaKey ? 'Meta+' : ''}${
-    event.shiftKey ? 'Shift+' : ''
+    event.shiftKey && event.key.toUpperCase() !== event.key ? 'Shift+' : ''
   }${event.key}`
 }
diff --git a/test/test.js b/test/test.js
@@ -90,6 +90,12 @@ describe('hotkey', function() {
       document.dispatchEvent(new KeyboardEvent('keydown', {key: 'b'}))
       assert.deepEqual(elementsActivated, [])
     })
+
+    it('triggers elements with capitalised key', function() {
+      setHTML('<button id="button1" data-hotkey="B">Button 1</button>')
+      document.dispatchEvent(new KeyboardEvent('keydown', {shiftKey: true, key: 'B'}))
+      assert.include(elementsActivated, 'button1')
+    })
   })
 
   describe('eventToHotkeyString', function() {