fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Gr3mIin wants to merge 1 commit into from
Closed

fix: sync desktop window theme with theme changes #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 30 additions & 2 deletions apps/desktop/src/main.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
app,
BrowserWindow,
dialog,
ipcMain,
Menu,
nativeImage,
nativeTheme,
protocol,
shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
DesktopUpdateActionResult,
DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
}
});

ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
if (process.platform !== "win32") {
return;
}

if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
return;
}

nativeTheme.themeSource = rawTheme;
});

ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
event.preventDefault();
window.setTitle(APP_DISPLAY_NAME);
});

window.webContents.on("did-finish-load", () => {
window.setTitle(APP_DISPLAY_NAME);
emitUpdateState();
Expand Down
4 changes: 4 additions & 0 deletions apps/desktop/src/preload.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
setWindowTheme: (theme) => {
void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
},
onMenuAction: (listener) => {
const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
if (typeof action !== "string") return;
Expand Down
30 changes: 26 additions & 4 deletions apps/web/src/hooks/useTheme.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
if (typeof window === "undefined") {
return;
}

window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
if (suppressTransitions) {
document.documentElement.classList.add("no-transitions");
}
const isDark = theme === "dark" || (theme === "system" && getSystemDark());
const isDark = resolveTheme(theme) === "dark";
document.documentElement.classList.toggle("dark", isDark);
if (suppressTransitions) {
// Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
// Listen for system preference changes
const mq = window.matchMedia(MEDIA_QUERY);
const handleChange = () => {
if (getStored() === "system") applyTheme("system", true);
if (getStored() === "system") {
applyTheme("system", true);
syncDesktopWindowTheme("system");
}
emitChange();
};
mq.addEventListener("change", handleChange);

// Listen for storage changes from other tabs
const handleStorage = (e: StorageEvent) => {
if (e.key === STORAGE_KEY) {
applyTheme(getStored(), true);
const nextTheme = getStored();
applyTheme(nextTheme, true);
syncDesktopWindowTheme(nextTheme);
emitChange();
}
};
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
const setTheme = useCallback((next: Theme) => {
localStorage.setItem(STORAGE_KEY, next);
applyTheme(next, true);
syncDesktopWindowTheme(next);
emitChange();
}, []);

// Keep DOM in sync on mount/change
useEffect(() => {
applyTheme(theme);
}, [theme]);
syncDesktopWindowTheme(theme);
}, [resolvedTheme, theme]);

return { theme, setTheme, resolvedTheme } as const;
}
3 changes: 3 additions & 0 deletions packages/contracts/src/ipc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
position?: { x: number; y: number },
) => Promise<T | null>;
openExternal: (url: string) => Promise<boolean>;
setWindowTheme?: (theme: DesktopWindowTheme) => void;
onMenuAction: (listener: (action: string) => void) => () => void;
getUpdateState: () => Promise<DesktopUpdateState>;
downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gr3mIin
wants to merge
1
commit into

from

 Closed


fix: sync desktop window theme with theme changes
#648
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


32 changes: 30 additions & 2 deletions
apps/desktop/src/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
 app,
 BrowserWindow,
 dialog,
 ipcMain,
 Menu,
 nativeImage,
 nativeTheme,
 protocol,
 shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
 DesktopUpdateActionResult,
 DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
 }
 });

 ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
 ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
 if (process.platform !== "win32") {
 return;
 }

 if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
 return;
 }

 nativeTheme.themeSource = rawTheme;
 });

 ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
 ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
 event.preventDefault();
 window.setTitle(APP_DISPLAY_NAME);
 });

 window.webContents.on("did-finish-load", () => {
 window.setTitle(APP_DISPLAY_NAME);
 emitUpdateState();
Expand Down

4 changes: 4 additions & 0 deletions
apps/desktop/src/preload.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
 confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
 showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
 openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
 setWindowTheme: (theme) => {
 void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
 },
 onMenuAction: (listener) => {
 const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
 if (typeof action !== "string") return;
Expand Down

30 changes: 26 additions & 4 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
 theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
 return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
 return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
 if (typeof window === "undefined") {
 return;
 }

 window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 const isDark = resolveTheme(theme) === "dark";
 document.documentElement.classList.toggle("dark", isDark);
 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
 const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
 // Listen for system preference changes
 const mq = window.matchMedia(MEDIA_QUERY);
 const handleChange = () => {
 if (getStored() === "system") applyTheme("system", true);
 if (getStored() === "system") {
 applyTheme("system", true);
 syncDesktopWindowTheme("system");
 }
 emitChange();
 };
 mq.addEventListener("change", handleChange);

 // Listen for storage changes from other tabs
 const handleStorage = (e: StorageEvent) => {
 if (e.key === STORAGE_KEY) {
 applyTheme(getStored(), true);
 const nextTheme = getStored();
 applyTheme(nextTheme, true);
 syncDesktopWindowTheme(nextTheme);
 emitChange();
 }
 };
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
 applyTheme(next, true);
 syncDesktopWindowTheme(next);
 emitChange();
 }, []);

 // Keep DOM in sync on mount/change
 useEffect(() => {
 applyTheme(theme);
 }, [theme]);
 syncDesktopWindowTheme(theme);
 }, [resolvedTheme, theme]);

 return { theme, setTheme, resolvedTheme } as const;
}

