Extract entire restoreScrollPosition variable

remix-run · Jan 10, 2023 · 859b093 · 859b093
1 parent 0cdb3ac
commit 859b093
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/packages/router/router.ts b/packages/router/router.ts
@@ -771,9 +771,12 @@ export function createRouter(init: RouterInit): Router {
         )
       : state.loaderData;
 
-    // Don't restore on submission navigations when no redirection
-    let preventScrollRestoration =
-      state.navigation.formData && location.state?._isRedirect !== true;
+    // Don't restore on submission navigations unless they redirect
+    let restoreScrollPosition =
+      state.navigation.formData && location.state?._isRedirect !== true
+        ? false
+        : getSavedScrollPosition(location, newState.matches || state.matches);
+
     updateState({
       ...newState, // matches, errors, fetchers go through as-is
       actionData,
@@ -783,9 +786,7 @@ export function createRouter(init: RouterInit): Router {
       initialized: true,
       navigation: IDLE_NAVIGATION,
       revalidation: "idle",
-      restoreScrollPosition: preventScrollRestoration
-        ? false
-        : getSavedScrollPosition(location, newState.matches || state.matches),
+      restoreScrollPosition,
       preventScrollReset: pendingPreventScrollReset,
     });