jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 01:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pick-theme-row and behavior of default theme mode (#20783)

Browse Source
This commit is contained in:
karwosts 2024-05-24 07:06:22 -07:00 committed by GitHub
parent afc624bf4b
commit 3c3d54243c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/panels/profile/ha-pick-theme-row.ts
View File

@ -37,6 +37,8 @@ export class HaPickThemeRow extends LitElement {
protected render(): TemplateResult { protected render(): TemplateResult {
const hasThemes = const hasThemes =
this.hass.themes.themes && Object.keys(this.hass.themes.themes).length; this.hass.themes.themes && Object.keys(this.hass.themes.themes).length;
const curThemeIsUseDefault = this.hass.selectedTheme?.theme === "";
const curTheme = this.hass.selectedTheme?.theme const curTheme = this.hass.selectedTheme?.theme
? this.hass.selectedTheme?.theme ? this.hass.selectedTheme?.theme
: this.hass.themes.darkMode : this.hass.themes.darkMode
@ -86,6 +88,9 @@ export class HaPickThemeRow extends LitElement {
</ha-select> </ha-select>
</ha-settings-row> </ha-settings-row>
${curTheme === HOME_ASSISTANT_THEME || ${curTheme === HOME_ASSISTANT_THEME ||
(curThemeIsUseDefault &&
this.hass.themes.default_dark_theme &&
this.hass.themes.default_theme) ||
this._supportsModeSelection(curTheme) this._supportsModeSelection(curTheme)
? html` <div class="inputs"> ? html` <div class="inputs">
<ha-formfield <ha-formfield

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

@ -84,15 +84,15 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
} }
: this.hass.selectedTheme; : this.hass.selectedTheme;
const themeName =
themeSettings?.theme ||
(darkPreferred && this.hass.themes.default_dark_theme
? this.hass.themes.default_dark_theme
: this.hass.themes.default_theme);
let darkMode = let darkMode =
themeSettings?.dark === undefined ? darkPreferred : themeSettings.dark; themeSettings?.dark === undefined ? darkPreferred : themeSettings.dark;
const themeName =
themeSettings?.theme ||
(darkMode && this.hass.themes.default_dark_theme
? this.hass.themes.default_dark_theme
: this.hass.themes.default_theme);
const selectedTheme = themeName const selectedTheme = themeName
? this.hass.themes.themes[themeName] ? this.hass.themes.themes[themeName]
: undefined; : undefined;