kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-01 12:42:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12291 from KostyaEsmukov/react-router-render-prop

Browse Source 
react-router: added render prop and fixed applyRouterMiddleware types
This commit is contained in:
Yui
2016-11-10 16:26:59 -08:00
committed by GitHub
parent 15ac8c9f2a 6e4467c379
commit f6cf80c8ad
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
react-router/index.d.ts vendored
View File

@@ -1,6 +1,6 @@
// Type definitions for react-router v2.0.0
// Project: https://github.com/rackt/react-router
// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>, Nathan Brown <https://github.com/ngbrown>, Alex Wendland <https://github.com/awendland>
// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>, Nathan Brown <https://github.com/ngbrown>, Alex Wendland <https://github.com/awendland>, Kostya Esmukov <https://github.com/KostyaEsmukov>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
/// <reference types="history" />

20
react-router/lib/Router.d.ts vendored
View File

@@ -1,4 +1,5 @@
import * as React from 'react';
import RouterContext from './RouterContext';
import {
QueryString, Query,
Location, LocationDescriptor, LocationState,
@@ -48,16 +49,17 @@ declare namespace Router {
components: RouteComponent[];
}
interface RouterProps extends React.Props<Router> {
history?: History;
routes?: RouteConfig; // alias for children
createElement?: (component: RouteComponent, props: Object) => any;
onError?: (error: any) => any;
onUpdate?: () => any;
parseQueryString?: ParseQueryString;
stringifyQuery?: StringifyQuery;
interface RouterProps extends React.Props<Router> {
history?: History;
routes?: RouteConfig; // alias for children
createElement?: (component: RouteComponent, props: Object) => any;
onError?: (error: any) => any;
onUpdate?: () => any;
parseQueryString?: ParseQueryString;
stringifyQuery?: StringifyQuery;
basename?: string;
}
render?: (renderProps: React.Props<{}>) => RouterContext;
}
interface PlainRoute {
path?: RoutePattern;

8
react-router/lib/applyRouterMiddleware.d.ts vendored
View File

@@ -1,7 +1,9 @@
import * as React from 'react';
import Router from './Router';
import RouterContext from './RouterContext';
export interface Middleware {
renderRouterContext: (previous: React.Props<{}>[], props: React.Props<{}>) => React.Props<{}>[];
renderRouteComponent: (previous: React.Props<{}>[], props: React.Props<{}>) => React.Props<{}>[];
renderRouterContext?: (previous: RouterContext, props: React.Props<{}>) => RouterContext;
renderRouteComponent?: (previous: Router.RouteComponent, props: React.Props<{}>) => Router.RouteComponent;
}
export default function applyRouterMiddleware(...middlewares: Middleware[]): (renderProps: React.Props<{}>) => React.Props<{}>[];
export default function applyRouterMiddleware(...middlewares: Middleware[]): (renderProps: React.Props<{}>) => RouterContext;

14
react-router/react-router-tests.tsx
View File

@@ -2,7 +2,7 @@ import * as React from "react"
import * as ReactDOM from "react-dom"
import {renderToString} from "react-dom/server";
import { browserHistory, hashHistory, match, createMemoryHistory, withRouter, routerShape, Router, Route, IndexRoute, InjectedRouter, Link, RouterOnContext, RouterContext} from "react-router";
import { applyRouterMiddleware, browserHistory, hashHistory, match, createMemoryHistory, withRouter, routerShape, Router, Route, IndexRoute, InjectedRouter, Link, RouterOnContext, RouterContext} from "react-router";
interface MasterContext {
router: RouterOnContext;
@@ -105,3 +105,15 @@ const routes = (
match({history, routes, location: "baseurl"}, (error, redirectLocation, renderProps) => {
renderToString(<RouterContext {...renderProps} />);
});
ReactDOM.render((
<Router
history={history}
routes={routes}
render={applyRouterMiddleware({
renderRouteComponent: child => child
})}
>
</Router>
), document.body);