Fix clear area action in area-picker (#25511)

* Fix clear area action in area-picker

* Fix area not displayed after creation
This commit is contained in:
Paul Bottein 2025-05-20 10:01:01 +02:00 committed by GitHub
parent 83df10ef29
commit 01b398c2a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -94,7 +94,10 @@ export class HaAreaPicker extends LitElement {
await this._picker?.open();
}
private _valueRenderer: PickerValueRenderer = (value) => {
// Recompute value renderer when the areas change
private _computeValueRenderer = memoizeOne(
(_haAreas: HomeAssistant["areas"]): PickerValueRenderer =>
(value) => {
const area = this.hass.areas[value];
if (!area) {
@ -114,13 +117,17 @@ export class HaAreaPicker extends LitElement {
return html`
${icon
? html`<ha-icon slot="start" .icon=${icon}></ha-icon>`
: html`<ha-svg-icon slot="start" .path=${mdiTextureBox}></ha-svg-icon>`}
: html`<ha-svg-icon
slot="start"
.path=${mdiTextureBox}
></ha-svg-icon>`}
<span slot="headline">${areaName}</span>
${floorName
? html`<span slot="supporting-text">${floorName}</span>`
: nothing}
`;
};
}
);
private _getAreas = memoizeOne(
(
@ -352,6 +359,8 @@ export class HaAreaPicker extends LitElement {
const placeholder =
this.placeholder ?? this.hass.localize("ui.components.area-picker.area");
const valueRenderer = this._computeValueRenderer(this.hass.areas);
return html`
<ha-generic-picker
.hass=${this.hass}
@ -364,7 +373,7 @@ export class HaAreaPicker extends LitElement {
.value=${this.value}
.getItems=${this._getItems}
.getAdditionalItems=${this._getAdditionalItems}
.valueRenderer=${this._valueRenderer}
.valueRenderer=${valueRenderer}
@value-changed=${this._valueChanged}
>
</ha-generic-picker>
@ -375,13 +384,12 @@ export class HaAreaPicker extends LitElement {
ev.stopPropagation();
const value = ev.detail.value;
if (!value.startsWith(ADD_NEW_ID)) {
if (value !== this.value) {
this._setValue(value);
}
if (!value) {
this._setValue(undefined);
return;
}
if (value.startsWith(ADD_NEW_ID)) {
this.hass.loadFragmentTranslation("config");
const suggestedName = value.substring(ADD_NEW_ID.length);
@ -404,6 +412,9 @@ export class HaAreaPicker extends LitElement {
});
}
this._setValue(value);
}
private _setValue(value?: string) {
this.value = value;
fireEvent(this, "value-changed", { value });