3 changes: 3 additions & 0 deletions
packages/contracts/src/ipc.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
 state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
 getWsUrl: () => string | null;
 pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
 position?: { x: number; y: number },
 ) => Promise<T | null>;
 openExternal: (url: string) => Promise<boolean>;
 setWindowTheme?: (theme: DesktopWindowTheme) => void;
 onMenuAction: (listener: (action: string) => void) => () => void;
 getUpdateState: () => Promise<DesktopUpdateState>;
 downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gr3mIin
wants to merge
1
commit into

from

 Closed


fix: sync desktop window theme with theme changes
#648
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


32 changes: 30 additions & 2 deletions
apps/desktop/src/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
 app,
 BrowserWindow,
 dialog,
 ipcMain,
 Menu,
 nativeImage,
 nativeTheme,
 protocol,
 shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
 DesktopUpdateActionResult,
 DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
 }
 });

 ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
 ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
 if (process.platform !== "win32") {
 return;
 }

 if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
 return;
 }

 nativeTheme.themeSource = rawTheme;
 });

 ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
 ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
 event.preventDefault();
 window.setTitle(APP_DISPLAY_NAME);
 });

 window.webContents.on("did-finish-load", () => {
 window.setTitle(APP_DISPLAY_NAME);
 emitUpdateState();
Expand Down

4 changes: 4 additions & 0 deletions
apps/desktop/src/preload.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
 confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
 showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
 openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
 setWindowTheme: (theme) => {
 void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
 },
 onMenuAction: (listener) => {
 const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
 if (typeof action !== "string") return;
Expand Down

30 changes: 26 additions & 4 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
 theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
 return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
 return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
 if (typeof window === "undefined") {
 return;
 }

 window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 const isDark = resolveTheme(theme) === "dark";
 document.documentElement.classList.toggle("dark", isDark);
 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
 const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
 // Listen for system preference changes
 const mq = window.matchMedia(MEDIA_QUERY);
 const handleChange = () => {
 if (getStored() === "system") applyTheme("system", true);
 if (getStored() === "system") {
 applyTheme("system", true);
 syncDesktopWindowTheme("system");
 }
 emitChange();
 };
 mq.addEventListener("change", handleChange);

 // Listen for storage changes from other tabs
 const handleStorage = (e: StorageEvent) => {
 if (e.key === STORAGE_KEY) {
 applyTheme(getStored(), true);
 const nextTheme = getStored();
 applyTheme(nextTheme, true);
 syncDesktopWindowTheme(nextTheme);
 emitChange();
 }
 };
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
 applyTheme(next, true);
 syncDesktopWindowTheme(next);
 emitChange();
 }, []);

 // Keep DOM in sync on mount/change
 useEffect(() => {
 applyTheme(theme);
 }, [theme]);
 syncDesktopWindowTheme(theme);
 }, [resolvedTheme, theme]);

 return { theme, setTheme, resolvedTheme } as const;
}

3 changes: 3 additions & 0 deletions
packages/contracts/src/ipc.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
 state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
 getWsUrl: () => string | null;
 pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
 position?: { x: number; y: number },
 ) => Promise<T | null>;
 openExternal: (url: string) => Promise<boolean>;
 setWindowTheme?: (theme: DesktopWindowTheme) => void;
 onMenuAction: (listener: (action: string) => void) => () => void;
 getUpdateState: () => Promise<DesktopUpdateState>;
 downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gr3mIin
wants to merge
1
commit into

from

 Closed


fix: sync desktop window theme with theme changes
#648
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


