diff --git a/packages/tui/src/context/theme.tsx b/packages/tui/src/context/theme.tsx index 806cd35fb2e..ffddfc75fbc 100644 --- a/packages/tui/src/context/theme.tsx +++ b/packages/tui/src/context/theme.tsx @@ -23,7 +23,7 @@ import { } from "../theme" import { generateSystem, terminalMode } from "../theme/system" import { discoverThemes } from "../theme/discovery" -import { createComponentTheme, type ComponentTheme } from "../theme/component" +import { createComponentTheme, createComponentThemeView, type ComponentTheme } from "../theme/component" import { createEffect, createMemo, onCleanup, onMount, type Accessor, type ParentProps } from "solid-js" import { createStore, produce } from "solid-js/store" import { createSimpleContext } from "./helper" @@ -379,12 +379,15 @@ export function useTheme(context?: ContextName) { } export const ThemeProvider = themeContext.provider -export function ThemeContextProvider(props: ParentProps<{ context: ContextName }>) { +/** Switches context without remounting children; undefined inherits the enclosing view. */ +export function ThemeContextProvider(props: ParentProps<{ context: ContextName | undefined }>) { const value = themeContext.use() + const current = createComponentThemeView(() => { + const name = props.context + return name ? value.themes.currentTokens().contextual[name] : value.current + }, value.themes.mode) return ( - + {props.children} ) diff --git a/packages/tui/src/theme/component.ts b/packages/tui/src/theme/component.ts index 8e9cdffcb34..9ecd37b5ff4 100644 --- a/packages/tui/src/theme/component.ts +++ b/packages/tui/src/theme/component.ts @@ -3,7 +3,16 @@ import type { Accessor } from "solid-js" import type { Mode, ResolvedTheme, ResolvedThemeTokens } from "@opencode-ai/theme/tui" export function createComponentTheme(current: Accessor, mode: Accessor) { - const create = (view: Accessor) => ({ + return Object.assign(createComponentThemeView(current, mode), { + contextual: { + elevated: createComponentThemeView(() => current().contextual.elevated, mode), + overlay: createComponentThemeView(() => current().contextual.overlay, mode), + }, + }) +} + +export function createComponentThemeView(view: Accessor, mode: Accessor) { + return { get hue() { return view().hue }, @@ -35,14 +44,7 @@ export function createComponentTheme(current: Accessor, mode: Acc increase: (color: RGBA, amount = 1) => view().increase(color, amount), decrease: (color: RGBA, amount = 1) => view().decrease(color, amount), raise: (color: RGBA) => (mode() === "light" ? view().increase(color) : view().decrease(color)), - }) - - return Object.assign(create(current), { - contextual: { - elevated: create(() => current().contextual.elevated), - overlay: create(() => current().contextual.overlay), - }, - }) + } } export type ComponentTheme = ReturnType diff --git a/packages/tui/test/cli/tui/theme-mode.test.tsx b/packages/tui/test/cli/tui/theme-mode.test.tsx index dfa2c3a934f..4fc4e93be3d 100644 --- a/packages/tui/test/cli/tui/theme-mode.test.tsx +++ b/packages/tui/test/cli/tui/theme-mode.test.tsx @@ -2,6 +2,7 @@ import { testRender } from "@opentui/solid" import { expect, test } from "bun:test" import { RGBA } from "@opentui/core" +import { createSignal } from "solid-js" import { DEFAULT_THEME, selectTheme } from "@opencode-ai/theme/tui" import { createTuiResolvedConfig } from "../../fixture/tui-runtime" import { DEFAULT_THEMES } from "../../../src/theme" @@ -166,10 +167,58 @@ test("contextual hooks resolve overrides and fall back to a standalone theme's b if (!theme) throw new Error("Contextual theme is not mounted") if (!explicit) throw new Error("Explicit contextual theme is not mounted") expect(theme.text.default.equals(RGBA.fromHex("#abcdef"))).toBeTrue() - expect(theme).toBe(explicit) + expect(theme.text.default).toBe(explicit.text.default) expect(theme.text.default).toBe(themes.current.contextual.elevated.text.default) expect(themes.current.contextual.overlay.background.default).toBe(themes.current.background.default) } finally { app.renderer.destroy() } }) + +test.each(["dark", "light"] as const)( + "reactive %s theme contexts change without remounting their contents", + async (mode) => { + const [context, setContext] = createSignal<"elevated" | undefined>("elevated") + const [parent, setParent] = createSignal<"overlay" | undefined>() + let theme: ReturnType | undefined + let themes: ReturnType | undefined + let mounts = 0 + function Probe() { + mounts++ + theme = useTheme() + themes = useThemes() + return probe + } + const app = await testRender(() => ( + + ({}) }}> + + + + + + + + )) + app.renderer.start() + try { + await wait(() => themes?.ready === true) + if (!theme || !themes) throw new Error("Theme provider is not mounted") + const view = theme + expect(view.background.default).toBe(themes.current.contextual.elevated.background.default) + setContext(undefined) + await app.flush() + expect(view.background.default).toBe(themes.current.background.default) + setParent("overlay") + await app.flush() + expect(view.background.default).toBe(themes.current.contextual.overlay.background.default) + setContext("elevated") + await app.flush() + expect(view.text.default).toBe(themes.current.contextual.elevated.text.default) + expect(theme).toBe(view) + expect(mounts).toBe(1) + } finally { + app.renderer.destroy() + } + }, +) diff --git a/packages/tui/test/theme/v2/component.test.ts b/packages/tui/test/theme/v2/component.test.ts index b264a3723a5..d01201a5480 100644 --- a/packages/tui/test/theme/v2/component.test.ts +++ b/packages/tui/test/theme/v2/component.test.ts @@ -2,7 +2,7 @@ import { expect, test } from "bun:test" import { createSignal } from "solid-js" import { RGBA } from "@opentui/core" import { DEFAULT_THEME, resolveTheme, selectTheme, type ContextName } from "@opencode-ai/theme/tui" -import { createComponentTheme } from "../../../src/theme/component" +import { createComponentTheme, createComponentThemeView } from "../../../src/theme/component" test("provides reactive properties, states, contexts, and color operations", () => { const [resolved, setResolved] = createSignal(resolveTheme(selectTheme(DEFAULT_THEME, "light"))) @@ -67,3 +67,19 @@ test("provides reactive properties, states, contexts, and color operations", () expect(current().decrease(current().background.surface.offset, 1)).toBe(resolved().hue.neutral[600]) expect(current().raise(current().background.surface.offset)).toBe(resolved().hue.neutral[600]) }) + +test("a stable component theme view follows presentation context changes", () => { + const [resolved, setResolved] = createSignal(resolveTheme(selectTheme(DEFAULT_THEME, "dark"))) + const [context, setContext] = createSignal() + const theme = createComponentThemeView( + () => (context() ? resolved().contextual[context()!] : resolved()), + () => "dark", + ) + expect(theme.background.default).toBe(resolved().background.default) + setContext("elevated") + expect(theme.background.default).toBe(resolved().contextual.elevated.background.default) + setContext(undefined) + expect(theme.background.default).toBe(resolved().background.default) + setResolved(resolveTheme(selectTheme(DEFAULT_THEME, "light"))) + expect(theme.text.default).toBe(resolved().text.default) +})