jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-27 03:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for hass when setting themes (#6897)

Browse Source
This commit is contained in:
Bram Kragten 2020-09-09 22:57:44 +02:00 committed by GitHub
parent eb96dd4803
commit e955cc4378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/state/themes-mixin.ts
View File

@ -45,25 +45,28 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
}
private _applyTheme(dark: boolean) {
if (!this.hass) {
return;
}
const themeName =
this.hass!.selectedTheme?.theme ||
(dark && this.hass!.themes.default_dark_theme
? this.hass!.themes.default_dark_theme!
: this.hass!.themes.default_theme);
this.hass.selectedTheme?.theme ||
(dark && this.hass.themes.default_dark_theme
? this.hass.themes.default_dark_theme!
: this.hass.themes.default_theme);
let options: Partial<HomeAssistant["selectedTheme"]> = this.hass!
.selectedTheme;
if (themeName === "default" && options?.dark === undefined) {
options = {
...this.hass!.selectedTheme!,
...this.hass.selectedTheme!,
dark,
};
}
applyThemesOnElement(
document.documentElement,
this.hass!.themes,
this.hass.themes,
themeName,
options
);
@ -71,11 +74,11 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
const darkMode =
themeName === "default"
? !!options?.dark
: !!(dark && this.hass!.themes.default_dark_theme);
: !!(dark && this.hass.themes.default_dark_theme);
if (darkMode !== this.hass!.themes.darkMode) {
if (darkMode !== this.hass.themes.darkMode) {
this._updateHass({
themes: { ...this.hass!.themes, darkMode },
themes: { ...this.hass.themes, darkMode },
});
const schemeMeta = document.querySelector("meta[name=color-scheme]");