Handle custom themes (#599)

hacs · May 29, 2022 · 528def0 · 528def0
1 parent 3340044
commit 528def0
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -118,6 +118,10 @@ class HacsFrontend extends HacsElement {
       }
     });
 
+    mainWindow
+      .matchMedia("(prefers-color-scheme: dark)")
+      .addEventListener("change", (_) => this._applyTheme());
+
     makeDialogManager(this, this.shadowRoot!);
   }
 
@@ -236,9 +240,14 @@ class HacsFrontend extends HacsElement {
     applyThemesOnElement(
       this.parentElement,
       this.hass.themes,
-      (this.hass.selectedTheme as unknown as string) || this.hass.themes.default_theme,
-      undefined,
-      true
+      this.hass.selectedTheme?.theme ||
+        (this.hass.themes.darkMode && this.hass.themes.default_dark_theme
+          ? this.hass.themes.default_dark_theme!
+          : this.hass.themes.default_theme),
+      {
+        ...this.hass.selectedTheme,
+        dark: this.hass.themes.darkMode,
+      }
     );
     this.parentElement!.style.backgroundColor = "var(--primary-background-color)";
     this.parentElement!.style.color = "var(--primary-text-color)";