type: modify Default type issue. #50

uiwjs · Mar 23, 2024 · 396c946 · 396c946
1 parent 6dd9df9
commit 396c946
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/core/README.md b/core/README.md
@@ -182,17 +182,16 @@ export declare const If: FC<PropsWithChildren<IfProps>>;
 ## `<Switch />` `<Case />` `<Default />` Props
 
 ```tsx
-import { type FC, type PropsWithChildren } from 'react';
-export declare const Switch: FC<PropsWithChildren<{}>>;
-
+import type { FC, PropsWithChildren } from 'react';
+export const Switch: FC<PropsWithChildren<{}>>;
 type TagType = React.ElementType | keyof JSX.IntrinsicElements;
 interface CaseElementProps<T extends TagType> {
   as?: T;
   readonly condition?: boolean;
 }
 export type CaseProps<T extends TagType> = CaseElementProps<T> & React.ComponentPropsWithoutRef<T>;
-export declare const Case: <T extends TagType>(props: CaseProps<T>) => null;
-export declare const Default: <T extends TagType>(props: CaseProps<T>) => null;
+export const Case: <T extends TagType>(props: CaseProps<T>) => any;
+export const Default: <T extends TagType>(props: Omit<CaseProps<T>, 'condition'>) => import("react/jsx-runtime").JSX.Element;
 ```
 
 ## Development

diff --git a/core/src/switch.tsx b/core/src/switch.tsx
@@ -20,7 +20,7 @@ export const Switch: FC<PropsWithChildren<{}>> = ({ children }) => {
     }
     return false;
   });
-  return <>{matchChild ?? defaultCase ?? null}</>;
+  return matchChild ?? defaultCase ?? null;
 };
 
 type TagType = React.ElementType | keyof JSX.IntrinsicElements;
@@ -37,4 +37,6 @@ export const Case = <T extends TagType>(props: CaseProps<T>) => {
   return Elm ? <Elm {...reset}>{children}</Elm> : children;
 };
 
-export const Default = <T extends TagType>(props: CaseProps<T>) => <Case {...props} />;
+export const Default = <T extends TagType>(props: Omit<CaseProps<T>, 'condition'>) => (
+  <Case {...({ ...props } as CaseProps<T>)} />
+);
diff --git a/core/switch.d.ts b/core/switch.d.ts
@@ -1,12 +1,14 @@
 declare module '@uiw/react-only-when/switch' {
-  import { FC, PropsWithChildren } from 'react';
-  export declare const Switch: <T extends TagType>({ children }: PropsWithChildren) => null;
+  import type { FC, PropsWithChildren } from 'react';
+  export const Switch: FC<PropsWithChildren<{}>>;
   type TagType = React.ElementType | keyof JSX.IntrinsicElements;
   interface CaseElementProps<T extends TagType> {
     as?: T;
     readonly condition?: boolean;
   }
   export type CaseProps<T extends TagType> = CaseElementProps<T> & React.ComponentPropsWithoutRef<T>;
-  export declare const Case: <T extends TagType>(props: CaseProps<T>) => any;
-  export declare const Default: <T extends TagType>(props: CaseProps<T>) => any;
+  export const Case: <T extends TagType>(props: CaseProps<T>) => any;
+  export const Default: <T extends TagType>(
+    props: Omit<CaseProps<T>, 'condition'>,
+  ) => import('react/jsx-runtime').JSX.Element;
 }