rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: fix theme not toggling when changing auto-light/dark theme selection

Browse Source
This commit is contained in:
Aman Harwara
2024-03-23 00:24:41 +05:30
parent 7967ddead7
commit f0613e7af5
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/ui-services/src/Theme/ThemeManager.ts
View File

@@ -27,7 +27,9 @@ const DefaultThemeIdentifier = 'Default'
export class ThemeManager extends AbstractUIService { export class ThemeManager extends AbstractUIService {
private themesActiveInTheUI: ActiveThemeList private themesActiveInTheUI: ActiveThemeList
private lastUseDeviceThemeSettings = false private lastUseDeviceThemeSettings: boolean | undefined
private lastAutoLightTheme: string | undefined
private lastAutoDarkTheme: string | undefined
constructor( constructor(
application: WebApplicationInterface, application: WebApplicationInterface,
@@ -166,15 +168,25 @@ export class ThemeManager extends AbstractUIService {
this.toggleTranslucentUIColors() this.toggleTranslucentUIColors()
const useDeviceThemeSettings = this.preferences.getLocalValue(LocalPrefKey.UseSystemColorScheme, false) const useSystemColorScheme = this.preferences.getLocalValue(LocalPrefKey.UseSystemColorScheme, false)
const autoLightTheme = this.preferences.getLocalValue(LocalPrefKey.AutoLightThemeIdentifier, DefaultThemeIdentifier)
const autoDarkTheme = this.preferences.getLocalValue(
LocalPrefKey.AutoDarkThemeIdentifier,
NativeFeatureIdentifier.TYPES.DarkTheme,
)
const hasPreferenceChanged = useDeviceThemeSettings !== this.lastUseDeviceThemeSettings const hasPreferenceChanged =
useSystemColorScheme !== this.lastUseDeviceThemeSettings ||
autoLightTheme !== this.lastAutoLightTheme ||
autoDarkTheme !== this.lastAutoDarkTheme
if (hasPreferenceChanged) { if (hasPreferenceChanged) {
this.lastUseDeviceThemeSettings = useDeviceThemeSettings this.lastUseDeviceThemeSettings = useSystemColorScheme
this.lastAutoLightTheme = autoLightTheme
this.lastAutoDarkTheme = autoDarkTheme
} }
if (hasPreferenceChanged && useDeviceThemeSettings) { if (hasPreferenceChanged && useSystemColorScheme) {
let prefersDarkColorScheme = window.matchMedia('(prefers-color-scheme: dark)').matches let prefersDarkColorScheme = window.matchMedia('(prefers-color-scheme: dark)').matches
if (this.application.isNativeMobileWeb()) { if (this.application.isNativeMobileWeb()) {