@tanstack/router-core 1.158.4 → 1.159.4

package/dist/esm/router.js

@@ -1127,6 +1127,9 @@ class RouterCore {
     }
     const globalNotFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
     const matches = new Array(matchedRoutes.length);
+    const previousMatchesByRouteId = new Map(
+      this.state.matches.map((match) => [match.routeId, match])
+    );
     for (let index = 0; index < matchedRoutes.length; index++) {
       const route = matchedRoutes[index];
       const parentMatch = matches[index - 1];
@@ -1176,9 +1179,7 @@ class RouterCore {
         loaderDepsHash
       );
       const existingMatch = this.getMatch(matchId);
-      const previousMatch = this.state.matches.find(
-        (d) => d.routeId === route.id
-      );
+      const previousMatch = previousMatchesByRouteId.get(route.id);
       const strictParams = existingMatch?._strictParams ?? usedParams;
       let paramsError = void 0;
       if (!existingMatch) {
@@ -1204,7 +1205,7 @@ class RouterCore {
         match = {
           ...existingMatch,
           cause,
-          params: previousMatch ? replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          params: previousMatch?.params ?? routeParams,
           _strictParams: strictParams,
           search: previousMatch ? replaceEqualDeep(previousMatch.search, preMatchSearch) : replaceEqualDeep(existingMatch.search, preMatchSearch),
           _strictSearch: strictMatchSearch
@@ -1216,7 +1217,7 @@ class RouterCore {
           ssr: isServer ?? this.isServer ? void 0 : route.options.ssr,
           index,
           routeId: route.id,
-          params: previousMatch ? replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          params: previousMatch?.params ?? routeParams,
           _strictParams: strictParams,
           pathname: interpolatedPath,
           updatedAt: Date.now(),
@@ -1263,6 +1264,8 @@ class RouterCore {
       const match = matches[index];
       const route = this.looseRoutesById[match.routeId];
       const existingMatch = this.getMatch(match.id);
+      const previousMatch = previousMatchesByRouteId.get(match.routeId);
+      match.params = previousMatch ? replaceEqualDeep(previousMatch.params, routeParams) : routeParams;
       if (!existingMatch) {
         const parentMatch = matches[index - 1];
         const parentContext = this.getParentContext(parentMatch);