p-sw/pswui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add type safety for other props after variant resolved

Browse Source
This commit is contained in:
p-sw 2024-05-19 12:52:26 +09:00
parent 99151f13f2
commit 8e1cabba2c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/react/shared.ts
View File

@ -22,12 +22,15 @@ export function vcn<V extends Record<string, Record<string, string>>>({
}; };
}): [ }): [
(variantProps: RawVariantProps<V> & { className?: string }) => string, (variantProps: RawVariantProps<V> & { className?: string }) => string,
( <AnyPropBeforeResolve extends Record<string, any>>(
anyProps: Record<string, any>, anyProps: AnyPropBeforeResolve,
options?: { options?: {
excludeClassName?: boolean; excludeClassName?: boolean;
} }
) => [RawVariantProps<V> & { className?: string }, Record<string, any>], ) => [
RawVariantProps<V> & { className?: string },
Omit<AnyPropBeforeResolve, keyof RawVariantProps<V> | "className">,
],
] { ] {
return [ return [
({ className, ...variantProps }) => { ({ className, ...variantProps }) => {
@ -59,7 +62,10 @@ export function vcn<V extends Record<string, Record<string, string>>>({
return [variantProps, { ...otherProps, [key]: value }]; return [variantProps, { ...otherProps, [key]: value }];
}, },
[{}, {}] [{}, {}]
); ) as [
RawVariantProps<V> & { className?: string },
Omit<typeof anyProps, keyof RawVariantProps<V> | "className">,
];
}, },
]; ];
} }