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

package/dist/router.umd.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.
  *
@@ -1592,7 +1592,7 @@
 
 
     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
@@ -1618,7 +1618,10 @@
       } // 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, {
         // matches, errors, fetchers go through as-is
         actionData,
@@ -1628,9 +1631,8 @@
         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 === exports.Action.Pop) ; else if (pendingAction === exports.Action.Push) {
@@ -2454,7 +2456,9 @@
         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
@@ -2467,7 +2471,9 @@
             formAction: submission ? submission.formAction : undefined,
             formEncType: submission ? submission.formEncType : undefined,
             formData: submission ? submission.formData : undefined
-          }
+          },
+          // Preserve this flag across redirects
+          preventScrollReset: pendingPreventScrollReset
         });
       }
     }