fix(clerk-js): Replace state when merging fragment into url

chore(clerk-js): Changeset
clerk · Jul 6, 2023 · bafec05 · bafec05
1 parent f81c4fc
commit bafec05
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/fair-mangos-roll.md b/.changeset/fair-mangos-roll.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': minor
+---
+
+Fix a bug where clicking sign in/up would require two back button presses to return to the original page
diff --git a/packages/clerk-js/src/ui/router/PathRouter.tsx b/packages/clerk-js/src/ui/router/PathRouter.tsx
@@ -38,7 +38,8 @@ export const PathRouter = ({ basePath, preservedParams, children }: PathRouterPr
     const convertHashToPath = async () => {
       if (hasUrlInFragment(window.location.hash)) {
         const url = mergeFragmentIntoUrl(new URL(window.location.href));
-        await internalNavigate(url.href);
+        window.history.replaceState(window.history.state, '', url.href);
+        await internalNavigate(url.href); // make this navigation as well since replaceState is asynchronous
         setStripped(true);
       }
     };

diff --git a/packages/clerk-js/src/ui/router/__tests__/PathRouter.test.tsx b/packages/clerk-js/src/ui/router/__tests__/PathRouter.test.tsx
@@ -54,6 +54,7 @@ describe('PathRouter', () => {
   beforeAll(() => {
     // @ts-ignore
     delete window.location;
+    history.replaceState = jest.fn();
   });
 
   afterAll(() => {