πͺ’ Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
refactor(web): Clean up `KeyboardShortcut` (#16612)
Ben Bachemfe889b2368b7
diff --git a/web/.storybook/main.ts b/web/.storybook/main.tsindex 0f9892b0a2..b30a102496 100644--- a/web/.storybook/main.ts+++ b/web/.storybook/main.ts@@ -15,6 +15,7 @@ const DESIGN_COMPONENT_STORIES = ["Checkbox/Checkbox","Codeblock/Codeblock","Dropzone/Dropzone",+ "KeyboardShortcut/KeyboardShortcut","LangfuseIcon/LangfuseIcon","LangfuseLogo/LangfuseLogo","PasswordInput/PasswordInput",diff --git a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsxnew file mode 100644index 0000000000..b2f8a244ce--- /dev/null+++ b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx@@ -0,0 +1,57 @@+import { expect, within } from "storybook/test";++import preview from "../../../../.storybook/preview";+import { KeyboardShortcut } from "./KeyboardShortcut";++const meta = preview.meta({+ component: KeyboardShortcut,+});++export const Default = meta.story({+ args: {+ keys: ["K"],+ },+});++// Multiple keys (e.g. a modifier + a letter) render as separate labels+// inside the same kbd, joined by a small gap β the "βK" / "Ctrl Enter" shape+// used for command-menu and submit hints.+export const MultipleKeys = meta.story({+ args: {+ keys: ["Mod", "Enter"],+ },+});++export const VariantMatrix = meta.story({+ render: () => (+ <div className="flex flex-col gap-4">+ <div className="flex items-center gap-2">+ <KeyboardShortcut keys={["K"]} />+ <KeyboardShortcut variant="subtle" keys={["K"]} />+ <KeyboardShortcut variant="inverse" keys={["K"]} />+ </div>+ <div className="flex items-center gap-2">+ <KeyboardShortcut size="sm" keys={["K"]} />+ <KeyboardShortcut size="xs" keys={["K"]} />+ </div>+ </div>+ ),+});++export const TestRendersMultipleKeys = meta.story({+ name: "(Test) Renders Multiple Keys",+ args: {+ keys: ["Mod", "Enter"],+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const modLabel = navigator.userAgent.includes("Mac") ? "β" : "Ctrl";+ const shortcut = canvas.getByText(modLabel).closest("kbd");++ await expect(shortcut).toBeInTheDocument();+ await expect(shortcut).toHaveClass("inline-flex");+ await expect(shortcut).not.toHaveClass("hidden");+ await expect(shortcut).toHaveTextContent(`${modLabel}β΅`);+ await expect(shortcut?.querySelectorAll("span")).toHaveLength(2);+ },+});diff --git a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsxnew file mode 100644index 0000000000..e628933b97--- /dev/null+++ b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx@@ -0,0 +1,137 @@+import * as React from "react";+import { cva, type VariantProps } from "class-variance-authority";+import { useIsMac } from "@/src/hooks/useIsMac";++type LetterKey =+ | "A"+ | "B"+ | "C"+ | "D"+ | "E"+ | "F"+ | "G"+ | "H"+ | "I"+ | "J"+ | "K"+ | "L"+ | "M"+ | "N"+ | "O"+ | "P"+ | "Q"+ | "R"+ | "S"+ | "T"+ | "U"+ | "V"+ | "W"+ | "X"+ | "Y"+ | "Z";++type DigitKey = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9";++export type KeyboardKey =+ | LetterKey+ | DigitKey+ | "?"+ | "Mod"+ | "Control"+ | "Alt"+ | "Shift"+ | "Meta"+ | "Enter"+ | "Escape"+ | "Tab"+ | "ArrowUp"+ | "ArrowDown"+ | "ArrowLeft"+ | "ArrowRight"+ | "Space"+ | "Backspace"+ | "Delete";++const keyboardKeyLabels: Partial<Record<KeyboardKey, string>> = {+ Control: "Ctrl",+ Alt: "Alt",+ Shift: "Shift",+ Meta: "β",+ Enter: "β΅",+ Escape: "Esc",+ Tab: "Tab",+ ArrowUp: "β",+ ArrowDown: "β",+ ArrowLeft: "β",+ ArrowRight: "β",+ Space: "Space",+ Backspace: "β«",+ Delete: "Del",+};++function getKeyboardKeyLabel(key: KeyboardKey, isMac: boolean) {+ if (key === "Mod") {+ return isMac ? "β" : "Ctrl";+ }++ if (isMac && key === "Shift") {+ return "β§";+ }++ if (isMac && key === "Alt") {+ return "β₯";+ }++ return keyboardKeyLabels[key] ?? key;+}++const keyboardShortcutVariants = cva(+ "pointer-events-none inline-flex items-center justify-center gap-1 rounded-md border font-mono leading-none font-bold select-none",+ {+ variants: {+ variant: {+ default: "bg-muted text-muted-foreground shadow-xs",+ subtle: "bg-transparent text-muted-foreground shadow-none",+ inverse:+ "border-primary-foreground/30 bg-primary-foreground/20 text-primary-foreground shadow-xs",+ },+ size: {+ default: "h-5 min-w-5 px-1.5 text-[10px]",+ sm: "h-4 min-w-4 px-1 text-[9px]",+ xs: "h-3.5 min-w-3.5 px-1 text-[9px]",+ },+ },+ defaultVariants: {+ variant: "default",+ size: "default",+ },+ },+);++export type KeyboardShortcutProps = {+ ref?: React.Ref<HTMLElement>;+ title?: string;+ keys: readonly [KeyboardKey, ...KeyboardKey[]];+} & VariantProps<typeof keyboardShortcutVariants>;++export function KeyboardShortcut({+ ref,+ keys,+ title,+ variant,+ size,+}: KeyboardShortcutProps) {+ const isMac = useIsMac();++ return (+ <kbd+ ref={ref}+ className={keyboardShortcutVariants({ variant, size })}+ title={title}+ >+ {keys.map((key, index) => (+ <span key={index}>{getKeyboardKeyLabel(key, isMac)}</span>+ ))}+ </kbd>+ );+}diff --git a/web/src/components/layouts/routes.tsx b/web/src/components/layouts/routes.tsxindex 845c605beb..1ff1a9ff45 100644--- a/web/src/components/layouts/routes.tsx+++ b/web/src/components/layouts/routes.tsx@@ -30,7 +30,7 @@ import { V4MigrationNavItem } from "@/src/features/v4-migration/V4MigrationNavItimport { V4SidebarToggle } from "@/src/features/events/components/V4SidebarToggle";import { BookACallButton } from "@/src/components/nav/book-a-call-button";import { SidebarMenuButton } from "@/src/components/ui/sidebar";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import { useCommandMenu } from "@/src/features/command-k-menu/CommandMenuProvider";import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";import { CloudStatusMenu } from "@/src/features/cloud-status-notification/components/CloudStatusMenu";@@ -284,10 +284,9 @@ function CommandMenuTrigger() {><Search className="h-4 w-4" />Go to...- <KeyboardShortcut- className="ml-auto"- keys={[navigator.userAgent.includes("Mac") ? "β" : "Ctrl", "K"]}- />+ <span className="ml-auto hidden md:inline-flex">+ <KeyboardShortcut keys={["Mod", "K"]} />+ </span></SidebarMenuButton>);}diff --git a/web/src/components/nav/in-app-ai-agent-button.tsx b/web/src/components/nav/in-app-ai-agent-button.tsxindex 6ac1e2d737..df1422737d 100644--- a/web/src/components/nav/in-app-ai-agent-button.tsx+++ b/web/src/components/nav/in-app-ai-agent-button.tsx@@ -2,7 +2,7 @@ import { useCallback, useEffect } from "react";import { BotMessageSquare } from "lucide-react";import { Button } from "@/src/components/ui/button";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import {useIsInAppAgentLauncherVisible,useInAppAiAgent,@@ -123,16 +123,9 @@ export const InAppAiAgentButton = ({{!prominent && (<><span className="hidden sm:inline">Assistant</span>- <KeyboardShortcut- className="bg-transparent shadow-none"- keys={[- typeof navigator !== "undefined" &&- navigator.userAgent.includes("Mac")- ? "β"- : "Ctrl",- "I",- ]}- />+ <span className="hidden md:inline-flex">+ <KeyboardShortcut variant="subtle" keys={["Mod", "I"]} />+ </span></>)}</Button>diff --git a/web/src/components/ui/KeyboardShortcut.stories.tsx b/web/src/components/ui/KeyboardShortcut.stories.tsxdeleted file mode 100644index cd36ed5dd6..0000000000--- a/web/src/components/ui/KeyboardShortcut.stories.tsx+++ /dev/null@@ -1,27 +0,0 @@-import preview from "../../../.storybook/preview";-import { KeyboardShortcut } from "./keyboard-shortcut";--const meta = preview.meta({- component: KeyboardShortcut,-});--// Hidden below the `md` breakpoint (768px, the same cutoff `useIsMobile`-// uses) by default: a keyboard-shortcut hint is noise on a touch device with-// no physical keyboard (LFE-11067). The underlying shortcut still fires there-// β only this visual chip is gated. Resize the Storybook canvas below 768px-// to see it disappear (CSS-only; jsdom-based story tests don't apply media-// queries, so this is only visible when the canvas renders in a real browser).-export const Default = meta.story({- args: {- children: "K",- },-});--// Multiple glyphs (e.g. a modifier + a letter) render as separate chips-// inside the same kbd, joined by a small gap β the "βK" / "β Enter" shape-// used for command-menu and submit hints.-export const MultipleKeys = meta.story({- args: {- keys: ["β", "Enter"],- },-});diff --git a/web/src/components/ui/command.tsx b/web/src/components/ui/command.tsxindex 569c00f6c8..a395a6e6ac 100644--- a/web/src/components/ui/command.tsx+++ b/web/src/components/ui/command.tsx@@ -10,7 +10,7 @@ import { cn } from "@/src/utils/tailwind";import {KeyboardShortcut,type KeyboardShortcutProps,-} from "@/src/components/ui/keyboard-shortcut";+} from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import {Dialog,DialogBody,@@ -171,8 +171,16 @@ const CommandItem = React.forwardRef<CommandItem.displayName = CommandPrimitive.Item.displayName;-const CommandShortcut = ({ className, ...props }: KeyboardShortcutProps) => {- return <KeyboardShortcut className={cn("ml-auto", className)} {...props} />;+type CommandShortcutProps = KeyboardShortcutProps & {+ className?: string;+};++const CommandShortcut = ({ className, ...props }: CommandShortcutProps) => {+ return (+ <span className={cn("ml-auto hidden md:inline-flex", className)}>+ <KeyboardShortcut {...props} />+ </span>+ );};CommandShortcut.displayName = "CommandShortcut";diff --git a/web/src/components/ui/input-command.tsx b/web/src/components/ui/input-command.tsxindex 492846e6f2..74e44f42f5 100644--- a/web/src/components/ui/input-command.tsx+++ b/web/src/components/ui/input-command.tsx@@ -13,7 +13,7 @@ import { Dialog, DialogBody, DialogContent } from "@/src/components/ui/dialog";import {KeyboardShortcut,type KeyboardShortcutProps,-} from "@/src/components/ui/keyboard-shortcut";+} from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import { cn } from "@/src/utils/tailwind";const InputCommand = React.forwardRef<@@ -148,11 +148,19 @@ const InputCommandItem = React.forwardRef<InputCommandItem.displayName = CommandPrimitive.Item.displayName;+type InputCommandShortcutProps = KeyboardShortcutProps & {+ className?: string;+};+const InputCommandShortcut = ({className,...props-}: KeyboardShortcutProps) => {- return <KeyboardShortcut className={cn("ml-auto", className)} {...props} />;+}: InputCommandShortcutProps) => {+ return (+ <span className={cn("ml-auto hidden md:inline-flex", className)}>+ <KeyboardShortcut {...props} />+ </span>+ );};InputCommandShortcut.displayName = "CommandShortcut";diff --git a/web/src/components/ui/keyboard-shortcut.tsx b/web/src/components/ui/keyboard-shortcut.tsxdeleted file mode 100644index 49715ca20e..0000000000--- a/web/src/components/ui/keyboard-shortcut.tsx+++ /dev/null@@ -1,40 +0,0 @@-/* eslint-disable @repo/no-style-props */-import * as React from "react";--import { cn } from "@/src/utils/tailwind";--type KeyboardShortcutContent =- | { children: React.ReactNode; keys?: never }- | { children?: never; keys: React.ReactNode[] };--export type KeyboardShortcutProps = Omit<- React.ComponentPropsWithoutRef<"kbd">,- "children"-> &- KeyboardShortcutContent;--const KeyboardShortcut = React.forwardRef<HTMLElement, KeyboardShortcutProps>(- ({ className, children, keys, ...props }, ref) => (- <kbd- ref={ref}- className={cn(- // Hidden below `md` (768px, matches useIsMobile) by default: a- // keyboard-shortcut hint is noise on a touch device with no physical- // keyboard. This only hides the visual chip β the shortcut's own- // keydown handler is untouched, so a Bluetooth keyboard still works.- // CSS-only (no useIsMobile()) so SSR'd hints don't hydration-mismatch- // or flash on first paint (LFE-11067).- "bg-muted text-muted-foreground pointer-events-none hidden h-5 min-w-5 items-center justify-center gap-1 rounded-md border px-1.5 font-mono text-[10px] leading-none font-bold shadow-xs select-none md:inline-flex",- className,- )}- {...props}- >- {keys- ? keys.map((key, index) => <span key={index}>{key}</span>)- : children}- </kbd>- ),-);-KeyboardShortcut.displayName = "KeyboardShortcut";--export { KeyboardShortcut };diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsxindex dd787bc449..12fb92a38f 100644--- a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx@@ -11,7 +11,7 @@ import { ArrowLeft, ArrowRight, Keyboard, SearchXIcon } from "lucide-react";import { useRouter } from "next/router";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { Button } from "@/src/components/ui/button";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import {Tooltip,TooltipContent,@@ -27,7 +27,6 @@ import {import { cn } from "@/src/utils/tailwind";import {hasModifier,- isAppleDevice,isCompleteShortcut,isInteractiveTarget,isOpenDialogPresent,@@ -42,14 +41,14 @@ import { useSession } from "next-auth/react";import { SplashScreen } from "@/src/components/ui/splash-screen";// A single row in the keyboard-shortcuts cheatsheet: label on the left, one or-// more <KeyboardShortcut> glyphs (passed as children) on the right.+// more <KeyboardShortcut> glyphs on the right.const ShortcutRow: React.FC<{label: string;children: React.ReactNode;}> = ({ label, children }) => (<div className="flex items-center justify-between gap-6 py-1.5"><span className="text-sm">{label}</span>- <span className="flex items-center gap-1">{children}</span>+ <span className="hidden items-center gap-1 md:flex">{children}</span></div>);@@ -226,13 +225,6 @@ export const AnnotationQueueItemPage: React.FC<{[],);- // Platform-aware modifier glyph for the complete chord (β on macOS, Ctrl else).- const [isMac, setIsMac] = useState(false);- useEffect(() => {- setIsMac(isAppleDevice());- }, []);- const modLabel = isMac ? "β" : "Ctrl";-// "?" opens a keyboard-shortcuts cheatsheet.const [showShortcuts, setShowShortcuts] = useState(false);@@ -451,24 +443,23 @@ export const AnnotationQueueItemPage: React.FC<{aria-label="Previous item"><ArrowLeft className="h-4 w-4" />- <KeyboardShortcut>β</KeyboardShortcut>+ <span className="hidden md:inline-flex">+ <KeyboardShortcut keys={["ArrowLeft"]} />+ </span></Button></TooltipTrigger><TooltipContent><span>Previous item</span>- <KeyboardShortcut className="ml-2">β</KeyboardShortcut>+ <span className="ml-2 hidden md:inline-flex">+ <KeyboardShortcut keys={["ArrowLeft"]} />+ </span></TooltipContent></Tooltip>{/* Shortcut legend so annotators can discover keyboard-first flow */}<span className="text-muted-foreground hidden items-center gap-1.5 pl-1 text-[11px] lg:flex">- <KeyboardShortcut- className="h-4 px-1 text-[9px]"- keys={[modLabel, "β΅"]}- />+ <KeyboardShortcut size="sm" keys={["Mod", "Enter"]} />complete + next Β·- <KeyboardShortcut className="h-4 min-w-4 px-1 text-[9px]">- β- </KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["ArrowRight"]} />skip</span><button@@ -477,9 +468,7 @@ export const AnnotationQueueItemPage: React.FC<{className="text-muted-foreground hover:text-foreground hidden items-center gap-1 text-[11px] transition-colors lg:flex"aria-label="Show keyboard shortcuts">- <KeyboardShortcut className="h-4 min-w-4 px-1 text-[9px]">- ?- </KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["?"]} />shortcuts</button></div>@@ -502,12 +491,16 @@ export const AnnotationQueueItemPage: React.FC<{aria-label="Skip to next item"><ArrowRight className="h-4 w-4" />- <KeyboardShortcut>β</KeyboardShortcut>+ <span className="hidden md:inline-flex">+ <KeyboardShortcut keys={["ArrowRight"]} />+ </span></Button></TooltipTrigger><TooltipContent><span>Skip to next item</span>- <KeyboardShortcut className="ml-2">β</KeyboardShortcut>+ <span className="ml-2 hidden md:inline-flex">+ <KeyboardShortcut keys={["ArrowRight"]} />+ </span></TooltipContent></Tooltip>)}@@ -530,10 +523,12 @@ export const AnnotationQueueItemPage: React.FC<{><span>Mark Completed</span>{!isSingleItem && (- <KeyboardShortcut- className="bg-primary-foreground/20 text-primary-foreground border-primary-foreground/30"- keys={[modLabel, "β΅"]}- />+ <span className="hidden md:inline-flex">+ <KeyboardShortcut+ variant="inverse"+ keys={["Mod", "Enter"]}+ />+ </span>)}</Button></TooltipTrigger>@@ -544,7 +539,9 @@ export const AnnotationQueueItemPage: React.FC<{: "Mark completed + go to next item"}</span>{!isSingleItem && (- <KeyboardShortcut className="ml-2" keys={[modLabel, "β΅"]} />+ <span className="ml-2 hidden md:inline-flex">+ <KeyboardShortcut keys={["Mod", "Enter"]} />+ </span>)}</TooltipContent></Tooltip>@@ -569,13 +566,13 @@ export const AnnotationQueueItemPage: React.FC<{Navigate</p><ShortcutRow label="Complete & go to next item">- <KeyboardShortcut keys={[modLabel, "β΅"]} />+ <KeyboardShortcut size="sm" keys={["Mod", "Enter"]} /></ShortcutRow><ShortcutRow label="Skip to next item">- <KeyboardShortcut>β</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["ArrowRight"]} /></ShortcutRow><ShortcutRow label="Previous item">- <KeyboardShortcut>β</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["ArrowLeft"]} /></ShortcutRow></div><div>@@ -583,33 +580,32 @@ export const AnnotationQueueItemPage: React.FC<{Score the item</p><ShortcutRow label="Move between score fields">- <KeyboardShortcut>β</KeyboardShortcut>- <KeyboardShortcut>β</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["ArrowUp"]} />+ <KeyboardShortcut size="sm" keys={["ArrowDown"]} /></ShortcutRow><ShortcutRow label="Select an option on the focused field">- <KeyboardShortcut>1</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["1"]} /><span className="text-muted-foreground text-xs">β</span>- <KeyboardShortcut>9</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["9"]} /></ShortcutRow><ShortcutRow label="Edit a field / open a dropdown">- <KeyboardShortcut>β΅</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["Enter"]} /></ShortcutRow><ShortcutRow label="Commit a number / leave a text field">- <KeyboardShortcut>Esc</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["Escape"]} /><span className="text-muted-foreground text-xs">/</span>- <KeyboardShortcut>Tab</KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["Tab"]} /></ShortcutRow></div><p className="text-muted-foreground border-t pt-3 text-xs">Bare{" "}- <KeyboardShortcut className="h-4 px-1 text-[9px]">- β΅- </KeyboardShortcut>{" "}+ <span className="hidden md:inline-flex">+ <KeyboardShortcut size="sm" keys={["Enter"]} />+ </span>{" "}inside a text field (e.g. Feedback) inserts a new line β use{" "}- <KeyboardShortcut- className="h-4 px-1 text-[9px]"- keys={[modLabel, "β΅"]}- />{" "}+ <span className="hidden md:inline-flex">+ <KeyboardShortcut size="sm" keys={["Mod", "Enter"]} />+ </span>{" "}to complete.</p></DialogBody>diff --git a/web/src/features/comments/CommentList.tsx b/web/src/features/comments/CommentList.tsxindex c5d8dbbff5..92f44acc78 100644--- a/web/src/features/comments/CommentList.tsx+++ b/web/src/features/comments/CommentList.tsx@@ -5,7 +5,7 @@ import {AvatarImage,} from "@/src/components/ui/avatar";import { Button } from "@/src/components/ui/button";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import {Form,FormControl,@@ -538,15 +538,9 @@ export function CommentList({</Button>)}{!searchQuery && (- <KeyboardShortcut- className="absolute top-1/2 right-1 -translate-y-1/2 opacity-50"- keys={- typeof navigator !== "undefined" &&- navigator.userAgent.includes("Macintosh")- ? ["β", "F"]- : ["Ctrl", "F"]- }- />+ <span className="absolute top-1/2 right-1 hidden -translate-y-1/2 opacity-50 md:inline-flex">+ <KeyboardShortcut keys={["Mod", "F"]} />+ </span>)}</div></div>@@ -804,7 +798,9 @@ export function CommentList({><div className="flex items-center gap-2 text-sm"><span>Send comment</span>- <KeyboardShortcut keys={["β", "Enter"]} />+ <span className="hidden md:inline-flex">+ <KeyboardShortcut keys={["Mod", "Enter"]} />+ </span></div></HoverCardContent></HoverCard>diff --git a/web/src/features/evals/components/code-eval-template-form-body.tsx b/web/src/features/evals/components/code-eval-template-form-body.tsxindex ff255be042..317a8770f0 100644--- a/web/src/features/evals/components/code-eval-template-form-body.tsx+++ b/web/src/features/evals/components/code-eval-template-form-body.tsx@@ -24,7 +24,7 @@ import {import { Loader2 } from "lucide-react";import { Button } from "@/src/components/ui/button";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import {Tooltip,TooltipContent,@@ -397,15 +397,9 @@ export function CodeEvalTemplateFormBody({>{isFormatting && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}Format- <KeyboardShortcut- className="ml-2 h-4"- keys={- typeof navigator !== "undefined" &&- navigator.userAgent.includes("Macintosh")- ? ["β§", "β₯", "F"]- : ["Shift", "Alt", "F"]- }- />+ <span className="ml-2 hidden md:inline-flex">+ <KeyboardShortcut size="sm" keys={["Shift", "Alt", "F"]} />+ </span></Button>);diff --git a/web/src/features/in-app-agent/components/InAppAgentBackgroundHint.tsx b/web/src/features/in-app-agent/components/InAppAgentBackgroundHint.tsxindex 999ce91159..f444beb3b9 100644--- a/web/src/features/in-app-agent/components/InAppAgentBackgroundHint.tsx+++ b/web/src/features/in-app-agent/components/InAppAgentBackgroundHint.tsx@@ -1,7 +1,7 @@import { BotMessageSquare, Minus } from "lucide-react";import { Button } from "@/src/components/ui/button";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import { InAppAgentNotice } from "@/src/features/in-app-agent/components/InAppAgentNotice";/**@@ -31,16 +31,9 @@ export function InAppAgentBackgroundHint({onClick={onMinimize}><Minus className="size-3" />- <KeyboardShortcut- className="bg-transparent shadow-none"- keys={[- typeof navigator !== "undefined" &&- navigator.userAgent.includes("Mac")- ? "β"- : "Ctrl",- "I",- ]}- />+ <span className="hidden md:inline-flex">+ <KeyboardShortcut variant="subtle" keys={["Mod", "I"]} />+ </span></Button>}>diff --git a/web/src/features/navigate-detail-pages/DetailPageNav.tsx b/web/src/features/navigate-detail-pages/DetailPageNav.tsxindex 7817ccabbe..937c86efcd 100644--- a/web/src/features/navigate-detail-pages/DetailPageNav.tsx+++ b/web/src/features/navigate-detail-pages/DetailPageNav.tsx@@ -1,6 +1,6 @@import { Button, type ButtonProps } from "@/src/components/ui/button";import { InputCommandShortcut } from "@/src/components/ui/input-command";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import {Tooltip,TooltipContent,@@ -160,12 +160,16 @@ export const DetailPageNav = (props: {}}><ArrowUp className="h-4 w-4" />- {!compact && <KeyboardShortcut>K</KeyboardShortcut>}+ {!compact && (+ <span className="hidden md:inline-flex">+ <KeyboardShortcut keys={["K"]} />+ </span>+ )}</Button></TooltipTrigger><TooltipContent><span>Navigate up</span>- <InputCommandShortcut className="ml-2">K</InputCommandShortcut>+ <InputCommandShortcut className="ml-2" keys={["K"]} /></TooltipContent></Tooltip>@@ -184,12 +188,16 @@ export const DetailPageNav = (props: {}}><ArrowDown className="h-4 w-4" />- {!compact && <KeyboardShortcut>J</KeyboardShortcut>}+ {!compact && (+ <span className="hidden md:inline-flex">+ <KeyboardShortcut keys={["J"]} />+ </span>+ )}</Button></TooltipTrigger><TooltipContent><span>Navigate down</span>- <InputCommandShortcut className="ml-2">J</InputCommandShortcut>+ <InputCommandShortcut className="ml-2" keys={["J"]} /></TooltipContent></Tooltip></div>diff --git a/web/src/features/playground/page/index.tsx b/web/src/features/playground/page/index.tsxindex 5b7b025667..1f2f31fb3c 100644--- a/web/src/features/playground/page/index.tsx+++ b/web/src/features/playground/page/index.tsx@@ -1,6 +1,6 @@-import React, { useCallback, useEffect, useState } from "react";+import React, { useCallback } from "react";import { Button } from "@/src/components/ui/button";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import { Play } from "lucide-react";import { ResetPlaygroundButton } from "@/src/features/playground/page/components/ResetPlaygroundButton";import { useWindowCoordination } from "@/src/features/playground/page/hooks/useWindowCoordination";@@ -39,12 +39,6 @@ import Spinner from "@/src/components/design-system/Spinner/Spinner";* - Clean single-header design*/export default function PlaygroundPage() {- const [isMac, setIsMac] = useState(false);-- useEffect(() => {- setIsMac(window.navigator.userAgent.includes("Mac"));- }, []);-const projectId = useProjectIdFromURL();const { windowIds, isLoaded, addWindowWithCopy, removeWindowId } =usePersistedWindowIds();@@ -191,7 +185,7 @@ export default function PlaygroundPage() {)}<span className="hidden items-center gap-1 lg:inline-flex"><span>Run All</span>- <KeyboardShortcut keys={[isMac ? "β" : "Ctrl", "Enter"]} />+ <KeyboardShortcut keys={["Mod", "Enter"]} /></span></Button>diff --git a/web/src/features/scores/components/AnnotationForm.tsx b/web/src/features/scores/components/AnnotationForm.tsxindex 7a9b6435da..2e9c9d8e9e 100644--- a/web/src/features/scores/components/AnnotationForm.tsx+++ b/web/src/features/scores/components/AnnotationForm.tsx@@ -66,7 +66,7 @@ import { MultiSelectKeyValues } from "@/src/features/scores/components/multi-selimport { CategoricalScoreInput } from "@/src/features/scores/components/CategoricalScoreInput";import { DropdownMenuItemWithSecondaryAction } from "@/src/components/ui/dropdown-menu";import { useScoreConfigSelection } from "@/src/features/scores/hooks/useScoreConfigSelection";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import {hasBlockingOverlay,hasModifier,@@ -1155,32 +1155,22 @@ function InnerAnnotationForm<Target extends ScoreTarget>({<div className="text-muted-foreground hidden flex-wrap items-center gap-x-2 gap-y-1 px-0.5 text-[11px] md:flex">{rowCount > 1 && (<span className="flex items-center gap-1">- <KeyboardShortcut className="h-4 min-w-4 px-1 text-[9px]">- β- </KeyboardShortcut>- <KeyboardShortcut className="h-4 min-w-4 px-1 text-[9px]">- β- </KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["ArrowUp"]} />+ <KeyboardShortcut size="sm" keys={["ArrowDown"]} />move between fields</span>)}{optionRowCount > 0 && (<span className="flex items-center gap-1">- <KeyboardShortcut className="h-4 min-w-4 px-1 text-[9px]">- 1- </KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["1"]} /><span className="text-muted-foreground">β¦</span>- <KeyboardShortcut className="h-4 min-w-4 px-1 text-[9px]">- 9- </KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["9"]} />select option</span>)}{hasEditableRow && (<span className="flex items-center gap-1">- <KeyboardShortcut className="h-4 px-1 text-[9px]">- β΅- </KeyboardShortcut>+ <KeyboardShortcut size="sm" keys={["Enter"]} />edit field</span>)}diff --git a/web/src/features/scores/components/CategoricalScoreInput.tsx b/web/src/features/scores/components/CategoricalScoreInput.tsxindex f52a28d0ca..9e0aa397d4 100644--- a/web/src/features/scores/components/CategoricalScoreInput.tsx+++ b/web/src/features/scores/components/CategoricalScoreInput.tsx@@ -6,7 +6,7 @@ import {} from "@langfuse/shared";import { Button } from "@/src/components/ui/button";import { Combobox } from "@/src/components/ui/combobox";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import { ToggleGroup, ToggleGroupItem } from "@/src/components/ui/toggle-group";import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";import { isCategoricalDataType } from "@/src/features/scores/lib/helpers";@@ -15,6 +15,7 @@ import { AddScoreCategoryDialog } from "@/src/features/scores/components/AddScorimport { type AnalyticsData } from "@/src/features/scores/types";const CHAR_CUTOFF = 6;+const DIGIT_SHORTCUTS = ["1", "2", "3", "4", "5", "6", "7", "8", "9"] as const;function shouldUseCombobox(categories: Pick<ScoreConfigCategoryDomain, "label">[],@@ -136,14 +137,15 @@ export function CategoricalScoreInput({{category.label}</span>{(() => {- const digit =- (config.categories?.findIndex(+ const categoryIndex =+ config.categories?.findIndex((c) => c.label === category.label,- ) ?? -1) + 1;- return digit >= 1 && digit <= 9 ? (- <KeyboardShortcut className="ml-0.5 h-3.5 min-w-3.5 px-1 text-[9px] md:hidden md:group-focus-within:inline-flex">- {digit}- </KeyboardShortcut>+ ) ?? -1;+ const digitShortcut = DIGIT_SHORTCUTS[categoryIndex];+ return digitShortcut ? (+ <span className="ml-0.5 hidden md:group-focus-within:inline-flex">+ <KeyboardShortcut size="xs" keys={[digitShortcut]} />+ </span>) : null;})()}</ToggleGroupItem>diff --git a/web/src/features/search-bar/components/SearchBarAiPrompt.tsx b/web/src/features/search-bar/components/SearchBarAiPrompt.tsxindex 8caaeb9abf..908435045f 100644--- a/web/src/features/search-bar/components/SearchBarAiPrompt.tsx+++ b/web/src/features/search-bar/components/SearchBarAiPrompt.tsx@@ -19,7 +19,7 @@ import { ArrowLeft, ArrowRight, Loader2 } from "lucide-react";import { useStore } from "zustand";import { type FilterState } from "@langfuse/shared";-import { KeyboardShortcut } from "@/src/components/ui/keyboard-shortcut";+import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";import { showErrorToast } from "@/src/features/notifications/showErrorToast";import type { ObservedScoreNames } from "@/src/features/search-bar/lib/observed-options";import type { SearchBarStore } from "@/src/features/search-bar/store/searchBarStore";@@ -287,11 +287,16 @@ export function SearchBarAiPrompt({) : (<div className="flex shrink-0 items-center gap-1.5">{value.trim().length > 0 && (- <KeyboardShortcut title="Press Enter to generate">- β΅- </KeyboardShortcut>+ <span className="hidden md:inline-flex">+ <KeyboardShortcut+ title="Press Enter to generate"+ keys={["Enter"]}+ />+ </span>)}- <KeyboardShortcut>esc</KeyboardShortcut>+ <span className="hidden md:inline-flex">+ <KeyboardShortcut keys={["Escape"]} />+ </span><buttontype="button"aria-label="Generate filters"diff --git a/web/src/hooks/useIsMac.ts b/web/src/hooks/useIsMac.tsnew file mode 100644index 0000000000..12f7ebac36--- /dev/null+++ b/web/src/hooks/useIsMac.ts@@ -0,0 +1,9 @@+import { useSyncExternalStore } from "react";++const subscribeToPlatform = () => () => undefined;+const getIsMac = () => navigator.userAgent.includes("Mac");+const getServerIsMac = () => false;++export function useIsMac() {+ return useSyncExternalStore(subscribeToPlatform, getIsMac, getServerIsMac);+}