Merge pull request #11155 from mbelsky/reuse-api-lib

UI: Remove unused & duplicated code
storybookjs · Jun 14, 2020 · 1af7ae6 · 1af7ae6
2 parents 26b94ff + 531e9bc
commit 1af7ae6
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 172 deletions.
diff --git a/lib/api/shortcut.d.ts b/lib/api/shortcut.d.ts
@@ -0,0 +1 @@
+export * from './dist/lib/shortcut.d';
diff --git a/lib/api/shortcut.js b/lib/api/shortcut.js
@@ -0,0 +1 @@
+module.exports = require('./dist/lib/shortcut');
diff --git a/lib/api/src/lib/shortcut.ts b/lib/api/src/lib/shortcut.ts
@@ -14,7 +14,7 @@ export const isShortcutTaken = (arr1: string[], arr2: string[]): boolean =>
 
 // Map a keyboard event to a keyboard shortcut
 // NOTE: if we change the fields on the event that we need, we'll need to update the serialization in core/preview/start.js
-export const eventToShortcut = (e: Event): KeyCollection | null => {
+export const eventToShortcut = (e: KeyboardEvent): KeyCollection | null => {
   // Meta key only doesn't map to a shortcut
   if (['Meta', 'Alt', 'Control', 'Shift'].includes(e.key)) {
     return null;

diff --git a/lib/ui/src/containers/menu.tsx b/lib/ui/src/containers/menu.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from 'react';
 import { Badge } from '@storybook/components';
 import { API } from '@storybook/api';
 
-import { shortcutToHumanString } from '../libs/shortcut';
+import { shortcutToHumanString } from '@storybook/api/shortcut';
 import { MenuItemIcon } from '../components/sidebar/Menu';
 
 const focusableUIElements = {

diff --git a/lib/ui/src/libs/merge.ts b/lib/ui/src/libs/merge.ts
diff --git a/lib/ui/src/libs/shortcut.ts b/lib/ui/src/libs/shortcut.ts
diff --git a/lib/ui/src/libs/withLifecycleDecorator.tsx b/lib/ui/src/libs/withLifecycleDecorator.tsx
diff --git a/lib/ui/src/settings/shortcuts.tsx b/lib/ui/src/settings/shortcuts.tsx
@@ -2,11 +2,14 @@ import React, { Component, Fragment, SyntheticEvent } from 'react';
 import { styled, keyframes } from '@storybook/theming';
 import { GlobalHotKeys } from 'react-hotkeys';
 
+import {
+  eventToShortcut,
+  shortcutToHumanString,
+  shortcutMatchesShortcut,
+} from '@storybook/api/shortcut';
 import { Form, IconButton, Icons, Tabs } from '@storybook/components';
 import SettingsFooter from './SettingsFooter';
 
-import { eventToShortcut, shortcutToHumanString, shortcutMatchesShortcut } from '../libs/shortcut';
-
 const { Button, Input } = Form;
 
 const Header = styled.header(({ theme }) => ({
@@ -200,7 +203,10 @@ class ShortcutsScreen extends Component<ShortcutsScreenProps, ShortcutsScreenSta
 
     this.setState({
       activeFeature: focusedInput,
-      shortcutKeys: { ...shortcutKeys, [focusedInput]: { shortcut: null, error: false } },
+      shortcutKeys: {
+        ...shortcutKeys,
+        [focusedInput]: { shortcut: null, error: false },
+      },
     });
   };