Allow passing handler via "handler" prop

Author: andreypopp

README.md

@@ -42,6 +42,14 @@ descriptors — `Location` and `NotFound`.
 That way `App` will render a markup for a currently active location (via
 `window.location.pathname`).
 
+If you don't want to specify handlers for each location inline you can pass them
+a `handler` prop with a component class instead:
+
+    <Locations>
+      <Location path="/" handler={MainPage} />
+      <Location path="/users/:username" handler={UserPage} />
+    </Locations>
+
 It automatically handles `popstate` event and updates its state accordingly.
 
 To navigate to a different location, component exposes `navigate(path)` method.
@@ -61,7 +69,7 @@ You would want to keep a `ref` to the component to call it:
         </Locations>
       )
     }
-    
+
 That way all clicks to anchors will be intercepted and, instead of reloading the
 page, routed via `Locations` component.
 

index.js

@@ -42,7 +42,7 @@ function createRouter(component) {
 
         if (process.env.NODE_ENV !== "production") {
           invariant(
-            current.children !== undefined && current.path !== undefined,
+            current.handler !== undefined && current.path !== undefined,
             "Router should contain either Route or NotFound components as children")
         }
 
@@ -60,27 +60,27 @@ function createRouter(component) {
         }
       }
 
-      var children = page ? page.children :
-                     notFound ? notFound.children :
+      var handler = page ? page.handler :
+                     notFound ? notFound.handler :
                      [];
 
-      return this.transferPropsTo(component(null, children(match)));
+      return this.transferPropsTo(component(null, handler(match)));
     }
   });
 }
 
-function Route(props, children) {
+function Route(props, handler) {
   invariant(
-    typeof children === 'function',
-    "Route children should be a template");
-  return {path: props.path, children: children};
+    typeof props.handler === 'function' || typeof handler === 'function',
+    "Route handler should be a template");
+  return {path: props.path, handler: props.handler || handler};
 }
 
-function NotFound(_props, children) {
+function NotFound(props, handler) {
   invariant(
-    typeof children === 'function',
-    "NotFound children should be a template");
-  return {path: null, children: children};
+    typeof props.handler === 'function' || typeof handler === 'function',
+    "NotFound handler should be a template");
+  return {path: null, handler: props.handler || handler};
 }
 
 module.exports = {