Skip to content

ContentComponent: Keep correct order of passed elements #45

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

Open
Schlauer-Hax wants to merge 4 commits into
base: main
Choose a base branch
from
Open

ContentComponent: Keep correct order of passed elements #45

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1d4fd9
ContentComponent: Keep correct order of passed elements
Schlauer-Hax Feb 6, 2025
e872db8
fix incorrect ordering of elements
Schlauer-Hax Feb 6, 2025
b20cce2
dont reverse the original array
Schlauer-Hax Feb 13, 2025
5d58cba
replaceChildren
Schlauer-Hax Mar 25, 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
64 changes: 38 additions & 26 deletions core/layout/content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,45 @@ export class ContentComponent extends HTMLComponent {
].join(" ");
this.style.alignContent = "start";

this.useListener(alwaysRef(component), (current, oldValue) => {
if (oldValue) {
for (const iterator of Array.isArray(oldValue) ? oldValue : [ oldValue ]) {
const item = iterator.draw();
item.remove();
}
}
for (const iterator of Array.isArray(current) ? current : [ current ]) {
const item = iterator.draw();
if (item instanceof FullWidthSectionComponent) {
this.shadowRoot!.prepend(...Array.from(item.children));
} else {
item.style.gridColumn = "content";
this.shadowRoot!.prepend(item);
}
}
});
const dynamicElement = document.createElement("slot");
dynamicElement.name = "dynamic";
const staticElements = document.createElement("slot");
staticElements.name = "static";
this.shadowRoot!.append(dynamicElement, staticElements);

for (const iterator of components) {
const item = iterator.draw();
if (item instanceof FullWidthSectionComponent) {
this.shadowRoot!.append(...Array.from(item.children));
} else {
item.style.gridColumn = "content";
this.shadowRoot!.append(item);
}
}
this.addListen(() => {
const current = alwaysRef(component).value;
const alwaysList = Array.isArray(current) ? current : [ current ];

this.replaceChildren(
...alwaysList
.map(component => component.draw())
.map(element => {
if (element instanceof FullWidthSectionComponent) {
return Array.from(element.children)
} else {
element.style.gridColumn = "content";
return [element];
}
}).flat().map(element => {
element.slot = "dynamic";
return element;
}),
...components
.map(component => component.draw())
.map(element => {
if (element instanceof FullWidthSectionComponent) {
return Array.from(element.children)
} else {
element.style.gridColumn = "content";
return [element];
}
}).flat().map(element => {
element.slot = "static";
return element;
})
);
});
}

override make() {
Expand Down