root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix(runtime-core): further fix slots _ctx check 

close #10724
This commit is contained in:
Evan You 2024-04-18 12:23:25 +08:00
parent e51ca61ca0
commit cde7f05787
No known key found for this signature in database
GPG Key ID: B9D421896CA450FB
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,9 +21,7 @@ import { isKeepAlive } from './components/KeepAlive'
import { type ContextualRenderFn, withCtx } from './componentRenderContext' import { type ContextualRenderFn, withCtx } from './componentRenderContext'
import { isHmrUpdating } from './hmr' import { isHmrUpdating } from './hmr'
import { DeprecationTypes, isCompatEnabled } from './compat/compatConfig' import { DeprecationTypes, isCompatEnabled } from './compat/compatConfig'
import { toRaw } from '@vue/reactivity' import { TriggerOpTypes, trigger } from '@vue/reactivity'
import { trigger } from '@vue/reactivity'
import { TriggerOpTypes } from '@vue/reactivity'
import { createInternalObject } from './internalObject' import { createInternalObject } from './internalObject'
export type Slot<T extends any = any> = ( export type Slot<T extends any = any> = (
@ -167,27 +165,19 @@ export const initSlots = (
instance: ComponentInternalInstance, instance: ComponentInternalInstance,
children: VNodeNormalizedChildren, children: VNodeNormalizedChildren,
) => { ) => {
const slots = (instance.slots = createInternalObject())
if (instance.vnode.shapeFlag & ShapeFlags.SLOTS_CHILDREN) { if (instance.vnode.shapeFlag & ShapeFlags.SLOTS_CHILDREN) {
const type = (children as RawSlots)._ const type = (children as RawSlots)._
if (type) { if (type) {
// users can get the shallow readonly version of the slots object through `this.$slots`, extend(slots, children as InternalSlots)
// we should avoid the proxy object polluting the slots of the internal instance
instance.slots = toRaw(children as InternalSlots)
// make compiler marker non-enumerable // make compiler marker non-enumerable
def(instance.slots, '_', type) def(slots, '_', type)
} else { } else {
normalizeObjectSlots( normalizeObjectSlots(children as RawSlots, slots, instance)
children as RawSlots,
(instance.slots = createInternalObject()),
instance,
)
} }
} else { } else if (children) {
instance.slots = createInternalObject()
if (children) {
normalizeVNodeSlots(instance, children) normalizeVNodeSlots(instance, children)
} }
}
} }
export const updateSlots = ( export const updateSlots = (