@remix-run/router 1.3.0-pre.0 → 1.3.0-pre.1

package/dist/router.d.ts

@@ -285,6 +285,7 @@ declare type LinkNavigateOptions = {
 declare type SubmissionNavigateOptions = {
     replace?: boolean;
     state?: any;
+    preventScrollReset?: boolean;
     formMethod?: FormMethod;
     formEncType?: FormEncType;
     formData: FormData;

package/dist/router.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.3.0-pre.0
+ * @remix-run/router v1.3.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1542,7 +1542,7 @@ function createRouter(init) {
 
 
   function completeNavigation(location, newState) {
-    var _location$state;
+    var _location$state, _location$state2;
 
     // Deduce if we're in a loading/actionReload state:
     // - We have committed actionData in the store
@@ -1568,7 +1568,10 @@ function createRouter(init) {
     } // Always preserve any existing loaderData from re-used routes
 
 
-    let loaderData = newState.loaderData ? mergeLoaderData(state.loaderData, newState.loaderData, newState.matches || [], newState.errors) : state.loaderData;
+    let loaderData = newState.loaderData ? mergeLoaderData(state.loaderData, newState.loaderData, newState.matches || [], newState.errors) : state.loaderData; // Always respect the user flag.  Otherwise don't reset on mutation
+    // submission navigations unless they redirect
+
+    let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && ((_location$state2 = location.state) == null ? void 0 : _location$state2._isRedirect) !== true;
     updateState(_extends({}, newState, {
       actionData,
       loaderData,
@@ -1577,9 +1580,8 @@ function createRouter(init) {
       initialized: true,
       navigation: IDLE_NAVIGATION,
       revalidation: "idle",
-      // Don't restore on submission navigations
-      restoreScrollPosition: state.navigation.formData ? false : getSavedScrollPosition(location, newState.matches || state.matches),
-      preventScrollReset: pendingPreventScrollReset
+      restoreScrollPosition: getSavedScrollPosition(location, newState.matches || state.matches),
+      preventScrollReset
     }));
 
     if (isUninterruptedRevalidation) ; else if (pendingAction === Action.Pop) ; else if (pendingAction === Action.Push) {
@@ -2403,7 +2405,9 @@ function createRouter(init) {
       await startNavigation(redirectHistoryAction, redirectLocation, {
         submission: _extends({}, submission, {
           formAction: redirect.location
-        })
+        }),
+        // Preserve this flag across redirects
+        preventScrollReset: pendingPreventScrollReset
       });
     } else {
       // Otherwise, we kick off a new loading navigation, preserving the
@@ -2416,7 +2420,9 @@ function createRouter(init) {
           formAction: submission ? submission.formAction : undefined,
           formEncType: submission ? submission.formEncType : undefined,
           formData: submission ? submission.formData : undefined
-        }
+        },
+        // Preserve this flag across redirects
+        preventScrollReset: pendingPreventScrollReset
       });
     }
   }