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: Keep Chrome Surfaces and Destructive Confirms Legible in Quiet-Chrome Themes (#16833)
Marco Beretta3e951569c21d
diff --git a/client/src/components/Chat/Header.tsx b/client/src/components/Chat/Header.tsxindex 8d50f6f122..d41a0149a1 100644--- a/client/src/components/Chat/Header.tsx+++ b/client/src/components/Chat/Header.tsx@@ -84,7 +84,7 @@ function Header({return (/* The composer review is in a z-10 stacking context. Keep header controlsabove it when a tall review reaches the top of a short viewport. */- <div className="from-surface-canvas via-surface-canvas/70 text-text-primary md:from-surface-canvas/80 md:via-surface-canvas/50 2xl:from-surface-canvas/0 absolute top-0 z-20 flex h-[3.25rem] w-full items-center gap-2 bg-gradient-to-b to-transparent p-2 font-semibold 2xl:via-transparent">+ <div className="from-surface-canvas via-surface-canvas/70 text-text-primary md:from-surface-canvas/80 md:via-surface-canvas/50 2xl:from-surface-canvas/0 theme-chrome-quiet:bg-surface-canvas theme-chrome-quiet:bg-none absolute top-0 z-20 flex h-[3.25rem] w-full items-center gap-2 bg-gradient-to-b to-transparent p-2 font-semibold 2xl:via-transparent"><div className={cn('flex-shrink-0 items-center', isSmallScreen ? 'flex' : 'hidden')}><OpenSidebar testId="header-open-sidebar-button" /></div>diff --git a/client/src/components/Conversations/ConvoOptions/SharedLinkButton.tsx b/client/src/components/Conversations/ConvoOptions/SharedLinkButton.tsxindex 33390e4c7f..126fad72e0 100644--- a/client/src/components/Conversations/ConvoOptions/SharedLinkButton.tsx+++ b/client/src/components/Conversations/ConvoOptions/SharedLinkButton.tsx@@ -375,7 +375,7 @@ export default function SharedLinkButton({ref={deleteButtonRef}type="button"onClick={() => setShowDeleteDialog(true)}- variant="destructive"+ variant="destructive-soft"size="icon"className="size-9 sm:size-10"aria-label={localize('com_ui_delete_link')}diff --git a/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx b/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsxindex eebab23b98..5f05e6a0d5 100644--- a/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx+++ b/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx@@ -112,7 +112,7 @@ const RevokeKeysButton = ({<OGDialog open={open} onOpenChange={setOpen}><OGDialogTrigger asChild><Button- variant="destructive"+ variant="destructive-soft"className="flex items-center justify-center duration-200"onClick={() => setOpen(true)}disabled={disabled}diff --git a/client/src/components/MCP/CustomUserVarsSection.tsx b/client/src/components/MCP/CustomUserVarsSection.tsxindex f611c0a0a2..827f88c2d2 100644--- a/client/src/components/MCP/CustomUserVarsSection.tsx+++ b/client/src/components/MCP/CustomUserVarsSection.tsx@@ -174,7 +174,7 @@ export default function CustomUserVarsSection({<div className="flex justify-end gap-2"><Buttontype="button"- variant="destructive"+ variant="destructive-soft"disabled={isSubmitting}onClick={handleRevokeClick}>diff --git a/client/src/components/MCP/ServerInitializationSection.tsx b/client/src/components/MCP/ServerInitializationSection.tsxindex 5adf98b306..f050751ee1 100644--- a/client/src/components/MCP/ServerInitializationSection.tsx+++ b/client/src/components/MCP/ServerInitializationSection.tsx@@ -132,7 +132,7 @@ export default function ServerInitializationSection({{shouldShowRevoke && (<Buttonsize="sm"- variant="destructive"+ variant="destructive-soft"onClick={() => revokeOAuthForServer?.(serverName)}aria-label={localize('com_ui_revoke')}>diff --git a/client/src/components/Messages/ScrollToBottom.tsx b/client/src/components/Messages/ScrollToBottom.tsxindex 5c16ae865d..4ccd3d2f15 100644--- a/client/src/components/Messages/ScrollToBottom.tsx+++ b/client/src/components/Messages/ScrollToBottom.tsx@@ -47,14 +47,14 @@ const ScrollToBottom = forwardRef<HTMLDivElement, Props>(><Buttontype="button"- variant="outline"+ variant="floating"size="icon-theme"shape="round"onClick={scrollHandler}disabled={!interactive}aria-label={localize('com_ui_scroll_to_bottom')}className={cn(- 'me-2 bg-surface-chat/90 text-text-primary active:scale-[0.96] motion-reduce:active:scale-100',+ 'me-2 active:scale-[0.96] motion-reduce:active:scale-100',/* The wrapper owns the fade, so being briefly unreachable must notdim the control on its way in on top of it. */'disabled:opacity-100',diff --git a/client/src/components/Nav/SearchBar.tsx b/client/src/components/Nav/SearchBar.tsxindex 5d705e5608..041c45035f 100644--- a/client/src/components/Nav/SearchBar.tsx+++ b/client/src/components/Nav/SearchBar.tsx@@ -166,7 +166,7 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: React.Ref<HTMLDivEleme** No edge on focus, by request. What marks the focused field is its caret and* the chord appearing in the trailing slot. */- className="group bg-surface-search text-text-primary flex h-9 min-w-0 flex-1 cursor-text items-center gap-2 rounded-lg pr-1 pl-2.5"+ className="group bg-surface-search text-text-primary theme-field-fill:border theme-field-fill:border-border-control flex h-9 min-w-0 flex-1 cursor-text items-center gap-2 rounded-lg pr-1 pl-2.5"><Search aria-hidden="true" className="text-text-secondary size-4 shrink-0" /><inputdiff --git a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsxindex 681eb003cb..d6f7497c69 100644--- a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx@@ -70,7 +70,7 @@ const DeleteAccount = ({ disabled = false }: { title?: string; disabled?: boolea<OGDialogTrigger asChild><Buttonaria-labelledby="delete-account-label"- variant="destructive"+ variant="destructive-soft"onClick={() => setDialogOpen(true)}disabled={disabled}>diff --git a/client/src/components/Nav/SettingsTabs/Account/DisableTwoFactorToggle.tsx b/client/src/components/Nav/SettingsTabs/Account/DisableTwoFactorToggle.tsxindex 1de57b3a74..74a6a0bacc 100644--- a/client/src/components/Nav/SettingsTabs/Account/DisableTwoFactorToggle.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/DisableTwoFactorToggle.tsx@@ -23,7 +23,7 @@ export const DisableTwoFactorToggle: React.FC<DisableTwoFactorToggleProps> = ({const actionButton = (<Buttonref={buttonRef}- variant={enabled ? 'destructive' : 'outline'}+ variant={enabled ? 'destructive-soft' : 'outline'}onClick={isDisableBlockedByPolicy ? undefined : onChange}disabled={disabled}aria-disabled={isDisableBlockedByPolicy || disabled || undefined}diff --git a/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsx b/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsxindex 7a1786fd2c..b21873f0b6 100644--- a/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsx+++ b/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsx@@ -18,24 +18,24 @@ export default function Item({ apiKey }: ItemProps) {const status = getExpiryStatus(apiKey.expiresAt);return (- <li className="group flex items-start justify-between gap-3 px-4 py-3 transition-colors first:rounded-t-xl last:rounded-b-xl hover:bg-surface-secondary/50">+ <li className="group hover:bg-surface-secondary/50 flex items-start justify-between gap-3 px-4 py-3 transition-colors first:rounded-t-xl last:rounded-b-xl"><div className="min-w-0 flex-1 space-y-1"><div className="flex items-center gap-2">- <span className="truncate font-medium text-text-primary">{apiKey.name}</span>+ <span className="text-text-primary truncate font-medium">{apiKey.name}</span>{status?.state === 'expired' && (- <span className="shrink-0 rounded-full border border-status-error-border bg-status-error-subtle px-2 py-0.5 text-xs font-medium text-status-error">+ <span className="border-status-error-border bg-status-error-subtle text-status-error shrink-0 rounded-full border px-2 py-0.5 text-xs font-medium">{localize('com_ui_api_key_expired')}</span>)}{status?.state === 'expiring' && (- <span className="shrink-0 rounded-full border border-status-warning-border bg-status-warning-subtle px-2 py-0.5 text-xs font-medium text-status-warning">+ <span className="border-status-warning-border bg-status-warning-subtle text-status-warning shrink-0 rounded-full border px-2 py-0.5 text-xs font-medium">{status.days === 1? localize('com_ui_api_key_expires_in_day'): localize('com_ui_api_key_expires_in_days', { 0: status.days })}</span>)}</div>- <div className="flex flex-wrap items-center gap-x-2 gap-y-0.5 text-xs text-text-secondary">+ <div className="text-text-secondary flex flex-wrap items-center gap-x-2 gap-y-0.5 text-xs"><code className="font-mono">{apiKey.keyPrefix}…</code><span aria-hidden="true" className="text-text-tertiary">·@@ -57,7 +57,7 @@ export default function Item({ apiKey }: ItemProps) {</div><Buttonref={deleteButtonRef}- variant="destructive"+ variant="destructive-soft"size="icon"onClick={() => setDeleteOpen(true)}aria-label={localize('com_ui_api_key_delete_name', { 0: apiKey.name })}diff --git a/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsx b/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsxindex ed1cec0f44..e5ba6414cb 100644--- a/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsx+++ b/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsx@@ -36,7 +36,7 @@ export const ClearChats = () => {<OGDialogTrigger asChild><Buttonaria-labelledby="clear-all-chats-label"- variant="destructive"+ variant="destructive-soft"onClick={() => setOpen(true)}>{localize('com_ui_delete')}diff --git a/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsx b/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsxindex ac6911517e..7e5170d7e6 100644--- a/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsx+++ b/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsx@@ -47,7 +47,7 @@ export const DeleteCache = ({ disabled = false }: { disabled?: boolean }) => {<OGDialog open={open} onOpenChange={setOpen}><OGDialogTrigger asChild><Button- variant="destructive"+ variant="destructive-soft"onClick={() => setOpen(true)}disabled={disabled || isCacheEmpty}aria-labelledby="delete-cache-label"diff --git a/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsx b/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsxindex f3087a369b..3964085450 100644--- a/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsx+++ b/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsx@@ -42,7 +42,7 @@ export const RevokeKeys = ({<OGDialog open={open} onOpenChange={setOpen}><OGDialogTrigger asChild><Button- variant="destructive"+ variant="destructive-soft"onClick={() => setOpen(true)}disabled={disabled}aria-labelledby="revoke-info-label"diff --git a/client/src/components/Prompts/dialogs/DeletePrompt.tsx b/client/src/components/Prompts/dialogs/DeletePrompt.tsxindex dcc6a42cce..90333fab11 100644--- a/client/src/components/Prompts/dialogs/DeletePrompt.tsx+++ b/client/src/components/Prompts/dialogs/DeletePrompt.tsx@@ -29,7 +29,7 @@ const DeleteConfirmDialog = ({side="bottom"render={<Button- variant="destructive"+ variant="destructive-soft"size="icon"aria-label={localize('com_ui_delete')}disabled={disabled}diff --git a/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsx b/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsxindex 33aa4b1ed1..a73ac81151 100644--- a/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsx+++ b/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsx@@ -100,7 +100,7 @@ export default function ActionEditor({<OGDialogTrigger asChild><Buttontype="button"- variant="destructive"+ variant="destructive-soft"size="icon"disabled={isEphemeralAgent(agentId) || !action.action_id}aria-label={localize('com_ui_delete_action')}diff --git a/client/src/components/SidePanel/MCPBuilder/MCPServerDialog/index.tsx b/client/src/components/SidePanel/MCPBuilder/MCPServerDialog/index.tsxindex f687be18ba..29813fe82d 100644--- a/client/src/components/SidePanel/MCPBuilder/MCPServerDialog/index.tsx+++ b/client/src/components/SidePanel/MCPBuilder/MCPServerDialog/index.tsx@@ -158,7 +158,7 @@ export default function MCPServerDialog({type="text"readOnlyvalue={redirectUri}- className="flex-1 text-text-secondary"+ className="text-text-secondary flex-1"/><Buttonsize="icon"@@ -214,7 +214,7 @@ export default function MCPServerDialog({isEditMode ? (<div className="flex items-center gap-2"><Button- variant="destructive"+ variant="destructive-soft"size="sm"aria-label={localize('com_ui_delete_mcp_server_name', {0: server?.config?.title || server?.serverName || '',diff --git a/client/src/components/Skills/dialogs/DeleteSkill.tsx b/client/src/components/Skills/dialogs/DeleteSkill.tsxindex 139e14477e..ffe51f03c3 100644--- a/client/src/components/Skills/dialogs/DeleteSkill.tsx+++ b/client/src/components/Skills/dialogs/DeleteSkill.tsx@@ -62,7 +62,7 @@ function DeleteSkill({ skillId, skillName, disabled, onDelete }: DeleteSkillPropside="bottom"render={<Button- variant="destructive"+ variant="destructive-soft"size="icon"className="size-9"aria-label={localize('com_ui_delete')}diff --git a/e2e/specs/mock/scenarios/chrome-quiet-surfaces.spec.ts b/e2e/specs/mock/scenarios/chrome-quiet-surfaces.spec.tsnew file mode 100644index 0000000000..eadebcb82f--- /dev/null+++ b/e2e/specs/mock/scenarios/chrome-quiet-surfaces.spec.ts@@ -0,0 +1,107 @@+import { expect, test } from '@playwright/test';+import type { Page } from '@playwright/test';+import { clickHouseTheme } from '../../../../packages/client/src/theme/themes/clickhouse';+import { NEW_CHAT_PATH } from '../helpers';++/**+ * Surfaces that stand in for a chrome outline. A theme whose `chromeBorderAlpha` is 0 draws no edge+ * on chrome controls, so the chat header stops fading into the thread and takes the canvas. The+ * bundled default theme keeps the gradient header.+ */++type Mode = 'light' | 'dark';+type Surfaces = { headerImage: string; headerColor: string };++const QUIET_ZERO_SPELLING = {+ version: 1,+ name: 'e2e-quiet-zero',+ modes: {+ light: { colors: {}, appearance: { chromeBorderAlpha: '0.0' } },+ dark: { colors: {}, appearance: { chromeBorderAlpha: '0.0' } },+ },+} as const;++async function openChat(page: Page, mode: Mode, definition?: { name: string }) {+ await page.addInitScript(+ ([appearance, stored]) => {+ localStorage.setItem('color-theme', appearance as string);+ localStorage.removeItem('theme-colors');+ localStorage.removeItem('theme-name');+ if (stored) {+ localStorage.setItem('theme-definition', JSON.stringify(stored));+ localStorage.setItem('theme-source', 'definition');+ } else {+ localStorage.removeItem('theme-definition');+ localStorage.removeItem('theme-source');+ }+ },+ [mode, definition ?? null] as [string, unknown],+ );+ await page.setViewportSize({ width: 1440, height: 900 });+ await page.goto(NEW_CHAT_PATH, { timeout: 15000 });+ await expect(page.getByRole('textbox', { name: 'Message input' })).toBeVisible({+ timeout: 30000,+ });+ const root = page.locator('html');+ if (definition) {+ await expect(root).toHaveAttribute('data-theme', definition.name);+ } else {+ await expect(root).not.toHaveAttribute('data-theme');+ }+ await expect(root).toHaveClass(mode === 'dark' ? /\bdark\b/ : /\blight\b/);+}++async function surfaces(page: Page): Promise<Surfaces> {+ const header = page.locator('div[class~="theme-chrome-quiet:bg-none"]').first();+ await expect(header).toBeVisible();+ const [headerImage, headerColor] = await header.evaluate((node) => {+ const style = getComputedStyle(node);+ return [style.backgroundImage, style.backgroundColor];+ });+ return { headerImage, headerColor };+}++test.describe('surfaces that replace a chrome outline', () => {+ test('the default light theme keeps the gradient header @scenario:chrome-quiet-default-light-unchanged', async ({+ page,+ }) => {+ await openChat(page, 'light');+ const result = await surfaces(page);+ expect(result.headerImage).toContain('linear-gradient');+ });++ test('the default dark theme keeps the gradient header @scenario:chrome-quiet-default-dark-unchanged', async ({+ page,+ }) => {+ await openChat(page, 'dark');+ const result = await surfaces(page);+ expect(result.headerImage).toContain('linear-gradient');+ });++ test('the ClickHouse theme paints an opaque header @scenario:chrome-quiet-clickhouse-light', async ({+ page,+ }) => {+ await openChat(page, 'light', clickHouseTheme);+ const result = await surfaces(page);+ expect(result.headerImage).toBe('none');+ expect(result.headerColor).not.toBe('rgba(0, 0, 0, 0)');+ });++ test('the ClickHouse dark theme paints an opaque header @scenario:chrome-quiet-clickhouse-dark', async ({+ page,+ }) => {+ await openChat(page, 'dark', clickHouseTheme);+ const result = await surfaces(page);+ expect(result.headerImage).toBe('none');+ expect(result.headerColor).not.toBe('rgba(0, 0, 0, 0)');+ });++ test('a theme that spells the zero chrome alpha as 0.0 still paints the opaque header @scenario:chrome-quiet-zero-spelling', async ({+ page,+ }) => {+ await openChat(page, 'light', QUIET_ZERO_SPELLING);+ const result = await surfaces(page);+ expect(result.headerImage).toBe('none');+ expect(result.headerColor).not.toBe('rgba(0, 0, 0, 0)');+ });+});diff --git a/eslint-suppressions.json b/eslint-suppressions.jsonindex f8d8b91e99..9535f43afb 100644--- a/eslint-suppressions.json+++ b/eslint-suppressions.json@@ -987,7 +987,7 @@},"client/src/components/Messages/ScrollToBottom.tsx": {"shadcn/no-restyle": {- "count": 3+ "count": 1}},"client/src/components/Nav/AccountSettings.tsx": {diff --git a/packages/client/src/components/Button.spec.tsx b/packages/client/src/components/Button.spec.tsxindex 9c83ec7365..044e2f388b 100644--- a/packages/client/src/components/Button.spec.tsx+++ b/packages/client/src/components/Button.spec.tsx@@ -10,9 +10,17 @@ jest.mock('react-i18next', () => ({}));describe('Button', () => {- it('paints a destructive button solid and tints it only when the theme asks', () => {+ it('keeps a confirming destructive button solid in every theme', () => {const destructive = cn(buttonVariants({ variant: 'destructive' }));+ expect(destructive).toContain('bg-surface-destructive');+ expect(destructive).toContain('text-text-on-status');+ expect(destructive).not.toContain('theme-destructive-soft:');+ });++ it('paints an inline destructive button solid and tints it only when the theme asks', () => {+ const destructive = cn(buttonVariants({ variant: 'destructive-soft' }));+expect(destructive).toContain('bg-surface-destructive');expect(destructive).toContain('text-text-on-status');expect(destructive).toContain('theme-destructive-soft:bg-surface-destructive/10');@@ -54,6 +62,16 @@ describe('Button', () => {expect(cn(buttonVariants({ variant: 'toolbar' }))).not.toContain('py-2');});+ it('gives a floating control a surface only when its chrome outline is gone', () => {+ const floating = cn(buttonVariants({ variant: 'floating', size: 'icon-theme' }));++ expect(floating).toContain('border-border-chrome');+ expect(floating).toContain('bg-surface-chat/90');+ expect(floating).toContain('theme-chrome-quiet:bg-surface-chat');+ expect(floating).toContain('theme-chrome-quiet:shadow-md');+ expect(floating).toContain('theme-chrome-quiet:hover:active:bg-surface-pressed');+ });+it('outlines a toggle in the control border', () => {expect(cn(buttonVariants({ variant: 'outline-toggle' }))).toContain('border-border-control');});diff --git a/packages/client/src/components/Button.tsx b/packages/client/src/components/Button.tsxindex d7abfee4bd..51ab33fc10 100644--- a/packages/client/src/components/Button.tsx+++ b/packages/client/src/components/Button.tsx@@ -15,9 +15,11 @@ type ButtonVariantOptions =| 'submit'| 'outline'| 'outline-toggle'+ | 'floating'| 'choice'| 'subtle'| 'destructive'+ | 'destructive-soft'| 'secondary'| 'ghost'| 'quiet'@@ -71,9 +73,23 @@ const buttonVariantRecipe = cva(default:'bg-button-primary text-text-inverted hover:bg-button-primary-hover hover:active:bg-surface-inverted-pressed',destructive:+ 'bg-surface-destructive text-text-on-status hover:bg-surface-destructive-hover',+ /**+ * A destructive action offered inline, such as a row's delete or a revoke beside its+ * label. A theme whose `destructiveStyle` is `soft` tints it; the confirming button of a+ * destructive dialog stays `destructive`, the strongest action on screen.+ */+ 'destructive-soft':'bg-surface-destructive text-text-on-status hover:bg-surface-destructive-hover theme-destructive-soft:bg-surface-destructive/10 theme-destructive-soft:text-text-destructive theme-destructive-soft:hover:bg-surface-destructive/14 theme-destructive-soft:hover:active:bg-surface-destructive/17',outline:'text-text-primary border border-border-light bg-transparent hover:bg-surface-hover hover:active:bg-surface-pressed hover:text-text-primary',+ /**+ * A control floating over scrolling content, such as the scroll-to-bottom chip. A theme that+ * draws no chrome outline gives it an opaque fill and a lift instead, so it never reads as a+ * bare glyph over the thread.+ */+ floating:+ 'border border-border-chrome bg-surface-chat/90 text-text-primary hover:bg-surface-hover hover:active:bg-surface-pressed theme-chrome-quiet:bg-surface-chat theme-chrome-quiet:shadow-md theme-chrome-quiet:hover:bg-surface-hover theme-chrome-quiet:hover:active:bg-surface-pressed',/** An outlined filter whose pressed state stays visible between activations. */'outline-toggle':'text-text-primary border border-border-control bg-transparent transition-none hover:bg-surface-hover hover:active:bg-surface-pressed hover:text-text-primary aria-pressed:border-border-heavy aria-pressed:bg-surface-active-alt aria-pressed:hover:bg-surface-active-alt',diff --git a/packages/client/src/theme/README.md b/packages/client/src/theme/README.mdindex 77bc0e6e56..2c23ec6def 100644--- a/packages/client/src/theme/README.md+++ b/packages/client/src/theme/README.md@@ -441,10 +441,13 @@ Each status family has a foreground, a `-subtle` background, a `-border`, and aand Dialog scrims: `surface-overlay` at the `scrimOpacity`,`alertScrimOpacity` and `modalScrimOpacity` appearance roles (80%, 90% and65% by default). A bundled scrim dims the page and never lifts it.-- `theme-destructive-soft:` - A variant for a `destructive` Button's tint: the+- `theme-destructive-soft:` - A variant for a `destructive-soft` Button's tint (the inline delete or revoke; a dialog's confirming `destructive` button stays solid): thebutton paints a 10% tint of the destructive surface under the destructive inkwhen the theme's `destructiveStyle` is `soft`. The default `fill` keeps thesolid destructive surface.+- `theme-chrome-quiet:` - A variant for a surface that stands in for a chrome+ outline: it applies when the theme's `chromeBorderAlpha` is `0`, so a floating+ control or a bar over a scrolling thread stays separable once its edge is gone.- `border-border-inset-medium` - `border-medium` at the `insetBorderAlpha`appearance role, for the box edges of a form that sits on a stroked page.- `ring-focus-subtle` / `outline-focus-subtle` - The keyboard ring of a row ordiff --git a/packages/client/src/theme/tokens.css b/packages/client/src/theme/tokens.cssindex 1356e18922..0b4a7405ff 100644--- a/packages/client/src/theme/tokens.css+++ b/packages/client/src/theme/tokens.css@@ -287,6 +287,18 @@}}+/* A theme whose `chromeBorderAlpha` is `0` draws no outline on chrome controls, so a control that+ * floats over content or a bar that sits over a scrolling thread needs a surface in place of the+ * edge. Read, like the disabled style, from the `--theme-border-chrome-alpha` property the nearest+ * themed root carries. */+@custom-variant theme-chrome-quiet {+ @container style(--theme-border-chrome-alpha: 0) {+ &:is(:root *) {+ @slot;+ }+ }+}+/* A theme whose `fieldFocusStyle` is `border` swaps a focused field's edge color instead of* drawing a ring. Read, like the disabled style, from the `--theme-field-focus-style` property* the nearest themed root carries. */diff --git a/packages/client/src/theme/utils/applyTheme.spec.ts b/packages/client/src/theme/utils/applyTheme.spec.tsindex 93c95f9dfc..3b60f49446 100644--- a/packages/client/src/theme/utils/applyTheme.spec.ts+++ b/packages/client/src/theme/utils/applyTheme.spec.ts@@ -148,6 +148,34 @@ describe('applyTheme', () => {expect(root.style.getPropertyValue('--theme-motion-fast')).toBe('80ms');});+ it.each(['0', '.0', '0.0', '0.00'])('writes a chrome border alpha of %s as 0', (alpha) => {+ const theme: ThemeDefinition = {+ version: 1,+ name: 'quiet-reference',+ modes: { light: { appearance: { chromeBorderAlpha: alpha } } },+ };++ applyResolvedTheme(resolveTheme(theme, 'light'));++ expect(document.documentElement.style.getPropertyValue('--theme-border-chrome-alpha')).toBe(+ '0',+ );+ });++ it('leaves a non-zero chrome border alpha as written', () => {+ const theme: ThemeDefinition = {+ version: 1,+ name: 'faint-reference',+ modes: { light: { appearance: { chromeBorderAlpha: '0.5' } } },+ };++ applyResolvedTheme(resolveTheme(theme, 'light'));++ expect(document.documentElement.style.getPropertyValue('--theme-border-chrome-alpha')).toBe(+ '0.5',+ );+ });+/** The plain `rounded-*`, `font-sans` and `font-mono` utilities read these properties, so a* theme reaches every call site only if the adapter writes them and a reset removes them. */it('applies and clears the radius and shadow scales and the mono family', () => {diff --git a/packages/client/src/theme/utils/applyTheme.ts b/packages/client/src/theme/utils/applyTheme.tsindex 527529ccf2..b010c818f0 100644--- a/packages/client/src/theme/utils/applyTheme.ts+++ b/packages/client/src/theme/utils/applyTheme.ts@@ -173,10 +173,15 @@ function mapColors(colors: IThemeRGB, base?: IThemeRGB): Array<[string, string]>return variables;}+/** The `theme-chrome-quiet:` variant matches the literal `0`, so every spelling of zero is written as it. */+function canonicalAppearance(key: keyof IThemeAppearance, value: string): string {+ return key === 'chromeBorderAlpha' && Number(value) === 0 ? '0' : value;+}+function mapAppearance(appearance: IThemeAppearance): Array<[string, string]> {return Object.entries(themeAppearanceProperties).map(([key, property]) => [property,- appearance[key as keyof IThemeAppearance],+ canonicalAppearance(key as keyof IThemeAppearance, appearance[key as keyof IThemeAppearance]),]);}