Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 39 additions & 13 deletions apps/apollo-vertex/registry/shell/shell-theme-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ export type Theme = "light" | "dark" | "system";

interface ThemeProviderProps {
children: ReactNode;
defaultTheme?: Theme;
themeConfig?: ThemeConfig;
storageKey?: string;
disableTransitionOnChange?: boolean;
}

interface ThemeProviderState {
theme: Theme;
resolvedTheme: "light" | "dark";
setTheme: (theme: Theme) => void;
}

const ThemeProviderContext = createContext<ThemeProviderState>({
theme: "system",
setTheme: () => null,
});
const ThemeProviderContext = createContext<ThemeProviderState | null>(null);

const cssVarMap: Record<string, string> = {
background: "--background",
Expand Down Expand Up @@ -74,10 +74,26 @@ function getEffectiveTheme(theme: Theme): "light" | "dark" {
return theme;
}

function applyThemeClass(theme: Theme) {
function applyThemeClass(theme: Theme, disableTransitions?: boolean) {
const root = window.document.documentElement;
const resolved = getEffectiveTheme(theme);

let styleEl: HTMLStyleElement | null = null;
if (disableTransitions) {
styleEl = document.createElement("style");
styleEl.textContent =
"*, *::before, *::after { transition: none !important }";
document.head.append(styleEl);
}

root.classList.remove("light", "dark");
root.classList.add(getEffectiveTheme(theme));
root.classList.add(resolved);

if (styleEl) {
// Force reflow, then re-enable transitions
void root.offsetHeight;
styleEl.remove();
}
}

function applyThemeConfig(config: ThemeConfig, theme: Theme) {
Expand Down Expand Up @@ -108,35 +124,45 @@ function clearThemeConfig() {

export function ThemeProvider({
children,
defaultTheme = "system",
themeConfig,
storageKey = THEME_STORAGE_KEY,
disableTransitionOnChange,
}: ThemeProviderProps) {
const [theme, setThemeState] = useState<Theme>(() => {
if (typeof window === "undefined") return "system";
if (typeof window === "undefined") return defaultTheme;
const stored = localStorage.getItem(storageKey);
return isValidTheme(stored) ? stored : "system";
return isValidTheme(stored) ? stored : defaultTheme;
});

const [resolvedTheme, setResolvedTheme] = useState<"light" | "dark">(() =>
typeof window === "undefined" ? "light" : getEffectiveTheme(theme),
);

const setTheme = (newTheme: Theme) => {
localStorage.setItem(storageKey, newTheme);
setThemeState(newTheme);
};

// Apply light/dark class to document root
useEffect(() => {
applyThemeClass(theme);
}, [theme]);
applyThemeClass(theme, disableTransitionOnChange);
setResolvedTheme(getEffectiveTheme(theme));
}, [theme, disableTransitionOnChange]);

// Listen for system theme changes when in system mode
useEffect(() => {
if (theme !== "system") return;

const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
const handleChange = () => applyThemeClass(theme);
const handleChange = () => {
applyThemeClass(theme, disableTransitionOnChange);
setResolvedTheme(getEffectiveTheme(theme));
};

mediaQuery.addEventListener("change", handleChange);
return () => mediaQuery.removeEventListener("change", handleChange);
}, [theme]);
}, [theme, disableTransitionOnChange]);

// Cross-tab sync: update React state when theme changes in another tab
useEffect(() => {
Expand All @@ -159,7 +185,7 @@ export function ThemeProvider({
}, [themeConfig, theme]);

return (
<ThemeProviderContext.Provider value={{ theme, setTheme }}>
<ThemeProviderContext.Provider value={{ theme, resolvedTheme, setTheme }}>
{children}
</ThemeProviderContext.Provider>
);
Expand Down
Loading