From e91d1777d02c6c62e17885d38f2898e0fbc79415 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Mon, 29 Nov 2021 12:30:08 +0100 Subject: [PATCH] Ensure `conditional` rows getting `state_color` value (#10708) Co-authored-by: Bram Kragten --- src/panels/lovelace/cards/hui-entities-card.ts | 3 ++- .../lovelace/special-rows/hui-conditional-row.ts | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts index f733c678a3..b1a1e7d5c7 100644 --- a/src/panels/lovelace/cards/hui-entities-card.ts +++ b/src/panels/lovelace/cards/hui-entities-card.ts @@ -289,7 +289,8 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard { private renderEntity(entityConf: LovelaceRowConfig): TemplateResult { const element = createRowElement( - !("type" in entityConf) && this._config!.state_color + (!("type" in entityConf) || entityConf.type === "conditional") && + this._config!.state_color ? ({ state_color: true, ...(entityConf as EntityConfig), diff --git a/src/panels/lovelace/special-rows/hui-conditional-row.ts b/src/panels/lovelace/special-rows/hui-conditional-row.ts index 9251a72bd7..e17b07901c 100644 --- a/src/panels/lovelace/special-rows/hui-conditional-row.ts +++ b/src/panels/lovelace/special-rows/hui-conditional-row.ts @@ -1,7 +1,12 @@ import { customElement } from "lit/decorators"; +import { EntityCardConfig } from "../cards/types"; import { HuiConditionalBase } from "../components/hui-conditional-base"; 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") class HuiConditionalRow extends HuiConditionalBase implements LovelaceRow { @@ -12,7 +17,14 @@ class HuiConditionalRow extends HuiConditionalBase implements LovelaceRow { 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; } }