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.

feat: reset shortcut hint for all style panel style info tooltips (#2965)

Oleg Isonen13d0140d617c
diff --git a/apps/builder/app/builder/features/style-panel/shared/property-name.tsx b/apps/builder/app/builder/features/style-panel/shared/property-name.tsx
index 0cb8b792e3..e91d26aefa 100644
--- a/apps/builder/app/builder/features/style-panel/shared/property-name.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/property-name.tsx
@@ -11,6 +11,7 @@ import {
type TooltipProps,
Text,
ScrollArea,
+ Kbd,
} from "@webstudio-is/design-system";
import { ResetIcon } from "@webstudio-is/icons";
import type {
@@ -270,8 +271,13 @@ export const TooltipContent = ({
onReset !== undefined && (
<Button
color="dark"
- prefix={<ResetIcon />}
- css={{ flexGrow: 1 }}
+ prefix={
+ <Flex justify="end">
+ <ResetIcon />
+ </Flex>
+ }
+ suffix={<Kbd value={["option", "click"]} />}
+ css={{ gridTemplateColumns: "2fr 3fr 1fr" }}
onClick={onReset}
>
Reset value
diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsx
index 87cdba5c33..b8ace70e11 100644
--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx
+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx
@@ -14,8 +14,8 @@ import {
DropdownMenuSeparator,
DropdownMenuPortal,
Tooltip,
+ Kbd,
} from "@webstudio-is/design-system";
-import { ShortcutHint } from "./shortcut-hint";
import {
useIsShareDialogOpen,
useIsPublishDialogOpen,
@@ -145,13 +145,13 @@ export const Menu = () => {
<DropdownMenuItem onSelect={() => emitCommand("undo")}>
Undo
<DropdownMenuItemRightSlot>
- <ShortcutHint value={["cmd", "z"]} />
+ <Kbd value={["cmd", "z"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
<DropdownMenuItem onSelect={() => emitCommand("redo")}>
Redo
<DropdownMenuItemRightSlot>
- <ShortcutHint value={["shift", "cmd", "z"]} />
+ <Kbd value={["shift", "cmd", "z"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
{/* https://github.com/webstudio-is/webstudio/issues/499
@@ -162,7 +162,7 @@ export const Menu = () => {
}}
>
Copy
- <DropdownMenuItemRightSlot><ShortcutHint value={["cmd", "c"]} /></DropdownMenuItemRightSlot>
+ <DropdownMenuItemRightSlot><Kbd value={["cmd", "c"]} /></DropdownMenuItemRightSlot>
</DropdownMenuItem>
<DropdownMenuItem
onSelect={() => {
@@ -170,14 +170,14 @@ export const Menu = () => {
}}
>
Paste
- <DropdownMenuItemRightSlot><ShortcutHint value={["cmd", "v"]} /></DropdownMenuItemRightSlot>
+ <DropdownMenuItemRightSlot><Kbd value={["cmd", "v"]} /></DropdownMenuItemRightSlot>
</DropdownMenuItem>
*/}
<DropdownMenuItem onSelect={() => emitCommand("deleteInstance")}>
Delete
<DropdownMenuItemRightSlot>
- <ShortcutHint value={["backspace"]} />
+ <Kbd value={["backspace"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
<DropdownMenuSeparator />
@@ -185,7 +185,7 @@ export const Menu = () => {
<DropdownMenuItem onSelect={() => emitCommand("togglePreview")}>
Preview
<DropdownMenuItemRightSlot>
- <ShortcutHint value={["cmd", "shift", "p"]} />
+ <Kbd value={["cmd", "shift", "p"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
diff --git a/packages/design-system/src/components/kbd.stories.tsx b/packages/design-system/src/components/kbd.stories.tsx
new file mode 100644
index 0000000000..2a504e1449
--- /dev/null
+++ b/packages/design-system/src/components/kbd.stories.tsx
@@ -0,0 +1,9 @@
+import { Kbd } from "./kbd";
+
+export default {
+ title: "Library/Kbd",
+};
+
+const KbdStory = () => <Kbd value={["cmd", "z"]} />;
+
+export { KbdStory as Kbd };
diff --git a/apps/builder/app/builder/features/topbar/menu/shortcut-hint.tsx b/packages/design-system/src/components/kbd.tsx
similarity index 78%
rename from apps/builder/app/builder/features/topbar/menu/shortcut-hint.tsx
rename to packages/design-system/src/components/kbd.tsx
index d69a6a72a8..1363eee960 100644
--- a/apps/builder/app/builder/features/topbar/menu/shortcut-hint.tsx
+++ b/packages/design-system/src/components/kbd.tsx
@@ -1,4 +1,4 @@
-import { DeprecatedText2 } from "@webstudio-is/design-system";
+import { Text } from "./text";
const isMac =
typeof navigator === "object" ? /mac/i.test(navigator.platform) : false;
@@ -9,6 +9,7 @@ const shortcutSymbolMap: Record<string, string> = {
shift: "⇧",
option: "⌥",
backspace: "⌫",
+ click: "+click",
};
const shortcutWinMap: Record<string, string> = {
@@ -32,10 +33,10 @@ const format = (value: ShortcutDefinition) => {
);
};
-export const ShortcutHint = ({ value }: { value: ShortcutDefinition }) => {
+export const Kbd = ({ value }: { value: ShortcutDefinition }) => {
return (
- <DeprecatedText2 css={{ letterSpacing: 1.5 }}>
+ <Text color="subtle" as="kbd">
{format(value)}
- </DeprecatedText2>
+ </Text>
);
};
diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts
index bb663a4a9b..8957d616d2 100644
--- a/packages/design-system/src/index.ts
+++ b/packages/design-system/src/index.ts
@@ -80,6 +80,7 @@ export * from "./components/scroll-area";
export * from "./components/primitives/use-scrub";
export * from "./components/primitives/numeric-input-arrow-keys";
export * from "./components/primitives/list";
+export * from "./components/kbd";
// Deprecated