Uppercase all key combinations for consistent serialization

Issue #1283
metasfresh · Nov 16, 2017 · 6295286 · 6295286
1 parent 5aadac0
commit 6295286
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/src/components/Shortcuts/blacklist.js b/src/components/Shortcuts/blacklist.js
@@ -1,10 +1,16 @@
 const mods = [
-    'ctrl', // Windows, Linux
-    'cmd' // macOS
+    'Control', // Windows, Linux
+    'Meta' // macOS
 ];
 
-export default Object.assign(...mods.map(mod => ({
+export default Object.entries(Object.assign(...mods.map(mod => ({
     [`${mod}+l`]: 'Focus address bar',
     [`${mod}+t`]: 'New tab',
     [`${mod}+w`]: 'Close tab'
-})));
+})))).reduce((blacklist, pair) => {
+    const [key, value] = pair;
+
+    blacklist[key.toUpperCase()] = value;
+
+    return blacklist;
+}, {});
diff --git a/src/components/Shortcuts/generateHotkeys.js b/src/components/Shortcuts/generateHotkeys.js
@@ -1,7 +1,9 @@
 export default ({ keymap = {}, blacklist = {} } = {}) => {
     const hotkeys = {};
 
-    for (const [name, hotkey] of Object.entries(keymap)) {
+    for (const [name, _hotkey] of Object.entries(keymap)) {
+        const hotkey = _hotkey.toUpperCase();
+
         if (hotkey in blacklist) {
             const reason = blacklist[hotkey];
 

diff --git a/src/components/Shortcuts/generateHotkeys.test.js b/src/components/Shortcuts/generateHotkeys.test.js
@@ -16,15 +16,15 @@ describe('generateHotkeys', () => {
 
     it('should transform a key map to a map of hotkeys', () => {
         const keymap = {
-            COMBO_A: 'ctrl+a',
-            COMBO_B: 'ctrl+b'
+            COMBO_A: 'CONTROL+A',
+            COMBO_B: 'CONTROL+B'
         };
 
         const hotkeys = generateHotkeys({ keymap });
 
         expect(hotkeys).to.deep.equal({
-            'ctrl+a': [],
-            'ctrl+b': []
+            'CONTROL+A': [],
+            'CONTROL+B': []
         });
     });
 
@@ -33,8 +33,8 @@ describe('generateHotkeys', () => {
 
         try {
             const keymap = {
-                COMBO_1: 'ctrl+a',
-                COMBO_2: 'ctrl+a'
+                COMBO_1: 'CONTROL+A',
+                COMBO_2: 'CONTROL+A'
             };
 
             generateHotkeys({ keymap });
@@ -52,11 +52,11 @@ describe('generateHotkeys', () => {
 
         try {
             const blacklist = {
-                'ctrl+w': 'Close tab'
+                'CONTROL+W': 'Close tab'
             };
 
             const keymap = {
-                COMBO_1: 'ctrl+w'
+                COMBO_1: 'CONTROL+W'
             };
 
             generateHotkeys({ keymap, blacklist });

diff --git a/src/components/Shortcuts/keymap.js b/src/components/Shortcuts/keymap.js
@@ -1,4 +1,4 @@
-const mod = 'ctrl';
+const mod = 'Control';
 
 export default {
     /* Global context */