Skip to content

Commit 0966ab1

Browse files
committed
wip
1 parent aefdb55 commit 0966ab1

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

packages/runtime-core/src/apiDefineComponent.ts

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ export type DefineComponent<
7777
MakeDefaultsOptional extends boolean = true,
7878
TypeRefs extends Record<string, unknown> = {},
7979
TypeEl extends Element = any,
80-
> = 'props' extends keyof IfAny<
81-
OptionsOrPropsOrPropOptions,
82-
{},
83-
OptionsOrPropsOrPropOptions
84-
>
85-
? InferComponentOptions<OptionsOrPropsOrPropOptions, unknown>
86-
: InferComponentOptions<
87-
{
80+
> = InferComponentOptions<
81+
'props' extends keyof IfAny<
82+
OptionsOrPropsOrPropOptions,
83+
{},
84+
OptionsOrPropsOrPropOptions
85+
>
86+
? OptionsOrPropsOrPropOptions
87+
: {
8888
props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
8989
? OptionsOrPropsOrPropOptions
9090
: {}
@@ -106,9 +106,15 @@ export type DefineComponent<
106106
__typeRefs?: TypeRefs
107107
__typeEl?: TypeEl
108108
},
109-
MakeDefaultsOptional,
110-
Defaults
111-
>
109+
'props' extends keyof IfAny<
110+
OptionsOrPropsOrPropOptions,
111+
{},
112+
OptionsOrPropsOrPropOptions
113+
>
114+
? unknown
115+
: MakeDefaultsOptional,
116+
Defaults
117+
>
112118

113119
type InferComponentOptions<
114120
T,

0 commit comments

Comments
 (0)