Skip to content

fix(runtime-core): cleanup hoisted vnode when unmount component #9219

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

Closed
wants to merge 8 commits into from
Closed

fix(runtime-core): cleanup hoisted vnode when unmount component #9219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1bafc77
fix(runtime-core): cleanup hoisted vnode when unmount component
edison1105 Sep 15, 2023
8e9ab02
chore: improve code
edison1105 Oct 7, 2023
d4210ee
Merge branch 'main' into fix/5256
edison1105 Oct 20, 2023
e9499a5
Merge branch 'main' into fix/5256
edison1105 Dec 28, 2023
6933561
Merge branch 'main' into fix/5256
edison1105 Jan 9, 2024
fa6a85d
Merge branch 'main' into fix/5256
edison1105 Apr 16, 2024
96ecbdb
[autofix.ci] apply automated fixes
autofix-ci[bot] Apr 16, 2024
4d31b78
Merge branch 'main' into fix/5256
edison1105 Apr 18, 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
6 changes: 6 additions & 0 deletions packages/runtime-core/src/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,11 @@ export interface ComponentInternalInstance {
* @internal
*/
ut?: (vars?: Record<string, string>) => void
/**
* cleanup el of hoisted vnode
* @internal
*/
hoistedCleanup?: (() => void)[] | null
}

const emptyAppContext = createAppContext()
Expand Down Expand Up @@ -511,6 +516,7 @@ export function createComponentInstance(
provides: parent ? parent.provides : Object.create(appContext.provides),
accessCache: null!,
renderCache: [],
hoistedCleanup: null,

// local resolved assets
components: null,
Expand Down
14 changes: 13 additions & 1 deletion packages/runtime-core/src/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ function baseCreateRenderer(
) => {
let el: RendererElement
let vnodeHook: VNodeHook | undefined | null
const { type, props, shapeFlag, transition, dirs } = vnode
const { type, props, shapeFlag, patchFlag, transition, dirs } = vnode

el = vnode.el = hostCreateElement(
vnode.type as string,
Expand All @@ -630,6 +630,14 @@ function baseCreateRenderer(
props
)

if (patchFlag === PatchFlags.HOISTED && parentComponent) {
;(
parentComponent.hoistedCleanup || (parentComponent.hoistedCleanup = [])
).push(() => {
vnode.el = null
})
}

// mount children first, since some props may rely on child content
// being already rendered, e.g. `<select value>`
if (shapeFlag & ShapeFlags.TEXT_CHILDREN) {
Expand Down Expand Up @@ -2268,6 +2276,10 @@ function baseCreateRenderer(
)
}
queuePostRenderEffect(() => {
if (instance.hoistedCleanup) {
instance.hoistedCleanup.forEach(cleanup => cleanup())
instance.hoistedCleanup = null
}
instance.isUnmounted = true
}, parentSuspense)

Expand Down