diff --git a/.changeset/warm-peas-report.md b/.changeset/warm-peas-report.md new file mode 100644 index 000000000000..cb1a1f067b68 --- /dev/null +++ b/.changeset/warm-peas-report.md @@ -0,0 +1,6 @@ +--- +"@pankod/refine-react-location": patch +"@pankod/refine-react-router-v6": patch +--- + +fix: react extract incorrect resource from encoded pathname diff --git a/packages/react-location/src/index.ts b/packages/react-location/src/index.ts index cbc4a98779ac..1fb0a36a3661 100644 --- a/packages/react-location/src/index.ts +++ b/packages/react-location/src/index.ts @@ -68,9 +68,9 @@ const RouterProvider: IReactRouterProvider = { resource: Object.keys(match.params).length === 0 ? pathname.current.pathname.substring(1) - : pathname.current.pathname - .substring(1) - .replace(paramsString, ""), + : decodeURIComponent( + pathname.current.pathname.substring(1), + ).replace(paramsString, ""), }); }, Prompt, diff --git a/packages/react-router-v6/src/index.ts b/packages/react-router-v6/src/index.ts index 1c06ab55319f..6566ff1141bd 100644 --- a/packages/react-router-v6/src/index.ts +++ b/packages/react-router-v6/src/index.ts @@ -54,7 +54,10 @@ const RouterProvider: IReactRouterProvider = { resource: Object.keys(params).length === 0 ? pathname.substring(1) - : pathname.substring(1).replace(paramsString, ""), + : decodeURIComponent(pathname.substring(1)).replace( + paramsString, + "", + ), }); }, Prompt: Prompt as any,