Merge branch 'query-omit'

Author: faceyspacey

__tests__/NavLink.js

@@ -76,7 +76,7 @@ test('isActive returns true', () => {
     isActive: (match, location) => {
       expect(match).toMatchSnapshot()
       expect(location).toMatchSnapshot()
-      return true
+      return match
     }
   })
 
@@ -125,3 +125,12 @@ it('supports custom HTML tag name which is still a link', () => {
 
   expect(tree).toMatchSnapshot()
 })
+
+test('query params are ommitted', () => {
+  const { tree } = createNavLink('/first', {
+    to: '/first?foo=123',
+    activeClassName: 'active'
+  })
+
+  expect(tree).toMatchSnapshot()
+})

__tests__/__snapshots__/NavLink.js.snap

@@ -123,6 +123,16 @@ exports[`isActive returns true 3`] = `
 />
 `;
 
+exports[`query params are ommitted 1`] = `
+<a
+  aria-current="true"
+  className="active"
+  href="/first?foo=123"
+  onClick={[Function]}
+  style={Object {}}
+/>
+`;
+
 exports[`reacts to state changes (onClick) 1`] = `
 <a
   aria-current={false}

src/NavLink.js

@@ -63,7 +63,7 @@ const NavLink = (
   to = href || to
 
   const location = selectLocationState(store.getState())
-  const path = toUrl(to, location.routesMap)
+  const path = toUrl(to, location.routesMap).split('?')[0]
   const match = matchPath(pathname, { path, exact, strict })
   const active = !!(isActive ? isActive(match, location) : match)