Skip to content

Commit 6a5e5c5

Browse files
authored
Decode URI component when reading URL path (#482)
1 parent 262e368 commit 6a5e5c5

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

packages/cli/src/components/IndexPane/hooks/__test__/__snapshots__/usePreviewTree.test.ts.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ exports[`usePreviewTree sets routes and cursor from previews 1`] = `
7878
},
7979
{
8080
"collapsed": false,
81-
"displayName": "resetPassword",
81+
"displayName": "reset Password",
8282
"level": 2,
83-
"path": "/previews/ResetPassword/resetPassword",
83+
"path": "/previews/ResetPassword/reset Password",
8484
"previewClass": "ResetPassword",
85-
"previewFunction": "resetPassword",
85+
"previewFunction": "reset Password",
8686
},
8787
]
8888
`;

packages/cli/src/components/IndexPane/hooks/__test__/usePreviewTree.test.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe("usePreviewTree", () => {
1717
"Reservation",
1818
["reservationCanceled", "reservationChanged", "reservationConfirmed"],
1919
],
20-
["ResetPassword", ["resetPassword"]],
20+
["ResetPassword", ["reset Password"]],
2121
];
2222

2323
it("sets routes and cursor from previews", () => {
@@ -41,6 +41,13 @@ describe("usePreviewTree", () => {
4141
expect(cursor).toBe(3);
4242
});
4343

44+
it("sets cursor from previews when preview contains uri encoded char", () => {
45+
mockRouter.setCurrentUrl("/previews/ResetPassword/reset%20Password");
46+
const { result } = renderHook(() => usePreviewTree(previews));
47+
const { cursor } = result.current;
48+
expect(cursor).toBe(10);
49+
});
50+
4451
it("navigates up down left right", () => {
4552
const { result } = renderHook(() => usePreviewTree(previews));
4653
act(result.current.up);

packages/cli/src/components/IndexPane/hooks/usePreviewTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export function usePreviewTree(
8989

9090
useEffect(() => {
9191
if (cursor !== -1 || !treeRoutes) return;
92-
const path = router.asPath.split("?")[0];
92+
const path = decodeURIComponent(router.asPath.split("?")[0]);
9393
const idx = treeRoutes.findIndex((route) => route.path === path);
9494
if (idx >= 0) setCursor(idx);
9595
}, [router.asPath, cursor, treeRoutes]);

0 commit comments

Comments
 (0)