[fixed] Mark dynamic index routes as active

Author: taion

modules/__tests__/DynamicRoute-test.js

@@ -297,4 +297,45 @@ describe('isActive', function () {
       })
     })
   })
+
+  describe('dynamic routes', function () {
+    const routes = {
+      path: '/',
+      childRoutes: [
+        { path: 'foo' }
+      ],
+      getIndexRoute(location, callback) {
+        setTimeout(() => callback(null, {}))
+      }
+    }
+
+    describe('when not on index route', function () {
+      it('does not show index as active', function (done) {
+        render((
+          <Router history={createHistory('/foo')} routes={routes} />
+        ), node, function () {
+          expect(this.history.isActive('/')).toBe(true)
+          expect(this.history.isActive('/', null, true)).toBe(false)
+          expect(this.history.isActive('/foo')).toBe(true)
+          done()
+        })
+      })
+    })
+
+    describe('when on index route', function () {
+      it('shows index as active', function (done) {
+        render((
+          <Router history={createHistory('/')} routes={routes} />
+        ), node, function () {
+          // Need to wait for async match to complete.
+          setTimeout(() => {
+            expect(this.history.isActive('/')).toBe(true)
+            expect(this.history.isActive('/', null, true)).toBe(true)
+            expect(this.history.isActive('/foo')).toBe(false)
+            done()
+          })
+        })
+      })
+    })
+  })
 })

modules/__tests__/isActive-test.js

@@ -69,11 +69,28 @@ function getMatchingRoute(pathname, activeRoutes, activeParams) {
 function routeIsActive(pathname, activeRoutes, activeParams, indexOnly) {
   let route = getMatchingRoute(pathname, activeRoutes, activeParams)
 
-  if (route == null)
+  if (route == null) {
     return false
+  }
+
+  if (indexOnly) {
+    if (activeRoutes.length < 2) {
+      return false
+    }
 
-  if (indexOnly)
-    return activeRoutes.length > 1 && activeRoutes[activeRoutes.length - 1] === route.indexRoute
+    const lastRoute = activeRoutes[activeRoutes.length - 1]
+    if (route.indexRoute) {
+      return lastRoute === route.indexRoute
+    }
+
+    // TODO: Should we also return true if lastRoute is route?
+
+    // In case the index route was configured via getIndexRoute.
+    return (
+      activeRoutes[activeRoutes.length - 2] === route &&
+      !lastRoute.path // Pathless route must have been the index route.
+    )
+  }
 
   return true
 }