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

fix: remove any in library

Browse Source
This commit is contained in:
p-sw 2024-06-14 23:17:42 +09:00
parent c46163f525
commit 6263a99b9a
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/react/lib.tsx
View File

@ -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>> & {
@ -223,7 +223,7 @@ export function vcn<
* @param anyProps - Any props that have passed to the component. * @param anyProps - Any props that have passed to the component.
* @returns [variantProps, otherProps] * @returns [variantProps, otherProps]
*/ */
<AnyPropBeforeResolve extends Record<string, any>>( <AnyPropBeforeResolve extends Record<string, unknown>>(
anyProps: AnyPropBeforeResolve, anyProps: AnyPropBeforeResolve,
) => { ) => {
const variantKeys = Object.keys(variants) as (keyof V)[]; const variantKeys = Object.keys(variants) as (keyof V)[];
@ -268,7 +268,7 @@ export function vcn<
* } * }
* ``` * ```
*/ */
export type VariantProps<F extends (props: any) => string> = F extends ( export type VariantProps<F extends (props: unknown) => string> = F extends (
props: infer P, props: infer P,
) => string ) => string
? P ? P
@ -284,8 +284,8 @@ export type VariantProps<F extends (props: any) => string> = F extends (
* @returns The merged props. * @returns The merged props.
*/ */
function mergeReactProps( function mergeReactProps(
parentProps: Record<string, any>, parentProps: Record<string, unknown>,
childProps: Record<string, any>, childProps: Record<string, unknown>,
) { ) {
const overrideProps = { ...childProps }; const overrideProps = { ...childProps };
@ -295,7 +295,12 @@ function mergeReactProps(
const isHandler = /^on[A-Z]/.test(propName); const isHandler = /^on[A-Z]/.test(propName);
if (isHandler) { if (isHandler) {
if (childPropValue && parentPropValue) { if (
childPropValue &&
parentPropValue &&
typeof childPropValue === "function" &&
typeof parentPropValue === "function"
) {
overrideProps[propName] = (...args: unknown[]) => { overrideProps[propName] = (...args: unknown[]) => {
childPropValue?.(...args); childPropValue?.(...args);
parentPropValue?.(...args); parentPropValue?.(...args);
@ -303,9 +308,17 @@ function mergeReactProps(
} else if (parentPropValue) { } else if (parentPropValue) {
overrideProps[propName] = parentPropValue; overrideProps[propName] = parentPropValue;
} }
} else if (propName === "style") { } else if (
propName === "style" &&
typeof parentPropValue === "object" &&
typeof childPropValue === "object"
) {
overrideProps[propName] = { ...parentPropValue, ...childPropValue }; overrideProps[propName] = { ...parentPropValue, ...childPropValue };
} else if (propName === "className") { } else if (
propName === "className" &&
typeof parentPropValue === "string" &&
typeof childPropValue === "string"
) {
overrideProps[propName] = twMerge(parentPropValue, childPropValue); overrideProps[propName] = twMerge(parentPropValue, childPropValue);
} }
} }
@ -324,7 +337,7 @@ function combinedRef<I>(refs: React.Ref<I | null>[]) {
refs.forEach((ref) => { refs.forEach((ref) => {
if (ref instanceof Function) { if (ref instanceof Function) {
ref(instance); ref(instance);
} else if (!!ref) { } else if (ref) {
(ref as React.MutableRefObject<I | null>).current = instance; (ref as React.MutableRefObject<I | null>).current = instance;
} }
}); });
@ -333,8 +346,10 @@ function combinedRef<I>(refs: React.Ref<I | null>[]) {
interface SlotProps { interface SlotProps {
children?: React.ReactNode; children?: React.ReactNode;
} }
export const Slot = React.forwardRef<any, SlotProps & Record<string, any>>( export const Slot = React.forwardRef<
(props, ref) => { HTMLElement,
SlotProps & Record<string, unknown>
>((props, ref) => {
const { children, ...slotProps } = props; const { children, ...slotProps } = props;
const { asChild: _1, ...safeSlotProps } = slotProps; const { asChild: _1, ...safeSlotProps } = slotProps;
if (!React.isValidElement(children)) { if (!React.isValidElement(children)) {
@ -343,10 +358,12 @@ export const Slot = React.forwardRef<any, SlotProps & Record<string, any>>(
} }
return React.cloneElement(children, { return React.cloneElement(children, {
...mergeReactProps(safeSlotProps, children.props), ...mergeReactProps(safeSlotProps, children.props),
ref: combinedRef([ref, (children as any).ref]), ref: combinedRef([
} as any); ref,
}, (children as unknown as { ref: React.Ref<HTMLElement> }).ref,
); ]),
} as never);
});
export interface AsChild { export interface AsChild {
asChild?: boolean; asChild?: boolean;