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

refactor: adjust types and formatting in shared.tsx

Browse Source 
Improved the format and type handling in the react/shared.tsx file. This includes adjustments to how variants are handled and formatted, enhancing type consistency and declarations. Also, ordinary parameters are given trailing commas as per the enhanced coding standards.
This commit is contained in:
p-sw 2024-06-06 00:16:22 +09:00
parent 92b64405a4
commit 673702947d
1 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
packages/react/shared.tsx
View File

@ -104,13 +104,13 @@ export function vcn<V extends VariantType>(param: {
( (
variantProps: Partial<VariantKV<V>> & { variantProps: Partial<VariantKV<V>> & {
className?: string; className?: string;
} },
) => string, ) => string,
/** /**
* Any Props -> Variant Props, Other Props * Any Props -> Variant Props, Other Props
*/ */
<AnyPropBeforeResolve extends Record<string, any>>( <AnyPropBeforeResolve extends Record<string, any>>(
anyProps: AnyPropBeforeResolve anyProps: AnyPropBeforeResolve,
) => [ ) => [
Partial<VariantKV<V>> & { Partial<VariantKV<V>> & {
className?: string; className?: string;
@ -134,13 +134,13 @@ export function vcn<V extends VariantType, P extends PresetType<V>>(param: {
variantProps: Partial<VariantKV<V>> & { variantProps: Partial<VariantKV<V>> & {
className?: string; className?: string;
preset?: keyof P; preset?: keyof P;
} },
) => string, ) => string,
/** /**
* Any Props -> Variant Props, Other Props * Any Props -> Variant Props, Other Props
*/ */
<AnyPropBeforeResolve extends Record<string, any>>( <AnyPropBeforeResolve extends Record<string, any>>(
anyProps: AnyPropBeforeResolve anyProps: AnyPropBeforeResolve,
) => [ ) => [
Partial<VariantKV<V>> & { Partial<VariantKV<V>> & {
className?: string; className?: string;
@ -174,7 +174,11 @@ export function vcn<
* @param variantProps - The variant props including className. * @param variantProps - The variant props including className.
* @returns The class name. * @returns The class name.
*/ */
(variantProps: { className?: string; preset?: keyof P } & Partial<VariantKV<V>>) => { (
variantProps: { className?: string; preset?: keyof P } & Partial<
VariantKV<V>
>,
) => {
const { className, preset, ...otherVariantProps } = variantProps; const { className, preset, ...otherVariantProps } = variantProps;
const currentPreset: P[keyof P] | null = const currentPreset: P[keyof P] | null =
@ -183,19 +187,32 @@ export function vcn<
return twMerge( return twMerge(
base, base,
...( ...(
Object.entries(defaults) as [keyof V, keyof V[keyof V]][] Object.entries(defaults) as [keyof V, keyof V[keyof V] & string][]
).map<string>( ).map<string>(([variantKey, defaultValue]) => {
([variantKey, defaultValue]) => // Omit<Partial<VariantKV<V>> & { className; preset; }, className | preset> = Partial<VariantKV<V>> (safe to cast)
variants[variantKey][ // Partial<VariantKV<V>>[keyof V] => { [k in keyof V]?: BooleanString<keyof V[keyof V] & string> } => BooleanString<keyof V[keyof V]>
(otherVariantProps as unknown as Partial<VariantKV<V>>)[variantKey] ??
(!!currentPreset && presetVariantKeys.includes(variantKey) const directVariantValue: (keyof V[keyof V] & string) | undefined = (
? (currentPreset as Partial<VariantKV<V>>)[variantKey] ?? otherVariantProps as unknown as Partial<VariantKV<V>>
defaultValue )[variantKey]?.toString?.(); // BooleanString<> -> string (safe to index V[keyof V])
: defaultValue)
] const currentPresetVariantValue:
), | (keyof V[keyof V] & string)
(currentPreset as Partial<VariantKV<V>> | null)?.className, // preset's classname comes after user's variant props? huh.. | undefined =
className !!currentPreset && presetVariantKeys.includes(variantKey)
? (currentPreset as Partial<VariantKV<V>>)[
variantKey
]?.toString?.()
: undefined;
const variantValue: keyof V[keyof V] & string =
directVariantValue ?? currentPresetVariantValue ?? defaultValue;
return variants[variantKey][variantValue];
}),
(
currentPreset as Partial<VariantKV<V>> | null
)?.className?.toString?.(), // preset's classname comes after user's variant props? huh..
className,
); );
}, },
/** /**
@ -207,7 +224,7 @@ export function vcn<
* @returns [variantProps, otherProps] * @returns [variantProps, otherProps]
*/ */
<AnyPropBeforeResolve extends Record<string, any>>( <AnyPropBeforeResolve extends Record<string, any>>(
anyProps: AnyPropBeforeResolve anyProps: AnyPropBeforeResolve,
) => { ) => {
const variantKeys = Object.keys(variants) as (keyof V)[]; const variantKeys = Object.keys(variants) as (keyof V)[];
@ -222,7 +239,7 @@ export function vcn<
} }
return [variantProps, { ...otherProps, [key]: value }]; return [variantProps, { ...otherProps, [key]: value }];
}, },
[{}, {}] [{}, {}],
) as [ ) as [
Partial<VariantKV<V>> & { Partial<VariantKV<V>> & {
className?: string; className?: string;
@ -252,7 +269,7 @@ export function vcn<
* ``` * ```
*/ */
export type VariantProps<F extends (props: any) => string> = F extends ( export type VariantProps<F extends (props: any) => string> = F extends (
props: infer P props: infer P,
) => string ) => string
? P ? P
: never; : never;
@ -268,7 +285,7 @@ export type VariantProps<F extends (props: any) => string> = F extends (
*/ */
function mergeReactProps( function mergeReactProps(
parentProps: Record<string, any>, parentProps: Record<string, any>,
childProps: Record<string, any> childProps: Record<string, any>,
) { ) {
const overrideProps = { ...childProps }; const overrideProps = { ...childProps };
@ -328,7 +345,7 @@ export const Slot = React.forwardRef<any, SlotProps & Record<string, any>>(
...mergeReactProps(safeSlotProps, children.props), ...mergeReactProps(safeSlotProps, children.props),
ref: combinedRef([ref, (children as any).ref]), ref: combinedRef([ref, (children as any).ref]),
} as any); } as any);
} },
); );
export interface AsChild { export interface AsChild {