@hairy/react-lib 1.10.0 → 1.11.0

package/dist/index.d.ts

@@ -20,48 +20,49 @@ declare namespace cls {
     var append: (value: any, newClass: any) => any;
 }
 
-type WrapperProps<K extends keyof JSX.IntrinsicElements | unknown, P = unknown> = {
-    tag?: K | React.FC<P>;
-} & (K extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[K] : unknown) & P;
+type WrapperTag = keyof JSX.IntrinsicElements | Function;
+type WrapperProps<Kag extends keyof JSX.IntrinsicElements | React.FC | unknown> = {
+    tag?: Kag;
+} & (Kag extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[Kag] : unknown) & (Kag extends React.FC<infer P> ? P : unknown);
 declare function wrapper(tag: any, props: unknown, children?: React.ReactNode): react.ReactNode;
 
-type CaseProps<K, P> = WrapperProps<K, P> & {
+type CaseProps<Kag> = WrapperProps<Kag> & {
     cond?: BooleanLike;
     children?: ReactNode;
 };
-declare function Case<K, P>(props: CaseProps<K, P>): ReactNode;
+declare function Case<Tag extends WrapperTag>(props: CaseProps<Tag>): ReactNode;
 
-type DefaultProps<K, P> = WrapperProps<K, P> & {
+type DefaultProps<Tag> = WrapperProps<Tag> & {
     children?: ReactNode;
 };
-declare function Default<K, P>(props: DefaultProps<K, P>): ReactNode;
+declare function Default<Tag extends WrapperTag>(props: DefaultProps<Tag>): ReactNode;
 
-type IfProps<K, P> = WrapperProps<K, P> & {
+type IfProps<Kag> = WrapperProps<Kag> & {
     cond?: BooleanLike;
     then?: ReactNode;
     else?: ReactNode;
     children?: ReactNode;
 };
-declare function If<K, P>(props: IfProps<K, P>): ReactNode;
+declare function If<K extends WrapperTag>(props: IfProps<K>): ReactNode;
 
-type ElseProps<K, P> = IfProps<K, P>;
-declare function Else<K, P>(props: ElseProps<K, P>): react.ReactNode;
+type ElseProps<Tag> = IfProps<Tag>;
+declare function Else<Tag extends WrapperTag>(props: ElseProps<Tag>): react.ReactNode;
 
 interface SwitchProps extends PropsWithChildren {
     value?: BooleanLike;
 }
 declare function Switch(props: SwitchProps): ReactElement<any, string | react.JSXElementConstructor<any>> | null;
 
-type ThenProps<K, P> = IfProps<K, P>;
-declare function Then<K, P>(props: ThenProps<K, P>): react.ReactNode;
+type ThenProps<Tag> = IfProps<Tag>;
+declare function Then<Tag extends WrapperTag>(props: ThenProps<Tag>): react.ReactNode;
 
-type UnlessProps<K, P> = WrapperProps<K, P> & {
+type UnlessProps<Tag> = WrapperProps<Tag> & {
     cond?: BooleanLike;
     then?: ReactNode;
     else?: ReactNode;
     children?: ReactNode;
 };
-declare function Unless<K, P>(props: UnlessProps<K, P>): ReactNode;
+declare function Unless<Tag extends WrapperTag>(props: UnlessProps<Tag>): ReactNode;
 
 interface InjectComponent<P> {
     component: FC<P> | ComponentClass<P>;
@@ -208,4 +209,4 @@ declare function useStore<S extends object, A extends Actions<S>>(store: Store<S
 
 type PropsWithDetailedHTML<T = HTMLDivElement> = DetailedHTMLProps<HTMLAttributes<T>, T>;
 
-export { type Actions, type ActionsOmitThisParameter, type Argument, type ArgumentArray, type AsyncStoreOptions, type AsyncStorePlainOptions, Case, type CaseProps, Default, type DefaultProps, Else, type ElseProps, type EventBusListener, type FetchRequestInterceptCallback, type FetchResponseInterceptCallback, If, type IfProps, type InjectComponent, Injector, type InjectorProps, type Mapping, type PersistantOptions, type PropsWithDetailedHTML, type ReadonlyArgumentArray, type StateFromFunctionReturningPromise, type Store, type StoreDefine, type StoreOptions, Switch, type SwitchProps, Then, type ThenProps, Trans, type TransProps, Unless, type UnlessProps, type UseAsyncStateOptions, type Value, type WatchCallback, type WatchOptions, type WrapperProps, cls, defineAsyncStore, defineAsyncStorePlain, defineStore, proxyWithPersistant, useAsyncCallback, useAsyncState, useDebounce, useEventBus, useFetchRequestIntercept, useFetchResponseIntercept, useMounted, useStore, useWatch, useWhenever, wrapper };
+export { type Actions, type ActionsOmitThisParameter, type Argument, type ArgumentArray, type AsyncStoreOptions, type AsyncStorePlainOptions, Case, type CaseProps, Default, type DefaultProps, Else, type ElseProps, type EventBusListener, type FetchRequestInterceptCallback, type FetchResponseInterceptCallback, If, type IfProps, type InjectComponent, Injector, type InjectorProps, type Mapping, type PersistantOptions, type PropsWithDetailedHTML, type ReadonlyArgumentArray, type StateFromFunctionReturningPromise, type Store, type StoreDefine, type StoreOptions, Switch, type SwitchProps, Then, type ThenProps, Trans, type TransProps, Unless, type UnlessProps, type UseAsyncStateOptions, type Value, type WatchCallback, type WatchOptions, type WrapperProps, type WrapperTag, cls, defineAsyncStore, defineAsyncStorePlain, defineStore, proxyWithPersistant, useAsyncCallback, useAsyncState, useDebounce, useEventBus, useFetchRequestIntercept, useFetchResponseIntercept, useMounted, useStore, useWatch, useWhenever, wrapper };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hairy/react-lib",
   "type": "module",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Library for react",
   "author": "Hairyf <wwu710632@gmail.com>",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "react-dom": "^18.2.0",
     "react-i18next": "^14.1.2",
     "react-use": "^17.6.0",
-    "@hairy/utils": "1.10.0"
+    "@hairy/utils": "1.11.0"
   },
   "scripts": {
     "build": "tsup",