32 changes: 30 additions & 2 deletions
apps/desktop/src/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
 app,
 BrowserWindow,
 dialog,
 ipcMain,
 Menu,
 nativeImage,
 nativeTheme,
 protocol,
 shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
 DesktopUpdateActionResult,
 DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
 }
 });

 ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
 ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
 if (process.platform !== "win32") {
 return;
 }

 if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
 return;
 }

 nativeTheme.themeSource = rawTheme;
 });

 ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
 ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
 event.preventDefault();
 window.setTitle(APP_DISPLAY_NAME);
 });

 window.webContents.on("did-finish-load", () => {
 window.setTitle(APP_DISPLAY_NAME);
 emitUpdateState();
Expand Down

4 changes: 4 additions & 0 deletions
apps/desktop/src/preload.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
 confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
 showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
 openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
 setWindowTheme: (theme) => {
 void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
 },
 onMenuAction: (listener) => {
 const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
 if (typeof action !== "string") return;
Expand Down

30 changes: 26 additions & 4 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
 theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
 return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
 return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
 if (typeof window === "undefined") {
 return;
 }

 window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 const isDark = resolveTheme(theme) === "dark";
 document.documentElement.classList.toggle("dark", isDark);
 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
 const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
 // Listen for system preference changes
 const mq = window.matchMedia(MEDIA_QUERY);
 const handleChange = () => {
 if (getStored() === "system") applyTheme("system", true);
 if (getStored() === "system") {
 applyTheme("system", true);
 syncDesktopWindowTheme("system");
 }
 emitChange();
 };
 mq.addEventListener("change", handleChange);

 // Listen for storage changes from other tabs
 const handleStorage = (e: StorageEvent) => {
 if (e.key === STORAGE_KEY) {
 applyTheme(getStored(), true);
 const nextTheme = getStored();
 applyTheme(nextTheme, true);
 syncDesktopWindowTheme(nextTheme);
 emitChange();
 }
 };
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
 applyTheme(next, true);
 syncDesktopWindowTheme(next);
 emitChange();
 }, []);

 // Keep DOM in sync on mount/change
 useEffect(() => {
 applyTheme(theme);
 }, [theme]);
 syncDesktopWindowTheme(theme);
 }, [resolvedTheme, theme]);

 return { theme, setTheme, resolvedTheme } as const;
}

3 changes: 3 additions & 0 deletions
packages/contracts/src/ipc.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
 state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
 getWsUrl: () => string | null;
 pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
 position?: { x: number; y: number },
 ) => Promise<T | null>;
 openExternal: (url: string) => Promise<boolean>;
 setWindowTheme?: (theme: DesktopWindowTheme) => void;
 onMenuAction: (listener: (action: string) => void) => () => void;
 getUpdateState: () => Promise<DesktopUpdateState>;
 downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gr3mIin
wants to merge
1
commit into

from

 Closed


fix: sync desktop window theme with theme changes
#648
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


32 changes: 30 additions & 2 deletions
apps/desktop/src/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
 app,
 BrowserWindow,
 dialog,
 ipcMain,
 Menu,
 nativeImage,
 nativeTheme,
 protocol,
 shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
 DesktopUpdateActionResult,
 DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
 }
 });

 ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
 ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
 if (process.platform !== "win32") {
 return;
 }

 if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
 return;
 }

 nativeTheme.themeSource = rawTheme;
 });

 ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
 ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
 event.preventDefault();
 window.setTitle(APP_DISPLAY_NAME);
 });

 window.webContents.on("did-finish-load", () => {
 window.setTitle(APP_DISPLAY_NAME);
 emitUpdateState();
Expand Down

4 changes: 4 additions & 0 deletions
apps/desktop/src/preload.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
 confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
 showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
 openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
 setWindowTheme: (theme) => {
 void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
 },
 onMenuAction: (listener) => {
 const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
 if (typeof action !== "string") return;
Expand Down

30 changes: 26 additions & 4 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
 theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
 return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
 return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
 if (typeof window === "undefined") {
 return;
 }

 window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 const isDark = resolveTheme(theme) === "dark";
 document.documentElement.classList.toggle("dark", isDark);
 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
 const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
 // Listen for system preference changes
 const mq = window.matchMedia(MEDIA_QUERY);
 const handleChange = () => {
 if (getStored() === "system") applyTheme("system", true);
 if (getStored() === "system") {
 applyTheme("system", true);
 syncDesktopWindowTheme("system");
 }
 emitChange();
 };
 mq.addEventListener("change", handleChange);

 // Listen for storage changes from other tabs
 const handleStorage = (e: StorageEvent) => {
 if (e.key === STORAGE_KEY) {
 applyTheme(getStored(), true);
 const nextTheme = getStored();
 applyTheme(nextTheme, true);
 syncDesktopWindowTheme(nextTheme);
 emitChange();
 }
 };
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
 applyTheme(next, true);
 syncDesktopWindowTheme(next);
 emitChange();
 }, []);

 // Keep DOM in sync on mount/change
 useEffect(() => {
 applyTheme(theme);
 }, [theme]);
 syncDesktopWindowTheme(theme);
 }, [resolvedTheme, theme]);

 return { theme, setTheme, resolvedTheme } as const;
}

