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

package/dist/router.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.2.0
+ * @remix-run/router v1.2.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1790,7 +1790,10 @@ function createRouter(init) {
         replace = result.location === state.location.pathname + state.location.search;
       }
 
-      await startRedirectNavigation(state, result, replace);
+      await startRedirectNavigation(state, result, {
+        submission,
+        replace
+      });
       return {
         shortCircuited: true
       };
@@ -1845,9 +1848,17 @@ function createRouter(init) {
       }, 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
 
@@ -1926,7 +1937,9 @@ function createRouter(init) {
     let redirect = findRedirect(results);
 
     if (redirect) {
-      await startRedirectNavigation(state, redirect, replace);
+      await startRedirectNavigation(state, redirect, {
+        replace
+      });
       return {
         shortCircuited: true
       };
@@ -2056,7 +2069,10 @@ function createRouter(init) {
       updateState({
         fetchers: new Map(state.fetchers)
       });
-      return startRedirectNavigation(state, actionResult, false, true);
+      return startRedirectNavigation(state, actionResult, {
+        submission,
+        isFetchActionRedirect: true
+      });
     } // Process any non-redirect errors thrown
 
 
@@ -2133,7 +2149,9 @@ function createRouter(init) {
     let redirect = findRedirect(results);
 
     if (redirect) {
-      return startRedirectNavigation(state, redirect);
+      return startRedirectNavigation(state, redirect, {
+        submission
+      });
     } // Process and commit output from loaders
 
 
@@ -2279,9 +2297,15 @@ function createRouter(init) {
    */
 
 
-  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;
     }
@@ -2311,24 +2335,33 @@ function createRouter(init) {
 
 
     pendingNavigationController = null;
-    let redirectHistoryAction = replace === true ? Action.Replace : Action.Push;
+    let redirectHistoryAction = replace === true ? Action.Replace : 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
@@ -2337,10 +2370,10 @@ function createRouter(init) {
         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
         }
       });
     }
@@ -2585,10 +2618,10 @@ function createStaticHandler(routes, opts) {
    * 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");
@@ -2674,11 +2707,11 @@ function createStaticHandler(routes, opts) {
    */
 
 
-  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");
@@ -3459,12 +3492,12 @@ function getShortCircuitMatches(routes) {
   };
 }
 
-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";