Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(web): centre keyboard shortcut glyphs in their chip (#18745)

Der Gerät68bae3e2f774
diff --git a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx
index b9d2e2f277..530f71393c 100644
--- a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx
+++ b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx
@@ -1,6 +1,8 @@
/* eslint-disable @repo/storybook-play-no-implementation-detail-assertions */
+import { Keyboard, Play } from "lucide-react";
import { expect, within } from "storybook/test";
+import { Button } from "@/src/components/ui/button";
import preview from "../../../../.storybook/preview";
import { KeyboardShortcut } from "./KeyboardShortcut";
@@ -41,6 +43,50 @@ export const VariantMatrix = meta.story({
),
});
+/** Shows the chips beside the words, icons and button labels they line up with. */
+export const BesideTextAndIcons = meta.story({
+ render: () => (
+ <div className="flex flex-col items-start gap-4">
+ <span className="text-muted-foreground flex items-center gap-1.5 text-[11px]">
+ <KeyboardShortcut size="sm" keys={["Mod", "Enter"]} />
+ complete + next ·
+ <KeyboardShortcut size="sm" keys={["ArrowRight"]} />
+ skip
+ </span>
+ <span className="text-muted-foreground flex flex-wrap items-center gap-x-2 gap-y-1 text-[11px]">
+ <span className="flex items-center gap-1">
+ <KeyboardShortcut size="sm" keys={["ArrowUp"]} />
+ <KeyboardShortcut size="sm" keys={["ArrowDown"]} />
+ move between fields
+ </span>
+ <span className="flex items-center gap-1">
+ <KeyboardShortcut size="sm" keys={["1"]} />
+ <span>…</span>
+ <KeyboardShortcut size="sm" keys={["9"]} />
+ select option
+ </span>
+ </span>
+ <div className="flex items-center gap-2">
+ <Button variant="outline" size="lg" className="gap-1.5 px-4">
+ <Keyboard className="icon-base text-icon-foreground" />
+ Shortcuts
+ <KeyboardShortcut keys={["?"]} />
+ </Button>
+ <Button size="lg" className="gap-1.5">
+ <Play className="icon-base" />
+ <span>Run All</span>
+ <KeyboardShortcut variant="inverse" keys={["Mod", "Enter"]} />
+ </Button>
+ </div>
+ <p className="text-muted-foreground max-w-sm text-xs">
+ Bare <KeyboardShortcut size="sm" keys={["Enter"]} /> inside a text field
+ inserts a new line — use{" "}
+ <KeyboardShortcut size="sm" keys={["Mod", "Enter"]} /> to complete.
+ </p>
+ </div>
+ ),
+});
+
export const TestRendersMultipleKeys = meta.story({
name: "(Test) Renders Multiple Keys",
args: {
diff --git a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx
index 4bda239ee9..bf0d462441 100644
--- a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx
+++ b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx
@@ -86,15 +86,14 @@ function getKeyboardKeyLabel(key: KeyboardKey, isMac: boolean) {
}
const keyboardShortcutVariants = cva(
- "pointer-events-none inline-flex justify-center gap-1 rounded-sm font-mono leading-none font-normal select-none",
+ "pointer-events-none inline-flex items-center justify-center gap-1 rounded-sm align-middle font-mono leading-none font-normal select-none",
{
variants: {
variant: {
- default: "items-baseline bg-transparent text-foreground-tertiary",
- subtle: "items-baseline bg-transparent text-foreground-tertiary",
- inverse: "items-baseline bg-transparent text-primary-foreground",
- keycap:
- "items-center border bg-muted px-1 align-middle text-muted-foreground",
+ default: "bg-transparent text-foreground-tertiary",
+ subtle: "bg-transparent text-foreground-tertiary",
+ inverse: "bg-transparent text-primary-foreground",
+ keycap: "border bg-muted px-1 text-muted-foreground",
},
size: {
default: "h-5 min-w-5 text-xs",
@@ -109,10 +108,11 @@ const keyboardShortcutVariants = cva(
},
);
+/** Draws symbol labels one font step up, with their line box pinned to the chip's height. */
const symbolSizeClass = {
- default: "text-lg",
- sm: "text-sm",
- xs: "text-xs",
+ default: "text-lg leading-none",
+ sm: "text-sm leading-none",
+ xs: "text-xs leading-none",
} as const;
export type KeyboardShortcutProps = {
@@ -129,7 +129,6 @@ export function KeyboardShortcut({
size,
}: KeyboardShortcutProps) {
const isMac = useIsMac();
- const letterClass = variant === "keycap" ? undefined : "-translate-y-0.5";
return (
<kbd
@@ -139,13 +138,12 @@ export function KeyboardShortcut({
>
{keys.map((key, index) => {
const label = getKeyboardKeyLabel(key, isMac);
- // Modifier and arrow glyphs draw small and high in the mono face; one step up, letters nudged up to meet them.
const isSymbol = /^[^\p{L}\p{N}]$/u.test(label);
return (
<span
key={index}
className={
- isSymbol ? symbolSizeClass[size ?? "default"] : letterClass
+ isSymbol ? symbolSizeClass[size ?? "default"] : undefined
}
>
{label}
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
index 1f5a7e8196..5b4a907a8b 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
@@ -475,16 +475,13 @@ function AnnotationQueueRunContent({
}
size="lg"
className={cn(
- "gap-1.5 px-4 transition-colors duration-150",
+ "px-4 transition-colors duration-150",
shortcutPulse === "back" &&
"border-primary/60 bg-accent/60 ring-primary/20 ring-2",
)}
aria-label="Previous item"
>
<ArrowLeft className="icon-base text-icon-foreground" />
- <span className="hidden md:inline-flex">
- <KeyboardShortcut keys={["ArrowLeft"]} />
- </span>
</Button>
)}
</Tooltip>
@@ -521,7 +518,7 @@ function AnnotationQueueRunContent({
}
size="lg"
className={cn(
- "gap-1.5 px-4 transition-colors duration-150",
+ "px-4 transition-colors duration-150",
!relevantItem ? "w-full" : "",
shortcutPulse === "next" &&
"border-primary/60 bg-accent/60 ring-primary/20 ring-2",
@@ -530,9 +527,6 @@ function AnnotationQueueRunContent({
aria-label="Skip to next item"
>
<ArrowRight className="icon-base text-icon-foreground" />
- <span className="hidden md:inline-flex">
- <KeyboardShortcut keys={["ArrowRight"]} />
- </span>
</Button>
)}
</Tooltip>