Skip to content

fix(theme): prevent freeze when switching to system theme #2790

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

Merged
bajrangCoder merged 1 commit into from
Aug 22, 2026
+14 −5
Merged

fix(theme): prevent freeze when switching to system theme #2790

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
14 changes: 11 additions & 3 deletions src/theme/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ export async function apply(id, init) {
if (!DOES_SUPPORT_THEME) {
id = "default";
}
if (id.toLowerCase() === "system") {
// Refresh the mutable System theme before reading its preferred editor
// theme. Do not re-enter apply() while appTheme is being updated below.
updateSystemTheme(isDeviceDarkTheme(), false);
}

themeApplied = true;
const theme = get(id);
Expand Down Expand Up @@ -164,10 +169,10 @@ export function update(theme) {
});
}

function syncSystemTheme(event) {
function syncSystemTheme(event, applyTheme = true) {
if (settings.value.appTheme.toLowerCase() !== "system") return;
const isDark = event ? event.matches : darkModeMediaQuery.matches;
updateSystemTheme(isDark);
updateSystemTheme(isDark, applyTheme);
}

function startSystemThemeWatcher() {
Expand Down Expand Up @@ -197,7 +202,10 @@ function stopSystemThemeWatcher() {
export function updateSystemThemeWatcher(theme) {
if (String(theme).toLowerCase() === "system") {
startSystemThemeWatcher();
syncSystemTheme();
// Starting the watcher happens from the appTheme update listener. Applying
// the theme here would update appTheme again before the first settings
// update is saved, causing unbounded synchronous recursion.
syncSystemTheme(undefined, false);
return;
}
stopSystemThemeWatcher();
Expand Down
5 changes: 3 additions & 2 deletions src/theme/preInstalled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,9 @@ export function getSystemEditorTheme(darkTheme) {
/**
* Update the system theme based on the user's preference.
* @param {boolean} darkTheme Whether the user prefers a dark theme.
* @param {boolean} applyTheme Whether to apply the refreshed theme immediately.
*/
export function updateSystemTheme(darkTheme) {
export function updateSystemTheme(darkTheme, applyTheme = true) {
if (darkTheme) {
system.type = "dark";
system.primaryColor = "rgb(35, 39, 42)";
Expand Down Expand Up @@ -278,7 +279,7 @@ export function updateSystemTheme(darkTheme) {

system.preferredEditorTheme = getSystemEditorTheme(darkTheme);

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