Merge pull request DefinitelyTyped#4312 from mrk21/fix-react-router.d.ts

Fix DefinitelyTyped#4267(react-router/react-router.d.ts)

Author: vvakame

react-router/react-router-test.ts

@@ -263,6 +263,7 @@ class CreateTest {
     v: Router.Router;
 
     constructor() {
+        // React.createElement() version
         this.v = Router.create({
             routes: React.createElement(Router.Route, null)
         });
@@ -271,6 +272,16 @@ class CreateTest {
             location: Router.HistoryLocation,
             scrollBehavior: Router.ImitateBrowserBehavior
         });
+        
+        // React.createFactory() version
+        this.v = Router.create({
+            routes: React.createFactory(Router.Route)()
+        });
+        this.v = Router.create({
+            routes: React.createFactory(Router.Route)(),
+            location: Router.HistoryLocation,
+            scrollBehavior: Router.ImitateBrowserBehavior
+        });
     }
 
     run() {
@@ -281,12 +292,21 @@ class CreateTest {
 
 class RunTest {
     constructor() {
+        // React.createElement() version
         var v1: Router.Router = Router.run(React.createElement(Router.Route, null), (Handler) => {
             React.render(React.createElement(Handler, null), document.body);
         });
         var v2: Router.Router = Router.run(React.createElement(Router.Route, null), Router.HistoryLocation, (Handler, state) => {
             React.render(React.createElement(Handler, null), document.body);
         });
+        
+        // React.createFactory() version
+        var v3: Router.Router = Router.run(React.createFactory(Router.Route)(), (Handler) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
+        var v4: Router.Router = Router.run(React.createFactory(Router.Route)(), Router.HistoryLocation, (Handler, state) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
     }
 }
 

react-router/react-router.d.ts

@@ -179,16 +179,16 @@ declare module ReactRouter {
     }
 
     interface RouterCreateOption {
-        routes: Route;
+        routes: React.ReactElement<RouteProp>;
         location?: LocationBase;
         scrollBehavior?: ScrollBehaviorBase;
     }
 
     type RouterRunCallback = (Handler: Router, state: RouterState) => void;
 
     function create(options: RouterCreateOption): Router;
-    function run(routes: Route, callback: RouterRunCallback): Router;
-    function run(routes: Route, location: LocationBase, callback: RouterRunCallback): Router;
+    function run(routes: React.ReactElement<RouteProp>, callback: RouterRunCallback): Router;
+    function run(routes: React.ReactElement<RouteProp>, location: LocationBase, callback: RouterRunCallback): Router;
 
 
     //