From: daiwei <daiwei521@126.com>
Date: Fri, 30 May 2025 03:17:28 +0000 (+0800)
Subject: Merge branch 'edison/feat/fowardedSlots' into edison/testVapor
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a3fcdad62e06a1def51edec32c56d6918cd04b0;p=thirdparty%2Fvuejs%2Fcore.git

Merge branch 'edison/feat/fowardedSlots' into edison/testVapor
---

3a3fcdad62e06a1def51edec32c56d6918cd04b0
diff --cc packages/runtime-vapor/src/componentSlots.ts
index 4c2e48b4cc,19e9b5b6d1..9dfde2a9c9
--- a/packages/runtime-vapor/src/componentSlots.ts
+++ b/packages/runtime-vapor/src/componentSlots.ts
@@@ -105,9 -105,11 +116,9 @@@ export function createSlot
  ): Block {
    const _insertionParent = insertionParent
    const _insertionAnchor = insertionAnchor
 -  if (isHydrating) {
 -    locateHydrationNode()
 -  }
 +  if (!isHydrating) resetInsertionState()
  
-   const instance = currentInstance as VaporComponentInstance
+   const instance = i || (currentInstance as VaporComponentInstance)
    const rawSlots = instance.rawSlots
    const slotProps = rawProps
      ? new Proxy(rawProps, rawPropsProxyHandlers)