3 changes: 3 additions & 0 deletions
packages/contracts/src/ipc.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
 state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
 getWsUrl: () => string | null;
 pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
 position?: { x: number; y: number },
 ) => Promise<T | null>;
 openExternal: (url: string) => Promise<boolean>;
 setWindowTheme?: (theme: DesktopWindowTheme) => void;
 onMenuAction: (listener: (action: string) => void) => () => void;
 getUpdateState: () => Promise<DesktopUpdateState>;
 downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gr3mIin
wants to merge
1
commit into

from

 Closed


fix: sync desktop window theme with theme changes
#648
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


32 changes: 30 additions & 2 deletions
apps/desktop/src/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
 app,
 BrowserWindow,
 dialog,
 ipcMain,
 Menu,
 nativeImage,
 nativeTheme,
 protocol,
 shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
 DesktopUpdateActionResult,
 DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
 }
 });

 ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
 ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
 if (process.platform !== "win32") {
 return;
 }

 if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
 return;
 }

 nativeTheme.themeSource = rawTheme;
 });

 ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
 ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
 event.preventDefault();
 window.setTitle(APP_DISPLAY_NAME);
 });

 window.webContents.on("did-finish-load", () => {
 window.setTitle(APP_DISPLAY_NAME);
 emitUpdateState();
Expand Down

4 changes: 4 additions & 0 deletions
apps/desktop/src/preload.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
 confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
 showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
 openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
 setWindowTheme: (theme) => {
 void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
 },
 onMenuAction: (listener) => {
 const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
 if (typeof action !== "string") return;
Expand Down

30 changes: 26 additions & 4 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
 theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
 return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
 return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
 if (typeof window === "undefined") {
 return;
 }

 window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 const isDark = resolveTheme(theme) === "dark";
 document.documentElement.classList.toggle("dark", isDark);
 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
 const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
 // Listen for system preference changes
 const mq = window.matchMedia(MEDIA_QUERY);
 const handleChange = () => {
 if (getStored() === "system") applyTheme("system", true);
 if (getStored() === "system") {
 applyTheme("system", true);
 syncDesktopWindowTheme("system");
 }
 emitChange();
 };
 mq.addEventListener("change", handleChange);

 // Listen for storage changes from other tabs
 const handleStorage = (e: StorageEvent) => {
 if (e.key === STORAGE_KEY) {
 applyTheme(getStored(), true);
 const nextTheme = getStored();
 applyTheme(nextTheme, true);
 syncDesktopWindowTheme(nextTheme);
 emitChange();
 }
 };
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
 applyTheme(next, true);
 syncDesktopWindowTheme(next);
 emitChange();
 }, []);

 // Keep DOM in sync on mount/change
 useEffect(() => {
 applyTheme(theme);
 }, [theme]);
 syncDesktopWindowTheme(theme);
 }, [resolvedTheme, theme]);

 return { theme, setTheme, resolvedTheme } as const;
}

3 changes: 3 additions & 0 deletions
packages/contracts/src/ipc.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
 state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
 getWsUrl: () => string | null;
 pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
 position?: { x: number; y: number },
 ) => Promise<T | null>;
 openExternal: (url: string) => Promise<boolean>;
 setWindowTheme?: (theme: DesktopWindowTheme) => void;
 onMenuAction: (listener: (action: string) => void) => () => void;
 getUpdateState: () => Promise<DesktopUpdateState>;
 downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gr3mIin
wants to merge
1
commit into

from

 Closed


fix: sync desktop window theme with theme changes
#648
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


