vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-13 13:30:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tsc-1.5.0-alpha

Browse Source
This commit is contained in:
vvakame
2015-07-19 17:36:39 +09:00
parent 3be880fc7d 159b808f9b
commit 4e71f3fb32
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
react-router/react-router.d.ts
Vendored
+16 -13
View File
@@ -7,6 +7,8 @@
///<reference path='../react/react-addons.d.ts' />
declare module ReactRouter {
import React = __React;
//
// Transition
// ----------------------------------------------------------------------
@@ -276,42 +278,43 @@ declare module "react-router" {
export = ReactRouter;
}
declare module React {
declare module __React {
// for DefaultRoute
function createElement(
type: ReactRouter.DefaultRouteClass,
props: ReactRouter.DefaultRouteProp,
...children: React.ReactNode[]): ReactRouter.DefaultRoute;
...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
// for Link
function createElement(
type: ReactRouter.LinkClass,
props: ReactRouter.LinkProp,
...children: React.ReactNode[]): ReactRouter.Link;
...children: __React.ReactNode[]): ReactRouter.Link;
// for NotFoundRoute
function createElement(
type: ReactRouter.NotFoundRouteClass,
props: ReactRouter.NotFoundRouteProp,
...children: React.ReactNode[]): ReactRouter.NotFoundRoute;
...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
// for Redirect
function createElement(
type: ReactRouter.RedirectClass,
props: ReactRouter.RedirectProp,
...children: React.ReactNode[]): ReactRouter.Redirect;
...children: __React.ReactNode[]): ReactRouter.Redirect;
// for Route
function createElement(
type: ReactRouter.RouteClass,
props: ReactRouter.RouteProp,
...children: React.ReactNode[]): ReactRouter.Route;
...children: __React.ReactNode[]): ReactRouter.Route;
// for RouteHandler
function createElement(
type: ReactRouter.RouteHandlerClass,
props: ReactRouter.RouteHandlerProp,
...children: React.ReactNode[]): ReactRouter.RouteHandler;
...children: __React.ReactNode[]): ReactRouter.RouteHandler;
}
declare module "react/addons" {
@@ -319,35 +322,35 @@ declare module "react/addons" {
function createElement(
type: ReactRouter.DefaultRouteClass,
props: ReactRouter.DefaultRouteProp,
...children: React.ReactNode[]): ReactRouter.DefaultRoute;
...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
// for Link
function createElement(
type: ReactRouter.LinkClass,
props: ReactRouter.LinkProp,
...children: React.ReactNode[]): ReactRouter.Link;
...children: __React.ReactNode[]): ReactRouter.Link;
// for NotFoundRoute
function createElement(
type: ReactRouter.NotFoundRouteClass,
props: ReactRouter.NotFoundRouteProp,
...children: React.ReactNode[]): ReactRouter.NotFoundRoute;
...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
// for Redirect
function createElement(
type: ReactRouter.RedirectClass,
props: ReactRouter.RedirectProp,
...children: React.ReactNode[]): ReactRouter.Redirect;
...children: __React.ReactNode[]): ReactRouter.Redirect;
// for Route
function createElement(
type: ReactRouter.RouteClass,
props: ReactRouter.RouteProp,
...children: React.ReactNode[]): ReactRouter.Route;
...children: __React.ReactNode[]): ReactRouter.Route;
// for RouteHandler
function createElement(
type: ReactRouter.RouteHandlerClass,
props: ReactRouter.RouteHandlerProp,
...children: React.ReactNode[]): ReactRouter.RouteHandler;
...children: __React.ReactNode[]): ReactRouter.RouteHandler;
}