Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

Set observer for VsCode theme in `useTheme` (#6149)

Trevor Manz8fa44c5c10d8
diff --git a/frontend/src/theme/useTheme.ts b/frontend/src/theme/useTheme.ts
index ae85fafd81..cffd2e316a 100644
--- a/frontend/src/theme/useTheme.ts
+++ b/frontend/src/theme/useTheme.ts
@@ -25,8 +25,7 @@ const themeAtom = atom((get) => {
if (
document.body.dataset.theme === "dark" ||
document.body.dataset.mode === "dark" ||
- document.body.dataset.vscodeThemeKind === "vscode-dark" ||
- document.body.dataset.vscodeThemeKind === "vscode-high-contrast"
+ getVsCodeTheme() === "dark"
) {
return "dark";
}
@@ -73,8 +72,39 @@ function setupThemeListener(): void {
}
setupThemeListener();
+function getVsCodeTheme(): "light" | "dark" | undefined {
+ const kind = document.body.dataset.vscodeThemeKind;
+ if (kind === "vscode-dark") {
+ return "dark";
+ } else if (kind === "vscode-high-contrast") {
+ return "dark";
+ } else if (kind === "vscode-light") {
+ return "light";
+ }
+ return undefined;
+}
+
+const codeThemeAtom = atom<"light" | "dark" | undefined>(getVsCodeTheme());
+
+function setupVsCodeThemeListener() {
+ const observer = new MutationObserver(() => {
+ const theme = getVsCodeTheme();
+ store.set(codeThemeAtom, theme);
+ });
+ observer.observe(document.body, {
+ attributes: true,
+ attributeFilter: ["data-vscode-theme-kind"],
+ });
+ return () => observer.disconnect();
+}
+setupVsCodeThemeListener();
+
export const resolvedThemeAtom = atom((get) => {
const theme = get(themeAtom);
+ const codeTheme = get(codeThemeAtom);
+ if (codeTheme !== undefined) {
+ return codeTheme;
+ }
const prefersDarkMode = get(prefersDarkModeAtom);
return theme === "system" ? (prefersDarkMode ? "dark" : "light") : theme;
});