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

Merge d2c6e2d5b5 into bb4ae25793

This commit is contained in:
zhiyuanzmj 2025-06-26 16:10:58 +08:00 committed by GitHub
parent bb4ae25793 d2c6e2d5b5
commit 957f2b8615
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/runtime-vapor/src/component.ts
View File

@ -150,8 +150,9 @@ export function createComponent(
resetInsertionState() resetInsertionState()
} }
const isFnComponent = isFunction(component)
// vdom interop enabled and component is not an explicit vapor component // vdom interop enabled and component is not an explicit vapor component
if (appContext.vapor && !component.__vapor) { if (appContext.vapor && !isFnComponent && !component.__vapor) {
const frag = appContext.vapor.vdomMount( const frag = appContext.vapor.vdomMount(
component as any, component as any,
rawProps, rawProps,
@ -205,7 +206,7 @@ export function createComponent(
setupPropsValidation(instance) setupPropsValidation(instance)
} }
const setupFn = isFunction(component) ? component : component.setup const setupFn = isFnComponent ? component : component.setup
const setupResult = setupFn const setupResult = setupFn
? callWithErrorHandling(setupFn, instance, ErrorCodes.SETUP_FUNCTION, [ ? callWithErrorHandling(setupFn, instance, ErrorCodes.SETUP_FUNCTION, [
instance.props, instance.props,
@ -214,7 +215,7 @@ export function createComponent(
: EMPTY_OBJ : EMPTY_OBJ
if (__DEV__ && !isBlock(setupResult)) { if (__DEV__ && !isBlock(setupResult)) {
if (isFunction(component)) { if (isFnComponent) {
warn(`Functional vapor component must return a block directly.`) warn(`Functional vapor component must return a block directly.`)
instance.block = [] instance.block = []
} else if (!component.render) { } else if (!component.render) {