Skip to content

fix: system theme #2524

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

Open
RohitKushvaha01 wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −19
Open

fix: system theme #2524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4604052
fix: system theme
RohitKushvaha01 Jul 22, 2026
7eb0270
Update src/theme/preInstalled.js
RohitKushvaha01 Jul 22, 2026
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
27 changes: 8 additions & 19 deletions src/palettes/changeTheme/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import "./style.scss";
import palette from "components/palette";
import config from "lib/config";
import appSettings from "lib/settings";
import { isDeviceDarkTheme } from "lib/systemConfiguration";
import themes from "theme/list";
import { updateSystemTheme } from "theme/preInstalled";
import changeEditorTheme from "../changeEditorTheme";

const darkModeMediaQuery = window.matchMedia("(prefers-color-scheme: dark)");

export default function changeTheme(type = "editor") {
if (type === "editor") return changeEditorTheme();
palette(
Expand Down Expand Up @@ -41,30 +42,18 @@ function generateHints(type) {
});
}

let previousDark = isDeviceDarkTheme();
const updateTimeMs = 2000;

let intervalId = null;

function syncSystemTheme() {
if (appSettings.value.appTheme.toLowerCase() === "system") {
const isDark = isDeviceDarkTheme();
if (isDark !== previousDark) {
previousDark = isDark;
updateSystemTheme(isDark);
}
}
function syncSystemTheme(event) {
if (appSettings.value.appTheme.toLowerCase() !== "system") return;
const isDark = event ? event.matches : darkModeMediaQuery.matches;
updateSystemTheme(isDark);
}

function startSystemThemeWatcher() {
if (intervalId) return;
intervalId = setInterval(syncSystemTheme, updateTimeMs);
darkModeMediaQuery.addEventListener("change", syncSystemTheme);

@greptile-apps greptile-apps Bot Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Legacy Media Query Listener Crash

When a WebView supports matchMedia but exposes only addListener, selecting the system theme now throws because addEventListener is undefined. The previous polling path worked in this runtime, so system-theme synchronization needs matching addListener and removeListener fallbacks.

}

function stopSystemThemeWatcher() {
if (!intervalId) return;
clearInterval(intervalId);
intervalId = null;
darkModeMediaQuery.removeEventListener("change", syncSystemTheme);
}

function updateSystemThemeWatcher(theme) {
Expand Down
1 change: 1 addition & 0 deletions src/theme/preInstalled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ export function updateSystemTheme(darkTheme) {

if (appSettings?.value?.appTheme === "system") {
apply(system.id);
appSettings.update({ editorTheme: system.preferredEditorTheme }, false);
}
}

Expand Down
Loading