Skip to content

Regenerate service-picker valueRenderer on localize update #27640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2025
Merged

Regenerate service-picker valueRenderer on localize update #27640

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c9bbef
Regenerate service-picker valueRenderer on localize update
karwosts Oct 25, 2025
0c54b25
memoize services
karwosts Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 34 additions & 29 deletions src/components/ha-service-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,34 +76,39 @@ class HaServicePicker extends LitElement {
</ha-combo-box-item>
`;

private _valueRenderer: PickerValueRenderer = (value) => {
const serviceId = value;
const [domain, service] = serviceId.split(".");

if (!this.hass.services[domain]?.[service]) {
return html`
<ha-svg-icon slot="start" .path=${mdiRoomService}></ha-svg-icon>
<span slot="headline">${value}</span>
`;
}

const serviceName =
this.hass.localize(`component.${domain}.services.${service}.name`) ||
this.hass.services[domain][service].name ||
service;

return html`
<ha-service-icon
slot="start"
.hass=${this.hass}
.service=${serviceId}
></ha-service-icon>
<span slot="headline">${serviceName}</span>
${this.showServiceId
? html`<span slot="supporting-text" class="code">${serviceId}</span>`
: nothing}
`;
};
private _valueRenderer = memoizeOne(
(localize: LocalizeFunc): PickerValueRenderer =>
(value) => {
const serviceId = value;
const [domain, service] = serviceId.split(".");

if (!this.hass.services[domain]?.[service]) {
Copy link
Member

@MindFreeze MindFreeze Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should services also be memoized? It is in _getItems

Copy link
Member Author

@karwosts karwosts Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like that would make sense.

return html`
<ha-svg-icon slot="start" .path=${mdiRoomService}></ha-svg-icon>
<span slot="headline">${value}</span>
`;
}

const serviceName =
localize(`component.${domain}.services.${service}.name`) ||
this.hass.services[domain][service].name ||
service;

return html`
<ha-service-icon
slot="start"
.hass=${this.hass}
.service=${serviceId}
></ha-service-icon>
<span slot="headline">${serviceName}</span>
${this.showServiceId
? html`<span slot="supporting-text" class="code"
>${serviceId}</span
>`
: nothing}
`;
}
);

protected render(): TemplateResult {
const placeholder =
Expand All @@ -123,7 +128,7 @@ class HaServicePicker extends LitElement {
.value=${this.value}
.getItems=${this._getItems}
.rowRenderer=${this._rowRenderer}
.valueRenderer=${this._valueRenderer}
.valueRenderer=${this._valueRenderer(this.hass.localize)}
@value-changed=${this._valueChanged}
>
</ha-generic-picker>
Expand Down
Loading