Refactor: initialize currentPath

Shopify · Mar 7, 2022 · c40d022 · c40d022
1 parent db853d6
commit c40d022
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/hydrogen/src/foundation/Router/Router.client.tsx b/packages/hydrogen/src/foundation/Router/Router.client.tsx
@@ -17,7 +17,7 @@ type RouterContextValue = {
 
 const RouterContext = createContext<RouterContextValue | {}>({});
 
-let currentPath = '';
+let currentPath = window.location.pathname;
 
 export const Router: FC<{history?: BrowserHistory}> = ({
   history: pHistory,
@@ -34,10 +34,9 @@ export const Router: FC<{history?: BrowserHistory}> = ({
     if (firstLoad) setFirstLoad(false);
     // A navigation event has just happened
     else if (!pending && currentPath !== serverState.pathname) {
+      currentPath = serverState.pathname;
       window.scrollTo(0, 0);
     }
-
-    currentPath = serverState.pathname;
   }, [pending]);
 
   useEffect(() => {