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

fix(slots): filter out compiler marker from resolved slots

Browse Source 
fix #1451
This commit is contained in:
Evan You 2020-06-26 17:18:39 -04:00
parent 7777473ddd
commit 70ea76ae0c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/runtime-core/src/componentSlots.ts
View File

@ -102,7 +102,10 @@ export const initSlots = (
) => { ) => {
if (instance.vnode.shapeFlag & ShapeFlags.SLOTS_CHILDREN) { if (instance.vnode.shapeFlag & ShapeFlags.SLOTS_CHILDREN) {
if ((children as RawSlots)._ === 1) { if ((children as RawSlots)._ === 1) {
instance.slots = children as InternalSlots const slots: InternalSlots = (instance.slots = {})
for (const key in children as RawSlots) {
if (key !== '_') slots[key] = (children as Slots)[key]
}
} else { } else {
normalizeObjectSlots(children as RawSlots, (instance.slots = {})) normalizeObjectSlots(children as RawSlots, (instance.slots = {}))
} }
@ -128,7 +131,9 @@ export const updateSlots = (
if (__DEV__ && isHmrUpdating) { if (__DEV__ && isHmrUpdating) {
// Parent was HMR updated so slot content may have changed. // Parent was HMR updated so slot content may have changed.
// force update slots and mark instance for hmr as well // force update slots and mark instance for hmr as well
extend(slots, children as Slots) for (const key in children as RawSlots) {
if (key !== '_') slots[key] = (children as Slots)[key]
}
} else if ( } else if (
// bail on dynamic slots (v-if, v-for, reference of scope variables) // bail on dynamic slots (v-if, v-for, reference of scope variables)
!(vnode.patchFlag & PatchFlags.DYNAMIC_SLOTS) !(vnode.patchFlag & PatchFlags.DYNAMIC_SLOTS)