32 changes: 30 additions & 2 deletions
apps/desktop/src/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
 app,
 BrowserWindow,
 dialog,
 ipcMain,
 Menu,
 nativeImage,
 nativeTheme,
 protocol,
 shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
 DesktopUpdateActionResult,
 DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
 }
 });

 ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
 ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
 if (process.platform !== "win32") {
 return;
 }

 if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
 return;
 }

 nativeTheme.themeSource = rawTheme;
 });

 ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
 ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
 event.preventDefault();
 window.setTitle(APP_DISPLAY_NAME);
 });

 window.webContents.on("did-finish-load", () => {
 window.setTitle(APP_DISPLAY_NAME);
 emitUpdateState();
Expand Down

4 changes: 4 additions & 0 deletions
apps/desktop/src/preload.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
 confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
 showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
 openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
 setWindowTheme: (theme) => {
 void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
 },
 onMenuAction: (listener) => {
 const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
 if (typeof action !== "string") return;
Expand Down

30 changes: 26 additions & 4 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
 theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
 return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
 return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
 if (typeof window === "undefined") {
 return;
 }

 window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 const isDark = resolveTheme(theme) === "dark";
 document.documentElement.classList.toggle("dark", isDark);
 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
 const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
 // Listen for system preference changes
 const mq = window.matchMedia(MEDIA_QUERY);
 const handleChange = () => {
 if (getStored() === "system") applyTheme("system", true);
 if (getStored() === "system") {
 applyTheme("system", true);
 syncDesktopWindowTheme("system");
 }
 emitChange();
 };
 mq.addEventListener("change", handleChange);

 // Listen for storage changes from other tabs
 const handleStorage = (e: StorageEvent) => {
 if (e.key === STORAGE_KEY) {
 applyTheme(getStored(), true);
 const nextTheme = getStored();
 applyTheme(nextTheme, true);
 syncDesktopWindowTheme(nextTheme);
 emitChange();
 }
 };
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
 applyTheme(next, true);
 syncDesktopWindowTheme(next);
 emitChange();
 }, []);

 // Keep DOM in sync on mount/change
 useEffect(() => {
 applyTheme(theme);
 }, [theme]);
 syncDesktopWindowTheme(theme);
 }, [resolvedTheme, theme]);

 return { theme, setTheme, resolvedTheme } as const;
}

3 changes: 3 additions & 0 deletions
packages/contracts/src/ipc.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
 state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
 getWsUrl: () => string | null;
 pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
 position?: { x: number; y: number },
 ) => Promise<T | null>;
 openExternal: (url: string) => Promise<boolean>;
 setWindowTheme?: (theme: DesktopWindowTheme) => void;
 onMenuAction: (listener: (action: string) => void) => () => void;
 getUpdateState: () => Promise<DesktopUpdateState>;
 downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: sync desktop window theme with theme changes#648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gr3mIin
wants to merge
1
commit into

from

 Closed


fix: sync desktop window theme with theme changes
#648
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


32 changes: 30 additions & 2 deletions
apps/desktop/src/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,23 @@ import * as FS from "node:fs";
import * as OS from "node:os";
import * as Path from "node:path";

import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, protocol, shell } from "electron";
import {
 app,
 BrowserWindow,
 dialog,
 ipcMain,
 Menu,
 nativeImage,
 nativeTheme,
 protocol,
 shell,
} from "electron";
import type { MenuItemConstructorOptions } from "electron";
import * as Effect from "effect/Effect";
import type { DesktopUpdateActionResult, DesktopUpdateState } from "@t3tools/contracts";
import type {
 DesktopUpdateActionResult,
 DesktopUpdateState,
} from "@t3tools/contracts";
import { autoUpdater } from "electron-updater";

import type { ContextMenuItem } from "@t3tools/contracts";
Expand DownExpand Up@@ -38,6 +51,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand DownExpand Up@@ -1095,6 +1109,19 @@ function registerIpcHandlers(): void {
 }
 });

 ipcMain.removeHandler(SET_WINDOW_THEME_CHANNEL);
 ipcMain.handle(SET_WINDOW_THEME_CHANNEL, async (_event, rawTheme: unknown) => {
 if (process.platform !== "win32") {
 return;
 }

 if (rawTheme !== "light" && rawTheme !== "dark" && rawTheme !== "system") {
 return;
 }

 nativeTheme.themeSource = rawTheme;
 });

 ipcMain.removeHandler(UPDATE_GET_STATE_CHANNEL);
 ipcMain.handle(UPDATE_GET_STATE_CHANNEL, async () => updateState);

