@remix-run/router 1.2.0 → 1.2.1-pre.1

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.2.0
+ * @remix-run/router v1.2.1-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1548,17 +1548,14 @@
 
 
     function completeNavigation(location, newState) {
-      var _state$navigation$for;
+      var _location$state;
 
       // Deduce if we're in a loading/actionReload state:
       // - We have committed actionData in the store
-      // - The current navigation was a submission
+      // - The current navigation was a mutation submission
       // - We're past the submitting state and into the loading state
-      // - The location we've finished loading is different from the submission
-      //   location, indicating we redirected from the action (avoids false
-      //   positives for loading/submissionRedirect when actionData returned
-      //   on a prior submission)
-      let isActionReload = state.actionData != null && state.navigation.formMethod != null && state.navigation.state === "loading" && ((_state$navigation$for = state.navigation.formAction) == null ? void 0 : _state$navigation$for.split("?")[0]) === location.pathname;
+      // - The location being loaded is not the result of a redirect
+      let isActionReload = state.actionData != null && state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && state.navigation.state === "loading" && ((_location$state = location.state) == null ? void 0 : _location$state._isRedirect) !== true;
       let actionData;
 
       if (newState.actionData) {
@@ -1841,7 +1838,10 @@
           replace = result.location === state.location.pathname + state.location.search;
         }
 
-        await startRedirectNavigation(state, result, replace);
+        await startRedirectNavigation(state, result, {
+          submission,
+          replace
+        });
         return {
           shortCircuited: true
         };
@@ -1896,9 +1896,17 @@
         }, submission);
 
         loadingNavigation = navigation;
-      }
+      } // If this was a redirect from an action we don't have a "submission" but
+      // we have it on the loading navigation so use that if available
+
 
-      let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(state, matches, submission, location, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, pendingActionData, pendingError, fetchLoadMatches); // Cancel pending deferreds for no-longer-matched routes or routes we're
+      let activeSubmission = submission ? submission : loadingNavigation.formMethod && loadingNavigation.formAction && loadingNavigation.formData && loadingNavigation.formEncType ? {
+        formMethod: loadingNavigation.formMethod,
+        formAction: loadingNavigation.formAction,
+        formData: loadingNavigation.formData,
+        formEncType: loadingNavigation.formEncType
+      } : undefined;
+      let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(state, matches, activeSubmission, location, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, pendingActionData, pendingError, fetchLoadMatches); // Cancel pending deferreds for no-longer-matched routes or routes we're
       // about to reload.  Note that if this is an action reload we would have
       // already cancelled all pending deferreds so this would be a no-op
 
@@ -1977,7 +1985,9 @@
       let redirect = findRedirect(results);
 
       if (redirect) {
-        await startRedirectNavigation(state, redirect, replace);
+        await startRedirectNavigation(state, redirect, {
+          replace
+        });
         return {
           shortCircuited: true
         };
@@ -2107,7 +2117,9 @@
         updateState({
           fetchers: new Map(state.fetchers)
         });
-        return startRedirectNavigation(state, actionResult, false, true);
+        return startRedirectNavigation(state, actionResult, {
+          isFetchActionRedirect: true
+        });
       } // Process any non-redirect errors thrown
 
 
@@ -2330,9 +2342,15 @@
      */
 
 
-    async function startRedirectNavigation(state, redirect, replace, isFetchActionRedirect) {
+    async function startRedirectNavigation(state, redirect, _temp) {
       var _window;
 
+      let {
+        submission,
+        replace,
+        isFetchActionRedirect
+      } = _temp === void 0 ? {} : _temp;
+
       if (redirect.revalidate) {
         isRevalidationRequired = true;
       }
@@ -2362,24 +2380,33 @@
 
 
       pendingNavigationController = null;
-      let redirectHistoryAction = replace === true ? exports.Action.Replace : exports.Action.Push;
+      let redirectHistoryAction = replace === true ? exports.Action.Replace : exports.Action.Push; // Use the incoming submission if provided, fallback on the active one in
+      // state.navigation
+
       let {
         formMethod,
         formAction,
         formEncType,
         formData
-      } = state.navigation; // If this was a 307/308 submission we want to preserve the HTTP method and
+      } = state.navigation;
+
+      if (!submission && formMethod && formAction && formData && formEncType) {
+        submission = {
+          formMethod,
+          formAction,
+          formEncType,
+          formData
+        };
+      } // If this was a 307/308 submission we want to preserve the HTTP method and
       // re-submit the GET/POST/PUT/PATCH/DELETE as a submission navigation to the
       // redirected location
 
-      if (redirectPreserveMethodStatusCodes.has(redirect.status) && formMethod && isMutationMethod(formMethod) && formEncType && formData) {
+
+      if (redirectPreserveMethodStatusCodes.has(redirect.status) && submission && isMutationMethod(submission.formMethod)) {
         await startNavigation(redirectHistoryAction, redirectLocation, {
-          submission: {
-            formMethod,
-            formAction: redirect.location,
-            formEncType,
-            formData
-          }
+          submission: _extends({}, submission, {
+            formAction: redirect.location
+          })
         });
       } else {
         // Otherwise, we kick off a new loading navigation, preserving the
@@ -2388,10 +2415,10 @@
           overrideNavigation: {
             state: "loading",
             location: redirectLocation,
-            formMethod: formMethod || undefined,
-            formAction: formAction || undefined,
-            formEncType: formEncType || undefined,
-            formData: formData || undefined
+            formMethod: submission ? submission.formMethod : undefined,
+            formAction: submission ? submission.formAction : undefined,
+            formEncType: submission ? submission.formEncType : undefined,
+            formData: submission ? submission.formData : undefined
           }
         });
       }
@@ -2636,10 +2663,10 @@
      * return it directly.
      */
 
-    async function query(request, _temp) {
+    async function query(request, _temp2) {
       let {
         requestContext
-      } = _temp === void 0 ? {} : _temp;
+      } = _temp2 === void 0 ? {} : _temp2;
       let url = new URL(request.url);
       let method = request.method.toLowerCase();
       let location = createLocation("", createPath(url), null, "default");
@@ -2725,11 +2752,11 @@
      */
 
 
-    async function queryRoute(request, _temp2) {
+    async function queryRoute(request, _temp3) {
       let {
         routeId,
         requestContext
-      } = _temp2 === void 0 ? {} : _temp2;
+      } = _temp3 === void 0 ? {} : _temp3;
       let url = new URL(request.url);
       let method = request.method.toLowerCase();
       let location = createLocation("", createPath(url), null, "default");
@@ -3510,12 +3537,12 @@
     };
   }
 
-  function getInternalRouterError(status, _temp3) {
+  function getInternalRouterError(status, _temp4) {
     let {
       pathname,
       routeId,
       method
-    } = _temp3 === void 0 ? {} : _temp3;
+    } = _temp4 === void 0 ? {} : _temp4;
     let statusText = "Unknown Server Error";
     let errorMessage = "Unknown @remix-run/router error";