Fix race condition with picture-elements card custom elements (#18765)

This commit is contained in:
Robert Van Gorkom 2023-11-28 13:23:06 -08:00 committed by GitHub
parent b6a7581eca
commit 6134f415e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -78,15 +78,10 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
this._config = config;
this._elements = this._config.elements.map(
(elementConfig: LovelaceElementConfig) => {
const element = createStyledHuiElement(elementConfig);
if (this.hass) {
element.hass = this.hass;
}
return element as LovelaceElement;
}
);
this._elements = config.elements.map((element) => {
const cardElement = this._createElement(element);
return cardElement;
});
}
protected updated(changedProps: PropertyValues): void {
@ -165,6 +160,37 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
}
`;
}
private _createElement(
elementConfig: LovelaceElementConfig
): LovelaceElement {
const element = createStyledHuiElement(elementConfig) as LovelaceCard;
if (this.hass) {
element.hass = this.hass;
}
element.addEventListener(
"ll-rebuild",
(ev) => {
ev.stopPropagation();
this._rebuildElement(element, elementConfig);
},
{ once: true }
);
return element;
}
private _rebuildElement(
elToReplace: LovelaceElement,
config: LovelaceElementConfig
): void {
const newCardEl = this._createElement(config);
if (elToReplace.parentElement) {
elToReplace.parentElement.replaceChild(newCardEl, elToReplace);
}
this._elements = this._elements!.map((curCardEl) =>
curCardEl === elToReplace ? newCardEl : curCardEl
);
}
}
declare global {