Skip to content

Commit

Permalink
Support sensitive matchPath option in NavLink (#7251)
Browse files Browse the repository at this point in the history
* Support `sensitive` matchPath option in NavLink

* Add NavLink sensitive prop tests
  • Loading branch information
caseywebdev authored Apr 12, 2020
1 parent 402ecab commit 291bfd0
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 0 deletions.
3 changes: 3 additions & 0 deletions packages/react-router-dom/modules/NavLink.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const NavLink = forwardRef(
exact,
isActive: isActiveProp,
location: locationProp,
sensitive,
strict,
style: styleProp,
to,
Expand Down Expand Up @@ -59,6 +60,7 @@ const NavLink = forwardRef(
? matchPath(currentLocation.pathname, {
path: escapedPath,
exact,
sensitive,
strict
})
: null;
Expand Down Expand Up @@ -114,6 +116,7 @@ if (__DEV__) {
exact: PropTypes.bool,
isActive: PropTypes.func,
location: PropTypes.object,
sensitive: PropTypes.bool,
strict: PropTypes.bool,
style: PropTypes.object
};
Expand Down
62 changes: 62 additions & 0 deletions packages/react-router-dom/modules/__tests__/NavLink-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,68 @@ describe("A <NavLink>", () => {
});
});

describe("with `sensitive=true`", () => {
it("applies default activeClassName for sensitive matches", () => {
renderStrict(
<MemoryRouter initialEntries={["/pizza"]}>
<NavLink sensitive to="/pizza">
Pizza!
</NavLink>
</MemoryRouter>,
node
);

const a = node.querySelector("a");

expect(a.className).toContain("active");
});

it("does not apply default activeClassName for non-sensitive matches", () => {
renderStrict(
<MemoryRouter initialEntries={["/PIZZA"]}>
<NavLink sensitive to="/pizza">
Pizza!
</NavLink>
</MemoryRouter>,
node
);

const a = node.querySelector("a");

expect(a.className).not.toContain("active");
});

it("applies custom activeClassName for sensitive matches", () => {
renderStrict(
<MemoryRouter initialEntries={["/pizza"]}>
<NavLink sensitive to="/pizza" activeClassName="selected">
Pizza!
</NavLink>
</MemoryRouter>,
node
);

const a = node.querySelector("a");

expect(a.className).toContain("selected");
});

it("does not apply custom activeClassName for non-sensitive matches", () => {
renderStrict(
<MemoryRouter initialEntries={["/pizza"]}>
<NavLink sensitive to="/PIZZA" activeClassName="selected">
Pizza!
</NavLink>
</MemoryRouter>,
node
);

const a = node.querySelector("a");

expect(a.className).not.toContain("selected");
});
});

describe("the `location` prop", () => {
it("overrides the current location", () => {
renderStrict(
Expand Down

0 comments on commit 291bfd0

Please sign in to comment.