lastMatch should depend on isExact as well (#345)

supasate · Mar 14, 2020 · 16d4327 · 16d4327
1 parent 66eda0c
commit 16d4327
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/selectors.js b/src/selectors.js
@@ -32,7 +32,7 @@ const createSelectors = (structure) => {
       }
       lastPathname = pathname
       const match = matchPath(pathname, path)
-      if (!match || !lastMatch || match.url !== lastMatch.url) {
+      if (!match || !lastMatch || match.url !== lastMatch.url || match.isExact !== lastMatch.isExact) {
         lastMatch = match
       }
 

diff --git a/test/selectors.test.js b/test/selectors.test.js
@@ -126,11 +126,14 @@ describe("selectors", () => {
 
     it("does not update if the match is the same", () => {
       const matchSelector = createMatchSelector("/")
-      store.dispatch(push('test1'))
-      const match = matchSelector(store.getState())
-      store.dispatch(push('test2'))
-      const expectedMatch = matchSelector(store.getState())
-      expect(match).toBe(expectedMatch)
+      const match1 = matchSelector(store.getState())
+      store.dispatch(push('/test1'))
+      const match2 = matchSelector(store.getState())
+      store.dispatch(push('/test2'))
+      const match3 = matchSelector(store.getState())
+      expect(match1).not.toBe(match2)
+      expect(match1).not.toBe(match3)
+      expect(match2).toEqual(match3)
     })
 
     it("updates if the match is different", () => {