The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 22:00 UTC
fix(web): use the draft appearance when highlighting code (#18827)
Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Alex Southwell committed
Oct 20, 2026 at 05:15 UTC
c154d41c841df724aa528b4ff8789a2f8baef0dd
21 files changed
+120
-40
apps/web/src/components/ChatMarkdown.browser.test.tsx
+58
-1
@@ -2,12 +2,14 @@ import { EnvironmentId, ThreadId } from "@t3tools/contracts";
2
import { searchableMessageSegments } from "@t3tools/shared/threadFindText";
3
import { countThreadSearchOccurrences } from "@t3tools/shared/threadSearch";
4
import { AsyncResult } from "effect/reactivity";
5
-import { act, type ReactElement } from "react";
5
+import { act, useEffect, type ReactElement } from "react";
6
import { createRoot, type Root } from "react-dom/client";
7
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
8
import { page, userEvent } from "vite-plus/test/browser";
9
10
import "../index.css";
11
+import { useTheme } from "../hooks/useTheme";
12
+import { applyThemeColorPreview, getStandardThemeColors } from "../themePalette";
13
14
import { filesystemEnvironment } from "../state/filesystem";
15
import { useRightPanelStore } from "../rightPanelStore";
@@ -131,6 +133,61 @@ function fileOptions(container: HTMLElement) {
133
.filter((label) => label?.startsWith("File options for "));
134
}
135
136
+describe("ChatMarkdown theme drafts", () => {
137
+ afterEach(() => {
138
+ act(() => {
139
+ localStorage.clear();
140
+ window.dispatchEvent(new StorageEvent("storage", { key: null }));
141
+ });
142
+ });
143
+
144
+ it.each(["dark", "light"] as const)(
145
+ "previews opposite syntax colors and restores saved %s colors on cancel",
146
+ async (savedAppearance) => {
147
+ let selection: ReturnType<typeof useTheme>;
148
+ function Preview() {
149
+ const theme = useTheme();
150
+ useEffect(() => {
151
+ selection = theme;
152
+ }, [theme]);
153
+ return <ChatMarkdown cwd={undefined} text={"```typescript\nconst answer = 42;\n```"} />;
154
+ }
155
+ await getSyntaxHighlighterPromise("typescript");
156
+ const { container } = await render(<Preview />);
157
+ await act(async () => {
158
+ selection.setTheme(savedAppearance);
159
+ selection.setAppearanceMode(savedAppearance);
160
+ });
161
+ const keywordColor = () =>
162
+ container.querySelector<HTMLElement>(".chat-markdown-shiki .line span")?.style.color;
163
+ await vi.waitFor(() => expect(keywordColor()).toBeTruthy());
164
+ const savedColor = keywordColor();
165
+ const savedStorage = Object.fromEntries(Object.entries(localStorage));
166
+ const draftAppearance = savedAppearance === "dark" ? "light" : "dark";
167
+
168
+ await act(async () =>
169
+ applyThemeColorPreview(getStandardThemeColors(draftAppearance), draftAppearance),
170
+ );
171
+ await vi.waitFor(() => {
172
+ expect(keywordColor()).toBeTruthy();
173
+ expect(keywordColor()).not.toBe(savedColor);
174
+ });
175
+ expect(document.documentElement.classList.contains("dark")).toBe(draftAppearance === "dark");
176
+ expect(selection!).toMatchObject({
177
+ theme: savedAppearance,
178
+ resolvedTheme: savedAppearance,
179
+ appearanceMode: savedAppearance,
180
+ });
181
+ expect(Object.fromEntries(Object.entries(localStorage))).toEqual(savedStorage);
182
+
183
+ await act(async () => selection.refreshTheme());
184
+ await vi.waitFor(() => expect(keywordColor()).toBe(savedColor));
185
+ expect(document.documentElement.classList.contains("dark")).toBe(savedAppearance === "dark");
186
+ expect(Object.fromEntries(Object.entries(localStorage))).toEqual(savedStorage);
187
+ },
188
+ );
189
+});
190
+
191
describe("ChatMarkdown table layout", () => {
192
it.each([
193
{ width: 36, timeline: true, fits: true },
apps/web/src/components/ChatMarkdown.tsx
+3
-3
@@ -165,7 +165,7 @@ import { createIncrementalHighlightedDocument } from "../lib/incrementalHighligh
165
import { HighlightedCodeLines } from "./chat/HighlightedCodeLines";
166
import { RenderErrorBoundary } from "./RenderErrorBoundary";
167
import { MermaidDiagram } from "./chat/MermaidDiagram";
168
-import { useTheme } from "../hooks/useTheme";
168
+import { useRenderedAppearance } from "../hooks/useTheme";
169
import { getClientSettings, useClientSettings } from "../hooks/useSettings";
170
import {
171
chatMarkdownClipboardPayload,
@@ -2383,7 +2383,7 @@ function useChatMarkdownState({
2383
headingLevelOffset = 0,
2384
githubMedia = false,
2385
}: ChatMarkdownProps) {
2386
- const { resolvedTheme } = useTheme();
2386
+ const resolvedTheme = useRenderedAppearance();
2387
const markdownRef = useRef<HTMLElement>(null);
2388
const mediaRequestId = useRef(0);
2389
// A preview opened from another thread or workspace never carries over.
@@ -2488,7 +2488,7 @@ function useChatMarkdownState({
2488
target !== null &&
2489
resolveRemoteOpenState({
2490
target,
2491
- sshAlias: null,
2491
+ sshTarget: null,
2492
remoteOpenTargets: undefined,
2493
isDesktopRenderer: window.desktopBridge !== undefined,
2494
}).mode !== "local-exec"
apps/web/src/components/CommandPalette.focus.browser.test.tsx
+1
@@ -21,6 +21,7 @@ vi.mock("@effect/atom-react", async (importOriginal) => {
21
};
22
});
23
vi.mock("../hooks/useTheme", () => ({
24
+ useRenderedAppearance: () => "light",
25
useTheme: () => ({ theme: "default", resolvedTheme: "light", appearanceMode: "light" }),
26
}));
27
vi.mock("../hooks/useCustomThemes", () => ({ useCustomThemes: () => [] }));
apps/web/src/components/DiffPanel.browser.test.tsx
+4
-1
@@ -44,7 +44,10 @@ vi.mock("../hooks/useSettings", () => ({
44
}),
45
updateClientSettings: vi.fn(),
46
}));
47
-vi.mock("../hooks/useTheme", () => ({ useTheme: () => ({ resolvedTheme: "dark" }) }));
47
+vi.mock("../hooks/useTheme", () => ({
48
+ useRenderedAppearance: () => "dark",
49
+ useTheme: () => ({ resolvedTheme: "dark" }),
50
+}));
51
vi.mock("../editorPreferences", () => ({ useOpenInPreferredEditor: () => vi.fn() }));
52
vi.mock("../fileContextMenu", () => ({ useFileContextMenuHandler: () => vi.fn() }));
53
vi.mock("../lib/checkpointDiffState", () => ({
apps/web/src/components/DiffPanel.tsx
+2
-2
@@ -31,7 +31,7 @@ import { useCheckpointDiff } from "~/lib/checkpointDiffState";
31
import { cn } from "~/lib/utils";
32
import { selectThreadDiffPanelSelection, useDiffPanelStore } from "../diffPanelStore";
33
import { useLocalStorage } from "../hooks/useLocalStorage";
34
-import { useTheme } from "../hooks/useTheme";
34
+import { useRenderedAppearance } from "../hooks/useTheme";
35
import { useStableCallback } from "../hooks/useStableCallback";
36
import {
37
buildFileDiffContentVersion,
@@ -197,7 +197,7 @@ export default function DiffPanel({
197
workspaceMutationId,
198
visible,
199
}: DiffPanelProps) {
200
- const { resolvedTheme } = useTheme();
200
+ const resolvedTheme = useRenderedAppearance();
201
const settings = useClientSettings((settings) => ({
202
diffFilesCollapsed: settings.diffFilesCollapsed,
203
diffIgnoreWhitespace: settings.diffIgnoreWhitespace,
apps/web/src/components/DiffWorkerPoolProvider.tsx
+2
-2
@@ -4,7 +4,7 @@ import DiffsWorker from "@pierre/diffs/worker/worker.js?worker";
4
import * as Schema from "effect/Schema";
5
import { useEffect, useState, useSyncExternalStore, type ReactNode } from "react";
6
import { useStableCallback } from "../hooks/useStableCallback";
7
-import { useTheme } from "../hooks/useTheme";
7
+import { useRenderedAppearance } from "../hooks/useTheme";
8
import { resolveDiffThemeName, type DiffThemeName } from "../lib/diffRendering";
9
import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting";
10
@@ -126,7 +126,7 @@ function DiffWorkerReady({ children }: { children?: ReactNode }) {
126
}
127
128
export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {
129
- const { resolvedTheme } = useTheme();
129
+ const resolvedTheme = useRenderedAppearance();
130
const diffThemeName = resolveDiffThemeName(resolvedTheme);
131
const [workerPoolSize] = useState(resolveDiffWorkerPoolSize);
132
// A new subscribe identity makes React release and reacquire the shared pool on every render.
apps/web/src/components/chat/ComposerCodeBlockNodeView.tsx
+2
-2
@@ -2,7 +2,7 @@ import { NodeViewContent, NodeViewWrapper, type NodeViewProps } from "@tiptap/re
2
3
import { languageOfInfoString, withInfoStringLanguage } from "~/composer-code-languages";
4
5
-import { useTheme } from "../../hooks/useTheme";
5
+import { useRenderedAppearance } from "../../hooks/useTheme";
6
import { MarkdownCodeBlockFrame } from "../ChatMarkdown";
7
import { ComposerCodeBlockLanguagePicker } from "./ComposerCodeBlockLanguagePicker";
8
@@ -12,7 +12,7 @@ export function ComposerCodeBlockNodeView({
12
getPos,
13
updateAttributes,
14
}: NodeViewProps) {
15
- const { resolvedTheme } = useTheme();
15
+ const resolvedTheme = useRenderedAppearance();
16
const info = typeof node.attrs.language === "string" ? node.attrs.language : "";
17
const language = languageOfInfoString(info);
18
apps/web/src/components/chat/MessagesTimeline.tsx
+3
-1
@@ -1,3 +1,4 @@
1
+import { useRenderedAppearance } from "../../hooks/useTheme";
2
import type { Root, RootContent } from "mdast";
3
import { ThreadFindTimelineContext } from "./ThreadFindProvider";
4
import { shallow } from "zustand/vanilla/shallow";
@@ -4683,6 +4684,7 @@ const UserMessageBody = memo(function UserMessageBody(props: {
4684
});
4685
4686
function UserMessageReviewCommentCard({ comment }: { comment: ReviewCommentContext }) {
4687
+ const renderedAppearance = useRenderedAppearance();
4688
const ctx = use(TimelineRowCtx);
4689
const fenceLanguage = comment.fenceLanguage ?? "diff";
4690
const renderablePatch = getRenderablePatch(
@@ -4729,7 +4731,7 @@ function UserMessageReviewCommentCard({ comment }: { comment: ReviewCommentConte
4731
options={{
4732
collapsed: false,
4733
diffStyle: "unified",
4732
- theme: resolveDiffThemeName(ctx.resolvedTheme),
4734
+ theme: resolveDiffThemeName(renderedAppearance),
4735
preferredHighlighter: PREFERRED_HIGHLIGHTER,
4736
}}
4737
/>
apps/web/src/components/chat/ShellCommandBlock.tsx
+2
-2
@@ -4,7 +4,7 @@ import {
4
} from "@t3tools/client-runtime/work-log/command-label";
5
import { Suspense, use } from "react";
6
7
-import { useTheme } from "../../hooks/useTheme";
7
+import { useRenderedAppearance } from "../../hooks/useTheme";
8
import { RenderErrorBoundary } from "../RenderErrorBoundary";
9
import { HighlightedTokens } from "./HighlightedTokens";
10
@@ -49,7 +49,7 @@ function HighlightedCommand({ code, theme }: { code: string; theme: "light" | "d
49
}
50
51
export function ShellCommandBlock({ command }: { command: string }) {
52
- const { resolvedTheme } = useTheme();
52
+ const resolvedTheme = useRenderedAppearance();
53
const code = withVisibleControlCharacters(command.trim());
54
if (!code) return null;
55
const plain = <PlainWords code={code} />;
apps/web/src/components/chat/SnapShotAttachmentDetails.tsx
+2
-2
@@ -2,7 +2,7 @@ import type { SnapShotSource } from "@t3tools/contracts";
2
import { ImageIcon, TextIcon } from "lucide-react";
3
import { Suspense } from "react";
4
5
-import { useTheme } from "../../hooks/useTheme";
5
+import { useRenderedAppearance } from "../../hooks/useTheme";
6
import { cn } from "../../lib/utils";
7
import { RenderErrorBoundary } from "../RenderErrorBoundary";
8
import { Button } from "../ui/button";
@@ -25,7 +25,7 @@ export function SnapShotAccessibilityData({
25
details: SnapShotAccessibilityDetails;
26
className?: string;
27
}) {
28
- const { resolvedTheme } = useTheme();
28
+ const resolvedTheme = useRenderedAppearance();
29
const content =
30
details.format === "json" ? (
31
<RenderErrorBoundary fallback={details.content}>
apps/web/src/components/chat/V2ItemInspector.tsx
+2
-2
@@ -16,7 +16,7 @@ import { isJavaScriptReplTool } from "@t3tools/shared/toolActivity";
16
import { ExternalLinkIcon, GitBranchIcon, RotateCcwIcon } from "lucide-react";
17
import { memo, type ReactNode, Suspense, use } from "react";
18
19
-import { useTheme } from "../../hooks/useTheme";
19
+import { useRenderedAppearance } from "../../hooks/useTheme";
20
import { cn } from "../../lib/utils";
21
import { resolveDiffThemeName } from "../../lib/diffRendering";
22
import { getSyntaxHighlighterPromise } from "../../lib/syntaxHighlighting";
@@ -52,7 +52,7 @@ function SyntaxTokens({
52
readonly text: string;
53
readonly language: "json" | "typescript";
54
}) {
55
- const { resolvedTheme } = useTheme();
55
+ const resolvedTheme = useRenderedAppearance();
56
const highlighter = use(getSyntaxHighlighterPromise(language));
57
const { tokens } = highlighter.codeToTokens(text, {
58
lang: language,
apps/web/src/components/diffs/StyledDiffCodeView.browser.test.tsx
+1
-1
@@ -39,7 +39,7 @@ const testState = vi.hoisted(() => ({
39
40
vi.mock(import("../../hooks/useTheme"), async (original) => ({
41
...(await original()),
42
- useTheme: (() => ({ resolvedTheme: "dark" })) as never,
42
+ useRenderedAppearance: (() => "dark") as never,
43
}));
44
45
// Wraps Pierre's real worker so the suite can count workers, read requests and hold startup.
apps/web/src/components/files/ReadOnlySourcePreview.tsx
+2
-2
@@ -2,7 +2,7 @@ import { File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
2
3
import { DiffWorkerPoolProvider } from "~/components/DiffWorkerPoolProvider";
4
import { useClientSettings } from "~/hooks/useSettings";
5
-import { useTheme } from "~/hooks/useTheme";
5
+import { useRenderedAppearance } from "~/hooks/useTheme";
6
import { resolveDiffThemeName } from "~/lib/diffRendering";
7
import { PREFERRED_HIGHLIGHTER } from "~/lib/syntaxHighlighting";
8
@@ -14,7 +14,7 @@ export default function ReadOnlySourcePreview(props: {
14
readonly cacheKey?: string;
15
readonly onPostRender?: FileOptions<unknown, undefined>["onPostRender"];
16
}) {
17
- const { resolvedTheme } = useTheme();
17
+ const resolvedTheme = useRenderedAppearance();
18
const wordWrap = useClientSettings((settings) => settings.wordWrap);
19
return (
20
<DiffWorkerPoolProvider>
apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
+2
-2
@@ -38,7 +38,7 @@ import {
38
39
import { useLocalStorage } from "~/hooks/useLocalStorage";
40
import { useClientSettings, updateClientSettings } from "~/hooks/useSettings";
41
-import { useTheme } from "~/hooks/useTheme";
41
+import { useRenderedAppearance } from "~/hooks/useTheme";
42
import { areAllDiffFilesCollapsed } from "~/lib/diffCollapse";
43
import { pullRequestFindingKey, type PullRequestFinding } from "./pullRequestDetail.logic";
44
import { canEditPullRequestComment, canResolvePullRequestThread } from "./pullRequestEditing.logic";
@@ -270,7 +270,7 @@ function PullRequestCodeTab({
270
backgroundRefreshToken?: number;
271
revealRequest?: { readonly path: string; readonly nonce: number } | null;
272
}) {
273
- const { resolvedTheme } = useTheme();
273
+ const resolvedTheme = useRenderedAppearance();
274
const settings = useClientSettings((settings) => ({
275
diffFilesCollapsed: settings.diffFilesCollapsed,
276
diffIgnoreWhitespace: settings.diffIgnoreWhitespace,
apps/web/src/components/pullRequest/guide/GuideExcerpt.tsx
+2
-2
@@ -9,7 +9,7 @@ import type { PullRequestReviewGuideExcerpt, PullRequestReviewPosition } from "@
9
import { ArrowUpRightIcon } from "lucide-react";
10
import { useState } from "react";
11
12
-import { useTheme } from "~/hooks/useTheme";
12
+import { useRenderedAppearance } from "~/hooks/useTheme";
13
import {
14
getRenderablePatch,
15
resolveDiffThemeName,
@@ -202,7 +202,7 @@ function ExcerptDiff({
202
commenting: ExcerptCommenting | null;
203
onOpenFile: (path: string) => void;
204
}) {
205
- const { resolvedTheme } = useTheme();
205
+ const resolvedTheme = useRenderedAppearance();
206
const loadExcerptFiles = excerptLoader(excerpt, slice.rows, loadDiffFiles);
207
208
const annotations = (() => {
apps/web/src/components/pullRequest/guide/GuideFileDiff.tsx
+2
-2
@@ -5,7 +5,7 @@ import {
5
} from "@pierre/diffs";
6
import { FileDiff } from "@pierre/diffs/react";
7
8
-import { useTheme } from "~/hooks/useTheme";
8
+import { useRenderedAppearance } from "~/hooks/useTheme";
9
import { resolveDiffThemeName } from "~/lib/diffRendering";
10
import { PREFERRED_HIGHLIGHTER } from "~/lib/syntaxHighlighting";
11
@@ -18,7 +18,7 @@ export function GuideFileDiff({
18
file: FileDiffMetadata;
19
loadDiffFiles: FileDiffContentsLoader;
20
}) {
21
- const { resolvedTheme } = useTheme();
21
+ const resolvedTheme = useRenderedAppearance();
22
// Loading the unchanged lines rewrites the diff it is given; the excerpts read the same file
23
// as a patch, so this view expands a copy of its own.
24
const expandable = cloneFileDiffMetadata(file);
apps/web/src/components/search/ProjectContentSearchDialog.tsx
+3
-2
@@ -4,7 +4,7 @@ import { AuthFilesystemReadScope, type ProjectContentMatch } from "@t3tools/cont
4
import { useEffect, useState, type ReactNode } from "react";
5
6
import { useActiveProjectTarget, type ActiveProjectTarget } from "~/hooks/useActiveProjectTarget";
7
-import { useTheme } from "~/hooks/useTheme";
7
+import { useRenderedAppearance, useTheme } from "~/hooks/useTheme";
8
import { cn } from "~/lib/utils";
9
import { useRightPanelStore } from "~/rightPanelStore";
10
import { useProjectContentSearch } from "~/state/queries";
@@ -106,6 +106,7 @@ function OpenContentSearchDialog(props: {
106
}) {
107
const { target } = props;
108
const { resolvedTheme } = useTheme();
109
+ const renderedAppearance = useRenderedAppearance();
110
const [query, setQuery] = useState("");
111
const [caseSensitive, setCaseSensitive] = useState(false);
112
const [wholeWord, setWholeWord] = useState(false);
@@ -300,7 +301,7 @@ function OpenContentSearchDialog(props: {
301
<HighlightedSearchLine
302
match={match}
303
path={group.path}
303
- theme={resolvedTheme}
304
+ theme={renderedAppearance}
305
/>
306
</span>
307
</button>
apps/web/src/components/settings/CaptureShortcutConfig.tsx
+2
-2
@@ -12,7 +12,7 @@ import * as Cause from "effect/Cause";
12
import { useState } from "react";
13
import { getDesktopSnapShotBridge } from "../../lib/desktopSnapShot";
14
import { resolveDiffThemeName } from "../../lib/diffRendering";
15
-import { useTheme } from "../../hooks/useTheme";
15
+import { useRenderedAppearance } from "../../hooks/useTheme";
16
import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
17
import { Button } from "../ui/button";
18
import { toastManager } from "../ui/toast";
@@ -35,7 +35,7 @@ export function CaptureShortcutConfig({
35
onComplete?: () => Promise<void>;
36
}) {
37
const bridge = getDesktopSnapShotBridge();
38
- const { resolvedTheme } = useTheme();
38
+ const resolvedTheme = useRenderedAppearance();
39
const { copyToClipboard, isCopied } = useCopyToClipboard();
40
const [preview, setPreview] = useState<DesktopCaptureConfigPreview | null>(null);
41
const [result, setResult] = useState<DesktopCaptureConfigApplied | null>(null);
apps/web/src/components/settings/SettingsFontPreviews.tsx
+2
-2
@@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from "react";
4
import { ComposerPromptEditor, type ComposerPromptEditorHandle } from "../ComposerPromptEditor";
5
import { EMPTY_COMPOSER_CONTEXT_RECORDS } from "../composerContextPresentation";
6
import { terminalThemeFromApp } from "../ThreadTerminalDrawer";
7
-import { useTheme } from "../../hooks/useTheme";
7
+import { useRenderedAppearance, useTheme } from "../../hooks/useTheme";
8
import { DISCONNECTED_COMPOSER_PLACEHOLDER } from "../../composerPlaceholder";
9
import { resolveDiffThemeName, type DiffThemeName } from "../../lib/diffRendering";
10
import { PREFERRED_HIGHLIGHTER } from "../../lib/syntaxHighlighting";
@@ -113,7 +113,7 @@ function StaticDiffHtml({ html }: { html: string }) {
113
}
114
115
export function CodeFontPreview() {
116
- const { resolvedTheme } = useTheme();
116
+ const resolvedTheme = useRenderedAppearance();
117
const themeName = resolveDiffThemeName(resolvedTheme);
118
const [htmlByFile, setHtmlByFile] = useState<readonly string[] | null>(null);
119
useEffect(() => {
apps/web/src/hooks/useTheme.ts
+12
@@ -9,10 +9,12 @@ import {
9
canonicalThemePreference,
10
isKnownThemePreference,
11
getThemePreferenceMode,
12
+ getThemePreviewAppearance,
13
parseThemeHalves,
14
resolveDesktopTheme,
15
resolveThemeAppearance,
16
resolveThemeHalf,
17
+ subscribeToThemePreview,
18
THEME_PREVIEW_ID,
19
THEME_APPEARANCE_MODE_STORAGE_KEY,
20
THEME_FOLLOW_SYSTEM_STORAGE_KEY,
@@ -492,6 +494,16 @@ function subscribe(listener: () => void): () => void {
494
};
495
}
496
497
+export function useRenderedAppearance() {
498
+ const { resolvedTheme } = useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);
499
+ const previewAppearance = useSyncExternalStore(
500
+ subscribeToThemePreview,
501
+ getThemePreviewAppearance,
502
+ () => null,
503
+ );
504
+ return previewAppearance ?? resolvedTheme;
505
+}
506
+
507
function setTheme(next: Theme): boolean {
508
if (typeof window === "undefined") return false;
509
try {
apps/web/src/themePalette.ts
+11
-7
@@ -73,10 +73,14 @@ type CustomThemeLibrarySnapshot =
73
74
let customThemeLibrarySnapshot: CustomThemeLibrarySnapshot | null = null;
75
const themePreviewListeners = new Set<() => void>();
76
-let themePreviewSidebarArtwork: boolean | null = null;
76
+let themePreviewAppearance: ThemeAppearance | null = null;
77
+
78
+export function getThemePreviewAppearance(): ThemeAppearance | null {
79
+ return themePreviewAppearance;
80
+}
81
82
export function getThemePreviewSidebarArtwork(): boolean | null {
79
- return themePreviewSidebarArtwork;
83
+ return themePreviewAppearance === null ? null : false;
84
}
85
86
export function subscribeToThemePreview(listener: () => void): () => void {
@@ -84,9 +88,9 @@ export function subscribeToThemePreview(listener: () => void): () => void {
88
return () => themePreviewListeners.delete(listener);
89
}
90
87
-function setThemePreviewSidebarArtwork(next: boolean | null): void {
88
- if (themePreviewSidebarArtwork === next) return;
89
- themePreviewSidebarArtwork = next;
91
+function setThemePreviewAppearance(appearance: ThemeAppearance | null): void {
92
+ if (themePreviewAppearance === appearance) return;
93
+ themePreviewAppearance = appearance;
94
for (const listener of themePreviewListeners) listener();
95
}
96
@@ -1434,12 +1438,12 @@ export function applyThemeColorPreview(colors: ThemeColors, appearance: ThemeApp
1438
const root = document.documentElement;
1439
if (!root?.style) return;
1440
1437
- setThemePreviewSidebarArtwork(false);
1441
root.dataset.themeId = THEME_PREVIEW_ID;
1442
root.classList.toggle("dark", appearance === "dark");
1443
for (const [role, value] of Object.entries(colors) as Array<[ThemeColorRole, string]>) {
1444
if (isThemeColor(value)) root.style.setProperty(APP_THEME_VARIABLES[role], value);
1445
}
1446
+ setThemePreviewAppearance(appearance);
1447
}
1448
1449
export function applyThemePalette(theme: ThemePreference, appearance?: ThemeAppearance): void {
@@ -1448,7 +1452,7 @@ export function applyThemePalette(theme: ThemePreference, appearance?: ThemeAppe
1452
const root = document.documentElement;
1453
if (!root?.style) return;
1454
1451
- setThemePreviewSidebarArtwork(null);
1455
+ setThemePreviewAppearance(null);
1456
const palette = getThemeDefinition(theme);
1457
1458
if (palette) {