From 03f1b76db55896e914cbef09f3b963471ea7f8c2 Mon Sep 17 00:00:00 2001 From: Marco Beretta <81851188+berry-13@users.noreply.github.com> Date: Wed, 4 Nov 2026 21:56:57 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=84=20refactor:=20Compose=20Chat=20Pac?= =?UTF-8?q?kage=20Styles=20From=20Shared=20Primitive=20Variants=20(#17760)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: Compose Message Toolbar Styles From Shared Button and Label Variants * test: Cover an Open Fork Menu Holding the Message Toolbar Visible * refactor: Compose Composer File Styles From Shared Primitives * refactor: Compose Summary, Collapsible Text and Subagent Activity Styles From Shared Button Presets * fix: Draw the New Button Variants From Theme Radius and Height Roles * test: Find the Held-Open Scenario's Replies Inside the Message List * fix: Restore the Feedback Note and Fork Checkbox Looks Through Primitive Variants * refactor: Compose the Message Nav Chevrons With the Disabled Ink Recipe --- .../Input/SetKeyDialog/GoogleConfig.tsx | 1 - .../components/SidePanel/Builder/Images.tsx | 11 +- client/src/mobile.css | 5 - e2e/specs/mock/scenarios/mouse-reveal.spec.ts | 49 ++++++ eslint-suppressions.json | 140 ------------------ packages/chat/src/components.ts | 6 +- .../chat/src/components/CollapsibleText.tsx | 4 +- packages/chat/src/components/Summary.tsx | 53 +++---- .../components/composer/EscalateNowButton.tsx | 10 +- .../src/components/composer/QuoteButton.tsx | 8 +- .../composer/files/DragDropOverlay.tsx | 5 +- .../components/composer/files/FileUpload.tsx | 17 +-- .../composer/files/ImagePreview.tsx | 34 +---- .../composer/files/PastedTextDialog.tsx | 3 +- .../composer/files/ProgressCircle.tsx | 5 +- .../components/composer/files/SourceIcon.tsx | 2 +- .../chat/src/components/messages/Feedback.tsx | 33 +---- .../chat/src/components/messages/Fork.tsx | 14 +- .../src/components/messages/HeaderLabel.tsx | 10 +- .../src/components/messages/HoverButtons.tsx | 23 +-- .../src/components/messages/MessageNav.tsx | 25 ++-- .../src/components/messages/MessageRow.tsx | 2 +- .../messages/MinimalHoverButtons.tsx | 6 +- .../components/messages/ScrollToBottom.tsx | 3 - .../src/components/messages/SiblingSwitch.tsx | 7 - .../messages/__tests__/MessageNav.spec.tsx | 2 + .../messages/__tests__/styles.spec.ts | 47 +++--- .../chat/src/components/messages/styles.ts | 75 +--------- .../src/components/subagents/activity.tsx | 10 +- .../src/components/subagents/transcript.tsx | 9 +- packages/client/src/components/Button.tsx | 61 +++++++- .../client/src/components/Checkbox.spec.tsx | 19 +++ packages/client/src/components/Checkbox.tsx | 11 +- packages/client/src/components/Label.tsx | 6 +- packages/client/src/components/Textarea.tsx | 13 +- packages/client/src/theme/tailwind.spec.js | 22 +++ packages/client/src/utils/theme.ts | 39 +++++ packages/client/src/utils/utils.ts | 2 + packages/client/tailwind.preset.cjs | 15 ++ 39 files changed, 369 insertions(+), 438 deletions(-) diff --git a/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx b/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx index f6aec59018..62555bb558 100644 --- a/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx +++ b/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx @@ -36,7 +36,6 @@ const GoogleConfig = ({ userKey, setUserKey }: Pick @@ -48,13 +45,7 @@ export const AssistantAvatar = ({ width="80" height="80" /> - {progress < 1 && ( - - )} + {progress < 1 && } ); diff --git a/client/src/mobile.css b/client/src/mobile.css index aae757ca94..b26685f1e6 100644 --- a/client/src/mobile.css +++ b/client/src/mobile.css @@ -3,11 +3,6 @@ * emitting its CSS a second time. */ @reference './style.css'; -.hover-button.active { - display: block; - visibility: visible; -} - .nav { position: fixed; z-index: 110; diff --git a/e2e/specs/mock/scenarios/mouse-reveal.spec.ts b/e2e/specs/mock/scenarios/mouse-reveal.spec.ts index 5630100013..d405e67444 100644 --- a/e2e/specs/mock/scenarios/mouse-reveal.spec.ts +++ b/e2e/specs/mock/scenarios/mouse-reveal.spec.ts @@ -1,5 +1,12 @@ import { randomUUID } from 'crypto'; import { expect, test } from '@playwright/test'; +import { + MOCK_ENDPOINTS, + NEW_CHAT_PATH, + messagesView, + sendMessage, + selectMockEndpoint, +} from '../helpers'; import { REPLY_TEXT, createProject, @@ -57,6 +64,48 @@ test('a mouse desktop reveals message actions on hover and keyboard focus @scena } }); +test("an open fork menu holds an earlier reply's actions visible after the pointer leaves @scenario:mouse-desktop-open-menu-holds-actions", async ({ + page, +}) => { + const label = `held-${randomUUID().slice(0, 8)}`; + await page.goto(NEW_CHAT_PATH, { timeout: 15000 }); + await selectMockEndpoint(page, MOCK_ENDPOINTS[0]); + for (const turn of ['first', 'second']) { + expect((await sendMessage(page, `E2E_REPLY:${label}-${turn}`)).ok()).toBeTruthy(); + await expect(messagesView(page).getByText(`E2E reply ${label}-${turn}`)).toBeVisible({ + timeout: 30000, + }); + } + const row = page + .locator('.message-render') + .filter({ hasText: `E2E reply ${label}-first` }) + .last(); + const latest = page + .locator('.message-render') + .filter({ hasText: `E2E reply ${label}-second` }) + .last(); + const copy = row.getByTestId('copy-response-button'); + const fork = row.getByRole('button', { name: 'Open Fork Menu' }); + + await page.mouse.move(0, 0); + await expect.poll(() => paintedOpacity(copy)).toBe(0); + /** The latest reply's actions never fade. */ + await expect.poll(() => paintedOpacity(latest.getByTestId('copy-response-button'))).toBe(1); + + await row.hover(); + await fork.click(); + await expect( + page.getByRole('button', { name: 'Visible messages only', exact: true }), + ).toBeVisible(); + await page.mouse.move(0, 0); + /** The open menu lights its trigger and keeps every action in the row opaque. */ + await expect.poll(() => paintedOpacity(copy)).toBe(1); + await expect(fork).toHaveAttribute('data-hover-active', 'true'); + + await page.keyboard.press('Escape'); + await expect(fork).not.toHaveAttribute('data-hover-active'); +}); + test('a mouse desktop reveals project row actions on hover and keyboard focus @scenario:mouse-desktop-project-row-actions-reveal', async ({ page, }) => { diff --git a/eslint-suppressions.json b/eslint-suppressions.json index e581d5e429..7a0ee55cf4 100644 --- a/eslint-suppressions.json +++ b/eslint-suppressions.json @@ -1254,146 +1254,6 @@ "count": 1 } }, - "packages/chat/src/components/CollapsibleText.tsx": { - "shadcn/no-restyle": { - "count": 2 - } - }, - "packages/chat/src/components/Summary.tsx": { - "shadcn/no-arbitrary-values": { - "count": 1 - }, - "shadcn/no-inline-styles": { - "count": 1 - }, - "shadcn/no-restyle": { - "count": 9 - }, - "shadcn/require-static-classes": { - "count": 1 - } - }, - "packages/chat/src/components/composer/EscalateNowButton.tsx": { - "design/disabled-recipe": { - "count": 1 - } - }, - "packages/chat/src/components/composer/QuoteButton.tsx": { - "shadcn/no-inline-styles": { - "count": 1 - } - }, - "packages/chat/src/components/composer/files/DragDropOverlay.tsx": { - "shadcn/no-inline-styles": { - "count": 3 - } - }, - "packages/chat/src/components/composer/files/FileUpload.tsx": { - "shadcn/no-restyle": { - "count": 11 - }, - "shadcn/require-static-classes": { - "count": 2 - } - }, - "packages/chat/src/components/composer/files/ImagePreview.tsx": { - "shadcn/no-inline-styles": { - "count": 3 - } - }, - "packages/chat/src/components/composer/files/PastedTextDialog.tsx": { - "shadcn/no-restyle": { - "count": 2 - } - }, - "packages/chat/src/components/composer/files/ProgressCircle.tsx": { - "shadcn/no-arbitrary-values": { - "count": 1 - }, - "shadcn/no-inline-styles": { - "count": 1 - } - }, - "packages/chat/src/components/composer/files/SourceIcon.tsx": { - "shadcn/no-arbitrary-values": { - "count": 1 - } - }, - "packages/chat/src/components/messages/Feedback.tsx": { - "shadcn/no-restyle": { - "count": 10 - }, - "shadcn/require-static-classes": { - "count": 3 - } - }, - "packages/chat/src/components/messages/Fork.tsx": { - "shadcn/no-restyle": { - "count": 4 - }, - "shadcn/require-static-classes": { - "count": 1 - } - }, - "packages/chat/src/components/messages/HeaderLabel.tsx": { - "shadcn/no-arbitrary-values": { - "count": 5 - } - }, - "packages/chat/src/components/messages/HoverButtons.tsx": { - "shadcn/require-static-classes": { - "count": 1 - } - }, - "packages/chat/src/components/messages/MessageNav.tsx": { - "design/disabled-recipe": { - "count": 1 - } - }, - "packages/chat/src/components/messages/MessageRow.tsx": { - "shadcn/no-arbitrary-values": { - "count": 1 - } - }, - "packages/chat/src/components/messages/MinimalHoverButtons.tsx": { - "shadcn/no-restyle": { - "count": 2 - }, - "shadcn/require-static-classes": { - "count": 1 - } - }, - "packages/chat/src/components/messages/ScrollToBottom.tsx": { - "shadcn/no-restyle": { - "count": 1 - } - }, - "packages/chat/src/components/messages/SiblingSwitch.tsx": { - "shadcn/no-restyle": { - "count": 2 - } - }, - "packages/chat/src/components/messages/styles.ts": { - "shadcn/no-arbitrary-values": { - "count": 1 - } - }, - "packages/chat/src/components/subagents/activity.tsx": { - "design/disabled-recipe": { - "count": 1 - }, - "shadcn/no-arbitrary-values": { - "count": 1 - }, - "shadcn/no-restyle": { - "count": 4 - } - }, - "packages/chat/src/components/subagents/transcript.tsx": { - "shadcn/no-restyle": { - "count": 12 - } - }, "packages/client/src/components/Badge.tsx": { "design/disabled-recipe": { "count": 1 diff --git a/packages/chat/src/components.ts b/packages/chat/src/components.ts index c568a416ad..86fb27dc77 100644 --- a/packages/chat/src/components.ts +++ b/packages/chat/src/components.ts @@ -84,11 +84,7 @@ export { getHeaderModelName, getHeaderHoverLabel, } from './components/messages/HeaderLabel'; -export { - hoverButtonClasses, - messageFooterClasses, - revealOnRowHoverClasses, -} from './components/messages/styles'; +export { messageFooterClasses, revealOnRowHoverClasses } from './components/messages/styles'; export { getRunStepDurationLabels, getElapsedDurationLabels } from './components/messages/duration'; export type { RunStepDurationLabels } from './components/messages/duration'; export { default as MessageRow } from './components/messages/MessageRow'; diff --git a/packages/chat/src/components/CollapsibleText.tsx b/packages/chat/src/components/CollapsibleText.tsx index 7f45cae570..e0a07643b7 100644 --- a/packages/chat/src/components/CollapsibleText.tsx +++ b/packages/chat/src/components/CollapsibleText.tsx @@ -118,14 +118,14 @@ const CollapsibleText: NamedExoticComponent = memo(functio {content && showCopyButton && ( - + + )} ); @@ -294,10 +297,10 @@ const Summary: NamedExoticComponent = memo( role="region" aria-label={label} aria-hidden={!isExpanded || undefined} - className={cn('grid transition-all duration-300 ease-out', isExpanded && 'mb-4')} - style={{ - gridTemplateRows: isExpanded ? '1fr' : '0fr', - }} + className={cn( + 'grid transition-all duration-300 ease-out', + isExpanded ? 'mb-4 grid-rows-[1fr]' : 'grid-rows-[0fr]', + )} >
{text} diff --git a/packages/chat/src/components/composer/EscalateNowButton.tsx b/packages/chat/src/components/composer/EscalateNowButton.tsx index 9211867447..dcee150369 100644 --- a/packages/chat/src/components/composer/EscalateNowButton.tsx +++ b/packages/chat/src/components/composer/EscalateNowButton.tsx @@ -163,8 +163,14 @@ export default function EscalateNowButton({ return ( {/* The disabled IconButton already renders at half opacity; 70% of that - is the 35% this control has always dimmed to. */} - + is the 35% this control has always dimmed to. A theme that paints a disabled + fill draws the control at full opacity, so the wrapper stops dimming it too. */} +