Apply some changes that had been applied to react-router.d.ts instead of index

(This is everything from https://github.com/DefinitelyTyped/DefinitelyTyped/commits/types-2.0/react-router/react-router.d.ts that came after index's creation on May 9)
This commit is contained in:
Andy Hanson
2016-08-24 11:44:24 -07:00
parent 69e4f6f196
commit a2d726de56
2 changed files with 4 additions and 3 deletions

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>
// 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: https://github.com/DefinitelyTyped/DefinitelyTyped
export as namespace ReactRouter;
@@ -55,6 +55,7 @@ export type InjectedRouter = Router.InjectedRouter;
export type HistoryBase = History.HistoryBase;
export type RouterOnContext = Router.RouterOnContext;
export type RouteProps = Route.RouteProps;
export type LinkProps = Link.LinkProps;
export {

View File

@@ -12,8 +12,8 @@ declare namespace self {
path?: Router.RoutePattern;
component?: Router.RouteComponent;
components?: Router.RouteComponents;
getComponent?: (location: Location, cb: (error: any, component?: Router.RouteComponent) => void) => void;
getComponents?: (location: Location, cb: (error: any, components?: Router.RouteComponents) => void) => void;
getComponent?: (nextState: Router.RouterState, cb: (error: any, component?: Router.RouteComponent) => void) => void
getComponents?: (nextState: Router.RouterState, cb: (error: any, components?: Router.RouteComponents) => void) => void
onEnter?: Router.EnterHook;
onLeave?: Router.LeaveHook;
onChange?: Router.ChangeHook;