Add support for "to" prop as a function

Author: smashercosmo

package.json

@@ -75,7 +75,7 @@
     "react": "^15.5.4",
     "react-bootstrap": "^0.30.9",
     "react-dom": "^15.5.4",
-    "react-router": "^2.6.0",
+    "react-router": "^3.0.5",
     "release-script": "^1.0.2",
     "rimraf": "^2.6.1",
     "shelljs": "^0.7.7",

src/LinkContainer.js

@@ -23,11 +23,16 @@ function createLocationDescriptor(to, query, hash, state) {
   return to;
 }
 
+function resolveToLocation(to, router) {
+  return typeof to === 'function' ? to(router.location) : to;
+}
+
 const propTypes = {
   onlyActiveOnIndex: PropTypes.bool.isRequired,
   to: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.object,
+    PropTypes.func,
   ]).isRequired,
   query: PropTypes.string,
   hash: PropTypes.string,
@@ -84,15 +89,16 @@ class LinkContainer extends React.Component {
   render() {
     const { router } = this.context;
     const { onlyActiveOnIndex, to, children, ...props } = this.props;
+    const toLocation = resolveToLocation(to, router);
 
     props.onClick = this.onClick;
 
     // Ignore if rendered outside Router context; simplifies unit testing.
     if (router) {
-      props.href = router.createHref(to);
+      props.href = router.createHref(toLocation);
 
       if (props.active == null) {
-        props.active = router.isActive(to, onlyActiveOnIndex);
+        props.active = router.isActive(toLocation, onlyActiveOnIndex);
       }
     }
 

test/LinkContainer.spec.js

@@ -42,6 +42,31 @@ describe('LinkContainer', () => {
         expect(anchor.getAttribute('href')).to.equal('/foo?bar=baz#the-hash');
       });
 
+      it('should support "to" prop as a function', () => {
+        const router = ReactTestUtils.renderIntoDocument(
+          <Router history={createMemoryHistory('/foo')}>
+            <Route
+              path="/foo"
+              component={() => (
+                <LinkContainer
+                  to={location => ({
+                    ...location,
+                    query: { bar: 'baz' },
+                  })}
+                >
+                  <Component>Foo</Component>
+                </LinkContainer>
+              )}
+            />
+          </Router>
+        );
+
+        const anchor = ReactTestUtils.findRenderedDOMComponentWithTag(
+          router, 'A'
+        );
+        expect(anchor.getAttribute('href')).to.equal('/foo?bar=baz');
+      });
+
       it('should not add extra DOM nodes', () => {
         const router = ReactTestUtils.renderIntoDocument(
           <Router history={createMemoryHistory('/')}>