Skip to content
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

fix(renderer): fix conditional rendering issue #5365

Merged
merged 5 commits into from
Mar 13, 2024
Merged

fix(renderer): fix conditional rendering issue #5365

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c917c3
fix(renderer): fix conditional rendering issue
yigityuce Feb 15, 2024
8b33cc1
Merge branch 'main' into fix/conditional-slot-rendering
yigityuce Feb 24, 2024
380e7b1
Merge branch 'main' of https://github.com/yigityuce/stencil into fix/…
yigityuce Mar 7, 2024
72ab89c
fix(renderer): add check to prevent regression for conditional render…
yigityuce Mar 7, 2024
f1f3a28
test(slot): add missing e2e tests for conditional slot rendering
yigityuce Mar 7, 2024
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
13 changes: 11 additions & 2 deletions src/runtime/vdom/vdom-render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,19 @@ const relocateToHostRoot = (parentElm: Element) => {
plt.$flags$ &= ~PLATFORM_FLAGS.isTmpDisconnected;
};

const putBackInOriginalLocation = (parentElm: Node, recursive: boolean) => {
const putBackInOriginalLocation = (parentElm: d.RenderNode, recursive: boolean) => {
plt.$flags$ |= PLATFORM_FLAGS.isTmpDisconnected;
const oldSlotChildNodes: ChildNode[] = Array.from(parentElm.childNodes);

if (parentElm['s-sr']) {
let node = parentElm;
while ((node = node.nextSibling as d.RenderNode)) {
if (node && node['s-sn'] === parentElm['s-sn'] && node['s-sh'] === hostTagName) {
oldSlotChildNodes.push(node);
}
}
}
yigityuce marked this conversation as resolved.
Show resolved Hide resolved

const oldSlotChildNodes = parentElm.childNodes;
for (let i = oldSlotChildNodes.length - 1; i >= 0; i--) {
const childNode = oldSlotChildNodes[i] as any;
if (childNode['s-hn'] !== hostTagName && childNode['s-ol']) {
Expand Down
Loading