Skip to content

fix(framework): prevent redundant invalidations #12994

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
nnaydenow merged 3 commits into from
Jan 30, 2026
Merged

fix(framework): prevent redundant invalidations #12994

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b841e3
fix(ui5element): prevent redundant invalidations
nnaydenow Jan 30, 2026
bbb0f93
chore: fix build
nnaydenow Jan 30, 2026
2f39a73
chore: fix build
nnaydenow Jan 30, 2026
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
43 changes: 27 additions & 16 deletions packages/base/src/UI5Element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ abstract class UI5Element extends HTMLElement {
const autoIncrementMap = new Map<string, number>();
const slottedChildrenMap = new Map<string, Array<{ child: Node, idx: number }>>();

const allChildrenUpgraded = domChildren.map(async (child, idx) => {
domChildren.forEach((child, idx) => {
// Determine the type of the child (mainly by the slot attribute)
const slotName = getSlotName(child);
const slotData = slotsMap[slotName];
Expand All @@ -474,6 +474,32 @@ abstract class UI5Element extends HTMLElement {
return;
}

const propertyName = slotData.propertyName || slotName;

if (slottedChildrenMap.has(propertyName)) {
slottedChildrenMap.get(propertyName)!.push({ child, idx });
} else {
slottedChildrenMap.set(propertyName, [{ child, idx }]);
}
});

// Distribute the child in the _state object, keeping the Light DOM order,
// not the order elements are defined.
slottedChildrenMap.forEach((children, propertyName) => {
this._state[propertyName] = children.sort((a, b) => a.idx - b.idx).map(_ => _.child);
this._state[kebabToCamelCase(propertyName)] = this._state[propertyName];
});

const allChildrenUpgraded = domChildren.map(async child => {
// Determine the type of the child (mainly by the slot attribute)
const slotName = getSlotName(child);
const slotData = slotsMap[slotName];

// Check if the slotName is supported
if (slotData === undefined) {
return;
}

// For children that need individual slots, calculate them
if (slotData.individualSlots) {
const nextIndex = (autoIncrementMap.get(slotName) || 0) + 1;
Expand Down Expand Up @@ -513,25 +539,10 @@ abstract class UI5Element extends HTMLElement {
if (child instanceof HTMLSlotElement) {
this._attachSlotChange(child, slotName, !!slotData.invalidateOnChildChange);
}

const propertyName = slotData.propertyName || slotName;

if (slottedChildrenMap.has(propertyName)) {
slottedChildrenMap.get(propertyName)!.push({ child, idx });
} else {
slottedChildrenMap.set(propertyName, [{ child, idx }]);
}
});

await Promise.all(allChildrenUpgraded);

// Distribute the child in the _state object, keeping the Light DOM order,
// not the order elements are defined.
slottedChildrenMap.forEach((children, propertyName) => {
this._state[propertyName] = children.sort((a, b) => a.idx - b.idx).map(_ => _.child);
this._state[kebabToCamelCase(propertyName)] = this._state[propertyName];
});

// Compare the content of each slot with the cached values and invalidate for the ones that changed
let invalidated = false;
for (const [slotName, slotData] of Object.entries(slotsMap)) { // eslint-disable-line
Expand Down
Loading