jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-04-28 15:27:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure conditional rows getting state_color value (#10708)

Browse Source 
Co-authored-by: Bram Kragten <mail@bramkragten.nl>
This commit is contained in:
Philip Allgaier 2021-11-29 12:30:08 +01:00 committed by GitHub
parent a5be143c3b
commit e91d1777d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/panels/lovelace/cards/hui-entities-card.ts
View File

@ -289,7 +289,8 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
private renderEntity(entityConf: LovelaceRowConfig): TemplateResult { private renderEntity(entityConf: LovelaceRowConfig): TemplateResult {
const element = createRowElement( const element = createRowElement(
!("type" in entityConf) && this._config!.state_color (!("type" in entityConf) || entityConf.type === "conditional") &&
this._config!.state_color
? ({ ? ({
state_color: true, state_color: true,
...(entityConf as EntityConfig), ...(entityConf as EntityConfig),

16
src/panels/lovelace/special-rows/hui-conditional-row.ts
View File

@ -1,7 +1,12 @@
import { customElement } from "lit/decorators"; import { customElement } from "lit/decorators";
import { EntityCardConfig } from "../cards/types";
import { HuiConditionalBase } from "../components/hui-conditional-base"; import { HuiConditionalBase } from "../components/hui-conditional-base";
import { createRowElement } from "../create-element/create-row-element"; import { createRowElement } from "../create-element/create-row-element";
import { ConditionalRowConfig, LovelaceRow } from "../entity-rows/types"; import {
ConditionalRowConfig,
EntityConfig,
LovelaceRow,
} from "../entity-rows/types";
@customElement("hui-conditional-row") @customElement("hui-conditional-row")
class HuiConditionalRow extends HuiConditionalBase implements LovelaceRow { class HuiConditionalRow extends HuiConditionalBase implements LovelaceRow {
@ -12,7 +17,14 @@ class HuiConditionalRow extends HuiConditionalBase implements LovelaceRow {
throw new Error("No row configured"); throw new Error("No row configured");
} }
this._element = createRowElement(config.row) as LovelaceRow; this._element = createRowElement(
(config as EntityCardConfig).state_color
? ({
state_color: true,
...(config.row as EntityConfig),
} as EntityConfig)
: config.row
) as LovelaceRow;
} }
} }