From c9e8bd2e5de2d2d703a56a0d76f8b210acfe49a0 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 18 May 2020 20:05:00 +0200 Subject: [PATCH] Fix picture card (#5922) --- src/panels/lovelace/cards/hui-picture-card.ts | 9 ++++++++- .../lovelace/cards/hui-picture-glance-card.ts | 17 +++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts index f07f18fa5b..bda16ed813 100644 --- a/src/panels/lovelace/cards/hui-picture-card.ts +++ b/src/panels/lovelace/cards/hui-picture-card.ts @@ -38,7 +38,7 @@ export class HuiPictureCard extends LitElement implements LovelaceCard { }; } - public hass?: HomeAssistant; + @property() public hass?: HomeAssistant; @property() protected _config?: PictureCardConfig; @@ -54,6 +54,13 @@ export class HuiPictureCard extends LitElement implements LovelaceCard { this._config = config; } + protected shouldUpdate(changedProps: PropertyValues): boolean { + if (changedProps.size === 1 && changedProps.has("hass")) { + return !changedProps.get("hass"); + } + return true; + } + protected updated(changedProps: PropertyValues): void { super.updated(changedProps); if (!this._config || !this.hass) { diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts index 5f2eac9b6f..a1fb3bec86 100644 --- a/src/panels/lovelace/cards/hui-picture-glance-card.ts +++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts @@ -250,17 +250,17 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard { hasAction(entityConf.tap_action) ? "0" : undefined )} .config=${entityConf} - class="${classMap({ + class=${classMap({ "state-on": !STATES_OFF.has(stateObj.state), - })}" - .icon="${entityConf.icon || stateIcon(stateObj)}" - title="${` + })} + .icon=${entityConf.icon || stateIcon(stateObj)} + title=${` ${computeStateName(stateObj)} : ${computeStateDisplay( this.hass!.localize, stateObj, this.hass!.language )} - `}" + `} > ${this._config!.show_state !== true && entityConf.show_state !== true ? html`
` @@ -328,19 +328,12 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard { ha-icon { cursor: pointer; - padding: 8px; color: #a9a9a9; } ha-icon.state-on { color: white; } - ha-icon.show-state { - width: 20px; - height: 20px; - padding-bottom: 4px; - padding-top: 4px; - } ha-icon:focus { outline: none; background: var(--divider-color);