Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

chg(command): tweak behavior of change theme command (#4850)

Seamusf7fceccbe4b6
diff --git a/apps/web/src/components/app/GlobalHotkeys.tsx b/apps/web/src/components/app/GlobalHotkeys.tsx
index 2b4a419d50..ca29b0f0ac 100644
--- a/apps/web/src/components/app/GlobalHotkeys.tsx
+++ b/apps/web/src/components/app/GlobalHotkeys.tsx
@@ -60,7 +60,6 @@ import {
applySystemTheme,
applyTheme,
clearThemePreview,
- pinTheme,
previewTheme,
resolveActiveThemeId,
} from '@theme/utils/themeUtils';
@@ -381,6 +380,15 @@ export default function GlobalShortcuts() {
(systemMode() === 'dark' ? darkModeTheme() : lightModeTheme())
);
+ const setVisibleTheme = (themeId: string) => {
+ const resolvedMode = themeMode() === 'system' ? systemMode() : themeMode();
+ if (resolvedMode === 'dark') {
+ setDarkModeTheme(themeId);
+ } else {
+ setLightModeTheme(themeId);
+ }
+ };
+
// "System preference" mirrors the Active-theme dropdown's first option: follow
// the OS scheme rather than pinning a fixed theme.
registerHotkey({
@@ -412,9 +420,9 @@ export default function GlobalShortcuts() {
scopeId: setThemeScope.commandScopeId,
description: `${theme.name}`,
keyDownHandler: () => {
- // Pin the theme (mode + per-mode theme) so the choice shows up in the
- // Appearance settings, then apply it live.
- pinTheme(theme);
+ // Change the theme currently being viewed without switching between
+ // static and system-driven theme modes.
+ setVisibleTheme(theme.id);
applyTheme(resolveActiveThemeId());
analytics.track('theme_changed', { themeId: theme.id });
return true;