@tanstack/router-core 1.125.0 → 1.125.1

package/dist/esm/router.js

@@ -211,7 +211,13 @@ class RouterCore {
       const match = this.getMatch(id);
       if (!match) return;
       match.abortController.abort();
-      clearTimeout(match.pendingTimeout);
+      this.updateMatch(id, (prev) => {
+        clearTimeout(prev.pendingTimeout);
+        return {
+          ...prev,
+          pendingTimeout: void 0
+        };
+      });
     };
     this.cancelMatches = () => {
       var _a;
@@ -877,19 +883,26 @@ class RouterCore {
                 }
                 const shouldPending = !!(onReady && !this.isServer && !resolvePreload(matchId) && (route.options.loader || route.options.beforeLoad || routeNeedsPreload(route)) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? ((_b = this.options) == null ? void 0 : _b.defaultPendingComponent)));
                 let executeBeforeLoad = true;
-                if (
-                  // If we are in the middle of a load, either of these will be present
-                  // (not to be confused with `loadPromise`, which is always defined)
-                  existingMatch.beforeLoadPromise || existingMatch.loaderPromise
-                ) {
-                  if (shouldPending) {
-                    setTimeout(() => {
+                const setupPendingTimeout = () => {
+                  if (shouldPending && this.getMatch(matchId).pendingTimeout === void 0) {
+                    const pendingTimeout = setTimeout(() => {
                       try {
                         triggerOnReady();
                       } catch {
                       }
                     }, pendingMs);
+                    updateMatch(matchId, (prev) => ({
+                      ...prev,
+                      pendingTimeout
+                    }));
                   }
+                };
+                if (
+                  // If we are in the middle of a load, either of these will be present
+                  // (not to be confused with `loadPromise`, which is always defined)
+                  existingMatch.beforeLoadPromise || existingMatch.loaderPromise
+                ) {
+                  setupPendingTimeout();
                   await existingMatch.beforeLoadPromise;
                   const match = this.getMatch(matchId);
                   if (match.status === "error") {
@@ -910,16 +923,6 @@ class RouterCore {
                         beforeLoadPromise: createControlledPromise()
                       };
                     });
-                    const abortController = new AbortController();
-                    let pendingTimeout;
-                    if (shouldPending) {
-                      pendingTimeout = setTimeout(() => {
-                        try {
-                          triggerOnReady();
-                        } catch {
-                        }
-                      }, pendingMs);
-                    }
                     const { paramsError, searchError } = this.getMatch(matchId);
                     if (paramsError) {
                       handleSerialError(index, paramsError, "PARSE_PARAMS");
@@ -927,13 +930,14 @@ class RouterCore {
                     if (searchError) {
                       handleSerialError(index, searchError, "VALIDATE_SEARCH");
                     }
+                    setupPendingTimeout();
+                    const abortController = new AbortController();
                     const parentMatchContext = (parentMatch == null ? void 0 : parentMatch.context) ?? this.options.context ?? {};
                     updateMatch(matchId, (prev) => ({
                       ...prev,
                       isFetching: "beforeLoad",
                       fetchCount: prev.fetchCount + 1,
                       abortController,
-                      pendingTimeout,
                       context: {
                         ...parentMatchContext,
                         ...prev.__routeContext
@@ -1196,14 +1200,18 @@ class RouterCore {
                       loaderPromise == null ? void 0 : loaderPromise.resolve();
                       loadPromise == null ? void 0 : loadPromise.resolve();
                     }
-                    updateMatch(matchId, (prev) => ({
-                      ...prev,
-                      isFetching: loaderIsRunningAsync ? prev.isFetching : false,
-                      loaderPromise: loaderIsRunningAsync ? prev.loaderPromise : void 0,
-                      invalid: false,
-                      _dehydrated: void 0,
-                      _forcePending: void 0
-                    }));
+                    updateMatch(matchId, (prev) => {
+                      clearTimeout(prev.pendingTimeout);
+                      return {
+                        ...prev,
+                        isFetching: loaderIsRunningAsync ? prev.isFetching : false,
+                        loaderPromise: loaderIsRunningAsync ? prev.loaderPromise : void 0,
+                        invalid: false,
+                        pendingTimeout: void 0,
+                        _dehydrated: void 0,
+                        _forcePending: void 0
+                      };
+                    });
                     return this.getMatch(matchId);
                   })()
                 );