From 557a6dba5c714557e97d5b537338ae3892586b44 Mon Sep 17 00:00:00 2001 From: winkerVSbecks Date: Fri, 25 Nov 2022 13:17:25 -0500 Subject: [PATCH 1/3] export the controlOrMetaKey fn from manager-api --- code/lib/manager-api/src/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/lib/manager-api/src/index.tsx b/code/lib/manager-api/src/index.tsx index 04e4251f91ff..51a8e030df12 100644 --- a/code/lib/manager-api/src/index.tsx +++ b/code/lib/manager-api/src/index.tsx @@ -64,7 +64,7 @@ import * as url from './modules/url'; import * as version from './modules/versions'; // eslint-disable-next-line import/no-cycle import * as globals from './modules/globals'; -import { eventToShortcut, shortcutMatchesShortcut, shortcutToHumanString } from './lib/shortcut'; +import { controlOrMetaKey, eventToShortcut, shortcutMatchesShortcut, shortcutToHumanString } from './lib/shortcut'; const { ActiveTabs } = layout; @@ -482,7 +482,7 @@ export function useArgTypes(): API_ArgTypes { return (current?.type === 'story' && current.argTypes) || {}; } -export { eventToShortcut, shortcutToHumanString, shortcutMatchesShortcut }; +export { controlOrMetaKey, eventToShortcut, shortcutToHumanString, shortcutMatchesShortcut }; export { addons } from './lib/addons'; From 392f600ac6343b7172d096a408422f6020206646 Mon Sep 17 00:00:00 2001 From: winkerVSbecks Date: Fri, 25 Nov 2022 13:51:35 -0500 Subject: [PATCH 2/3] fix formatting --- code/lib/manager-api/src/index.tsx | 7 ++++++- code/ui/manager/src/globals/exports.ts | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/lib/manager-api/src/index.tsx b/code/lib/manager-api/src/index.tsx index 51a8e030df12..93cf8c7187be 100644 --- a/code/lib/manager-api/src/index.tsx +++ b/code/lib/manager-api/src/index.tsx @@ -64,7 +64,12 @@ import * as url from './modules/url'; import * as version from './modules/versions'; // eslint-disable-next-line import/no-cycle import * as globals from './modules/globals'; -import { controlOrMetaKey, eventToShortcut, shortcutMatchesShortcut, shortcutToHumanString } from './lib/shortcut'; +import { + controlOrMetaKey, + eventToShortcut, + shortcutMatchesShortcut, + shortcutToHumanString, +} from './lib/shortcut'; const { ActiveTabs } = layout; diff --git a/code/ui/manager/src/globals/exports.ts b/code/ui/manager/src/globals/exports.ts index 92c4a0c4820c..3799f49236fb 100644 --- a/code/ui/manager/src/globals/exports.ts +++ b/code/ui/manager/src/globals/exports.ts @@ -202,6 +202,7 @@ export default { 'Provider', 'addons', 'combineParameters', + 'controlOrMetaKey', 'eventToShortcut', 'merge', 'mockChannel', From 036ddc3b2df0042d5229e5706acb202e5c04d89f Mon Sep 17 00:00:00 2001 From: winkerVSbecks Date: Fri, 25 Nov 2022 20:42:11 -0500 Subject: [PATCH 3/3] export all shortcut utilities from manager-api --- code/lib/manager-api/src/index.tsx | 10 ++-------- code/ui/manager/src/globals/exports.ts | 6 ++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/lib/manager-api/src/index.tsx b/code/lib/manager-api/src/index.tsx index 93cf8c7187be..34a1e65b8c92 100644 --- a/code/lib/manager-api/src/index.tsx +++ b/code/lib/manager-api/src/index.tsx @@ -64,12 +64,8 @@ import * as url from './modules/url'; import * as version from './modules/versions'; // eslint-disable-next-line import/no-cycle import * as globals from './modules/globals'; -import { - controlOrMetaKey, - eventToShortcut, - shortcutMatchesShortcut, - shortcutToHumanString, -} from './lib/shortcut'; + +export * from './lib/shortcut'; const { ActiveTabs } = layout; @@ -487,8 +483,6 @@ export function useArgTypes(): API_ArgTypes { return (current?.type === 'story' && current.argTypes) || {}; } -export { controlOrMetaKey, eventToShortcut, shortcutToHumanString, shortcutMatchesShortcut }; - export { addons } from './lib/addons'; /* deprecated */ diff --git a/code/ui/manager/src/globals/exports.ts b/code/ui/manager/src/globals/exports.ts index 3799f49236fb..09bff3b7d151 100644 --- a/code/ui/manager/src/globals/exports.ts +++ b/code/ui/manager/src/globals/exports.ts @@ -203,9 +203,15 @@ export default { 'addons', 'combineParameters', 'controlOrMetaKey', + 'controlOrMetaSymbol', + 'eventMatchesShortcut', 'eventToShortcut', + 'isMacLike', + 'isShortcutTaken', + 'keyToSymbol', 'merge', 'mockChannel', + 'optionOrAltSymbol', 'shortcutMatchesShortcut', 'shortcutToHumanString', 'types',