mirror of
https://github.com/anomalyco/opencode.git
synced 2026-11-16 05:01:03 +03:00
fix(ui): lighten dark contrast icon buttons
This commit is contained in:
committed by
GitHub
Unverified
parent
0674ddf043
commit
768e3d45a2
@@ -67,12 +67,12 @@ for (const theme of ["light", "dark"] as const) {
|
||||
await testInfo.attach("workspace-accent", { path, contentType: "image/png" })
|
||||
}
|
||||
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
await view.send.hover()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
await view.composer.locator('[data-action="composer-model"]').press("Tab")
|
||||
await expect(view.send).toBeFocused()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
const message = page.locator('[data-slot="user-message-text"]')
|
||||
await expect(message).toHaveText("Check this fixture workspace.")
|
||||
await expectToken(
|
||||
@@ -92,7 +92,7 @@ for (const theme of ["light", "dark"] as const) {
|
||||
const view = await openSession(page, workspace, [{ directory: root }])
|
||||
await view.input.fill("Keep this draft while the inventory changes.")
|
||||
await expect(view.send).toBeEnabled()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
const url = page.url()
|
||||
|
||||
const refreshed = page.waitForResponse(
|
||||
@@ -109,14 +109,14 @@ for (const theme of ["light", "dark"] as const) {
|
||||
data: { projectID },
|
||||
})
|
||||
expect((await refreshed).ok()).toBe(true)
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
await expect(page).toHaveURL(url)
|
||||
await expect(view.input).toHaveText("Keep this draft while the inventory changes.")
|
||||
await expect(view.send).toBeEnabled()
|
||||
|
||||
await view.input.fill("")
|
||||
await expect(view.send).toBeDisabled()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
|
||||
view.events.push({
|
||||
id: "evt_workspace_accent_running",
|
||||
@@ -127,29 +127,29 @@ for (const theme of ["light", "dark"] as const) {
|
||||
})
|
||||
const stop = view.composer.getByRole("button", { name: "Stop", exact: true })
|
||||
await expect(stop).toBeEnabled()
|
||||
await expectBackground(stop, "contrast")
|
||||
await expectBackground(stop, "icon-button-contrast")
|
||||
|
||||
await view.input.fill("Send a follow-up instead of stopping.")
|
||||
await expect(view.send).toBeEnabled()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
await expect(page).toHaveURL(url)
|
||||
})
|
||||
|
||||
test("new workspace send button stays neutral", async ({ page }) => {
|
||||
const view = await openSession(page, root, [...inventory], true)
|
||||
await expect(view.send).toBeDisabled()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
await page.getByRole("button", { name: "Local", exact: true }).click()
|
||||
await page.getByRole("menuitem", { name: "New worktree", exact: true }).click()
|
||||
await expect(page.getByRole("button", { name: "New worktree", exact: true })).toBeVisible()
|
||||
await view.input.fill("Inspect this fixture workspace.")
|
||||
await expect(view.send).toBeEnabled()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
await view.send.hover()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
await view.composer.locator('[data-action="composer-model"]').press("Tab")
|
||||
await expect(view.send).toBeFocused()
|
||||
await expectBackground(view.send, "contrast")
|
||||
await expectBackground(view.send, "icon-button-contrast")
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -842,11 +842,7 @@ export function ComposerEditorSubmitButton(props: {
|
||||
tabIndex={props.mode === "normal" ? undefined : -1}
|
||||
icon={<Icon name={props.stopping ? "stop" : props.mode === "shell" ? "arrow-undo-down" : "arrow-up"} />}
|
||||
variant="contrast"
|
||||
class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted shadow-[var(--v2-elevation-button-contrast)] disabled:opacity-50"
|
||||
style={{
|
||||
"background-image":
|
||||
"linear-gradient(180deg,var(--v2-alpha-light-20) 0%,var(--v2-alpha-light-0) 100%),linear-gradient(90deg,var(--v2-background-bg-contrast) 0%,var(--v2-background-bg-contrast) 100%)",
|
||||
}}
|
||||
class="size-7 rounded-md p-[6px] disabled:opacity-50"
|
||||
aria-label={props.stopping ? props.stopLabel : props.sendLabel}
|
||||
onClick={(event) => {
|
||||
event.preventDefault()
|
||||
|
||||
@@ -236,6 +236,7 @@
|
||||
--v2-background-bg-layer-04: var(--v2-grey-400);
|
||||
--v2-background-bg-inverse: var(--v2-grey-1100);
|
||||
--v2-background-bg-contrast: var(--v2-grey-1000);
|
||||
--v2-background-bg-icon-button-contrast: var(--v2-background-bg-contrast);
|
||||
--v2-background-bg-button-neutral: var(--v2-grey-50);
|
||||
--v2-background-bg-accent: var(--v2-blue-600);
|
||||
|
||||
@@ -250,6 +251,7 @@
|
||||
|
||||
--v2-icon-icon-base: var(--v2-grey-800);
|
||||
--v2-icon-icon-muted: var(--v2-grey-600);
|
||||
--v2-icon-icon-faint: var(--v2-grey-500);
|
||||
--v2-icon-icon-inverse: var(--v2-grey-50);
|
||||
--v2-icon-icon-contrast: var(--v2-grey-100);
|
||||
--v2-icon-icon-accent: var(--v2-blue-600);
|
||||
|
||||
@@ -71,23 +71,37 @@
|
||||
|
||||
/* Contrast */
|
||||
[data-component="icon-button-v2"][data-variant="contrast"] {
|
||||
--icon-button-contrast-highlight: var(--v2-alpha-light-20);
|
||||
--icon-button-contrast-hover: var(--v2-overlay-simple-overlay-contrast-hover);
|
||||
|
||||
background-image:
|
||||
linear-gradient(180deg, var(--v2-alpha-light-20) 0%, var(--v2-alpha-light-0) 100%),
|
||||
linear-gradient(90deg, var(--v2-background-bg-contrast) 0%, var(--v2-background-bg-contrast) 100%);
|
||||
linear-gradient(180deg, var(--icon-button-contrast-highlight) 0%, var(--v2-alpha-light-0) 100%),
|
||||
linear-gradient(
|
||||
90deg,
|
||||
var(--v2-background-bg-icon-button-contrast) 0%,
|
||||
var(--v2-background-bg-icon-button-contrast) 100%
|
||||
);
|
||||
color: var(--v2-text-text-contrast);
|
||||
text-shadow: 0 0.5px 0.5px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: var(--v2-elevation-button-contrast);
|
||||
}
|
||||
|
||||
[data-color-scheme="dark"] [data-component="icon-button-v2"][data-variant="contrast"] {
|
||||
--icon-button-contrast-highlight: var(--v2-alpha-light-60);
|
||||
--icon-button-contrast-hover: var(--v2-alpha-dark-8);
|
||||
|
||||
color: var(--v2-icon-icon-inverse);
|
||||
}
|
||||
|
||||
[data-component="icon-button-v2"][data-variant="contrast"]:is(:hover, [data-state="hover"]):not(:disabled) {
|
||||
background-image:
|
||||
linear-gradient(90deg, var(--icon-button-contrast-hover) 0%, var(--icon-button-contrast-hover) 100%),
|
||||
linear-gradient(180deg, var(--icon-button-contrast-highlight) 0%, var(--v2-alpha-light-0) 100%),
|
||||
linear-gradient(
|
||||
90deg,
|
||||
var(--v2-overlay-simple-overlay-contrast-hover) 0%,
|
||||
var(--v2-overlay-simple-overlay-contrast-hover) 100%
|
||||
),
|
||||
linear-gradient(180deg, var(--v2-alpha-light-20) 0%, var(--v2-alpha-light-0) 100%),
|
||||
linear-gradient(90deg, var(--v2-background-bg-contrast) 0%, var(--v2-background-bg-contrast) 100%);
|
||||
var(--v2-background-bg-icon-button-contrast) 0%,
|
||||
var(--v2-background-bg-icon-button-contrast) 100%
|
||||
);
|
||||
}
|
||||
|
||||
[data-component="icon-button-v2"][data-variant="contrast"]:is(:active, [data-state="pressed"]):not(:disabled) {
|
||||
@@ -97,8 +111,12 @@
|
||||
var(--v2-overlay-simple-overlay-contrast-pressed) 0%,
|
||||
var(--v2-overlay-simple-overlay-contrast-pressed) 100%
|
||||
),
|
||||
linear-gradient(180deg, var(--v2-alpha-light-20) 0%, var(--v2-alpha-light-0) 100%),
|
||||
linear-gradient(90deg, var(--v2-background-bg-contrast) 0%, var(--v2-background-bg-contrast) 100%);
|
||||
linear-gradient(180deg, var(--icon-button-contrast-highlight) 0%, var(--v2-alpha-light-0) 100%),
|
||||
linear-gradient(
|
||||
90deg,
|
||||
var(--v2-background-bg-icon-button-contrast) 0%,
|
||||
var(--v2-background-bg-icon-button-contrast) 100%
|
||||
);
|
||||
}
|
||||
|
||||
[data-component="icon-button-v2"][data-variant="contrast"]:is(:disabled, [data-state="disabled"]) {
|
||||
|
||||
@@ -240,6 +240,7 @@
|
||||
--color-v2-background-bg-layer-04: var(--v2-background-bg-layer-04);
|
||||
--color-v2-background-bg-inverse: var(--v2-background-bg-inverse);
|
||||
--color-v2-background-bg-contrast: var(--v2-background-bg-contrast);
|
||||
--color-v2-background-bg-icon-button-contrast: var(--v2-background-bg-icon-button-contrast);
|
||||
--color-v2-background-bg-button-neutral: var(--v2-background-bg-button-neutral);
|
||||
--color-v2-background-bg-accent: var(--v2-background-bg-accent);
|
||||
--color-v2-text-text-base: var(--v2-text-text-base);
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
--v2-background-bg-layer-04: var(--v2-grey-400);
|
||||
--v2-background-bg-inverse: var(--v2-grey-1100);
|
||||
--v2-background-bg-contrast: var(--v2-grey-1000);
|
||||
--v2-background-bg-icon-button-contrast: var(--v2-background-bg-contrast);
|
||||
--v2-background-bg-button-neutral: var(--v2-grey-50);
|
||||
--v2-background-bg-accent: var(--v2-blue-600);
|
||||
--v2-background-bg-code-path: var(--v2-cyan-100);
|
||||
@@ -267,6 +268,7 @@
|
||||
--v2-background-bg-layer-04: var(--v2-grey-400);
|
||||
--v2-background-bg-inverse: var(--v2-grey-1100);
|
||||
--v2-background-bg-contrast: var(--v2-grey-1000);
|
||||
--v2-background-bg-icon-button-contrast: var(--v2-background-bg-contrast);
|
||||
--v2-background-bg-button-neutral: var(--v2-grey-50);
|
||||
--v2-background-bg-accent: var(--v2-blue-600);
|
||||
--v2-background-bg-code-path: var(--v2-cyan-100);
|
||||
@@ -392,6 +394,7 @@
|
||||
--v2-background-bg-layer-04: var(--v2-grey-700);
|
||||
--v2-background-bg-inverse: var(--v2-grey-50);
|
||||
--v2-background-bg-contrast: var(--v2-grey-700);
|
||||
--v2-background-bg-icon-button-contrast: var(--v2-grey-400);
|
||||
--v2-background-bg-button-neutral: var(--v2-alpha-light-6);
|
||||
--v2-background-bg-accent: var(--v2-blue-600);
|
||||
--v2-background-bg-code-path: var(--v2-cyan-1200);
|
||||
|
||||
@@ -164,6 +164,7 @@
|
||||
"v2-background-bg-layer-04": "var(--v2-grey-400)",
|
||||
"v2-background-bg-inverse": "var(--v2-grey-1100)",
|
||||
"v2-background-bg-contrast": "var(--v2-grey-1000)",
|
||||
"v2-background-bg-icon-button-contrast": "var(--v2-background-bg-contrast)",
|
||||
"v2-background-bg-button-neutral": "var(--v2-grey-50)",
|
||||
"v2-background-bg-accent": "var(--v2-blue-600)",
|
||||
"v2-background-bg-code-path": "var(--v2-cyan-100)",
|
||||
@@ -414,6 +415,7 @@
|
||||
"v2-background-bg-layer-04": "var(--v2-grey-700)",
|
||||
"v2-background-bg-inverse": "var(--v2-grey-50)",
|
||||
"v2-background-bg-contrast": "var(--v2-grey-700)",
|
||||
"v2-background-bg-icon-button-contrast": "var(--v2-grey-400)",
|
||||
"v2-background-bg-button-neutral": "var(--v2-alpha-light-6)",
|
||||
"v2-background-bg-accent": "var(--v2-blue-600)",
|
||||
"v2-background-bg-code-path": "var(--v2-cyan-1200)",
|
||||
|
||||
@@ -40,6 +40,7 @@ const light: Record<string, V2ColorValue> = {
|
||||
"v2-background-bg-layer-04": ref("v2-grey-600"),
|
||||
"v2-background-bg-inverse": ref("v2-grey-1000"),
|
||||
"v2-background-bg-contrast": ref("v2-grey-900"),
|
||||
"v2-background-bg-icon-button-contrast": ref("v2-background-bg-contrast"),
|
||||
"v2-background-bg-button-neutral": ref("v2-grey-100"),
|
||||
"v2-background-bg-accent": ref("v2-blue-600"),
|
||||
"v2-background-bg-code-path": ref("v2-cyan-100"),
|
||||
@@ -107,6 +108,7 @@ const dark: Record<string, V2ColorValue> = {
|
||||
"v2-background-bg-layer-04": ref("v2-grey-400"),
|
||||
"v2-background-bg-inverse": ref("v2-grey-100"),
|
||||
"v2-background-bg-contrast": ref("v2-grey-700"),
|
||||
"v2-background-bg-icon-button-contrast": ref("v2-grey-400"),
|
||||
"v2-background-bg-button-neutral": ref("v2-alpha-light-6"),
|
||||
"v2-background-bg-accent": ref("v2-blue-600"),
|
||||
"v2-background-bg-code-path": ref("v2-cyan-1200"),
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
import type { DesktopTheme } from "../types"
|
||||
import { resolveThemeV2, resolveThemeVariantV2, themeV2ToCss } from "./resolve"
|
||||
|
||||
const theme: DesktopTheme = await Bun.file(new URL("../themes/oc-2.json", import.meta.url)).json()
|
||||
|
||||
describe("contrast icon-button tokens", () => {
|
||||
test("OC-2 dark mode uses a light background and an inverse icon matching the base surface", () => {
|
||||
const tokens = resolveThemeV2(theme).dark
|
||||
expect(tokens["v2-background-bg-icon-button-contrast"]).toBe("var(--v2-grey-400)")
|
||||
expect(tokens["v2-grey-400"]).toBe("#dbdbdbff")
|
||||
expect(tokens["v2-icon-icon-inverse"]).toBe(tokens["v2-background-bg-base"])
|
||||
expect(tokens["v2-grey-1100"]).toBe("#161616ff")
|
||||
expect(tokens["v2-background-bg-contrast"]).toBe("var(--v2-grey-700)")
|
||||
expect(tokens["v2-text-text-contrast"]).toBe("var(--v2-grey-50)")
|
||||
})
|
||||
|
||||
test("OC-2 light mode retains the existing contrast background and foreground", () => {
|
||||
const tokens = resolveThemeV2(theme).light
|
||||
expect(tokens["v2-background-bg-icon-button-contrast"]).toBe("var(--v2-background-bg-contrast)")
|
||||
expect(tokens["v2-background-bg-contrast"]).toBe("var(--v2-grey-1000)")
|
||||
expect(tokens["v2-text-text-contrast"]).toBe("var(--v2-grey-50)")
|
||||
})
|
||||
|
||||
test.each([false, true])("custom themes without the new token receive a fallback (dark: %s)", (dark) => {
|
||||
const tokens = resolveThemeVariantV2({ ...theme.dark, v2Overrides: undefined }, dark)
|
||||
expect(tokens["v2-background-bg-icon-button-contrast"]).toBe(
|
||||
dark ? "var(--v2-grey-400)" : "var(--v2-background-bg-contrast)",
|
||||
)
|
||||
expect(themeV2ToCss(tokens)).toContain(
|
||||
`--v2-background-bg-icon-button-contrast: ${tokens["v2-background-bg-icon-button-contrast"]};`,
|
||||
)
|
||||
})
|
||||
|
||||
test("custom themes can override the icon-button background independently", () => {
|
||||
const tokens = resolveThemeVariantV2(
|
||||
{
|
||||
...theme.dark,
|
||||
v2Overrides: { ...theme.dark.v2Overrides, "v2-background-bg-icon-button-contrast": "#dddddd" },
|
||||
},
|
||||
true,
|
||||
)
|
||||
expect(tokens["v2-background-bg-icon-button-contrast"]).toBe("#dddddd")
|
||||
expect(tokens["v2-background-bg-contrast"]).toBe("var(--v2-grey-700)")
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user