fix types

4Catalyzer · Jun 20, 2019 · 680d5da · 680d5da
1 parent 68182aa
commit 680d5da
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 30 deletions.
diff --git a/src/BaseLink.js b/src/BaseLink.js
@@ -5,14 +5,14 @@ import warning from 'warning';
 import { routerShape } from './PropTypes';
 
 const propTypes = {
-  as: PropTypes.elementType,
+  as: PropTypes.elementType.isRequired,
   to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
   match: PropTypes.object.isRequired,
   activeClassName: PropTypes.string,
   activeStyle: PropTypes.object,
   activePropName: PropTypes.string,
   router: routerShape.isRequired,
-  exact: PropTypes.bool,
+  exact: PropTypes.bool.isRequired,
   target: PropTypes.string,
   onClick: PropTypes.func,
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),

diff --git a/types/example-app/CustomLink.tsx b/types/example-app/CustomLink.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 interface Props {
   href: string;
-  active?: boolean;
+  active: boolean;
   onClick: (event: React.SyntheticEvent<any>) => void;
   children: React.ReactNode;
 }

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -333,43 +333,65 @@ declare module 'found' {
 
   class Redirect extends React.Component<RedirectProps> {}
 
-  interface BaseLinkProps
-    extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
+  interface LinkPropsCommon {
     to: LocationDescriptor;
     // match: Match,  provided by withRouter
-    activeClassName?: string;
-    activeStyle?: any;
-    activePropName?: string;
     // router: Router, provided by withRouter
     exact?: boolean;
     target?: string;
-    children?:
-      | React.ReactNode
-      | ((linkRenderArgs: {
-          href: string;
-          active: boolean;
-          onClick: (event: React.SyntheticEvent<any>) => void;
-        }) => React.ReactNode);
+    onClick?: (event: React.SyntheticEvent<any>) => void;
   }
 
-  type ReplaceProps<Inner extends React.ElementType, P> = Omit<
-    React.ComponentProps<Inner>,
-    keyof P
+  interface LinkPropsNodeChild extends LinkPropsCommon {
+    activeClassName?: string;
+    activeStyle?: {};
+    children?: React.ReactNode;
+  }
+
+  type ReplaceProps<TInner extends React.ElementType, TProps> = Omit<
+    React.ComponentProps<TInner>,
+    keyof TProps
   > &
-    P;
-
-  type LinkProps<As extends React.ElementType> = ReplaceProps<
-    As,
-    BaseLinkProps
-  > & { as?: As };
-
-  class Link<As extends React.ElementType = 'a'> extends React.Component<
-    LinkProps<As>
-  > {
-    onClick: (event: React.SyntheticEvent<any>) => void;
-    readonly props: LinkProps<As>;
+    TProps;
+
+  type LinkPropsSimple = ReplaceProps<'a', LinkPropsNodeChild>;
+
+  type LinkPropsWithAs<TInner extends React.ElementType> = ReplaceProps<
+    TInner,
+    LinkPropsNodeChild & { as: TInner }
+  >;
+
+  type LinkPropsWithActivePropName<
+    TInner extends React.ElementType<
+      { [activePropName in TActivePropName]: boolean }
+    >,
+    TActivePropName extends string
+  > = ReplaceProps<
+    TInner,
+    LinkPropsNodeChild & { as: TInner; activePropName: TActivePropName }
+  >;
+
+  interface LinkPropsWithFunctionChild extends LinkPropsCommon {
+    children: (linkRenderArgs: {
+      href: string;
+      active: boolean;
+      onClick: (event: React.SyntheticEvent<any>) => void;
+    }) => React.ReactNode;
   }
 
+  class Link<
+    TInner extends React.ElementType = never,
+    TInnerWithActivePropName extends React.ElementType<
+      { [activePropName in TActivePropName]: boolean }
+    > = never,
+    TActivePropName extends string = never
+  > extends React.Component<
+    | LinkPropsWithFunctionChild
+    | LinkPropsWithActivePropName<TInnerWithActivePropName, TActivePropName>
+    | LinkPropsWithAs<TInner>
+    | LinkPropsSimple
+  > {}
+
   interface RouterState {
     match: Match;
     router: Router;