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

domFor: always get generation from delayedRemoval instead of parameter #3007

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

domFor: always get generation from delayedRemoval instead of parameter #3007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba33b4
domFor: always get generation from delayedRemoval instead of parameter
kfule Feb 1, 2025
6d89fcf
add tests confirming multiple generations are tracked correctly
kfule Feb 1, 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
4 changes: 2 additions & 2 deletions render/domFor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

var delayedRemoval = new WeakMap

function *domFor(vnode, object = {}) {
function *domFor(vnode) {
// To avoid unintended mangling of the internal bundler,
// parameter destructuring is not used here.
var dom = vnode.dom
var domSize = vnode.domSize
var generation = object.generation
var generation = delayedRemoval.get(dom)
if (dom != null) do {
var nextSibling = dom.nextSibling

Expand Down
20 changes: 9 additions & 11 deletions render/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,34 +591,32 @@ module.exports = function() {
if (result == null) return

var generation = currentRender
if (counter.v++ === 1) {
for (var dom of domFor(vnode)) delayedRemoval.set(dom, generation)
}
for (var dom of domFor(vnode)) delayedRemoval.set(dom, generation)
counter.v++

Promise.resolve(result).finally(function () {
checkState(vnode, original)
tryResumeRemove(parent, vnode, generation, counter)
tryResumeRemove(parent, vnode, counter)
})
}
function tryResumeRemove(parent, vnode, generation, counter) {
function tryResumeRemove(parent, vnode, counter) {
if (--counter.v === 0) {
onremove(vnode)
removeDOM(parent, vnode, generation)
removeDOM(parent, vnode)
}
}
function removeNode(parent, vnode) {
var counter = {v: 1}
if (typeof vnode.tag !== "string" && typeof vnode.state.onbeforeremove === "function") tryBlockRemove(parent, vnode, vnode.state, counter)
if (vnode.attrs && typeof vnode.attrs.onbeforeremove === "function") tryBlockRemove(parent, vnode, vnode.attrs, counter)
tryResumeRemove(parent, vnode, undefined, counter)
tryResumeRemove(parent, vnode, counter)
}
function removeDOM(parent, vnode, generation) {
function removeDOM(parent, vnode) {
if (vnode.dom == null) return
if (vnode.domSize == null) {
// don't allocate for the common case
if (delayedRemoval.get(vnode.dom) === generation) parent.removeChild(vnode.dom)
parent.removeChild(vnode.dom)
} else {
for (var dom of domFor(vnode, {generation})) parent.removeChild(dom)
for (var dom of domFor(vnode)) parent.removeChild(dom)
}
}

Expand Down
Loading