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

fix: fix docs and types

Browse Source
This commit is contained in:
p-sw 2024-06-04 22:52:05 +09:00
parent 8c7fbf2d41
commit 5f2e5b4ae8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/react/shared.tsx
View File

@ -85,7 +85,7 @@ type PresetType<V extends VariantType> = {
/** /**
* A utility function to provide variants and presets to the component * A utility function to provide variants and presets to the component
* *
* @param config - Variant Configuration * @param param - Variant Configuration
* @returns function (variantProps) -> class name, * @returns function (variantProps) -> class name,
* @returns function (anyProps) -> [variantProps, otherProps] * @returns function (anyProps) -> [variantProps, otherProps]
*/ */
@ -109,7 +109,7 @@ export function vcn<V extends VariantType>(param: {
/** /**
* Any Props -> Variant Props, Other Props * Any Props -> Variant Props, Other Props
*/ */
<AnyPropBeforeResolve extends Record<string, any>>( <AnyPropBeforeResolve extends Record<string, unknown>>(
anyProps: AnyPropBeforeResolve anyProps: AnyPropBeforeResolve
) => [ ) => [
Partial<VariantKV<V>> & { Partial<VariantKV<V>> & {
@ -139,7 +139,7 @@ export function vcn<V extends VariantType, P extends PresetType<V>>(param: {
/** /**
* Any Props -> Variant Props, Other Props * Any Props -> Variant Props, Other Props
*/ */
<AnyPropBeforeResolve extends Record<string, any>>( <AnyPropBeforeResolve extends Record<string, unknown>>(
anyProps: AnyPropBeforeResolve anyProps: AnyPropBeforeResolve
) => [ ) => [
Partial<VariantKV<V>> & { Partial<VariantKV<V>> & {
@ -174,11 +174,9 @@ 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>>) => {
className, const { className, preset, ...otherVariantProps } = variantProps;
preset,
...variantProps
}: { className?: string; preset?: keyof P } & Partial<VariantKV<V>>) => {
const currentPreset: P[keyof P] | null = const currentPreset: P[keyof P] | null =
presets && preset ? (presets as NonNullable<P>)[preset] ?? null : null; presets && preset ? (presets as NonNullable<P>)[preset] ?? null : null;
const presetVariantKeys: (keyof V)[] = Object.keys(currentPreset ?? {}); const presetVariantKeys: (keyof V)[] = Object.keys(currentPreset ?? {});
@ -189,7 +187,7 @@ export function vcn<
).map<string>( ).map<string>(
([variantKey, defaultValue]) => ([variantKey, defaultValue]) =>
variants[variantKey][ variants[variantKey][
(variantProps as unknown as Partial<VariantKV<V>>)[variantKey] ?? (otherVariantProps as unknown as Partial<VariantKV<V>>)[variantKey] ??
(!!currentPreset && presetVariantKeys.includes(variantKey) (!!currentPreset && presetVariantKeys.includes(variantKey)
? (currentPreset as Partial<VariantKV<V>>)[variantKey] ?? ? (currentPreset as Partial<VariantKV<V>>)[variantKey] ??
defaultValue defaultValue