Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🦎 fix: Restore Theme Contrast in Composer and Messages (#16624)
lia-by-librechat[bot]d2f970910c8d
diff --git a/client/src/components/Chat/Input/__tests__/StopButton.spec.tsx b/client/src/components/Chat/Input/__tests__/StopButton.spec.tsxindex afc5d636b2..1e49879235 100644--- a/client/src/components/Chat/Input/__tests__/StopButton.spec.tsx+++ b/client/src/components/Chat/Input/__tests__/StopButton.spec.tsx@@ -6,6 +6,14 @@ jest.mock('~/hooks', () => ({}));describe('StopButton', () => {+ it('uses contrasted theme roles for its fill and inherited glyph ink', () => {+ render(<StopButton stop={jest.fn()} setShowStopButton={jest.fn()} />);++ const button = screen.getByTestId('stop-generation-button');+ expect(button).toHaveClass('bg-surface-inverted', 'text-text-inverted');+ expect(button.querySelector('rect')).toHaveAttribute('fill', 'currentColor');+ });+it('hides itself and aborts the run on click', () => {const stop = jest.fn();const setShowStopButton = jest.fn();diff --git a/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx b/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsxindex 46c8101993..014afa47a1 100644--- a/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx+++ b/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx@@ -1,4 +1,4 @@-import { memo, useId, useCallback, useEffect, useMemo, useRef, useState } from 'react';+import { memo, useId, useCallback, useEffect, useMemo, useRef, useState, useContext } from 'react';import { useAtomValue } from 'jotai';import { useTranslation } from 'react-i18next';import { ContentTypes } from 'librechat-data-provider';@@ -29,6 +29,7 @@ import { getActivityLabelText } from '~/utils/activityLabels';import { getOutcomeStatus, summarizeSpan } from './outcome';import { MCPAppViews } from '~/components/MCPUIResource';import { sandboxStartingByToolCallId } from '~/store';+import { MessageSurfaceContext } from '../ui/surface';import useClockFormat from '~/hooks/useClockFormat';import { cn, getMessageTimestamp } from '~/utils';import { StackedToolIcons } from './ToolOutput';@@ -548,6 +549,7 @@ export default function ActivityPhaseGroup({spanParts?: ReadonlyArray<TMessageContentParts | undefined>;onExpansionChange?: (expanded: boolean) => void;}) {+ const messageSurface = useContext(MessageSurfaceContext);const isLive = liveParts != null;const label = getActivityLabelText(labelPart);const hasFailure = labelPart.status === 'failed' || labelPart.status === 'partial';@@ -799,7 +801,7 @@ export default function ActivityPhaseGroup({/** Pinned while open, so a run long enough to scroll keeps its name* at the top of the viewport. The containing block is this card, so* the header stops pinning where its own rows end. */- className={cn(isExpanded && 'bg-presentation sticky top-0 z-[1]')}+ className={cn(isExpanded && 'sticky top-0 z-[1]', isExpanded && messageSurface)}><div className="flex items-center gap-2 overflow-hidden"><buttondiff --git a/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsxindex 3a00e82b2d..26d821342f 100644--- a/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsx+++ b/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsx@@ -2,6 +2,7 @@ import { ContentTypes, Tools } from 'librechat-data-provider';import { act, fireEvent, render, screen, within } from '@testing-library/react';import type { TAttachment, TMessageContentParts } from 'librechat-data-provider';import { ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '../rows';+import { MessageSurfaceContext } from '../../ui/surface';import ActivityPhaseGroup from '../ActivityPhaseGroup';import { useFailedReveal } from '../reveal';@@ -661,6 +662,24 @@ describe('ActivityPhaseGroup open header', () => {expect(screen.getByRole('button')).toHaveTextContent('Checking the rollback path');});+ test.each(['bg-surface-dialog', 'bg-surface-secondary'] as const)(+ 'paints the sticky header from its hosting %s canvas',+ (surface) => {+ render(+ <MessageSurfaceContext.Provider value={surface}>+ <ActivityPhaseGroup labelPart={labelPart} hasContent>+ <div data-testid="phase-content" />+ </ActivityPhaseGroup>+ </MessageSurfaceContext.Provider>,+ );+ const header = screen.getByRole('button', { name: LABEL });+ fireEvent.click(header);+ const pinned = header.parentElement?.parentElement;+ expect(pinned).toHaveClass('sticky', surface);+ expect(pinned).not.toHaveClass('bg-surface-primary-alt', 'bg-presentation');+ },+ );+test('pins the open header and rails the rows under it', () => {render(<ActivityPhaseGroup labelPart={labelPart} hasContent>@@ -671,7 +690,8 @@ describe('ActivityPhaseGroup open header', () => {const pinned = header.parentElement?.parentElement;expect(pinned).not.toHaveClass('sticky');fireEvent.click(header);- expect(pinned).toHaveClass('sticky', 'top-0');+ expect(pinned).toHaveClass('sticky', 'top-0', 'bg-surface-primary-alt');+ expect(pinned).not.toHaveClass('bg-presentation');expect(screen.getByTestId('activity-phase-panel').firstElementChild).toHaveClass('pl-6');});});diff --git a/client/src/components/Chat/Messages/MinimalMessages.tsx b/client/src/components/Chat/Messages/MinimalMessages.tsxindex 059f0eaff6..adeb5139b0 100644--- a/client/src/components/Chat/Messages/MinimalMessages.tsx+++ b/client/src/components/Chat/Messages/MinimalMessages.tsx@@ -1,4 +1,5 @@import React from 'react';+import { MessageSurfaceContext } from './ui/surface';import { cn } from '~/utils';const MinimalMessages = React.forwardRef(@@ -26,7 +27,9 @@ const MinimalMessages = React.forwardRef(}}><div className="flex flex-col pb-9 text-sm">- {props.children}+ <MessageSurfaceContext.Provider value="bg-surface-secondary">+ {props.children}+ </MessageSurfaceContext.Provider><div className="group h-0 w-full shrink-0" /></div></div>diff --git a/client/src/components/Chat/Messages/ui/surface.ts b/client/src/components/Chat/Messages/ui/surface.tsnew file mode 100644index 0000000000..7c81ac12b8--- /dev/null+++ b/client/src/components/Chat/Messages/ui/surface.ts@@ -0,0 +1,6 @@+import { createContext } from 'react';++/** Opaque sticky rows must repaint the canvas their host actually uses. */+export const MessageSurfaceContext = createContext<+ 'bg-surface-primary-alt' | 'bg-surface-secondary' | 'bg-surface-dialog'+>('bg-surface-primary-alt');diff --git a/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.test.tsx b/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.test.tsxindex d216cafbbf..db5310177b 100644--- a/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.test.tsx+++ b/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.test.tsx@@ -58,18 +58,25 @@ jest.mock('./SubagentConversation', () => ({trigger: { summary: string };activity: { items: Array<{ type: string; text?: string }> };}>;- }) => (- <div data-testid="subagent-conversation">- {turns.map((turn) => (- <div key={turn.taskId}>- {turn.trigger.summary}- {turn.activity.items.map((item, index) => (- <span key={index}>{item.text ?? item.type}</span>- ))}- </div>- ))}- </div>- ),+ }) => {+ const { MessageSurfaceContext } = jest.requireActual('~/components/Chat/Messages/ui/surface');+ return (+ <MessageSurfaceContext.Consumer>+ {(surface: string) => (+ <div data-testid="subagent-conversation" data-message-surface={surface}>+ {turns.map((turn) => (+ <div key={turn.taskId}>+ {turn.trigger.summary}+ {turn.activity.items.map((item, index) => (+ <span key={index}>{item.text ?? item.type}</span>+ ))}+ </div>+ ))}+ </div>+ )}+ </MessageSurfaceContext.Consumer>+ );+ },}));const persistedContent = (text: string): TMessageContentParts[] => [@@ -132,6 +139,10 @@ describe('SharedSubagentActivityDialog', () => {fireEvent.click(trigger);expect(screen.getByRole('dialog')).toBeInTheDocument();+ expect(screen.getByTestId('subagent-conversation')).toHaveAttribute(+ 'data-message-surface',+ 'bg-surface-dialog',+ );expect(screen.getByText('Shared review complete.')).toBeInTheDocument();fireEvent.click(screen.getByRole('button', { name: 'Close' }));await waitFor(() => expect(trigger).toHaveFocus());diff --git a/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.tsx b/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.tsxindex ee7f295e3a..823df45cd6 100644--- a/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.tsx+++ b/client/src/components/Chat/Subagents/SharedSubagentActivityDialog.tsx@@ -1,6 +1,7 @@import { useCallback, useEffect, useMemo, useRef } from 'react';import { useAtom } from 'jotai';import { OGDialog, OGDialogContent, OGDialogHeader, OGDialogTitle } from '@librechat/client';+import { MessageSurfaceContext } from '~/components/Chat/Messages/ui/surface';import { SubagentActivityScrollSurface } from './SubagentActivity';import SubagentConversation from './SubagentConversation';import { adaptLivePersistedActivity } from './adapters';@@ -63,28 +64,30 @@ export default function SharedSubagentActivityDialog({ shareId }: { shareId?: stclassName="flex h-[min(90vh,48rem)] w-11/12 max-w-3xl flex-col gap-0 overflow-hidden p-0"onCloseAutoFocus={restoreTriggerFocus}>- <OGDialogHeader className="shrink-0 border-b border-border-light px-5 py-4 pr-14">+ <OGDialogHeader className="border-border-light shrink-0 border-b px-5 py-4 pr-14"><OGDialogTitle className="truncate text-left text-base" title={activity.title}>{activity.title}</OGDialogTitle></OGDialogHeader>- <SubagentActivityScrollSurface padded={false}>- <SubagentConversation- turns={[- {- taskId:- selection == null- ? 'shared-subagent'- : `${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${selection.partIndex}`,- trigger: {- kind: 'parent_dispatch',- summary: selection?.prompt ?? '',+ <MessageSurfaceContext.Provider value="bg-surface-dialog">+ <SubagentActivityScrollSurface padded={false}>+ <SubagentConversation+ turns={[+ {+ taskId:+ selection == null+ ? 'shared-subagent'+ : `${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${selection.partIndex}`,+ trigger: {+ kind: 'parent_dispatch',+ summary: selection?.prompt ?? '',+ },+ activity,},- activity,- },- ]}- />- </SubagentActivityScrollSurface>+ ]}+ />+ </SubagentActivityScrollSurface>+ </MessageSurfaceContext.Provider></OGDialogContent></OGDialog>);diff --git a/client/src/style.css b/client/src/style.cssindex 5f9e32cc90..171ad486af 100644--- a/client/src/style.css+++ b/client/src/style.css@@ -1230,7 +1230,7 @@ html {.markdown blockquote {--tw-border-opacity: 1;- border-color: rgb(var(--gray-400));+ border-color: rgb(var(--border-medium));border-left-width: 2px;line-height: 1rem;padding-left: 1rem;@@ -1245,7 +1245,7 @@ html {}.markdown th {- background-color: rgba(236, 236, 241, 0.2);+ background-color: rgb(var(--table-header-fill));border-bottom-width: 1px;border-left-width: 1px;border-top-width: 1px;@@ -1258,7 +1258,7 @@ html {.markdown th:last-child {border-right-width: 1px;- border-color: #d1d5db;+ border-color: rgb(var(--border-medium));border-top-right-radius: 0.375rem;}@@ -1373,63 +1373,51 @@ html {}.markdown blockquote {--tw-border-opacity: 1;- border-color: rgb(var(--gray-300));+ border-color: rgb(var(--border-medium));border-left-width: 2px;line-height: 1rem;padding-left: 1rem;}-.dark .markdown blockquote {- border-color: rgb(var(--gray-600));-}.markdown table {--tw-border-spacing-x: 0px;--tw-border-spacing-y: 0px;border-collapse: separate;border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y);width: 100%;- border-color: rgb(var(--gray-300));+ border-color: rgb(var(--border-medium));}.markdown th {- background-color: rgb(var(--gray-100));+ background-color: rgb(var(--table-header-fill));+ color: rgb(var(--table-header-text));border-bottom-width: 1px;border-left-width: 1px;border-top-width: 1px;- border-color: rgb(var(--gray-300));+ border-color: rgb(var(--border-medium));padding: 0.25rem 0.75rem;font-weight: 600;}-.dark .markdown th {- border-color: rgb(var(--gray-600));- background-color: rgb(var(--gray-600));-}.markdown th:first-child {- border-top-left-radius: 0.75rem;+ border-top-left-radius: var(--theme-control-radius, 0.75rem);}.markdown th:last-child {border-right-width: 1px;- border-top-right-radius: 0.75rem;+ border-top-right-radius: var(--theme-control-radius, 0.75rem);}.markdown td {border-bottom-width: 1px;border-left-width: 1px;- border-color: rgb(var(--gray-300));+ border-color: rgb(var(--border-medium));padding: 0.25rem 0.75rem;}.markdown td:last-child {border-right-width: 1px;- border-color: rgb(var(--gray-300));-}-.dark .markdown td {- border-color: rgb(var(--gray-600));-}-.dark .markdown td:last-child {- border-color: rgb(var(--gray-600));+ border-color: rgb(var(--border-medium));}.markdown tbody tr:last-child td:first-child {- border-bottom-left-radius: 0.75rem;+ border-bottom-left-radius: var(--theme-control-radius, 0.75rem);}.markdown tbody tr:last-child td:last-child {- border-bottom-right-radius: 0.75rem;+ border-bottom-right-radius: var(--theme-control-radius, 0.75rem);}.markdown a {text-decoration-line: underline;diff --git a/e2e/specs/mock/scenarios/message-theme.spec.ts b/e2e/specs/mock/scenarios/message-theme.spec.tsnew file mode 100644index 0000000000..c87318d805--- /dev/null+++ b/e2e/specs/mock/scenarios/message-theme.spec.ts@@ -0,0 +1,184 @@+import { randomUUID } from 'crypto';+import { expect, test } from '@playwright/test';+import { clickHouseTheme } from '../../../../packages/client/src/theme/themes/clickhouse';+import {+ deleteConversations,+ deleteMessagesByConversation,+ seedConversations,+ seedMessages,+} from '../db';+import { NEW_CHAT_PATH, MOCK_ENDPOINTS, selectMockEndpoint, sendMessage } from '../helpers';+import { computedStyles, probeStyle } from './style.helpers';+import { getE2EUser } from '../../../setup/user';++const PHASE = 'Checked the message theme';+const MARKDOWN = [+ 'The message surfaces follow the active theme.',+ '',+ '> A quoted result.',+ '',+ '| Surface | Status |',+ '| --- | --- |',+ '| Stop control | Visible |',+ '| Activity header | Blends into the message canvas |',+].join('\n');++async function seedChat(): Promise<string> {+ const conversationId = randomUUID();+ const messageId = randomUUID();+ const { email } = getE2EUser();+ await seedConversations(email, [+ { conversationId, title: 'Message theme checks', updatedAt: new Date() },+ ]);+ await seedMessages(email, conversationId, [+ {+ messageId,+ parentMessageId: '00000000-0000-0000-0000-000000000000',+ text: 'Check the controls and message surfaces.',+ isCreatedByUser: true,+ sender: 'User',+ },+ {+ messageId: randomUUID(),+ parentMessageId: messageId,+ text: MARKDOWN,+ isCreatedByUser: false,+ sender: 'Mock Provider A',+ content: [+ {+ type: 'tool_call',+ tool_call: {+ id: 'theme-read',+ name: 'read_file',+ args: '{"path":"theme.ts"}',+ output: 'Theme roles checked.',+ type: 'tool_call',+ progress: 1,+ },+ },+ {+ type: 'tool_call',+ tool_call: {+ id: 'theme-query',+ name: 'run_select_query',+ args: '{}',+ output: 'Message colors checked.',+ type: 'tool_call',+ progress: 1,+ },+ },+ {+ type: 'activity_label',+ activity_label: PHASE,+ activity_label_type: 'phase',+ activity_start_index: 0,+ activity_end_index: 2,+ activity_count: 2,+ pending: false,+ },+ { type: 'text', text: MARKDOWN },+ ],+ },+ ]);+ return conversationId;+}++test.use({ viewport: { width: 1280, height: 800 } });++for (const definition of ['stock', 'clickhouse'] as const) {+ for (const mode of ['light', 'dark'] as const) {+ test(`message surfaces and stop contrast in ${definition} ${mode} @scenario:message-theme-${definition}-${mode}`, async ({+ page,+ }) => {+ await page.addInitScript(+ ({ selectedMode, theme }) => {+ localStorage.setItem('color-theme', selectedMode);+ localStorage.setItem('navVisible', 'true');+ localStorage.removeItem('theme-colors');+ localStorage.removeItem('theme-name');+ if (theme) {+ localStorage.setItem('theme-definition', JSON.stringify(theme));+ localStorage.setItem('theme-source', 'definition');+ } else {+ localStorage.removeItem('theme-definition');+ localStorage.removeItem('theme-source');+ }+ },+ { selectedMode: mode, theme: definition === 'clickhouse' ? clickHouseTheme : null },+ );+ const conversationId = await seedChat();+ try {+ await page.goto(`/c/${conversationId}`);+ const phase = page.getByTestId('activity-phase-card');+ const toggle = phase.getByRole('button', { name: PHASE });+ await toggle.click();+ await expect(toggle).toHaveAttribute('aria-expanded', 'true');+ const header = toggle.locator('..').locator('..');+ const table = page.locator('.markdown table');+ await expect(table).toBeVisible();+ const screenshot = test.info().outputPath(`messages-${definition}-${mode}.png`);+ await page.screenshot({ path: screenshot, animations: 'disabled' });+ await test.info().attach(`messages-${definition}-${mode}`, {+ path: screenshot,+ contentType: 'image/png',+ });++ expect((await computedStyles(header, ['backgroundColor'])).backgroundColor).toBe(+ await probeStyle(page, 'bg-surface-primary-alt', 'background-color'),+ );+ const heading = table.locator('th').first();+ const headingStyles = await computedStyles(heading, [+ 'backgroundColor',+ 'color',+ 'borderTopColor',+ 'borderTopLeftRadius',+ ]);+ expect(headingStyles.backgroundColor).toBe(+ await probeStyle(page, 'bg-table-header-fill', 'background-color'),+ );+ expect(headingStyles.color).toBe(await probeStyle(page, 'text-table-header-text', 'color'));+ expect(headingStyles.borderTopColor).toBe(+ await probeStyle(page, 'border border-border-medium', 'border-top-color'),+ );+ expect(headingStyles.borderTopLeftRadius).toBe(+ await probeStyle(page, 'rounded-theme-control', 'border-top-left-radius'),+ );+ expect(+ (await computedStyles(table.locator('td').first(), ['borderLeftColor'])).borderLeftColor,+ ).toBe(await probeStyle(page, 'border border-border-medium', 'border-left-color'));+ expect(+ (await computedStyles(page.locator('.markdown blockquote'), ['borderLeftColor']))+ .borderLeftColor,+ ).toBe(await probeStyle(page, 'border border-border-medium', 'border-left-color'));++ await page.goto(NEW_CHAT_PATH);+ await selectMockEndpoint(page, MOCK_ENDPOINTS[0]);+ await sendMessage(page, `E2E_SLOW_REPLY:theme-${definition}-${mode}`);+ const stop = page.getByTestId('stop-generation-button');+ await expect(stop).toBeVisible();+ await expect(stop).toBeEnabled();+ await page.mouse.move(0, 0);+ const stopScreenshot = test.info().outputPath(`stop-${definition}-${mode}.png`);+ await page.screenshot({ path: stopScreenshot, animations: 'disabled' });+ await test.info().attach(`stop-${definition}-${mode}`, {+ path: stopScreenshot,+ contentType: 'image/png',+ });+ const colors = await computedStyles(stop, ['color', 'backgroundColor']);+ expect(colors.backgroundColor).toBe(+ await probeStyle(page, 'bg-surface-inverted', 'background-color'),+ );+ expect(colors.color).toBe(await probeStyle(page, 'text-text-inverted', 'color'));+ expect((await computedStyles(stop.locator('rect'), ['fill'])).fill).toBe(colors.color);+ expect(colors.color).not.toBe(colors.backgroundColor);+ await stop.click();+ await expect(stop).toBeHidden();+ } finally {+ await Promise.all([+ deleteMessagesByConversation([conversationId]),+ deleteConversations([conversationId]),+ ]);+ }+ });+ }+}diff --git a/packages/client/src/components/Composer.spec.tsx b/packages/client/src/components/Composer.spec.tsxindex 9d3f4c0299..1517a08a00 100644--- a/packages/client/src/components/Composer.spec.tsx+++ b/packages/client/src/components/Composer.spec.tsx@@ -32,6 +32,24 @@ const Harness = ({};describe('Composer', () => {+ it('lets the stop glyph inherit the contrasted submit ink', () => {+ render(+ <Composer+ value=""+ onChange={jest.fn()}+ onSubmit={jest.fn()}+ canSubmit={false}+ submitLabel="Send"+ ariaLabel="Message input"+ onStop={jest.fn()}+ stopLabel="Stop"+ />,+ );+ const button = screen.getByRole('button', { name: 'Stop' });+ expect(button).toHaveClass('bg-surface-inverted', 'text-text-inverted');+ expect(button.querySelector('svg')).not.toHaveClass('text-surface-primary');+ });+it('submits on Enter and keeps Shift+Enter for a newline', () => {const onSubmit = jest.fn();render(<Harness onSubmit={onSubmit} />);diff --git a/packages/client/src/components/Composer.tsx b/packages/client/src/components/Composer.tsxindex f0f8f4fef7..bf42fe6050 100644--- a/packages/client/src/components/Composer.tsx+++ b/packages/client/src/components/Composer.tsx@@ -222,7 +222,7 @@ const Composer: ForwardRefExoticComponent<viewBox="0 0 24 24"fill="none"xmlns="http://www.w3.org/2000/svg"- className="icon-lg text-surface-primary"+ className="icon-lg"aria-hidden="true"><rect x="7" y="7" width="10" height="10" rx="1.25" fill="currentColor" />diff --git a/packages/client/src/components/IconButton.spec.tsx b/packages/client/src/components/IconButton.spec.tsxindex e333b61a00..9a2fbfd7d2 100644--- a/packages/client/src/components/IconButton.spec.tsx+++ b/packages/client/src/components/IconButton.spec.tsx@@ -33,6 +33,18 @@ describe('IconButton', () => {);});+ it('keeps submit glyphs contrasted against the theme fill', () => {+ render(+ <IconButton label="Stop" variant="submit" size="theme" shape="theme">+ stop+ </IconButton>,+ );++ const button = screen.getByRole('button', { name: 'Stop' });+ expect(button).toHaveClass('bg-surface-inverted', 'text-text-inverted');+ expect(button).not.toHaveClass('text-text-primary', 'bg-text-primary');+ });+it('provides a theme-aware primary action', () => {render(<IconButton label="Send" variant="primary">diff --git a/packages/client/src/utils/composer.spec.ts b/packages/client/src/utils/composer.spec.tsindex 6a981cefd9..a05a9a203d 100644--- a/packages/client/src/utils/composer.spec.ts+++ b/packages/client/src/utils/composer.spec.ts@@ -30,7 +30,9 @@ describe('composerSubmitClasses', () => {it('draws its fill and disabled state from semantic roles', () => {const classes = composerSubmitClasses();- expect(classes).toContain('bg-text-primary');+ expect(classes).toContain('bg-surface-inverted');+ expect(classes).toContain('text-text-inverted');+ expect(classes).not.toContain('bg-text-primary');expect(classes).toContain('disabled:text-text-secondary');expect(classes).not.toMatch(/#[0-9a-f]{3,6}|rgb\(|hsl\(/i);});diff --git a/packages/client/src/utils/composer.ts b/packages/client/src/utils/composer.tsindex 373aece7ce..a830c32a4c 100644--- a/packages/client/src/utils/composer.ts+++ b/packages/client/src/utils/composer.ts@@ -36,7 +36,7 @@ export const composerSubmitClasses = (): string =>cn('flex items-center justify-center','size-theme-control touch:size-theme-control-touch',- 'rounded-theme-control-round bg-text-primary p-theme-compact text-text-primary',+ 'rounded-theme-control-round bg-surface-inverted p-theme-compact text-text-inverted','outline-offset-4 transition-all duration-theme-normal','disabled:cursor-not-allowed disabled:text-text-secondary disabled:opacity-10',disabledFillClasses,