No config found.
`}
+ : ""}
+
${this._params.actionLabel || this.hass!.localize("ui.common.move")}
diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts
index 1756af4d9333..9e82e842df5f 100644
--- a/src/panels/profile/ha-panel-profile.ts
+++ b/src/panels/profile/ha-panel-profile.ts
@@ -250,7 +250,6 @@ class HaPanelProfile extends LitElement {
max-width: 600px;
margin: 0 auto;
padding-bottom: env(safe-area-inset-bottom);
- overflow: hidden;
}
.content > * {
diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts
index daa5eff68627..be03e260eccf 100644
--- a/src/panels/todo/dialog-todo-item-editor.ts
+++ b/src/panels/todo/dialog-todo-item-editor.ts
@@ -60,8 +60,10 @@ class DialogTodoItemEditor extends LitElement {
this._checked = entry.status === TodoItemStatus.Completed;
this._summary = entry.summary;
this._description = entry.description || "";
- this._due = entry.due ? new Date(entry.due) : undefined;
this._hasTime = entry.due?.includes("T") || false;
+ this._due = entry.due
+ ? new Date(this._hasTime ? entry.due : `${entry.due}T00:00:00`)
+ : undefined;
} else {
this._hasTime = false;
this._checked = false;
diff --git a/src/state-control/climate/ha-state-control-climate-temperature.ts b/src/state-control/climate/ha-state-control-climate-temperature.ts
index 7634fd2f2d18..0264af5ec7b3 100644
--- a/src/state-control/climate/ha-state-control-climate-temperature.ts
+++ b/src/state-control/climate/ha-state-control-climate-temperature.ts
@@ -177,11 +177,20 @@ export class HaStateControlClimateTemperature extends LitElement {
const action = this.stateObj.attributes.hvac_action;
+ const isTemperatureDisplayed =
+ (this.stateObj.attributes.current_temperature != null &&
+ this.showCurrentAsPrimary) ||
+ ((this._supportsTargetTemperature ||
+ this._supportsTargetTemperatureRange) &&
+ !this.showCurrentAsPrimary);
+
return html`
- ${action
+ ${action && action !== "off"
? this.hass.formatEntityAttributeValue(this.stateObj, "hvac_action")
- : this.hass.formatEntityState(this.stateObj)}
+ : isTemperatureDisplayed
+ ? this.hass.formatEntityState(this.stateObj)
+ : nothing}
`;
}
@@ -315,6 +324,14 @@ export class HaStateControlClimateTemperature extends LitElement {
`;
}
+ if (this.stateObj.state !== UNAVAILABLE) {
+ return html`
+
+ ${this.hass.formatEntityState(this.stateObj)}
+
+ `;
+ }
+
return nothing;
}
@@ -373,6 +390,14 @@ export class HaStateControlClimateTemperature extends LitElement {
return html``;
}
+ private _renderInfo() {
+ return html`
+
+ ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()}
+
+ `;
+ }
+
get _supportsTargetTemperature() {
return (
supportsFeature(this.stateObj, ClimateEntityFeature.TARGET_TEMPERATURE) &&
@@ -447,10 +472,7 @@ export class HaStateControlClimateTemperature extends LitElement {
@value-changing=${this._valueChanging}
>
-
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()}
-
- ${this._renderTemperatureButtons("value")}
+ ${this._renderInfo()} ${this._renderTemperatureButtons("value")}
`;
}
@@ -484,9 +506,7 @@ export class HaStateControlClimateTemperature extends LitElement {
@high-changing=${this._valueChanging}
>
-
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()}
-
+ ${this._renderInfo()}
${this._renderTemperatureButtons(this._selectTargetTemperature, true)}
`;
@@ -497,6 +517,7 @@ export class HaStateControlClimateTemperature extends LitElement {
class="container${containerSizeClass}"
style=${styleMap({
"--state-color": stateColor,
+ "--action-color": actionColor,
})}
>
-
- ${this._renderLabel()} ${this._renderSecondary()}
-
+ ${this._renderInfo()}
`;
}
diff --git a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts
index 6078180cd849..459e8d611730 100644
--- a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts
+++ b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts
@@ -105,11 +105,18 @@ export class HaStateControlHumidifierHumidity extends LitElement {
const action = this.stateObj.attributes.action;
+ const isHumidityDisplayed =
+ (this.stateObj.attributes.current_humidity != null &&
+ this.showCurrentAsPrimary) ||
+ (this._targetHumidity != null && !this.showCurrentAsPrimary);
+
return html`
- ${action
+ ${action && action !== "off"
? this.hass.formatEntityAttributeValue(this.stateObj, "action")
- : this.hass.formatEntityState(this.stateObj)}
+ : isHumidityDisplayed
+ ? this.hass.formatEntityState(this.stateObj)
+ : nothing}
`;
}
@@ -144,6 +151,14 @@ export class HaStateControlHumidifierHumidity extends LitElement {
return this._renderTarget(this._targetHumidity!, "big");
}
+ if (this.stateObj.state !== UNAVAILABLE) {
+ return html`
+
+ ${this.hass.formatEntityState(this.stateObj)}
+
+ `;
+ }
+
return nothing;
}
@@ -225,6 +240,14 @@ export class HaStateControlHumidifierHumidity extends LitElement {
`;
}
+ private _renderInfo() {
+ return html`
+
+ ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()}
+
+ `;
+ }
+
protected render() {
const stateColor = stateColorCss(this.stateObj);
const active = stateActive(this.stateObj);
@@ -272,10 +295,7 @@ export class HaStateControlHumidifierHumidity extends LitElement {
@value-changing=${this._valueChanging}
>
-
- ${this._renderLabel()}${this._renderPrimary()}${this._renderSecondary()}
-
- ${this._renderButtons()}
+ ${this._renderInfo()} ${this._renderButtons()}
`;
}
@@ -284,6 +304,7 @@ export class HaStateControlHumidifierHumidity extends LitElement {
@@ -296,9 +317,7 @@ export class HaStateControlHumidifierHumidity extends LitElement {
disabled
>
-
- ${this._renderLabel()} ${this._renderSecondary()}
-
+ ${this._renderInfo()}