From 9f3e8abe693bde4326cfcb17762cebbeee9a8628 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 5 Jun 2023 09:39:36 +0200 Subject: [PATCH] Don't show edit favorite colors button if the light doesn't support it (#16750) --- src/data/light.ts | 4 ++++ src/dialogs/more-info/controls/more-info-light.ts | 5 ++++- src/dialogs/more-info/ha-more-info-dialog.ts | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/data/light.ts b/src/data/light.ts index 64a9af075f..42a2507731 100644 --- a/src/data/light.ts +++ b/src/data/light.ts @@ -58,6 +58,10 @@ export const lightSupportsBrightness = (entity: LightEntity) => modesSupportingBrightness.includes(mode) ) || false; +export const lightSupportsFavoriteColors = (entity: LightEntity) => + lightSupportsColor(entity) || + lightSupportsColorMode(entity, LightColorMode.COLOR_TEMP); + export const getLightCurrentModeRgbColor = ( entity: LightEntity ): number[] | undefined => diff --git a/src/dialogs/more-info/controls/more-info-light.ts b/src/dialogs/more-info/controls/more-info-light.ts index 1614eaeb3b..f40b41977b 100644 --- a/src/dialogs/more-info/controls/more-info-light.ts +++ b/src/dialogs/more-info/controls/more-info-light.ts @@ -37,6 +37,7 @@ import { lightSupportsBrightness, lightSupportsColor, lightSupportsColorMode, + lightSupportsFavoriteColors, } from "../../../data/light"; import type { HomeAssistant } from "../../../types"; import { moreInfoControlStyle } from "../components/ha-more-info-control-style"; @@ -206,7 +207,9 @@ class MoreInfoLight extends LitElement { ` : nothing} - ${this.entry && (this.editMode || hasFavoriteColors) + ${this.entry && + lightSupportsFavoriteColors(this.stateObj) && + (this.editMode || hasFavoriteColors) ? html` ` : nothing} - ${this._entry && domain === "light" + ${this._entry && + stateObj && + domain === "light" && + lightSupportsFavoriteColors(stateObj) ? html`