[state-router] Fix link typings

sanity-io · Oct 6, 2020 · 1c8f34d · 1c8f34d
1 parent 76d7674
commit 1c8f34d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/packages/@sanity/state-router/components.ts b/packages/@sanity/state-router/components.ts
@@ -0,0 +1 @@
+export * from './src/components'
diff --git a/packages/@sanity/state-router/src/components/IntentLink.tsx b/packages/@sanity/state-router/src/components/IntentLink.tsx
@@ -3,14 +3,14 @@ import Link from './Link'
 import {RouterProviderContext, IntentParameters} from './types'
 import internalRouterContextTypeCheck from './internalRouterContextTypeCheck'
 
-type Props = {
+interface IntentLinkProps {
   intent: string
   params?: IntentParameters
-  children: React.ReactNode
-  className?: string
 }
 
-export default class IntentLink extends React.PureComponent<Props> {
+export default class IntentLink extends React.PureComponent<
+  IntentLinkProps & Omit<React.HTMLProps<HTMLAnchorElement>, 'ref'>
+> {
   context: RouterProviderContext
 
   static contextTypes = {
@@ -39,8 +39,10 @@ export default class IntentLink extends React.PureComponent<Props> {
   }
 
   render() {
-    const {intent, params, ...rest} = this.props
+    const {intent, params, ...restProps} = this.props
 
-    return <Link href={this.resolveIntentLink(intent, params)} {...rest} ref={this.setElement} />
+    return (
+      <Link {...restProps} href={this.resolveIntentLink(intent, params)} ref={this.setElement} />
+    )
   }
 }
diff --git a/packages/@sanity/state-router/src/components/Link.tsx b/packages/@sanity/state-router/src/components/Link.tsx
@@ -11,15 +11,13 @@ function isModifiedEvent(event: MouseEvent) {
   return !!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey)
 }
 
-type Props = {
+interface LinkProps {
   replace?: boolean
-  onClick?: (event: MouseEvent) => void
-  href: string
-  target?: string
-  children?: React.ReactNode
 }
 
-export default class Link extends React.PureComponent<Props> {
+export default class Link extends React.PureComponent<
+  LinkProps & Omit<React.HTMLProps<HTMLAnchorElement>, 'ref'>
+> {
   context: RouterProviderContext
   _element: HTMLAnchorElement
 
@@ -31,7 +29,7 @@ export default class Link extends React.PureComponent<Props> {
     __internalRouter: internalRouterContextTypeCheck
   }
 
-  private handleClick = (event: MouseEvent): void => {
+  private handleClick = (event: React.MouseEvent<HTMLAnchorElement>): void => {
     if (!this.context.__internalRouter) {
       return
     }

diff --git a/packages/@sanity/state-router/tsconfig.json b/packages/@sanity/state-router/tsconfig.json
@@ -3,6 +3,7 @@
   "include": ["src/**/*.ts", "src/**/*.tsx"],
   "exclude": ["node_modules", "test/**/*.ts"],
   "compilerOptions": {
+    "declaration": true,
     "strict": false,
     "jsx": "react",
     "outDir": "./lib"