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

feat: add resolveProps as vcn's second return

Browse Source
This commit is contained in:
p-sw 2024-05-19 12:33:54 +09:00
parent 23c96df0af
commit 5a3b5a258e
1 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/react/shared.ts
View File

@ -20,8 +20,17 @@ export function vcn<V extends Record<string, Record<string, string>>>({
defaults: {
[VariantKey in keyof V]: BooleanString<keyof V[VariantKey] & string>;
};
}): (variantProps: RawVariantProps<V> & { className?: string }) => string {
return ({ className, ...variantProps }) => {
}): [
(variantProps: RawVariantProps<V> & { className?: string }) => string,
(
anyProps: Record<string, any>,
options?: {
includeClassName?: boolean;
}
) => [RawVariantProps<V> & { className?: string }, Record<string, any>],
] {
return [
({ className, ...variantProps }) => {
return twMerge(
base,
...(
@ -35,10 +44,27 @@ export function vcn<V extends Record<string, Record<string, string>>>({
),
className
);
};
},
(anyProps, options = {}) => {
const variantKeys = Object.keys(variants) as (keyof V)[];
return Object.entries(anyProps).reduce(
([variantProps, otherProps], [key, value]) => {
if (
variantKeys.includes(key) ||
(options.includeClassName && key === "className")
) {
return [{ ...variantProps, [key]: value }, otherProps];
}
return [variantProps, { ...otherProps, [key]: value }];
},
[{}, {}]
);
},
];
}
export type VariantProps<F extends ReturnType<typeof vcn>> = F extends (
export type VariantProps<F extends ReturnType<typeof vcn>[0]> = F extends (
props: infer P
) => string
? P