Skip to content

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

fix(web): tooltips open after 150ms and show shortcuts as keycaps (#18274)

Trang Nguyen5e39e7ec347b
diff --git a/web/src/components/HeaderActionButton.tsx b/web/src/components/HeaderActionButton.tsx
index 0bf9d23c12..c5646fa431 100644
--- a/web/src/components/HeaderActionButton.tsx
+++ b/web/src/components/HeaderActionButton.tsx
@@ -1,13 +1,8 @@
import * as React from "react";
import { type KeyboardKey } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { Button, type ButtonProps } from "@/src/components/ui/button";
-import { InputCommandShortcut } from "@/src/components/ui/input-command";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/src/components/ui/tooltip";
import { cn } from "@/src/utils/tailwind";
type HeaderActionButtonProps = Omit<
@@ -28,10 +23,13 @@ export const HeaderActionButton = React.forwardRef<
ref,
) {
return (
- <Tooltip>
- <TooltipTrigger asChild onFocus={(event) => event.preventDefault()}>
+ <Tooltip
+ label={label}
+ shortcut={shortcut ? { keys: [shortcut] } : undefined}
+ >
+ {({ getTriggerProps }) => (
<Button
- ref={ref}
+ {...getTriggerProps({ ref })}
variant="ghost"
size="icon"
aria-label={label}
@@ -43,13 +41,7 @@ export const HeaderActionButton = React.forwardRef<
>
{icon}
</Button>
- </TooltipTrigger>
- <TooltipContent>
- <span>{label}</span>
- {shortcut && (
- <InputCommandShortcut className="ml-2" keys={[shortcut]} />
- )}
- </TooltipContent>
+ )}
</Tooltip>
);
});
diff --git a/web/src/components/design-system/CustomTooltip/CustomTooltip.tsx b/web/src/components/design-system/CustomTooltip/CustomTooltip.tsx
index 8b2c062e24..eaab57c72b 100644
--- a/web/src/components/design-system/CustomTooltip/CustomTooltip.tsx
+++ b/web/src/components/design-system/CustomTooltip/CustomTooltip.tsx
@@ -21,9 +21,9 @@ import { useLayerContainer } from "@/src/context/LayerContext/LayerContext";
type CustomTooltipProps = {
children: (controls: {
- getTriggerProps: () => ReturnType<
- ReturnType<typeof useInteractions>["getReferenceProps"]
- >;
+ getTriggerProps: (props?: {
+ ref?: React.Ref<HTMLElement>;
+ }) => ReturnType<ReturnType<typeof useInteractions>["getReferenceProps"]>;
}) => React.ReactNode;
content: React.ReactElement;
delay?: number;
@@ -31,10 +31,22 @@ type CustomTooltipProps = {
placement?: Placement;
};
+function mergeRefs<T>(...refs: Array<React.Ref<T> | undefined>) {
+ return (value: T | null) => {
+ refs.forEach((ref) => {
+ if (typeof ref === "function") {
+ ref(value);
+ } else if (ref) {
+ ref.current = value;
+ }
+ });
+ };
+}
+
function CustomTooltip({
children,
content,
- delay = 700,
+ delay = 150,
hoverableContent = true,
placement = "top",
}: CustomTooltipProps) {
@@ -66,10 +78,11 @@ function CustomTooltip({
return (
<>
{children({
- getTriggerProps: () =>
- getReferenceProps({
- ref: refs.setReference,
- }),
+ getTriggerProps: (props = {}) => {
+ return getReferenceProps({
+ ref: mergeRefs(props.ref, refs.setReference),
+ });
+ },
})}
{isOpen ? (
<FloatingPortal root={layerContainer}>
diff --git a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx
index b2f8a244ce..094f1e188c 100644
--- a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx
+++ b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.stories.tsx
@@ -29,6 +29,8 @@ export const VariantMatrix = meta.story({
<KeyboardShortcut keys={["K"]} />
<KeyboardShortcut variant="subtle" keys={["K"]} />
<KeyboardShortcut variant="inverse" keys={["K"]} />
+ <KeyboardShortcut variant="keycap" keys={["K"]} />
+ <KeyboardShortcut variant="keycap" keys={["Mod", "Enter"]} />
</div>
<div className="flex items-center gap-2">
<KeyboardShortcut size="sm" keys={["K"]} />
diff --git a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx
index 0b596e023a..4bda239ee9 100644
--- a/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx
+++ b/web/src/components/design-system/KeyboardShortcut/KeyboardShortcut.tsx
@@ -86,13 +86,15 @@ function getKeyboardKeyLabel(key: KeyboardKey, isMac: boolean) {
}
const keyboardShortcutVariants = cva(
- "pointer-events-none inline-flex items-baseline justify-center gap-1 rounded-sm font-mono leading-none font-normal select-none",
+ "pointer-events-none inline-flex justify-center gap-1 rounded-sm font-mono leading-none font-normal select-none",
{
variants: {
variant: {
- default: "bg-transparent text-foreground-tertiary",
- subtle: "bg-transparent text-foreground-tertiary",
- inverse: "bg-transparent text-primary-foreground",
+ 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",
},
size: {
default: "h-5 min-w-5 text-xs",
@@ -123,10 +125,11 @@ export function KeyboardShortcut({
ref,
keys,
title,
- variant,
+ variant = "default",
size,
}: KeyboardShortcutProps) {
const isMac = useIsMac();
+ const letterClass = variant === "keycap" ? undefined : "-translate-y-0.5";
return (
<kbd
@@ -142,7 +145,7 @@ export function KeyboardShortcut({
<span
key={index}
className={
- isSymbol ? symbolSizeClass[size ?? "default"] : "-translate-y-0.5"
+ isSymbol ? symbolSizeClass[size ?? "default"] : letterClass
}
>
{label}
diff --git a/web/src/components/design-system/Tooltip/Tooltip.stories.tsx b/web/src/components/design-system/Tooltip/Tooltip.stories.tsx
index 04162ee3a1..6733b81e4f 100644
--- a/web/src/components/design-system/Tooltip/Tooltip.stories.tsx
+++ b/web/src/components/design-system/Tooltip/Tooltip.stories.tsx
@@ -23,6 +23,13 @@ const meta = preview.meta({
export const Default = meta.story({});
+export const WithShortcut = meta.story({
+ args: {
+ label: "Navigate up",
+ shortcut: { keys: ["K"] },
+ },
+});
+
export const DisabledTrigger = meta.story({
args: {
label: "This action is unavailable",
@@ -76,3 +83,23 @@ export const TestHoverAndFocus = meta.story({
);
},
});
+
+export const TestShortcutRendersKeycap = meta.story({
+ name: "(Test) Shortcut renders as keycap",
+ args: {
+ label: "Navigate up",
+ shortcut: { keys: ["K"] },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const trigger = canvas.getByRole("button", { name: "Hover or focus me" });
+
+ await userEvent.hover(trigger);
+ const tooltip = await waitFor(() => body.getByRole("tooltip"));
+ await expect(tooltip).toHaveTextContent("Navigate up");
+ const kbd = tooltip.querySelector("kbd");
+ await expect(kbd).toHaveTextContent("K");
+ await expect(kbd).toHaveClass("border");
+ },
+});
diff --git a/web/src/components/design-system/Tooltip/Tooltip.tsx b/web/src/components/design-system/Tooltip/Tooltip.tsx
index ecf82a476d..72ac9da30c 100644
--- a/web/src/components/design-system/Tooltip/Tooltip.tsx
+++ b/web/src/components/design-system/Tooltip/Tooltip.tsx
@@ -3,18 +3,33 @@
import * as React from "react";
import { CustomTooltip } from "../CustomTooltip/CustomTooltip";
+import {
+ KeyboardShortcut,
+ type KeyboardShortcutProps,
+} from "../KeyboardShortcut/KeyboardShortcut";
type TooltipProps = Omit<
React.ComponentProps<typeof CustomTooltip>,
"content"
> & {
label: string;
+ /** Rendered as a keycap after the label. */
+ shortcut?: { keys: KeyboardShortcutProps["keys"] };
};
-function Tooltip({ label, ...props }: TooltipProps) {
+function Tooltip({ label, shortcut, ...props }: TooltipProps) {
return (
<CustomTooltip
- content={<span className="whitespace-pre-line">{label}</span>}
+ content={
+ shortcut ? (
+ <span className="inline-flex items-center gap-2">
+ <span className="whitespace-pre-line">{label}</span>
+ <KeyboardShortcut variant="keycap" keys={shortcut.keys} />
+ </span>
+ ) : (
+ <span className="whitespace-pre-line">{label}</span>
+ )
+ }
{...props}
/>
);
diff --git a/web/src/components/design-system/table/columns/createTextTableColumn.tsx b/web/src/components/design-system/table/columns/createTextTableColumn.tsx
index 7e0b858633..c12467c854 100644
--- a/web/src/components/design-system/table/columns/createTextTableColumn.tsx
+++ b/web/src/components/design-system/table/columns/createTextTableColumn.tsx
@@ -33,7 +33,7 @@ type TextTableColumnTrailingAction<TData extends RowData, TValue> =
type: "custom";
icon: LucideIcon;
label: string;
- onClick: (context: CellContext<TData, TValue>) => void;
+ onClick: (context: CellContext<TData, TValue | null | undefined>) => void;
};
export function createTextTableColumn<TData extends RowData, TValue = string>({
@@ -133,7 +133,7 @@ function TextWithTrailingAction<TData extends RowData, TValue>({
TextTableColumnTrailingAction<TData, TValue>,
{ type: "custom" }
>;
- context: CellContext<TData, TValue>;
+ context: CellContext<TData, TValue | null | undefined>;
value?: string;
}) {
return (
diff --git a/web/src/components/ui/input-command.tsx b/web/src/components/ui/input-command.tsx
index bfef05c07d..ddf651d890 100644
--- a/web/src/components/ui/input-command.tsx
+++ b/web/src/components/ui/input-command.tsx
@@ -8,10 +8,6 @@ import * as React from "react";
import { Command as CommandPrimitive } from "cmdk";
import { Search } from "lucide-react";
-import {
- KeyboardShortcut,
- type KeyboardShortcutProps,
-} from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
import { cn } from "@/src/utils/tailwind";
const InputCommand = React.forwardRef<
@@ -127,22 +123,6 @@ const InputCommandItem = React.forwardRef<
InputCommandItem.displayName = CommandPrimitive.Item.displayName;
-type InputCommandShortcutProps = KeyboardShortcutProps & {
- className?: string;
-};
-
-const InputCommandShortcut = ({
- className,
- ...props
-}: InputCommandShortcutProps) => {
- return (
- <span className={cn("ml-auto hidden md:inline-flex", className)}>
- <KeyboardShortcut {...props} />
- </span>
- );
-};
-InputCommandShortcut.displayName = "CommandShortcut";
-
export {
InputCommand,
InputCommandInput,
@@ -150,6 +130,5 @@ export {
InputCommandEmpty,
InputCommandGroup,
InputCommandItem,
- InputCommandShortcut,
InputCommandSeparator,
};
diff --git a/web/src/components/ui/tooltip.tsx b/web/src/components/ui/tooltip.tsx
index 1865429855..c2416bdda3 100644
--- a/web/src/components/ui/tooltip.tsx
+++ b/web/src/components/ui/tooltip.tsx
@@ -7,7 +7,7 @@ import * as TooltipPrimitive from "@radix-ui/react-tooltip";
import { cn } from "@/src/utils/tailwind";
import { useLayerContainer } from "@/src/context/LayerContext/LayerContext";
-const TOOLTIP_DELAY_MS = 300;
+const TOOLTIP_DELAY_MS = 150;
/** Nested providers reset the delay, so every provider carries the app default. */
const TooltipProvider = ({
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
index 08365eb753..036772463d 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
@@ -18,11 +18,7 @@ import {
} from "../state/annotationQueueRun";
import { Button } from "@/src/components/ui/button";
import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/src/components/ui/tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import {
Dialog,
DialogBody,
@@ -461,9 +457,10 @@ function AnnotationQueueRunContent({
<span className="bg-muted grid h-9 min-w-16 items-center rounded-md p-1 text-center text-sm">
{progressIndex + 1} / {totalItems}
</span>
- <Tooltip>
- <TooltipTrigger asChild>
+ <Tooltip label="Previous item" shortcut={{ keys: ["ArrowLeft"] }}>
+ {({ getTriggerProps }) => (
<Button
+ {...getTriggerProps()}
onClick={handleNavigateBack}
variant="outline"
disabled={
@@ -482,13 +479,7 @@ function AnnotationQueueRunContent({
<KeyboardShortcut keys={["ArrowLeft"]} />
</span>
</Button>
- </TooltipTrigger>
- <TooltipContent>
- <span>Previous item</span>
- <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">
@@ -510,9 +501,13 @@ function AnnotationQueueRunContent({
)}
<div className="flex w-full min-w-[265px] items-center justify-end gap-2">
{!isSingleItem && (
- <Tooltip>
- <TooltipTrigger asChild>
+ <Tooltip
+ label="Skip to next item"
+ shortcut={{ keys: ["ArrowRight"] }}
+ >
+ {({ getTriggerProps }) => (
<Button
+ {...getTriggerProps()}
onClick={handleNavigateNext}
disabled={
!isNextItemAvailable || !hasAccess || isTransitioning
@@ -532,20 +527,22 @@ function AnnotationQueueRunContent({
<KeyboardShortcut keys={["ArrowRight"]} />
</span>
</Button>
- </TooltipTrigger>
- <TooltipContent>
- <span>Skip to next item</span>
- <span className="ml-2 hidden md:inline-flex">
- <KeyboardShortcut keys={["ArrowRight"]} />
- </span>
- </TooltipContent>
+ )}
</Tooltip>
)}
{!!relevantItem &&
(isPending ? (
- <Tooltip>
- <TooltipTrigger asChild>
+ <Tooltip
+ label={
+ isSingleItem
+ ? "Mark completed"
+ : "Mark completed + go to next item"
+ }
+ shortcut={isSingleItem ? undefined : { keys: ["Mod", "Enter"] }}
+ >
+ {({ getTriggerProps }) => (
<Button
+ {...getTriggerProps()}
onClick={handleComplete}
size="lg"
className={cn(
@@ -566,19 +563,7 @@ function AnnotationQueueRunContent({
</span>
)}
</Button>
- </TooltipTrigger>
- <TooltipContent>
- <span>
- {isSingleItem
- ? "Mark completed"
- : "Mark completed + go to next item"}
- </span>
- {!isSingleItem && (
- <span className="ml-2 hidden md:inline-flex">
- <KeyboardShortcut keys={["Mod", "Enter"]} />
- </span>
- )}
- </TooltipContent>
+ )}
</Tooltip>
) : (
<div className="border-dark-green bg-light-green inline-flex h-9 w-full items-center justify-center rounded-md border px-8 text-sm font-bold">
diff --git a/web/src/features/navigate-detail-pages/DetailPageNav.tsx b/web/src/features/navigate-detail-pages/DetailPageNav.tsx
index 6d333be351..d3ada1dadd 100644
--- a/web/src/features/navigate-detail-pages/DetailPageNav.tsx
+++ b/web/src/features/navigate-detail-pages/DetailPageNav.tsx
@@ -1,13 +1,8 @@
/* eslint-disable @repo/no-null-render */
import { Button, type ButtonProps } from "@/src/components/ui/button";
import { HeaderActionButton } from "@/src/components/HeaderActionButton";
-import { InputCommandShortcut } from "@/src/components/ui/input-command";
import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/src/components/ui/tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import {
type ListEntry,
useDetailPageLists,
@@ -175,9 +170,10 @@ export const DetailPageNav = (props: {
);
return (
<div className="flex flex-row gap-1">
- <Tooltip>
- <TooltipTrigger asChild>
+ <Tooltip label="Navigate up" shortcut={{ keys: ["K"] }}>
+ {({ getTriggerProps }) => (
<Button
+ {...getTriggerProps()}
variant="outline"
type="button"
size={size}
@@ -194,16 +190,13 @@ export const DetailPageNav = (props: {
<KeyboardShortcut keys={["K"]} />
</span>
</Button>
- </TooltipTrigger>
- <TooltipContent>
- <span>Navigate up</span>
- <InputCommandShortcut className="ml-2" keys={["K"]} />
- </TooltipContent>
+ )}
</Tooltip>
- <Tooltip>
- <TooltipTrigger asChild>
+ <Tooltip label="Navigate down" shortcut={{ keys: ["J"] }}>
+ {({ getTriggerProps }) => (
<Button
+ {...getTriggerProps()}
variant="outline"
type="button"
size={size}
@@ -220,11 +213,7 @@ export const DetailPageNav = (props: {
<KeyboardShortcut keys={["J"]} />
</span>
</Button>
- </TooltipTrigger>
- <TooltipContent>
- <span>Navigate down</span>
- <InputCommandShortcut className="ml-2" keys={["J"]} />
- </TooltipContent>
+ )}
</Tooltip>
</div>
);