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

Jump to bottom

Cleanup _parent, _dom and __hooks after unmount #3709

Merged
merged 10 commits into from
Sep 11, 2022
Merged

Cleanup _parent, _dom and __hooks after unmount #3709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
71362b7
cleanup _parent, __hooks and _dom when unmounting
JoviDeCroock Sep 2, 2022
78866ff
set listeners
JoviDeCroock Sep 2, 2022
5d8b33c
try out perf impact
JoviDeCroock Sep 3, 2022
5bf0345
Merge branch 'master' into cleanup-unmount
JoviDeCroock Sep 3, 2022
f78eb88
Update index.js
JoviDeCroock Sep 3, 2022
80a898b
fix test
JoviDeCroock Sep 3, 2022
1a39d70
add _component removal
JoviDeCroock Sep 3, 2022
4994360
Update index.js
JoviDeCroock Sep 9, 2022
04eaeb4
Update suspense.js
JoviDeCroock Sep 9, 2022
b636502
Merge branch 'master' into cleanup-unmount
JoviDeCroock Sep 9, 2022
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
1 change: 1 addition & 0 deletions hooks/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ options.unmount = vnode => {
hasErrored = e;
}
});
c.__hooks = undefined;
if (hasErrored) options._catchError(hasErrored, c._vnode);
}
};
Expand Down
1 change: 1 addition & 0 deletions mangle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"props": {
"cname": 6,
"props": {
"$_listeners": "l",
"$_cleanup": "__c",
"$__hooks": "__H",
"$_list": "__",
Expand Down
7 changes: 5 additions & 2 deletions src/diff/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ export function unmount(vnode, parentVNode, skipRemove) {
}

r.base = r._parentDom = null;
vnode._component = undefined;
}

if ((r = vnode._children)) {
Expand All @@ -522,11 +523,13 @@ export function unmount(vnode, parentVNode, skipRemove) {
}
}

if (!skipRemove && vnode._dom != null) removeNode(vnode._dom);
if (!skipRemove && vnode._dom != null) {
removeNode(vnode._dom);
}

// Must be set to `undefined` to properly clean up `_nextDom`
// for which `null` is a valid value. See comment in `create-element.js`
vnode._dom = vnode._nextDom = undefined;
vnode._parent = vnode._dom = vnode._nextDom = undefined;
}

/** The `.render()` method for a PFC backing instance. */
Expand Down