Merge pull request #5374 from storybooks/shortcut-blur-2

Fix issue where "Tab" => [].
storybookjs · Jan 27, 2019 · 12a9e75 · 12a9e75
2 parents 6f4cf1c + cd47bc8
commit 12a9e75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/ui/src/libs/shortcut.test.ts b/lib/ui/src/libs/shortcut.test.ts
@@ -21,7 +21,11 @@ describe('eventToShortcut', () => {
   });
   test('it handles enter key inputs', () => {
     const output = eventToShortcut(ev({ key: 'Enter' }));
-    expect(output).toEqual([]);
+    expect(output).toEqual(null);
+  });
+  test('it handles tab key inputs', () => {
+    const output = eventToShortcut(ev({ key: 'Tab' }));
+    expect(output).toEqual(null);
   });
   test('it handles space bar inputs', () => {
     const output = eventToShortcut(ev({ key: ' ' }));

diff --git a/lib/ui/src/libs/shortcut.ts b/lib/ui/src/libs/shortcut.ts
@@ -54,7 +54,7 @@ export const eventToShortcut = (e: KeyboardEvent): Shortcut | null => {
     keys.push('ArrowLeft');
   }
 
-  return keys;
+  return keys.length > 0 ? keys : null;
 };
 
 export const shortcutMatchesShortcut = (inputShortcut: Shortcut, shortcut: Shortcut): boolean => {