Expand DownExpand Up@@ -1193,6 +1220,7 @@ function createWindow(): BrowserWindow {
 event.preventDefault();
 window.setTitle(APP_DISPLAY_NAME);
 });

 window.webContents.on("did-finish-load", () => {
 window.setTitle(APP_DISPLAY_NAME);
 emitUpdateState();
Expand Down

4 changes: 4 additions & 0 deletions
apps/desktop/src/preload.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONFIRM_CHANNEL = "desktop:confirm";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
const SET_WINDOW_THEME_CHANNEL = "desktop:set-window-theme";
const MENU_ACTION_CHANNEL = "desktop:menu-action";
const UPDATE_STATE_CHANNEL = "desktop:update-state";
const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
Expand All@@ -18,6 +19,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
 confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
 showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
 openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
 setWindowTheme: (theme) => {
 void ipcRenderer.invoke(SET_WINDOW_THEME_CHANNEL, theme);
 },
 onMenuAction: (listener) => {
 const wrappedListener = (_event: Electron.IpcRendererEvent, action: unknown) => {
 if (typeof action !== "string") return;
Expand Down

30 changes: 26 additions & 4 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

import type { DesktopWindowTheme } from "@t3tools/contracts";

type Theme = "light" | "dark" | "system";
type ThemeSnapshot = {
 theme: Theme;
Expand All@@ -25,11 +27,23 @@ function getStored(): Theme {
 return "system";
}

function resolveTheme(theme: Theme): DesktopWindowTheme {
 return theme === "system" ? (getSystemDark() ? "dark" : "light") : theme;
}

function syncDesktopWindowTheme(theme: Theme) {
 if (typeof window === "undefined") {
 return;
 }

 window.desktopBridge?.setWindowTheme?.(theme);
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 const isDark = resolveTheme(theme) === "dark";
 document.documentElement.classList.toggle("dark", isDark);
 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
Expand All@@ -43,6 +57,7 @@ function applyTheme(theme: Theme, suppressTransitions = false) {

// Apply immediately on module load to prevent flash
applyTheme(getStored());
syncDesktopWindowTheme(getStored());

function getSnapshot(): ThemeSnapshot {
 const theme = getStored();
Expand All@@ -62,15 +77,20 @@ function subscribe(listener: () => void): () => void {
 // Listen for system preference changes
 const mq = window.matchMedia(MEDIA_QUERY);
 const handleChange = () => {
 if (getStored() === "system") applyTheme("system", true);
 if (getStored() === "system") {
 applyTheme("system", true);
 syncDesktopWindowTheme("system");
 }
 emitChange();
 };
 mq.addEventListener("change", handleChange);

 // Listen for storage changes from other tabs
 const handleStorage = (e: StorageEvent) => {
 if (e.key === STORAGE_KEY) {
 applyTheme(getStored(), true);
 const nextTheme = getStored();
 applyTheme(nextTheme, true);
 syncDesktopWindowTheme(nextTheme);
 emitChange();
 }
 };
Expand All@@ -93,13 +113,15 @@ export function useTheme() {
 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
 applyTheme(next, true);
 syncDesktopWindowTheme(next);
 emitChange();
 }, []);

 // Keep DOM in sync on mount/change
 useEffect(() => {
 applyTheme(theme);
 }, [theme]);
 syncDesktopWindowTheme(theme);
 }, [resolvedTheme, theme]);

 return { theme, setTheme, resolvedTheme } as const;
}

3 changes: 3 additions & 0 deletions
packages/contracts/src/ipc.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,8 @@ export interface DesktopUpdateActionResult {
 state: DesktopUpdateState;
}

export type DesktopWindowTheme = "light" | "dark" | "system";

export interface DesktopBridge {
 getWsUrl: () => string | null;
 pickFolder: () => Promise<string | null>;
Expand All@@ -86,6 +88,7 @@ export interface DesktopBridge {
 position?: { x: number; y: number },
 ) => Promise<T | null>;
 openExternal: (url: string) => Promise<boolean>;
 setWindowTheme?: (theme: DesktopWindowTheme) => void;
 onMenuAction: (listener: (action: string) => void) => () => void;
 getUpdateState: () => Promise<DesktopUpdateState>;
 downloadUpdate: () => Promise<DesktopUpdateActionResult>;
Expand Down