]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
Merge branch 'edison/feat/fowardedSlots' into edison/testVapor
authordaiwei <daiwei521@126.com>
Fri, 30 May 2025 03:17:28 +0000 (11:17 +0800)
committerdaiwei <daiwei521@126.com>
Fri, 30 May 2025 03:17:28 +0000 (11:17 +0800)
1  2 
packages/compiler-vapor/__tests__/transforms/__snapshots__/vSlot.spec.ts.snap
packages/compiler-vapor/__tests__/transforms/vSlot.spec.ts
packages/compiler-vapor/src/transform.ts
packages/runtime-vapor/src/componentSlots.ts

index 4c2e48b4ccd3c67c222662e653326a0f6f746a6e,19e9b5b6d1a9b51d9e1fa8df7d2dbf0f97c3cbdb..9dfde2a9c9f000df3abc5e60a1eb846b9fc97b4d
@@@ -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)