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

fix: make variantProps resolver include className and preset as variantProps

Browse Source
This commit is contained in:
p-sw 2024-05-24 22:25:45 +09:00
parent de68eb45cf
commit 0e153845a2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/react/shared.tsx
View File

@ -112,7 +112,10 @@ export function vcn<
<AnyPropBeforeResolve extends Record<string, any>>( <AnyPropBeforeResolve extends Record<string, any>>(
anyProps: AnyPropBeforeResolve anyProps: AnyPropBeforeResolve
) => [ ) => [
Partial<VariantKV<V>>, Partial<VariantKV<V>> & {
className?: string;
preset?: N;
},
Omit< Omit<
AnyPropBeforeResolve, AnyPropBeforeResolve,
keyof Partial<VariantKV<V>> | "preset" | "className" keyof Partial<VariantKV<V>> | "preset" | "className"
@ -162,14 +165,21 @@ export function vcn<
return Object.entries(anyProps).reduce( return Object.entries(anyProps).reduce(
([variantProps, otherProps], [key, value]) => { ([variantProps, otherProps], [key, value]) => {
if (variantKeys.includes(key)) { if (
variantKeys.includes(key) ||
key === "className" ||
key === "preset"
) {
return [{ ...variantProps, [key]: value }, otherProps]; return [{ ...variantProps, [key]: value }, otherProps];
} }
return [variantProps, { ...otherProps, [key]: value }]; return [variantProps, { ...otherProps, [key]: value }];
}, },
[{}, {}] [{}, {}]
) as [ ) as [
Partial<VariantKV<V>>, Partial<VariantKV<V>> & {
className?: string;
preset?: N;
},
Omit< Omit<
typeof anyProps, typeof anyProps,
keyof Partial<VariantKV<V>> | "preset" | "className" keyof Partial<VariantKV<V>> | "preset" | "className"