Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: Use consistent naming of the meta key (#5069)

Oleg Isonen07fbc3b15528
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 ed29629972..66c6fe8fb0 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 = () => {
<button onClick={openCommandPanel}>Open command panel</button>
<br />
<input
- defaultValue="Press cmd+k to open command panel"
+ defaultValue="Press meta+k to open command panel"
style={{ width: 300 }}
/>
<CommandPanelComponent />
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 cfff717c0d..4383ef712f 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 aa1a5ff3b6..ec86625cb0 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 4201e395bc..43c3f09791 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: <PaintBrushIcon />,
description: "Edit components, styles, and properties",
title: "Design",
- shortcut: ["cmd", "shift", "d"],
+ shortcut: ["meta", "shift", "d"],
enabled: isDesignModeAllowed,
},
content: {
icon: <NotebookAndPenIcon />,
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={
<Flex gap="1">
<Text variant="regular">Toggle preview</Text>
- <Kbd value={["cmd", "shift", "p"]} />
+ <Kbd value={["meta", "shift", "p"]} />
</Flex>
}
>
diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsx
index 23db037a69..63287a2460 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 = () => {
<DropdownMenuItem onSelect={() => emitCommand("undo")}>
Undo
<DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "z"]} />
+ <Kbd value={["meta", "z"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
<DropdownMenuItem onSelect={() => emitCommand("redo")}>
Redo
<DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "shift", "z"]} />
+ <Kbd value={["meta", "shift", "z"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
{/* https://github.com/webstudio-is/webstudio/issues/499
@@ -124,7 +124,7 @@ export const Menu = () => {
}}
>
Copy
- <DropdownMenuItemRightSlot><Kbd value={["cmd", "c"]} /></DropdownMenuItemRightSlot>
+ <DropdownMenuItemRightSlot><Kbd value={["meta", "c"]} /></DropdownMenuItemRightSlot>
</DropdownMenuItem>
<DropdownMenuItem
onSelect={() => {
@@ -132,7 +132,7 @@ export const Menu = () => {
}}
>
Paste
- <DropdownMenuItemRightSlot><Kbd value={["cmd", "v"]} /></DropdownMenuItemRightSlot>
+ <DropdownMenuItemRightSlot><Kbd value={["meta", "v"]} /></DropdownMenuItemRightSlot>
</DropdownMenuItem>
*/}
@@ -146,7 +146,7 @@ export const Menu = () => {
<DropdownMenuItem onSelect={() => emitCommand("togglePreviewMode")}>
Preview
<DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "shift", "p"]} />
+ <Kbd value={["meta", "shift", "p"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
@@ -242,7 +242,7 @@ export const Menu = () => {
<DropdownMenuItem onSelect={() => emitCommand("openCommandPanel")}>
Search & Commands
<DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "k"]} />
+ <Kbd value={["meta", "k"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
)}
diff --git a/apps/builder/app/builder/shared/code-editor-base.tsx b/apps/builder/app/builder/shared/code-editor-base.tsx
index 07c4485270..0b1105a40f 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 && (
<Flex align="center" justify="end" gap="1" className={shortcutStyle()}>
<Text variant="small">Submit</Text>
- <Kbd value={["cmd", "enter"]} />
+ <Kbd value={["meta", "enter"]} />
</Flex>
)}
</div>
diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.ts
index 6ce296d3df..b6dae30e00 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 991394df52..0b29202ea9 100644
--- a/apps/builder/app/shared/commands-emitter.ts
+++ b/apps/builder/app/shared/commands-emitter.ts
@@ -17,7 +17,7 @@ type CommandMeta<CommandName extends string> = {
**/
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 70847f8edd..b852331c61 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 = () => {
</CommandIcon>
<Text variant="labelsTitleCase">Profile</Text>
</Flex>
- <Kbd value={["cmd", "p"]} />
+ <Kbd value={["meta", "p"]} />
</CommandItem>
<CommandItem>
<Flex gap={2}>
@@ -76,7 +76,7 @@ const CommandContent = () => {
</CommandIcon>
<Text variant="labelsTitleCase">Billing</Text>
</Flex>
- <Kbd value={["cmd", "b"]} />
+ <Kbd value={["meta", "b"]} />
</CommandItem>
<CommandItem>
<Flex gap={2}>
@@ -85,7 +85,7 @@ const CommandContent = () => {
</CommandIcon>
<Text variant="labelsTitleCase">Settings</Text>
</Flex>
- <Kbd value={["cmd", "s"]} />
+ <Kbd value={["meta", "s"]} />
</CommandItem>
</CommandGroup>
</CommandList>
diff --git a/packages/design-system/src/components/kbd.stories.tsx b/packages/design-system/src/components/kbd.stories.tsx
index 2a504e1449..d1d9142192 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 = () => <Kbd value={["cmd", "z"]} />;
+const KbdStory = () => <Kbd value={["meta", "z"]} />;
export { KbdStory as Kbd };
diff --git a/packages/design-system/src/components/kbd.tsx b/packages/design-system/src/components/kbd.tsx
index 5715d887b7..662dadb223 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<string, string> = {
- cmd: isMac ? "⌘" : "Ctrl",
+ meta: isMac ? "⌘" : "Ctrl",
shift: "⇧",
alt: isMac ? "⌥" : "Alt",
backspace: "⌫",