Update isActive

Author: taion

modules/Link.js

@@ -118,7 +118,7 @@ const Link = React.createClass({
       props.href = router.createHref(loc)
 
       if (activeClassName || (activeStyle != null && !isEmptyObject(activeStyle))) {
-        if (router.isActive(to, query, onlyActiveOnIndex)) {
+        if (router.isActive(loc, onlyActiveOnIndex)) {
           if (activeClassName)
             props.className += props.className === '' ? activeClassName : ` ${activeClassName}`
 

modules/__tests__/Link-test.js

@@ -78,8 +78,18 @@ describe('A <Link>', function () {
       render() {
         return (
           <div>
-            <Link to="/hello/michael" activeClassName="active">Michael</Link>
-            <Link to="/hello/ryan" activeClassName="active">Ryan</Link>
+            <Link
+              to="/hello/michael"
+              activeClassName="active"
+            >
+              Michael
+            </Link>
+            <Link
+              to={{ pathname: '/hello/ryan', query: { the: 'query' } }}
+              activeClassName="active"
+            >
+              Ryan
+            </Link>
           </div>
         )
       }
@@ -112,6 +122,34 @@ describe('A <Link>', function () {
         done()
       })
     })
+
+    it('is active when its params and query match', function (done) {
+      render((
+        <Router history={createHistory('/hello/ryan?the=query')}>
+          <Route path="/" component={App}>
+            <Route path="hello/:name" component={Hello} />
+          </Route>
+        </Router>
+      ), node, function () {
+        const a = node.querySelectorAll('a')[1]
+        expect(a.className.trim()).toEqual('active')
+        done()
+      })
+    })
+
+    it('is not active when its query does not match', function (done) {
+      render((
+        <Router history={createHistory('/hello/ryan?the=other+query')}>
+          <Route path="/" component={App}>
+            <Route path="hello/:name" component={Hello} />
+          </Route>
+        </Router>
+      ), node, function () {
+        const a = node.querySelectorAll('a')[1]
+        expect(a.className.trim()).toEqual('')
+        done()
+      })
+    })
   })
 
   describe('when its route is active and className is empty', function () {

modules/__tests__/_bc-Link-test.js

@@ -40,6 +40,85 @@ describe('v1 Link', function () {
     })
   })
 
+  describe('with params', function () {
+    class App extends Component {
+      render() {
+        return (
+          <div>
+            <Link
+              to="/hello/michael"
+              activeClassName="active"
+            >
+              Michael
+            </Link>
+            <Link
+              to="hello/ryan" query={{ the: 'query' }}
+              activeClassName="active"
+            >
+              Ryan
+            </Link>
+          </div>
+        )
+      }
+    }
+
+    it('is active when its params match', function (done) {
+      render((
+        <Router history={createHistory('/hello/michael')}>
+          <Route path="/" component={App}>
+            <Route path="hello/:name" component={Hello} />
+          </Route>
+        </Router>
+      ), node, function () {
+        const a = node.querySelectorAll('a')[0]
+        expect(a.className.trim()).toEqual('active')
+        done()
+      })
+    })
+
+    it('is not active when its params do not match', function (done) {
+      render((
+        <Router history={createHistory('/hello/michael')}>
+          <Route path="/" component={App}>
+            <Route path="hello/:name" component={Hello} />
+          </Route>
+        </Router>
+      ), node, function () {
+        const a = node.querySelectorAll('a')[1]
+        expect(a.className.trim()).toEqual('')
+        done()
+      })
+    })
+
+    it('is active when its params and query match', function (done) {
+      render((
+        <Router history={createHistory('/hello/ryan?the=query')}>
+          <Route path="/" component={App}>
+            <Route path="hello/:name" component={Hello} />
+          </Route>
+        </Router>
+      ), node, function () {
+        const a = node.querySelectorAll('a')[1]
+        expect(a.className.trim()).toEqual('active')
+        done()
+      })
+    })
+
+    it('is not active when its query does not match', function (done) {
+      render((
+        <Router history={createHistory('/hello/ryan?the=other+query')}>
+          <Route path="/" component={App}>
+            <Route path="hello/:name" component={Hello} />
+          </Route>
+        </Router>
+      ), node, function () {
+        const a = node.querySelectorAll('a')[1]
+        expect(a.className.trim()).toEqual('')
+        done()
+      })
+    })
+  })
+
   it('transitions to the correct route with deprecated props', function (done) {
     class LinkWrapper extends Component {
       handleClick() {