@tanstack/router-core 1.134.13 → 1.134.18

package/dist/esm/router.d.ts

@@ -561,6 +561,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     rewrite?: LocationRewrite;
     origin?: string;
     latestLocation: ParsedLocation<FullSearchSchema<TRouteTree>>;
+    pendingBuiltLocation?: ParsedLocation<FullSearchSchema<TRouteTree>>;
     basepath: string;
     routeTree: TRouteTree;
     routesById: RoutesById<TRouteTree>;

package/dist/esm/router.js

@@ -269,13 +269,24 @@ class RouterCore {
       match._nonReactive.pendingTimeout = void 0;
     };
     this.cancelMatches = () => {
-      this.state.pendingMatches?.forEach((match) => {
+      const currentPendingMatches = this.state.matches.filter(
+        (match) => match.status === "pending"
+      );
+      const currentLoadingMatches = this.state.matches.filter(
+        (match) => match.isFetching === "loader"
+      );
+      const matchesToCancelArray = /* @__PURE__ */ new Set([
+        ...this.state.pendingMatches ?? [],
+        ...currentPendingMatches,
+        ...currentLoadingMatches
+      ]);
+      matchesToCancelArray.forEach((match) => {
         this.cancelMatch(match.id);
       });
     };
     this.buildLocation = (opts) => {
       const build = (dest = {}) => {
-        const currentLocation = dest._fromLocation || this.latestLocation;
+        const currentLocation = dest._fromLocation || this.pendingBuiltLocation || this.latestLocation;
         const allCurrentLocationMatches = this.matchRoutes(currentLocation, {
           _buildLocation: true
         });
@@ -513,7 +524,8 @@ class RouterCore {
         ...rest,
         _includeValidateSearch: true
       });
-      return this.commitLocation({
+      this.pendingBuiltLocation = location;
+      const commitPromise = this.commitLocation({
         ...location,
         viewTransition,
         replace,
@@ -521,6 +533,12 @@ class RouterCore {
         hashScrollIntoView,
         ignoreBlocker
       });
+      Promise.resolve().then(() => {
+        if (this.pendingBuiltLocation === location) {
+          this.pendingBuiltLocation = void 0;
+        }
+      });
+      return commitPromise;
     };
     this.navigate = ({ to, reloadDocument, href, ...rest }) => {
       if (!reloadDocument && href) {