Skip to content

fix: support dark mode with custom/legacy themes #9093

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
ericokuma merged 2 commits into from
Mar 24, 2026
+6 −13
Merged

fix: support dark mode with custom/legacy themes #9093

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
c682284
fix: support dark mode with custom/legacy themes
cursoragent Mar 20, 2026
7fc402e
style: fix prettier formatting in theme-manager.ts
cursoragent Mar 21, 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
14 changes: 3 additions & 11 deletions web-common/src/features/themes/theme-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,9 @@ class ThemeManager {
: themeSpec.light;

// Handle legacy theme format (colors: primary/secondary)
// Fall back to legacy color fields only in light mode
// TODO: ENG-957
const primaryColor =
modeTheme?.primary ||
(!isThemeModeDark ? themeSpec.primaryColorRaw : undefined);
const secondaryColor =
modeTheme?.secondary ||
(!isThemeModeDark ? themeSpec.secondaryColorRaw : undefined);
// Fall back to legacy color fields in both light and dark modes
const primaryColor = modeTheme?.primary || themeSpec.primaryColorRaw;
const secondaryColor = modeTheme?.secondary || themeSpec.secondaryColorRaw;

return {
primary: primaryColor ? getChroma(primaryColor) : primary[`500`],
Expand All @@ -164,10 +159,7 @@ class ThemeManager {

// Handle legacy theme format (colors: primary/secondary)
// If neither light nor dark is defined, create a theme object from legacy fields
// but only for light mode
// TODO: ENG-957
const hasLegacyColors =
!isThemeModeDark &&
!themeSpec.light &&
!themeSpec.dark &&
(themeSpec.primaryColorRaw || themeSpec.secondaryColorRaw);
Expand Down
5 changes: 3 additions & 2 deletions web-common/src/features/themes/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class Theme {
private processTheme(spec: V1ThemeSpec) {
// Handle legacy theme format (colors: primary/secondary)
// If neither light nor dark is defined, but we have legacy color fields,
// treat them as light mode colors only for backwards compatibility
// generate both light and dark palettes from them
const hasLegacyColors =
!spec.light &&
!spec.dark &&
Expand All @@ -120,7 +120,8 @@ export class Theme {
secondary: spec.secondaryColorRaw,
};
const lightColors = this.processColors(legacyColors);
return { dark: {}, light: lightColors };
const darkColors = this.processColors(legacyColors, true);
return { dark: darkColors, light: lightColors };
}

const darkColors = this.processColors(spec.dark ?? {}, true);
Expand Down
Loading