fix: keep search params while doing background location redirect

leather-io · Dec 6, 2023 · 6b7ce6a · 6b7ce6a
1 parent 9414a9b
commit 6b7ce6a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/app/routes/hooks/use-background-location-redirect.ts b/src/app/routes/hooks/use-background-location-redirect.ts
@@ -11,18 +11,21 @@ import { useLocationState } from '@app/common/hooks/use-location-state';
  */
 
 export function useBackgroundLocationRedirect(baseUrl = RouteUrls.Home) {
-  const { pathname, state } = useLocation();
+  const { pathname, state, search } = useLocation();
   const navigate = useNavigate();
   const backgroundLocation = useLocationState('backgroundLocation');
 
   useEffect(() => {
     void (async () => {
       if (backgroundLocation === undefined) {
-        return navigate(pathname, {
-          state: { backgroundLocation: { pathname: baseUrl }, ...state },
-        });
+        return navigate(
+          { pathname, search },
+          {
+            state: { backgroundLocation: { pathname: baseUrl }, ...state },
+          }
+        );
       }
       return false;
     })();
-  }, [backgroundLocation, baseUrl, navigate, pathname, state]);
+  }, [backgroundLocation, baseUrl, navigate, pathname, state, search]);
 }