Merge a378f00 into f0f87c1

package.json

@@ -18,7 +18,7 @@
   "dependencies": {},
   "peerDependencies": {
     "react": ">=0.14.0",
-    "react-router": "^2.4.0"
+    "react-router": "^3.0.0"
   },
   "devDependencies": {
     "eslint-config-jonnybuchanan": "3.2.1",
@@ -27,7 +27,7 @@
     "react": "15.2.1",
     "react-addons-test-utils": "15.2.1",
     "react-dom": "15.2.1",
-    "react-router": "2.5.2",
+    "react-router": "3.0.0",
 
     "bootstrap": "3.3.6"
   },

src/index.js

@@ -13,6 +13,20 @@ function createLocationDescriptor({to, query, hash, state}) {
   return {query, hash, state, ...to}
 }
 
+function omitProps(props, omittedPropNames) {
+  const isOmittedProp = {}
+  omittedPropNames.forEach(propName => { isOmittedProp[propName] = true })
+
+  const elementProps = {}
+  Object.entries(props).forEach(([propName, propValue]) => {
+    if (!isOmittedProp[propName]) {
+      elementProps[propName] = propValue
+    }
+  })
+
+  return elementProps
+}
+
 module.exports = function activeComponent(Component, options) {
   if (!Component) {
     throw new Error('activeComponent() must be given a tag name or React component')
@@ -73,10 +87,12 @@ module.exports = function activeComponent(Component, options) {
         }
       }
 
+      let componentProps = omitProps(props, ['params', 'location', 'routes'])
+
       if (!link) {
-        return <Component {...props}>{this.props.children}</Component>
+        return <Component {...componentProps}>{this.props.children}</Component>
       }
-      return <Component {...props}>
+      return <Component {...componentProps}>
         <Link className={options.linkClassName} {...linkProps} to={location}>
           {this.props.children}
         </Link>