zhangyuqing
/
button-card
mirror of https://github.com/custom-cards/button-card.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: color: auto/auto-no-temperature was broken 

Fix #737
This commit is contained in:
Jérôme Wiedemann 2023-07-30 14:13:52 +00:00
parent bb4bc29b0f
commit a63f9a96a5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/button-card.ts
View File

@ -45,7 +45,7 @@ import copy from 'fast-copy';
import * as pjson from '../package.json';
import { deepEqual } from './deep-equal';
import { stateColorCss } from './common/state_color';
import { DOMAINS_TOGGLE } from './common/const';
import { AUTO_COLORS, DOMAINS_TOGGLE } from './common/const';
import { handleAction } from './handle-action';
import { fireEvent } from './common/fire-event';
import { HomeAssistant } from './types/homeassistant';
@ -515,7 +515,7 @@ class ButtonCard extends LitElement {
} else if (this._config!.color) {
colorValue = this._config!.color;
}
if (colorValue == 'auto' || colorValue == 'auto-no-temperature') {
if (AUTO_COLORS.includes(colorValue)) {
color = this._getColorForLightEntity(state, colorValue !== 'auto-no-temperature');
} else if (colorValue) {
color = colorValue;
@ -827,9 +827,9 @@ class ButtonCard extends LitElement {
private _cardHtml(): TemplateResult {
const configState = this._getMatchingConfigState(this._stateObj);
let color: string = 'var(--state-inactive-color)';
if (!!configState?.color) {
if (!!configState?.color && !AUTO_COLORS.includes(configState.color)) {
color = configState.color;
} else if (!!this._config?.color) {
} else if (!!this._config?.color && !AUTO_COLORS.includes(this._config.color)) {
if (this._stateObj) {
if (stateActive(this._stateObj)) {
color = this._config?.color || color;

2
src/common/const.ts
View File

@ -17,3 +17,5 @@ export const isUnavailableState = arrayLiteralIncludes(UNAVAILABLE_STATES);
export const isOffState = arrayLiteralIncludes(OFF_STATES);
export const DOMAINS_TOGGLE = new Set(['fan', 'input_boolean', 'light', 'switch', 'group', 'automation', 'humidifier']);
export const AUTO_COLORS = ['auto', 'auto-no-temperature'];