#204: Follow up

codegouvfr · Oct 31, 2023 · 9aa8a57 · 9aa8a57
1 parent 4b0e334
commit 9aa8a57
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/src/link.tsx b/src/link.tsx
@@ -11,15 +11,13 @@ type HTMLAnchorProps = DetailedHTMLProps<
 >;
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface RegisterLink {}
+export interface RegisterLink { }
 
 export type RegisteredLinkProps = RegisterLink extends { Link: infer Link }
     ? Omit<UnpackProps<Link>, "children">
     : Omit<HTMLAnchorProps, "children">;
 
-let Link: (
-    props: RegisteredLinkProps & { children: ReactNode }
-) => ReturnType<React.FC> = props => {
+let Link: React.ComponentType<RegisteredLinkProps & { children: ReactNode }> = props => {
     const { href, ...rest } = props as { to?: string; href?: string };
 
     button: {
@@ -42,8 +40,6 @@ let Link: (
     return <a href={href} {...rest} />;
 };
 
-//<a {...props} />;
-
 export function setLink(params: { Link: typeof Link }): void {
     Link = props => {
         {

diff --git a/src/next-appdir/DsfrHead.tsx b/src/next-appdir/DsfrHead.tsx
@@ -7,7 +7,7 @@ import FaviconIco from "../dsfr/favicon/favicon.ico";
 import { getScriptToRunAsap } from "../useIsDark/scriptToRunAsap";
 import { fontUrlByFileBasename } from "./zz_internal/fontUrlByFileBasename";
 import { getDefaultColorSchemeServerSide } from "./zz_internal/defaultColorScheme";
-import { setLink, type RegisteredLinkProps } from "../link";
+import { setLink, RegisteredLinkProps } from "../link";
 import { assert } from "tsafe/assert";
 //NOTE: As of now there is no way to enforce ordering in Next Appdir
 //See: https://github.com/vercel/next.js/issues/16630
@@ -22,7 +22,7 @@ export type DsfrHeadProps = {
      */
     preloadFonts?: (keyof typeof fontUrlByFileBasename)[];
     /** Default: <a /> */
-    Link?: (props: RegisteredLinkProps & { children: ReactNode }) => ReturnType<React.FC>;
+    Link?: React.ComponentType<RegisteredLinkProps & { children: ReactNode }>;
     /**
      * When set, the value will be used as the nonce attribute of subsequent script tags.
      *

diff --git a/src/next-appdir/zz_internal/start.ts b/src/next-appdir/zz_internal/start.ts
@@ -15,7 +15,7 @@ export function startReactDsfr(params: {
     /** Default: false */
     verbose?: boolean;
     /** Default: <a /> */
-    Link?: (props: RegisteredLinkProps & { children: ReactNode }) => ReturnType<React.FC>;
+    Link?: React.ComponentType<RegisteredLinkProps & { children: ReactNode }>;
     /**
      * When true, the nonce of the script tag will be checked, fetched from {@link DsfrHead} component and injected in react-dsfr scripts.
      *

diff --git a/src/next-pagesdir.tsx b/src/next-pagesdir.tsx
@@ -32,7 +32,7 @@ export type CreateNextDsfrIntegrationApiParams = {
     /** Default: false */
     verbose?: boolean;
     /** Default: <a /> */
-    Link?: (props: RegisteredLinkProps & { children: ReactNode }) => ReturnType<React.FC>;
+    Link?: React.ComponentType<RegisteredLinkProps & { children: ReactNode }>;
     /** If not provided no fonts are preloaded.
      * Preloading of fonts is only enabled in production.
      */

diff --git a/src/spa.ts b/src/spa.ts
@@ -13,7 +13,7 @@ export function startReactDsfr(params: {
     /** Default: false */
     verbose?: boolean;
     /** Default: <a /> */
-    Link?: (props: RegisteredLinkProps & { children: ReactNode }) => ReturnType<React.FC>;
+    Link?: React.ComponentType<RegisteredLinkProps & { children: ReactNode }>;
     /** Default: ()=> "fr" */
     useLang?: () => string;
     /**