fix(runtime-core): Revert to using InternalObjectKey for normalized s…

…lots to prevent reassigning _ctx
quiteeasy · Apr 16, 2024 · a646a83 · a646a83
1 parent b4b856b
commit a646a83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/runtime-core/src/componentSlots.ts b/packages/runtime-core/src/componentSlots.ts
@@ -1,5 +1,6 @@
 import { type ComponentInternalInstance, currentInstance } from './component'
 import {
+  InternalObjectKey,
   type VNode,
   type VNodeChild,
   type VNodeNormalizedChildren,
@@ -187,6 +188,8 @@ export const initSlots = (
       normalizeVNodeSlots(instance, children)
     }
   }
+
+  def(instance.slots, InternalObjectKey, 1)
 }
 
 export const updateSlots = (

diff --git a/packages/runtime-core/src/vnode.ts b/packages/runtime-core/src/vnode.ts
@@ -405,6 +405,8 @@ const createVNodeWithArgsTransform = (
   )
 }
 
+export const InternalObjectKey = `__vInternal`
+
 const normalizeKey = ({ key }: VNodeProps): VNode['key'] =>
   key != null ? key : null
 
@@ -791,7 +793,7 @@ export function normalizeChildren(vnode: VNode, children: unknown) {
     } else {
       type = ShapeFlags.SLOTS_CHILDREN
       const slotFlag = (children as RawSlots)._
-      if (!slotFlag) {
+      if (!slotFlag  && !(InternalObjectKey in children!)) {
         // if slots are not normalized, attach context instance
         // (compiled / normalized slots already have context)
         ;(children as RawSlots)._ctx = currentRenderingInstance