fix: apply active themes after features updated

standardnotes · Feb 22, 2022 · 3d6c10b · 3d6c10b
1 parent af69a02
commit 3d6c10b
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/app/assets/javascripts/services/themeManager.ts b/app/assets/javascripts/services/themeManager.ts
@@ -84,7 +84,7 @@ export class ThemeManager extends ApplicationService {
         break;
       }
       case ApplicationEvent.FeaturesUpdated: {
-        this.reloadThemeStatus();
+        this.handleFeaturesUpdated();
         break;
       }
       case ApplicationEvent.Launched: {
@@ -119,7 +119,7 @@ export class ThemeManager extends ApplicationService {
     super.deinit();
   }
 
-  private reloadThemeStatus(): void {
+  private handleFeaturesUpdated(): void {
     let hasChange = false;
     for (const themeUuid of this.activeThemes) {
       const theme = this.application.findItem(themeUuid) as SNTheme;
@@ -139,6 +139,17 @@ export class ThemeManager extends ApplicationService {
       }
     }
 
+    const activeThemes = (
+      this.application.getItems(ContentType.Theme) as SNTheme[]
+    ).filter((theme) => theme.active);
+
+    for (const theme of activeThemes) {
+      if (!this.activeThemes.includes(theme.uuid)) {
+        this.activateTheme(theme);
+        hasChange = true;
+      }
+    }
+
     if (hasChange) {
       this.cacheThemeState();
     }