diff --git a/apps/web/src/components/ThreadHoverCard.browser.test.tsx b/apps/web/src/components/ThreadHoverCard.browser.test.tsx new file mode 100644 index 0000000000000..618ffdccd6773 --- /dev/null +++ b/apps/web/src/components/ThreadHoverCard.browser.test.tsx @@ -0,0 +1,51 @@ +import { describe, expect, it, vi } from "vite-plus/test"; +import { page } from "vite-plus/test/browser"; + +import { render } from "../../test/render"; +import "../index.css"; + +const settingsOverrides = vi.hoisted(() => ({ hoverPreviews: true })); +vi.mock(import("../hooks/useSettings"), async (original) => { + const actual = await original(); + type Settings = ReturnType; + function useClientSettings(select?: (settings: Settings) => T): T { + const settings = { ...actual.getClientSettings(), ...settingsOverrides }; + return select ? select(settings) : (settings as T); + } + return { ...actual, useClientSettings }; +}); + +import { ThreadHoverCard, ThreadHoverCardPopup } from "./ThreadHoverCard"; +import { Tooltip, TooltipTrigger } from "./ui/tooltip"; + +function setup({ hoverPreviews }: { hoverPreviews: boolean }) { + settingsOverrides.hoverPreviews = hoverPreviews; +} + +function openCard() { + return render( + + Thread} /> + + details + + , + ); +} + +describe("ThreadHoverCardPopup", () => { + it("renders the card when hover previews are on", async () => { + setup({ hoverPreviews: true }); + await using _ = await openCard(); + + await expect.element(page.getByText("Card title")).toBeVisible(); + }); + + it("renders nothing when hover previews are off", async () => { + setup({ hoverPreviews: false }); + await using _ = await openCard(); + + await expect.element(page.getByRole("button", { name: "Thread" })).toBeVisible(); + await expect.element(page.getByText("Card title")).not.toBeInTheDocument(); + }); +}); diff --git a/apps/web/src/components/ThreadHoverCard.tsx b/apps/web/src/components/ThreadHoverCard.tsx index ae6774a98d76d..b7ce56905dcb7 100644 --- a/apps/web/src/components/ThreadHoverCard.tsx +++ b/apps/web/src/components/ThreadHoverCard.tsx @@ -1,8 +1,15 @@ import type { ComponentProps, ReactNode } from "react"; import { TooltipPopup } from "./ui/tooltip"; +import { useClientSettings } from "~/hooks/useSettings"; import { cn } from "~/lib/utils"; +export function useHoverPreviewsEnabled(): boolean { + return useClientSettings((settings) => settings.hoverPreviews); +} + export function ThreadHoverCardPopup({ className, ...props }: ComponentProps) { + const enabled = useHoverPreviewsEnabled(); + if (!enabled) return null; return ( project.id === node?.thread?.projectId); const relationshipHint = `Open ${relationship.toLowerCase()} in this chat`; - const RelationshipPopup = agent ? ThreadHoverCardPopup : TooltipPopup; - const relationshipTooltip = agent ? ( + const showAgentCard = agent && hoverPreviews; + const RelationshipPopup = showAgentCard ? ThreadHoverCardPopup : TooltipPopup; + const relationshipTooltip = showAgentCard ? ( ({ hoverPreviews: true })); +vi.mock(import("../../hooks/useSettings"), async (original) => { + const actual = await original(); + type Settings = ReturnType; + function useClientSettings(select?: (settings: Settings) => T): T { + const settings = { ...actual.getClientSettings(), ...settingsOverrides }; + return select ? select(settings) : (settings as T); + } + return { ...actual, useClientSettings }; +}); + +import { TimelineMinimap } from "./TimelineMinimap"; +import type { TimelineMinimapItem } from "./timelineMinimapItems"; + +const items: ReadonlyArray = [ + { id: "a", rowIndex: 0, userText: "First question", assistantText: "First answer" }, + { id: "b", rowIndex: 1, userText: "Second question", assistantText: "Second answer" }, +]; + +function setup({ hoverPreviews }: { hoverPreviews: boolean }) { + settingsOverrides.hoverPreviews = hoverPreviews; +} + +async function renderFocusedMinimap(onSelect = vi.fn()) { + await using stack = new AsyncDisposableStack(); + const screen = stack.use( + await render( +
+ {}} + onSelect={onSelect} + /> +
, + ), + ); + const jump = page.getByRole("button", { name: /Jump to message/ }); + await expect.element(jump).toBeInTheDocument(); + jump.element().focus(); + const disposables = stack.move(); + return { screen, onSelect, [Symbol.asyncDispose]: () => disposables.disposeAsync() }; +} + +describe("TimelineMinimap hover previews", () => { + it("shows the message preview by default", async () => { + setup({ hoverPreviews: true }); + await using _ = await renderFocusedMinimap(); + + await expect.element(page.getByText("First answer")).toBeVisible(); + }); + + it("hides the preview but keeps navigation when previews are off", async () => { + setup({ hoverPreviews: false }); + await using minimap = await renderFocusedMinimap(); + + await expect.element(page.getByText("First answer")).not.toBeInTheDocument(); + const jump = page.getByRole("button", { name: /Jump to message/ }); + await vi.waitFor(() => expect(jump.element().getBoundingClientRect().width).toBe(24)); + await userEvent.keyboard("{ArrowDown}{Enter}"); + await vi.waitFor(() => expect(minimap.onSelect).toHaveBeenCalledWith(items[1])); + }); +}); diff --git a/apps/web/src/components/chat/TimelineMinimap.tsx b/apps/web/src/components/chat/TimelineMinimap.tsx index 3a32ec20400d9..6be2ffe079e45 100644 --- a/apps/web/src/components/chat/TimelineMinimap.tsx +++ b/apps/web/src/components/chat/TimelineMinimap.tsx @@ -10,6 +10,7 @@ import { TIMELINE_MINIMAP_MIN_ITEMS, } from "./MessagesTimeline.logic"; import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip"; +import { useHoverPreviewsEnabled } from "../ThreadHoverCard"; import { cn } from "~/lib/utils"; // A release outside the window can skip `mouseup`, so the next button-free @@ -49,6 +50,7 @@ export function TimelineMinimap({ onSelect: (item: TimelineMinimapItem) => void; }) { const [activeIndex, setActiveIndex] = useState(null); + const hoverPreviews = useHoverPreviewsEnabled(); const wheelTargetRef = (node: HTMLDivElement | null) => { if (!node) return; node.addEventListener("wheel", onWheel, { passive: false }); @@ -63,6 +65,7 @@ export function TimelineMinimap({ const activeItem = resolveTimelineMinimapPreview( resolvedActiveIndex === null ? null : (items[resolvedActiveIndex] ?? null), ); + const previewItem = hoverPreviews ? activeItem : null; const navigationInteractive = resolveTimelineMinimapNavigationInteractive(hitStripWidth) && !passThrough; const activeTopPercent = @@ -223,7 +226,7 @@ export function TimelineMinimap({ /> ); })} - {activeItem ? ( + {previewItem ? ( // Display-only: it overlaps the message column, and the strip keeps tracking beneath it. - {activeItem.userText ?? "User message"} + {previewItem.userText ?? "User message"} - {activeItem.assistantText ? ( + {previewItem.assistantText ? ( - {activeItem.assistantText} + {previewItem.assistantText} ) : null} diff --git a/apps/web/src/components/settings/AppearanceSettingsPanel.tsx b/apps/web/src/components/settings/AppearanceSettingsPanel.tsx index 00783b085d609..005d2f5ffa590 100644 --- a/apps/web/src/components/settings/AppearanceSettingsPanel.tsx +++ b/apps/web/src/components/settings/AppearanceSettingsPanel.tsx @@ -257,6 +257,28 @@ export function AppearanceSettingsPanel() { } /> + + updateSettings({ hoverPreviews: DEFAULT_UNIFIED_SETTINGS.hoverPreviews }) + } + /> + ) : null + } + control={ + updateSettings({ hoverPreviews: Boolean(checked) })} + aria-label="Show hover previews" + /> + } + /> + void) { DEFAULT_UNIFIED_SETTINGS.persistComposerContextStrip ? ["Composer context"] : []), + ...(settings.hoverPreviews !== DEFAULT_UNIFIED_SETTINGS.hoverPreviews + ? ["Hover previews"] + : []), ...getChangedTypographySettingLabels(settings), ...(settings.diffFilesCollapsed !== DEFAULT_UNIFIED_SETTINGS.diffFilesCollapsed ? ["Default diff file state"] @@ -660,6 +663,7 @@ export function useSettingsRestore(onRestored?: () => void) { inAppNotificationsEnabled: DEFAULT_UNIFIED_SETTINGS.inAppNotificationsEnabled, wordWrap: DEFAULT_UNIFIED_SETTINGS.wordWrap, persistComposerContextStrip: DEFAULT_UNIFIED_SETTINGS.persistComposerContextStrip, + hoverPreviews: DEFAULT_UNIFIED_SETTINGS.hoverPreviews, diffFilesCollapsed: DEFAULT_UNIFIED_SETTINGS.diffFilesCollapsed, diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace, diffLayout: DEFAULT_UNIFIED_SETTINGS.diffLayout, diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts index 7d7939e7f21f9..26c54a9ec261a 100644 --- a/apps/web/src/components/settings/settingsSearch.ts +++ b/apps/web/src/components/settings/settingsSearch.ts @@ -427,6 +427,12 @@ export const SETTINGS_SEARCH_ITEMS = [ title: "Composer context", to: "/settings/appearance", }, + { + id: "hover-previews", + title: "Hover previews", + to: "/settings/appearance", + searchTerms: ["popover tooltip preview sidebar subagent minimap timeline details clutter"], + }, { id: "project-grouping", title: msg("Project grouping"), diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts index 7bbb03595d4bb..dfc66de7d22c0 100644 --- a/packages/contracts/src/settings.ts +++ b/packages/contracts/src/settings.ts @@ -505,6 +505,7 @@ export const ClientSettingsSchema = Schema.Struct({ persistComposerContextStrip: Schema.Boolean.pipe( Schema.withDecodingDefault(Effect.succeed(false)), ), + hoverPreviews: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))), favorites: ModelFavorites.pipe(Schema.withDecodingDefault(Effect.succeed([]))), providerModelPreferences: ProviderModelPreferences.pipe( @@ -2073,6 +2074,7 @@ export const ClientSettingsPatch = Schema.Struct({ fontFamilyTerminal: Schema.optionalKey(FontFamilyPreference), fontSmoothing: Schema.optionalKey(Schema.Boolean), persistComposerContextStrip: Schema.optionalKey(Schema.Boolean), + hoverPreviews: Schema.optionalKey(Schema.Boolean), favorites: Schema.optionalKey(ModelFavorites), providerModelPreferences: Schema.optionalKey(ProviderModelPreferences), pullRequestMergeMethodOverrides: Schema.optionalKey(