Revert to minimal change just to pass false state_color

home-assistant · Feb 14, 2024 · 75db509 · 75db509
1 parent e8245cb
commit 75db509
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -295,10 +295,15 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
   }
 
   private renderEntity(entityConf: LovelaceRowConfig): TemplateResult {
-    const element = createRowElement({
-      state_color: this._config!.state_color,
-      ...(entityConf as EntityConfig),
-    } as EntityConfig);
+    const element = createRowElement(
+      (!("type" in entityConf) || entityConf.type === "conditional") &&
+        "state_color" in this.config
+        ? ({
+            state_color: this._config.state_color,
+            ...(entityConf as EntityConfig),
+          } as EntityConfig)
+        : entityConf
+    );
     if (this._hass) {
       element.hass = this._hass;
     }