theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(runtime-core): avoid scopeId as attr for slot nodes with same scopeId (#1561)

Browse Source 
fix vitejs/vite#536
This commit is contained in:
underfin 2020-07-15 05:06:39 +08:00 committed by GitHub
parent 2b60870f8a
commit 583a1c7b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/runtime-core/src/componentRenderUtils.ts
View File

@ -166,12 +166,16 @@ export function renderComponentRoot(
// inherit scopeId // inherit scopeId
const scopeId = vnode.scopeId const scopeId = vnode.scopeId
// vite#536: if subtree root is created from parent slot if would already
// have the correct scopeId, in this case adding the scopeId will cause
// it to be removed if the original slot vnode is reused.
const needScopeId = scopeId && root.scopeId !== scopeId
const treeOwnerId = parent && parent.type.__scopeId const treeOwnerId = parent && parent.type.__scopeId
const slotScopeId = const slotScopeId =
treeOwnerId && treeOwnerId !== scopeId ? treeOwnerId + '-s' : null treeOwnerId && treeOwnerId !== scopeId ? treeOwnerId + '-s' : null
if (scopeId || slotScopeId) { if (needScopeId || slotScopeId) {
const extras: Data = {} const extras: Data = {}
if (scopeId) extras[scopeId] = '' if (needScopeId) extras[scopeId] = ''
if (slotScopeId) extras[slotScopeId] = '' if (slotScopeId) extras[slotScopeId] = ''
root = cloneVNode(root, extras) root = cloneVNode(root, extras)
} }