diff --git a/types/reach__router/index.d.ts b/types/reach__router/index.d.ts index e61e9e15ad..3a849dd8ee 100644 --- a/types/reach__router/index.d.ts +++ b/types/reach__router/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for @reach/router 1.0 +// Type definitions for @reach/router 1.2 // Project: https://github.com/reach/router // Definitions by: Kingdaro // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -18,12 +18,13 @@ export interface History { export type HistoryListener = () => void; export type HistoryUnsubscribe = () => void; -export class Router extends React.Component {} +export class Router extends React.Component { } export interface RouterProps { basepath?: string; primary?: boolean; location?: WindowLocation; + component?: React.ComponentType | string; } export type RouteComponentProps = Partial & { @@ -38,11 +39,11 @@ export type Omit = Pick>; export type AnchorProps = Omit< React.DetailedHTMLProps< - React.AnchorHTMLAttributes, - HTMLAnchorElement + React.AnchorHTMLAttributes, + HTMLAnchorElement >, "href" // remove href, as it's ignored by the router ->; + >; export interface LinkProps extends AnchorProps { to?: string; @@ -58,7 +59,7 @@ export interface LinkGetProps { location: WindowLocation; } -export class Link extends React.Component> {} +export class Link extends React.Component> { } export interface RedirectProps { from?: string; @@ -68,7 +69,7 @@ export interface RedirectProps { replace?: boolean; } -export class Redirect extends React.Component> {} +export class Redirect extends React.Component> { } export interface MatchProps { path: string; @@ -85,7 +86,7 @@ export interface MatchRenderProps { navigate: NavigateFn; } -export class Match extends React.Component> {} +export class Match extends React.Component> { } export type NavigateFn = (to: string, options?: NavigateOptions<{}>) => void; @@ -98,7 +99,7 @@ export interface LocationProps { children: LocationProviderRenderFn; } -export class Location extends React.Component {} +export class Location extends React.Component { } export interface LocationProviderProps { history: History; @@ -114,13 +115,13 @@ export interface LocationContext { navigate: NavigateFn; } -export class LocationProvider extends React.Component {} +export class LocationProvider extends React.Component { } export interface ServerLocationProps { url: string; } -export class ServerLocation extends React.Component {} +export class ServerLocation extends React.Component { } export const navigate: NavigateFn; diff --git a/types/reach__router/reach__router-tests.tsx b/types/reach__router/reach__router-tests.tsx index 0cada3367d..d279547fd2 100644 --- a/types/reach__router/reach__router-tests.tsx +++ b/types/reach__router/reach__router-tests.tsx @@ -22,6 +22,12 @@ const NotFound = (props: RouteComponentProps) =>
Route not found
; render( + + + + + +