Fix some issues of #4410/issuecomment-110341203

This commit is contained in:
Yuichi Murata
2015-07-12 21:27:57 +09:00
parent c7cbdd267b
commit 4ca5b84c23
2 changed files with 80 additions and 42 deletions

View File

@@ -140,7 +140,7 @@ declare module "react-router" {
getRouteDepth(): number;
createChildRouteHandler(props: {}): RouteHandler;
}
interface RouteHandlerClass extends React.ReactElement<RouteHandlerProp> {}
interface RouteHandlerClass extends React.ComponentClass<RouteHandlerProp> {}
var Link: LinkClass;
var RouteHandler: RouteHandlerClass;
@@ -253,45 +253,23 @@ declare module "react-router" {
length: number;
}
var History: History;
}
declare module "react" {
import ReactRouter = require("react-router");
// for DefaultRoute
function createElement(
type: ReactRouter.DefaultRouteClass,
props: ReactRouter.DefaultRouteProp,
...children: ReactNode[]): ReactRouter.DefaultRoute;
// for Link
function createElement(
type: ReactRouter.LinkClass,
props: ReactRouter.LinkProp,
...children: ReactNode[]): ReactRouter.Link;
// for NotFoundRoute
function createElement(
type: ReactRouter.NotFoundRouteClass,
props: ReactRouter.NotFoundRouteProp,
...children: ReactNode[]): ReactRouter.NotFoundRoute;
// for Redirect
function createElement(
type: ReactRouter.RedirectClass,
props: ReactRouter.RedirectProp,
...children: ReactNode[]): ReactRouter.Redirect;
// for Route
function createElement(
type: ReactRouter.RouteClass,
props: ReactRouter.RouteProp,
...children: ReactNode[]): ReactRouter.Route;
// for RouteHandler
function createElement(
type: ReactRouter.RouteHandlerClass,
props: ReactRouter.RouteHandlerProp,
...children: ReactNode[]): ReactRouter.RouteHandler;
//
// Context
// ----------------------------------------------------------------------
interface Context {
makePath(to: string, params?: {}, query?: {}): string;
makeHref(to: string, params?: {}, query?: {}): string;
transitionTo(to: string, params?: {}, query?: {}): void;
replaceWith(to: string, params?: {}, query?: {}): void;
goBack(): void;
getCurrentPath(): string;
getCurrentRoutes(): Route[];
getCurrentPathname(): string;
getCurrentParams(): {};
getCurrentQuery(): {};
isActive(to: string, params?: {}, query?: {}): boolean;
}
}