[fixed] Use defaultProps of config components

Fixes remix-run#814
danieljuhl · Feb 25, 2015 · 696a706 · 696a706
1 parent 67ecd77
commit 696a706
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/modules/Configuration.js b/modules/Configuration.js
@@ -1,8 +1,15 @@
 var invariant = require('react/lib/invariant');
+var RouteHandler = require('./RouteHandler');
 
 var Configuration = {
 
-  render: function () {
+  getDefaultProps() {
+    return {
+      handler: RouteHandler
+    };
+  },
+
+  render() {
     invariant(
       false,
       '%s elements are for router configuration only and should not be rendered',

diff --git a/modules/components/Route.js b/modules/components/Route.js
@@ -1,7 +1,7 @@
 var React = require('react');
 var Configuration = require('../Configuration');
 var PropTypes = require('../PropTypes');
-var RouteHandler = require('./RouteHandler');
+
 /**
  * <Route> components specify components that are rendered to the page when the
  * URL matches a given pattern.
@@ -53,12 +53,6 @@ var Route = React.createClass({
     path: PropTypes.string,
     handler: PropTypes.func,
     ignoreScrollBehavior: PropTypes.bool
-  },
-
-  getDefaultProps: function(){
-    return {
-      handler: RouteHandler
-    };
   }
 
 });

diff --git a/modules/createRoutesFromReactChildren.js b/modules/createRoutesFromReactChildren.js
@@ -37,7 +37,7 @@ function createRouteFromReactElement(element) {
     return;
 
   var type = element.type;
-  var props = element.props;
+  var props = assign({}, type.defaultProps, element.props);
 
   if (type.propTypes)
     checkPropTypes(type.displayName, type.propTypes, props);