Skip to content

[fixed #1441] isActive false positive when URL not finished #1651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[fixed #1441] isActive false positive when URL not finished #1651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions modules/RouterContextMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,25 @@ import { stripLeadingSlashes, stringifyQuery } from './URLUtils';
var { func, object } = React.PropTypes;

function pathnameIsActive(pathname, activePathname) {
if (stripLeadingSlashes(activePathname).indexOf(stripLeadingSlashes(pathname)) === 0)
return true; // This quick comparison satisfies most use cases.
pathname = stripLeadingSlashes(pathname);
activePathname = stripLeadingSlashes(activePathname);

// TODO: Implement a more stringent comparison that checks
// to see if the pathname matches any routes (and params)
// in the currently active branch.
// perfect match
if (pathname === activePathname) {
return true;
}

return false;
// starts with your path?
if (activePathname.indexOf(pathname) !== 0) {
return false;
}

// eliminate false-positive when the path section was not finished
if (activePathname.charAt(pathname.length) !== '/') {
return false;
}

return true;
}

function queryIsActive(query, activeQuery) {
Expand Down Expand Up @@ -79,7 +90,7 @@ var RouterContextMixin = {

return path;
},

/**
* Pushes a new Location onto the history stack.
*/
Expand Down Expand Up @@ -137,7 +148,7 @@ var RouterContextMixin = {
goForward() {
this.go(1);
},

/**
* Returns true if a <Link> to the given pathname/query combination is
* currently active.
Expand Down