@tanstack/react-router 1.52.3 → 1.52.5

package/dist/cjs/router.cjs

@@ -433,10 +433,6 @@ class Router {
     };
     this.load = async () => {
       this.latestLocation = this.parseLocation(this.latestLocation);
-      this.__store.setState((s) => ({
-        ...s,
-        loadedAt: Date.now()
-      }));
       let redirect;
       let notFound$1;
       let loadPromise;
@@ -502,6 +498,7 @@ class Router {
                       return {
                         ...s,
                         isLoading: false,
+                        loadedAt: Date.now(),
                         matches: newMatches,
                         pendingMatches: void 0,
                         cachedMatches: [
@@ -671,11 +668,22 @@ class Router {
               for (const [index, { id: matchId, routeId }] of matches.entries()) {
                 const existingMatch = this.getMatch(matchId);
                 const parentMatchId = (_a = matches[index - 1]) == null ? void 0 : _a.id;
+                const route = this.looseRoutesById[routeId];
+                const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs;
+                const shouldPending = !!(onReady && !this.isServer && !preload && (route.options.loader || route.options.beforeLoad) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? this.options.defaultPendingComponent));
                 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(() => {
+                      try {
+                        triggerOnReady();
+                      } catch {
+                      }
+                    }, pendingMs);
+                  }
                   await existingMatch.beforeLoadPromise;
                 } else {
                   try {
@@ -687,10 +695,7 @@ class Router {
                       }),
                       beforeLoadPromise: utils.createControlledPromise()
                     }));
-                    const route = this.looseRoutesById[routeId];
                     const abortController = new AbortController();
-                    const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs;
-                    const shouldPending = !!(onReady && !this.isServer && !preload && (route.options.loader || route.options.beforeLoad) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? this.options.defaultPendingComponent));
                     let pendingTimeout;
                     if (shouldPending) {
                       pendingTimeout = setTimeout(() => {