From: daiwei <daiwei521@126.com>
Date: Fri, 30 May 2025 08:27:02 +0000 (+0800)
Subject: fix(vdomInterop): handle forwarded vapor slots during render VDOM slot
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcf927ff8c1a7662771b30b7f76cbb63afa8ebe7;p=thirdparty%2Fvuejs%2Fcore.git

fix(vdomInterop): handle forwarded vapor slots during render VDOM slot
---

diff --git a/packages/runtime-vapor/src/componentProps.ts b/packages/runtime-vapor/src/componentProps.ts
index a5e9daad22..7a0e9ed928 100644
--- a/packages/runtime-vapor/src/componentProps.ts
+++ b/packages/runtime-vapor/src/componentProps.ts
@@ -210,7 +210,8 @@ export function hasAttrFromRawProps(rawProps: RawProps, key: string): boolean {
   if (dynamicSources) {
     let i = dynamicSources.length
     while (i--) {
-      if (hasOwn(resolveSource(dynamicSources[i]), key)) {
+      const source = resolveSource(dynamicSources[i])
+      if (source && hasOwn(source, key)) {
         return true
       }
     }
diff --git a/packages/runtime-vapor/src/vdomInterop.ts b/packages/runtime-vapor/src/vdomInterop.ts
index 77228fd72a..e7c7e02e0b 100644
--- a/packages/runtime-vapor/src/vdomInterop.ts
+++ b/packages/runtime-vapor/src/vdomInterop.ts
@@ -26,7 +26,14 @@ import {
   mountComponent,
   unmountComponent,
 } from './component'
-import { type Block, VaporFragment, insert, remove } from './block'
+import {
+  type Block,
+  VaporFragment,
+  insert,
+  isFragment,
+  isValidBlock,
+  remove,
+} from './block'
 import { EMPTY_OBJ, extend, isFunction } from '@vue/shared'
 import { type RawProps, rawPropsProxyHandlers } from './componentProps'
 import type { RawSlots, VaporSlot } from './componentSlots'
@@ -230,7 +237,24 @@ function renderVDOMSlot(
           isFunction(name) ? name() : name,
           props,
         )
-        if ((vnode.children as any[]).length) {
+        let isValidSlotContent
+        let children = vnode.children as any[]
+
+        // TODO add tests
+        // handle forwarded vapor slot
+        let vaporSlot
+        if (children.length === 1 && (vaporSlot = children[0].vs)) {
+          const block = vaporSlot.slot(props)
+          isValidSlotContent =
+            isValidBlock(block) ||
+            // if block is a vapor fragment with insert, it indicates a forwarded VDOM slot
+            (isFragment(block) && block.insert)
+        }
+        // vnode children
+        else {
+          isValidSlotContent = children.length > 0
+        }
+        if (isValidSlotContent) {
           if (fallbackNodes) {
             remove(fallbackNodes, parentNode)
             fallbackNodes = undefined