From ab6a3f5bd39fc48890f1b851e929df2fe1d8796c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Wiedemann?= <jerome@wnetworks.org>
Date: Sun, 23 Jul 2023 18:15:21 +0000
Subject: [PATCH] feat(icons)!: replace ha-icon with ha-state-icon to follow
 new HA's icons per domain automatically

BREAKING CHANGE: This might break your card-mod setup
---
 src/button-card.ts | 21 ++++++++++++++-------
 src/styles.ts      |  8 ++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/button-card.ts b/src/button-card.ts
index 9d71633..0347dc2 100644
--- a/src/button-card.ts
+++ b/src/button-card.ts
@@ -18,7 +18,6 @@ import { unsafeHTML } from 'lit-html/directives/unsafe-html';
 import { classMap, ClassInfo } from 'lit-html/directives/class-map';
 import { HassEntity } from 'home-assistant-js-websocket';
 import {
-  stateIcon,
   HomeAssistant,
   handleClick,
   timerTimeRemaining,
@@ -28,6 +27,7 @@ import {
   fireEvent,
   DOMAINS_TOGGLE,
   LovelaceCard,
+  computeStateDomain,
 } from 'custom-card-helpers';
 import {
   ButtonCardConfig,
@@ -407,8 +407,7 @@ class ButtonCard extends LitElement {
     } else if (this._config!.icon) {
       icon = this._config!.icon;
     } else {
-      if (!state) return undefined;
-      icon = stateIcon(state);
+      return undefined;
     }
     return this._getTemplateOrValue(state, icon);
   }
@@ -880,18 +879,26 @@ class ButtonCard extends LitElement {
       ...entityPictureStyleFromConfig,
     };
     const liveStream = this._buildLiveStream(entityPictureStyle);
+    const shouldShowIcon = this._config!.show_icon && (icon || state);
 
-    if (icon || entityPicture) {
+    if (shouldShowIcon || entityPicture) {
+      let domain: string | undefined = undefined;
+      if (state) {
+        domain = computeStateDomain(state);
+      }
       return html`
         <div id="img-cell" style=${styleMap(imgCellStyleFromConfig)}>
-          ${icon && !entityPicture && !liveStream
+          ${shouldShowIcon && !entityPicture && !liveStream
             ? html`
-                <ha-icon
+                <ha-state-icon
+                  .state=${state}
+                  ?data-domain=${domain}
+                  data-state=${state?.state}
                   style=${styleMap(haIconStyle)}
                   .icon="${icon}"
                   id="icon"
                   ?rotating=${this._rotate(configState)}
-                ></ha-icon>
+                ></ha-state-icon>
               `
             : ''}
           ${liveStream ? liveStream : ''}
diff --git a/src/styles.ts b/src/styles.ts
index 4f98e96..6968976 100644
--- a/src/styles.ts
+++ b/src/styles.ts
@@ -53,7 +53,7 @@ export const styles = css`
     opacity: 1;
     transition-delay: 1.5s;
   }
-  ha-icon {
+  ha-state-icon {
     display: inline-block;
     margin: auto;
     --mdc-icon-size: 100%;
@@ -175,7 +175,7 @@ export const styles = css`
     position: relative;
   }
 
-  ha-icon#icon {
+  ha-state-icon#icon {
     height: 100%;
     width: 100%;
     max-height: 100%;
@@ -209,6 +209,10 @@ export const styles = css`
     justify-self: center;
   }
 
+  #container.vertical div#img-cell + div,
+  #container.name_state div#img-cell + div {
+    margin-top: 8px;
+  }
   #container.vertical {
     grid-template-areas: 'i' 'n' 's' 'l';
     grid-template-columns: 1fr;