#204: Correctly infer props from ClassBased Link components

codegouvfr · Oct 31, 2023 · b6f3636 · b6f3636
1 parent 36086ba
commit b6f3636
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/link.tsx b/src/link.tsx
@@ -3,6 +3,7 @@ import { fr } from "./fr";
 import { cx } from "./tools/cx";
 import { assert } from "tsafe/assert";
 import { is } from "tsafe/is";
+import type { UnpackProps } from "./tools/UnpackProps";
 
 type HTMLAnchorProps = DetailedHTMLProps<
     AnchorHTMLAttributes<HTMLAnchorElement>,
@@ -12,11 +13,7 @@ type HTMLAnchorProps = DetailedHTMLProps<
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface RegisterLink {}
 
-export type RegisteredLinkProps = RegisterLink extends {
-    Link: (props: infer LinkProps) => any;
-}
-    ? Omit<LinkProps, "children">
-    : Omit<HTMLAnchorProps, "children">;
+export type RegisteredLinkProps = RegisterLink extends { Link: infer Link; } ? Omit<UnpackProps<Link>, "children"> : Omit<HTMLAnchorProps, "children">;
 
 let Link: (
     props: RegisteredLinkProps & { children: ReactNode }

diff --git a/src/tools/UnpackProps.ts b/src/tools/UnpackProps.ts
@@ -0,0 +1,5 @@
+
+export type UnpackProps<T> = T extends React.ComponentType<infer P>
+  ? P
+  : never;
+