Skip to content
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

Jump to bottom

Ensure backwards-compatibility with navigator.encodeLocation #9647

Merged
merged 2 commits into from Nov 28, 2022
Merged

Ensure backwards-compatibility with navigator.encodeLocation #9647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aad3792
Ensure backwards-compatibility with navigator.encodeLocation
brophdawg11 Nov 28, 2022
1b6b2bb
add changeset
brophdawg11 Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hungry-eyes-cheat.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---
"react-router": patch
---

backwards compatibility for encodeLocation
4 changes: 3 additions & 1 deletion packages/react-router-dom/index.tsx
View file
Open in desktop
Expand Up @@ -480,7 +480,9 @@ export const NavLink = React.forwardRef<HTMLAnchorElement, NavLinkProps>(
let routerState = React.useContext(DataRouterStateContext);
let { navigator } = React.useContext(NavigationContext);

let toPathname = navigator.encodeLocation(path).pathname;
let toPathname = navigator.encodeLocation
? navigator.encodeLocation(path).pathname
: path.pathname;
let locationPathname = location.pathname;
let nextLocationPathname =
routerState && routerState.navigation && routerState.navigation.location
Expand Down
3 changes: 2 additions & 1 deletion packages/react-router/lib/context.ts
View file
Open in desktop
Expand Up @@ -107,7 +107,8 @@ export interface NavigateOptions {
*/
export interface Navigator {
createHref: History["createHref"];
encodeLocation: History["encodeLocation"];
// Optional for backwards-compat with Router/HistoryRouter usage (edge case)
encodeLocation?: History["encodeLocation"];
go: History["go"];
push(to: To, state?: any, opts?: NavigateOptions): void;
replace(to: To, state?: any, opts?: NavigateOptions): void;
Expand Down
8 changes: 6 additions & 2 deletions packages/react-router/lib/hooks.tsx
View file
Open in desktop
Expand Up @@ -405,15 +405,19 @@ export function useRoutes(
pathname: joinPaths([
parentPathnameBase,
// Re-encode pathnames that were decoded inside matchRoutes
navigator.encodeLocation(match.pathname).pathname,
navigator.encodeLocation
? navigator.encodeLocation(match.pathname).pathname
: match.pathname,
]),
pathnameBase:
match.pathnameBase === "/"
? parentPathnameBase
: joinPaths([
parentPathnameBase,
// Re-encode pathnames that were decoded inside matchRoutes
navigator.encodeLocation(match.pathnameBase).pathname,
navigator.encodeLocation
? navigator.encodeLocation(match.pathnameBase).pathname
: match.pathnameBase,
]),
})
),
Expand Down