Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Sync diff renderer theme with app theme changes
Julius Marminge3a4304710221
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsxindex 9120e5b82..61243fc64 100644--- a/apps/web/src/components/DiffPanel.tsx+++ b/apps/web/src/components/DiffPanel.tsx@@ -16,7 +16,11 @@ import { useStore } from "../store";import { ToggleGroup, Toggle } from "./ui/toggle-group";type DiffRenderMode = "stacked" | "split";-type DiffThemeType = "light" | "dark" | "system";+type DiffThemeType = "light" | "dark";++function resolveDiffThemeName(theme: "light" | "dark") {+ return theme === "dark" ? "pierre-dark" : "pierre-light";+}type RenderablePatch =| {@@ -472,13 +476,15 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {{renderableFiles.map((fileDiff) => {const filePath = resolveFileDiffPath(fileDiff);const fileKey = buildFileDiffRenderKey(fileDiff);+ const themedFileKey = `${fileKey}:${resolvedTheme}`;return (- <div key={fileKey} data-diff-file-path={filePath} className="rounded-md">+ <div key={themedFileKey} data-diff-file-path={filePath} className="rounded-md"><FileDifffileDiff={fileDiff}options={{diffStyle: diffRenderMode === "split" ? "split" : "unified",lineDiffType: "none",+ theme: resolveDiffThemeName(resolvedTheme),themeType: resolvedTheme as DiffThemeType,}}/>diff --git a/apps/web/src/components/DiffWorkerPoolProvider.tsx b/apps/web/src/components/DiffWorkerPoolProvider.tsxindex 176ab44d0..f5930a19b 100644--- a/apps/web/src/components/DiffWorkerPoolProvider.tsx+++ b/apps/web/src/components/DiffWorkerPoolProvider.tsx@@ -1,8 +1,39 @@-import { WorkerPoolContextProvider } from "@pierre/diffs/react";+import { WorkerPoolContextProvider, useWorkerPool } from "@pierre/diffs/react";import DiffsWorker from "@pierre/diffs/worker/worker.js?worker";-import { useMemo, type ReactNode } from "react";+import { useEffect, useMemo, type ReactNode } from "react";+import { useTheme } from "../hooks/useTheme";++function resolveDiffThemeName(theme: "light" | "dark") {+ return theme === "dark" ? "pierre-dark" : "pierre-light";+}++function DiffWorkerThemeSync({ themeName }: { themeName: "pierre-light" | "pierre-dark" }) {+ const workerPool = useWorkerPool();++ useEffect(() => {+ if (!workerPool) {+ return;+ }++ const current = workerPool.getDiffRenderOptions();+ if (current.theme === themeName) {+ return;+ }++ void workerPool+ .setRenderOptions({+ ...current,+ theme: themeName,+ })+ .catch(() => undefined);+ }, [themeName, workerPool]);++ return null;+}export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {+ const { resolvedTheme } = useTheme();+ const diffThemeName = resolveDiffThemeName(resolvedTheme);const workerPoolSize = useMemo(() => {const cores =typeof navigator === "undefined" ? 4 : Math.max(1, navigator.hardwareConcurrency || 4);@@ -17,9 +48,11 @@ export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {totalASTLRUCacheSize: 240,}}highlighterOptions={{+ theme: diffThemeName,tokenizeMaxLineLength: 1_000,}}>+ <DiffWorkerThemeSync themeName={diffThemeName} />{children}</WorkerPoolContextProvider>);diff --git a/apps/web/src/hooks/useTheme.ts b/apps/web/src/hooks/useTheme.tsindex 6a0e61d2d..1e6a7cc88 100644--- a/apps/web/src/hooks/useTheme.ts+++ b/apps/web/src/hooks/useTheme.ts@@ -1,11 +1,16 @@import { useCallback, useEffect, useSyncExternalStore } from "react";type Theme = "light" | "dark" | "system";+type ThemeSnapshot = {+ theme: Theme;+ systemDark: boolean;+};const STORAGE_KEY = "t3code:theme";const MEDIA_QUERY = "(prefers-color-scheme: dark)";let listeners: Array<() => void> = [];+let lastSnapshot: ThemeSnapshot | null = null;function emitChange() {for (const listener of listeners) listener();}@@ -39,8 +44,16 @@ function applyTheme(theme: Theme, suppressTransitions = false) {// Apply immediately on module load to prevent flashapplyTheme(getStored());-function getSnapshot(): Theme {- return getStored();+function getSnapshot(): ThemeSnapshot {+ const theme = getStored();+ const systemDark = theme === "system" ? getSystemDark() : false;++ if (lastSnapshot && lastSnapshot.theme === theme && lastSnapshot.systemDark === systemDark) {+ return lastSnapshot;+ }++ lastSnapshot = { theme, systemDark };+ return lastSnapshot;}function subscribe(listener: () => void): () => void {@@ -71,10 +84,11 @@ function subscribe(listener: () => void): () => void {}export function useTheme() {- const theme = useSyncExternalStore(subscribe, getSnapshot);+ const snapshot = useSyncExternalStore(subscribe, getSnapshot);+ const theme = snapshot.theme;const resolvedTheme: "light" | "dark" =- theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;+ theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;const setTheme = useCallback((next: Theme) => {localStorage.setItem(STORAGE_KEY, next);