Rename NonRenderable => Configuration

Also, make validateProps a static method.

Author: mjackson

modules/Configuration.js

@@ -0,0 +1,35 @@
+var warning = require('react/lib/warning');
+var invariant = require('react/lib/invariant');
+
+function checkPropTypes(componentName, propTypes, props) {
+  for (var propName in propTypes) {
+    if (propTypes.hasOwnProperty(propName)) {
+      var error = propTypes[propName](props, propName, componentName);
+
+      if (error instanceof Error)
+        warning(false, error.message);
+    }
+  }
+}
+
+var Configuration = {
+
+  statics: {
+
+    validateProps: function (props) {
+      checkPropTypes(this.displayName, this.propTypes, props);
+    }
+
+  },
+
+  render: function () {
+    invariant(
+      false,
+      '%s elements are for router configuration only and should not be rendered',
+      this.constructor.displayName
+    );
+  }
+
+};
+
+module.exports = Configuration;

modules/NonRenderable.js

@@ -1,5 +1,5 @@
 var React = require('react');
-var NonRenderable = require('../NonRenderable');
+var Configuration = require('../Configuration');
 var PropTypes = require('../PropTypes');
 
 /**
@@ -12,11 +12,12 @@ var DefaultRoute = React.createClass({
 
   displayName: 'DefaultRoute',
 
-  mixins: [ NonRenderable ],
+  mixins: [ Configuration ],
 
   propTypes: {
     name: PropTypes.string,
     path: PropTypes.falsy,
+    children: PropTypes.falsy,
     handler: PropTypes.func.isRequired
   }
 

modules/components/DefaultRoute.js

@@ -1,5 +1,5 @@
 var React = require('react');
-var NonRenderable = require('../NonRenderable');
+var Configuration = require('../Configuration');
 var PropTypes = require('../PropTypes');
 
 /**
@@ -13,11 +13,12 @@ var NotFoundRoute = React.createClass({
 
   displayName: 'NotFoundRoute',
 
-  mixins: [ NonRenderable ],
+  mixins: [ Configuration ],
 
   propTypes: {
     name: PropTypes.string,
     path: PropTypes.falsy,
+    children: PropTypes.falsy,
     handler: PropTypes.func.isRequired
   }
 

modules/components/NotFoundRoute.js

@@ -1,5 +1,5 @@
 var React = require('react');
-var NonRenderable = require('../NonRenderable');
+var Configuration = require('../Configuration');
 var PropTypes = require('../PropTypes');
 
 /**
@@ -10,7 +10,7 @@ var Redirect = React.createClass({
 
   displayName: 'Redirect',
 
-  mixins: [ NonRenderable ],
+  mixins: [ Configuration ],
 
   propTypes: {
     path: PropTypes.string,

modules/components/Redirect.js

@@ -1,5 +1,5 @@
 var React = require('react');
-var NonRenderable = require('../NonRenderable');
+var Configuration = require('../Configuration');
 var PropTypes = require('../PropTypes');
 
 /**
@@ -44,7 +44,7 @@ var Route = React.createClass({
 
   displayName: 'Route',
 
-  mixins: [ NonRenderable ],
+  mixins: [ Configuration ],
 
   propTypes: {
     name: PropTypes.string,

modules/components/Route.js

@@ -1,6 +1,5 @@
 /* jshint -W084 */
 var React = require('react');
-var warning = require('react/lib/warning');
 var invariant = require('react/lib/invariant');
 var DefaultRoute = require('./components/DefaultRoute');
 var NotFoundRoute = require('./components/NotFoundRoute');
@@ -21,28 +20,17 @@ function createRedirectHandler(to, _params, _query) {
   });
 }
 
-function checkPropTypes(componentName, propTypes, props) {
-  for (var propName in propTypes) {
-    if (propTypes.hasOwnProperty(propName)) {
-      var error = propTypes[propName](props, propName, componentName);
-
-      if (error instanceof Error)
-        warning(false, error.message);
-    }
-  }
-}
-
 function createRoute(element, parentRoute, namedRoutes) {
   var type = element.type;
   var props = element.props;
 
-  if (type.propTypes)
-    checkPropTypes(type.displayName, type.propTypes, props);
-
-  var route = { name: props.name };
+  if (type.validateProps)
+    type.validateProps(props);
 
-  if (props.ignoreScrollBehavior)
-    route.ignoreScrollBehavior = true;
+  var route = {
+    name: props.name,
+    ignoreScrollBehavior: !!props.ignoreScrollBehavior
+  };
 
   if (type === Redirect.type) {
     route.handler = createRedirectHandler(props.to, props.params, props.query);