[fixed] Compare query by string value

Author: mjackson

modules/__tests__/isActive-test.js

@@ -22,7 +22,7 @@ describe('isActive', function () {
     describe('with no query', function () {
       it('is active', function (done) {
         React.render((
-          <Router history={createHistory('/home')}>
+          <Router history={createHistory('/home?the=query')}>
             <Route path="/home" />
           </Router>
         ), node, function () {
@@ -45,6 +45,19 @@ describe('isActive', function () {
       })
     })
 
+    describe('with a query that also matches by value, but not by type', function () {
+      it('is active', function (done) {
+        React.render((
+          <Router history={createHistory('/home?the=query&n=2&show=false')}>
+            <Route path="/home" />
+          </Router>
+        ), node, function () {
+          expect(this.history.isActive('/home', { the: 'query', n: 2, show: false })).toBe(true)
+          done()
+        })
+      })
+    })
+
     describe('with a query that does not match', function () {
       it('is not active', function (done) {
         React.render((

modules/isActive.js

@@ -1,5 +1,28 @@
 import { matchPattern } from './PatternUtils'
-import deepEqual from 'deep-equal'
+
+function deepEqual(a, b) {
+  if (a == b)
+    return true
+
+  if (a == null || b == null)
+    return false
+
+  if (Array.isArray(a)) {
+    return Array.isArray(b) && a.length === b.length && a.every(function (item, index) {
+      return deepEqual(item, b[index])
+    })
+  }
+
+  if (typeof a === 'object') {
+    for (let p in a)
+      if (a.hasOwnProperty(p) && (!b.hasOwnProperty(p) || !deepEqual(a[p], b[p])))
+        return false
+
+    return true
+  }
+
+  return String(a) === String(b)
+}
 
 function paramsAreActive(paramNames, paramValues, activeParams) {
   return paramNames.every(function (paramName, index) {
@@ -11,10 +34,6 @@ function getMatchingRoute(pathname, activeRoutes, activeParams) {
   let route, pattern, basename = ''
   for (let i = 0, len = activeRoutes.length; i < len; ++i) {
     route = activeRoutes[i]
-
-    //if (!route.path)
-    //  return false
-
     pattern = route.path || ''
 
     if (pattern.charAt(0) !== '/')

package.json

@@ -25,7 +25,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "deep-equal": "^1.0.0",
     "history": "1.12.1",
     "invariant": "^2.0.0",
     "warning": "^2.0.0"