diff --git a/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx b/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx index ed2962997279..66c6fe8fb0a8 100644 --- a/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx +++ b/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx @@ -81,7 +81,7 @@ export const CommandPanel: StoryFn = () => {
diff --git a/apps/builder/app/builder/features/command-panel/command-panel.tsx b/apps/builder/app/builder/features/command-panel/command-panel.tsx index cfff717c0d32..4383ef712f05 100644 --- a/apps/builder/app/builder/features/command-panel/command-panel.tsx +++ b/apps/builder/app/builder/features/command-panel/command-panel.tsx @@ -349,9 +349,7 @@ const $shortcutOptions = computed([$commandMetas], (commandMetas) => { for (const [name, meta] of commandMetas) { if (!meta.hidden) { const label = humanizeString(name); - const keys = meta.defaultHotkeys?.[0] - ?.split("+") - .map((key) => (key === "meta" ? "cmd" : key)); + const keys = meta.defaultHotkeys?.[0]?.split("+"); shortcutOptions.push({ tokens: ["shortcuts", "commands", label], type: "shortcut", diff --git a/apps/builder/app/builder/features/style-panel/shared/modifier-keys.ts b/apps/builder/app/builder/features/style-panel/shared/modifier-keys.ts index aa1a5ff3b68d..ec86625cb09e 100644 --- a/apps/builder/app/builder/features/style-panel/shared/modifier-keys.ts +++ b/apps/builder/app/builder/features/style-panel/shared/modifier-keys.ts @@ -39,7 +39,7 @@ export const useModifierKeys = () => { window.addEventListener("keydown", handler); window.addEventListener("keyup", handler); // The use of only the keyup/keydown events may not be sufficient. - // on a Mac, when the cmd-shift-4 (printscreen) combination is triggered, there is a possibility of losing the keyup event. + // on a Mac, when the meta-shift-4 (printscreen) combination is triggered, there is a possibility of losing the keyup event. window.addEventListener("mousemove", handler); return () => { diff --git a/apps/builder/app/builder/features/topbar/builder-mode.tsx b/apps/builder/app/builder/features/topbar/builder-mode.tsx index 4201e395bc7c..43c3f09791ba 100644 --- a/apps/builder/app/builder/features/topbar/builder-mode.tsx +++ b/apps/builder/app/builder/features/topbar/builder-mode.tsx @@ -44,14 +44,14 @@ export const BuilderModeDropDown = () => { icon: , description: "Edit components, styles, and properties", title: "Design", - shortcut: ["cmd", "shift", "d"], + shortcut: ["meta", "shift", "d"], enabled: isDesignModeAllowed, }, content: { icon: , description: "Modify the page content", title: "Content", - shortcut: ["cmd", "shift", "c"], + shortcut: ["meta", "shift", "c"], enabled: isContentModeAllowed, }, } as const; @@ -74,7 +74,7 @@ export const BuilderModeDropDown = () => { content={ Toggle preview - + } > diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsx index 23db037a69dd..63287a246053 100644 --- a/apps/builder/app/builder/features/topbar/menu/menu.tsx +++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx @@ -107,13 +107,13 @@ export const Menu = () => { emitCommand("undo")}> Undo - + emitCommand("redo")}> Redo - + {/* https://github.com/webstudio-is/webstudio/issues/499 @@ -124,7 +124,7 @@ export const Menu = () => { }} > Copy - + { @@ -132,7 +132,7 @@ export const Menu = () => { }} > Paste - + */} @@ -146,7 +146,7 @@ export const Menu = () => { emitCommand("togglePreviewMode")}> Preview - + @@ -242,7 +242,7 @@ export const Menu = () => { emitCommand("openCommandPanel")}> Search & Commands - + )} diff --git a/apps/builder/app/builder/shared/code-editor-base.tsx b/apps/builder/app/builder/shared/code-editor-base.tsx index 07c448527038..0b1105a40f64 100644 --- a/apps/builder/app/builder/shared/code-editor-base.tsx +++ b/apps/builder/app/builder/shared/code-editor-base.tsx @@ -402,7 +402,7 @@ export const EditorContent = ({ {showShortcuts && ( Submit - + )} diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.ts index 6ce296d3dfab..b6dae30e006f 100644 --- a/apps/builder/app/builder/shared/commands.ts +++ b/apps/builder/app/builder/shared/commands.ts @@ -513,7 +513,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({ { name: "undo", - // safari use cmd+z to reopen closed tabs, here added ctrl as alternative + // safari use meta+z to reopen closed tabs, here added ctrl as alternative defaultHotkeys: ["meta+z", "ctrl+z"], disableOnInputLikeControls: true, handler: () => { @@ -522,7 +522,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({ }, { name: "redo", - // safari use cmd+z to reopen closed tabs, here added ctrl as alternative + // safari use meta+z to reopen closed tabs, here added ctrl as alternative defaultHotkeys: ["meta+shift+z", "ctrl+shift+z"], disableOnInputLikeControls: true, handler: () => { diff --git a/apps/builder/app/shared/commands-emitter.ts b/apps/builder/app/shared/commands-emitter.ts index 991394df52ed..0b29202ea937 100644 --- a/apps/builder/app/shared/commands-emitter.ts +++ b/apps/builder/app/shared/commands-emitter.ts @@ -17,7 +17,7 @@ type CommandMeta = { **/ disableOnInputLikeControls?: boolean; /** - * hide the command in cmd+k panel + * hide the command in meta+k panel */ hidden?: boolean; }; diff --git a/packages/design-system/src/components/command.stories.tsx b/packages/design-system/src/components/command.stories.tsx index 70847f8eddcf..b852331c6127 100644 --- a/packages/design-system/src/components/command.stories.tsx +++ b/packages/design-system/src/components/command.stories.tsx @@ -67,7 +67,7 @@ const CommandContent = () => { Profile - + @@ -76,7 +76,7 @@ const CommandContent = () => { Billing - + @@ -85,7 +85,7 @@ const CommandContent = () => { Settings - + diff --git a/packages/design-system/src/components/kbd.stories.tsx b/packages/design-system/src/components/kbd.stories.tsx index 2a504e1449e2..d1d9142192c4 100644 --- a/packages/design-system/src/components/kbd.stories.tsx +++ b/packages/design-system/src/components/kbd.stories.tsx @@ -4,6 +4,6 @@ export default { title: "Library/Kbd", }; -const KbdStory = () => ; +const KbdStory = () => ; export { KbdStory as Kbd }; diff --git a/packages/design-system/src/components/kbd.tsx b/packages/design-system/src/components/kbd.tsx index 5715d887b716..662dadb22375 100644 --- a/packages/design-system/src/components/kbd.tsx +++ b/packages/design-system/src/components/kbd.tsx @@ -4,7 +4,7 @@ const isMac = typeof navigator === "object" ? /mac/i.test(navigator.platform) : false; const shortcutSymbolMap: Record = { - cmd: isMac ? "⌘" : "Ctrl", + meta: isMac ? "⌘" : "Ctrl", shift: "⇧", alt: isMac ? "⌥" : "Alt", backspace: "⌫",