From 785db34c786b40114105e2209bf0bfc0929eeaf2 Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Sun, 1 Nov 2026 10:28:11 -0700 Subject: [PATCH] Show tab previews only when titles are clipped (#37085) --- .../tab-bar/TabHoverCard.fixture.tsx | 64 +++++++++++++++++++ .../src/components/tab-bar/TabHoverCard.tsx | 34 +++++++++- .../tab-bar/TabStripTooltipProvider.test.tsx | 36 ++++++++++- .../src/components/tab-bar/tab-width-rules.ts | 2 +- 4 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 src/renderer/src/components/tab-bar/TabHoverCard.fixture.tsx diff --git a/src/renderer/src/components/tab-bar/TabHoverCard.fixture.tsx b/src/renderer/src/components/tab-bar/TabHoverCard.fixture.tsx new file mode 100644 index 00000000000..519c162b13e --- /dev/null +++ b/src/renderer/src/components/tab-bar/TabHoverCard.fixture.tsx @@ -0,0 +1,64 @@ +import { Terminal } from 'lucide-react' +import { defineFixture } from '../../component-fixtures/component-fixture' +import { TabHoverCard } from './TabHoverCard' +import { TabStripTooltipProvider } from './TabStripTooltipProvider' +import { TAB_LABEL_WIDTH_CLASSES } from './tab-width-rules' + +function preview(width: number): React.JSX.Element { + return ( +
+ + }> +
+ + Codex Chat +
+
+
+
+ ) +} + +export const fullTitle = defineFixture({ + width: 400, + render: () => preview(300), + interact: (frame) => { + frame.querySelector('[tabindex]')?.focus() + if (document.querySelector('[data-tab-hover-card]')) { + throw new Error('Full title should not open a preview') + } + } +}) + +export const clippedTitle = defineFixture({ + width: 400, + render: () => preview(80), + interact: (frame) => { + frame.querySelector('[tabindex]')?.focus() + } +}) + +export const widenedTitle = defineFixture({ + width: 400, + render: () => preview(80), + interact: async (frame) => { + const tab = frame.querySelector('[tabindex]') + tab?.focus() + await new Promise(requestAnimationFrame) + if (!document.querySelector('[data-tab-hover-card]')) { + throw new Error('Clipped title should open a preview') + } + if (tab) { + tab.style.width = '300px' + } + await new Promise(requestAnimationFrame) + await new Promise(requestAnimationFrame) + if (document.querySelector('[data-tab-hover-card]')) { + throw new Error('Widening the tab should close its preview') + } + } +}) diff --git a/src/renderer/src/components/tab-bar/TabHoverCard.tsx b/src/renderer/src/components/tab-bar/TabHoverCard.tsx index 6be2ef963ce..44296aba41c 100644 --- a/src/renderer/src/components/tab-bar/TabHoverCard.tsx +++ b/src/renderer/src/components/tab-bar/TabHoverCard.tsx @@ -1,4 +1,4 @@ -import { useState, type ReactNode, type SyntheticEvent } from 'react' +import { useEffect, useRef, useState, type ReactNode, type SyntheticEvent } from 'react' import { flushSync } from 'react-dom' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' @@ -19,12 +19,42 @@ export function TabHoverCard({ alert?: ReactNode | ((dismiss: () => void) => ReactNode) }): React.JSX.Element { const [open, setOpen] = useState(false) + const triggerRef = useRef(null) // Remove the portal before navigation can start rendering a slower destination. const dismiss = () => flushSync(() => setOpen(false)) const interactive = alert !== undefined && alert !== null + const canOpen = (): boolean => { + const label = triggerRef.current?.querySelector('.tab-label') + return interactive || !!(label && label.scrollWidth > label.clientWidth) + } + + useEffect(() => { + if (!open || interactive) { + return + } + const label = triggerRef.current?.querySelector('.tab-label') + if (!label) { + return + } + const observer = new ResizeObserver(() => { + if (label.scrollWidth <= label.clientWidth) { + setOpen(false) + } + }) + observer.observe(label) + return () => observer.disconnect() + }, [open, interactive, title]) + return ( - + setOpen(nextOpen && canOpen())} + disableHoverableContent={!interactive} + > { + triggerRef.current = node + }} asChild onFocus={(event) => { // Nested controls own their focus hints. diff --git a/src/renderer/src/components/tab-bar/TabStripTooltipProvider.test.tsx b/src/renderer/src/components/tab-bar/TabStripTooltipProvider.test.tsx index afb35a2dde6..13b7ef6b475 100644 --- a/src/renderer/src/components/tab-bar/TabStripTooltipProvider.test.tsx +++ b/src/renderer/src/components/tab-bar/TabStripTooltipProvider.test.tsx @@ -10,10 +10,14 @@ function renderTabs(): void { } programName="Terminal"> - + } programName="Codex"> - + @@ -32,6 +36,12 @@ describe('TabStripTooltipProvider', () => { beforeEach(() => { vi.useFakeTimers() renderTabs() + for (const label of document.querySelectorAll('.tab-label')) { + Object.defineProperties(label, { + clientWidth: { configurable: true, value: 60 }, + scrollWidth: { configurable: true, value: 100 } + }) + } }) afterEach(() => { @@ -39,6 +49,28 @@ describe('TabStripTooltipProvider', () => { vi.useRealTimers() }) + it('keeps previews hidden when the full title fits, including keyboard focus', () => { + Object.defineProperty(screen.getByText('first tab'), 'clientWidth', { value: 100 }) + hover('first tab') + advance(TAB_TOOLTIP_DELAY_MS) + expect(screen.queryByText('Build')).toBeNull() + act(() => screen.getByRole('button', { name: 'first tab' }).focus()) + expect(screen.queryByText('Build')).toBeNull() + }) + + it('remeasures the title when a tab shrinks before the next hover', () => { + const label = screen.getByText('first tab') + Object.defineProperty(label, 'clientWidth', { configurable: true, value: 120 }) + hover('first tab') + advance(TAB_TOOLTIP_DELAY_MS) + expect(screen.queryByText('Build')).toBeNull() + fireEvent.pointerLeave(screen.getByRole('button', { name: 'first tab' })) + Object.defineProperty(label, 'clientWidth', { value: 60 }) + hover('first tab') + advance(TAB_TOOLTIP_DELAY_MS) + expect(screen.getAllByText('Build').length).toBeGreaterThan(0) + }) + it('holds the first preview until a 500 ms hover', () => { hover('first tab') advance(499) diff --git a/src/renderer/src/components/tab-bar/tab-width-rules.ts b/src/renderer/src/components/tab-bar/tab-width-rules.ts index 232c8569669..caf5bb41ef8 100644 --- a/src/renderer/src/components/tab-bar/tab-width-rules.ts +++ b/src/renderer/src/components/tab-bar/tab-width-rules.ts @@ -1,4 +1,4 @@ // Divide available space independently of titles; overflow only at the readable minimum. export const TAB_CONTAINER_WIDTH_CLASSES = 'min-w-[144px] flex-1' -export const TAB_LABEL_WIDTH_CLASSES = 'min-w-0 flex-1 truncate' +export const TAB_LABEL_WIDTH_CLASSES = 'tab-label min-w-0 flex-1 truncate'