@tanstack/react-router 1.81.6 → 1.81.7

package/dist/cjs/matchContext.cjs

@@ -19,5 +19,9 @@ function _interopNamespaceDefault(e) {
 }
 const React__namespace = /* @__PURE__ */ _interopNamespaceDefault(React);
 const matchContext = React__namespace.createContext(void 0);
+const dummyMatchContext = React__namespace.createContext(
+  void 0
+);
+exports.dummyMatchContext = dummyMatchContext;
 exports.matchContext = matchContext;
 //# sourceMappingURL=matchContext.cjs.map

package/dist/cjs/matchContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"matchContext.cjs","sources":["../../src/matchContext.tsx"],"sourcesContent":["import * as React from 'react'\n\nexport const matchContext = React.createContext<string | undefined>(undefined)\n"],"names":["React"],"mappings":";;;;;;;;;;;;;;;;;;;;AAEa,MAAA,eAAeA,iBAAM,cAAkC,MAAS;;"}
+{"version":3,"file":"matchContext.cjs","sources":["../../src/matchContext.tsx"],"sourcesContent":["import * as React from 'react'\n\nexport const matchContext = React.createContext<string | undefined>(undefined)\n\n// N.B. this only exists so we can conditionally call useContext on it when we are not interested in the nearest match\nexport const dummyMatchContext = React.createContext<string | undefined>(\n  undefined,\n)\n"],"names":["React"],"mappings":";;;;;;;;;;;;;;;;;;;;AAEa,MAAA,eAAeA,iBAAM,cAAkC,MAAS;AAGtE,MAAM,oBAAoBA,iBAAM;AAAA,EACrC;AACF;;;"}

package/dist/cjs/matchContext.d.cts

@@ -1,2 +1,3 @@
 import * as React from 'react';
 export declare const matchContext: React.Context<string | undefined>;
+export declare const dummyMatchContext: React.Context<string | undefined>;

package/dist/cjs/router.cjs

@@ -1556,13 +1556,17 @@ class Router {
         decodeCharMap: this.pathParamsDecodeCharMap
       }) + loaderDepsHash;
       const existingMatch = this.getMatch(matchId);
-      const cause = this.state.matches.find((d) => d.id === matchId) ? "stay" : "enter";
+      const previousMatch = this.state.matches.find(
+        (d) => d.routeId === route.id
+      );
+      const cause = previousMatch ? "stay" : "enter";
       let match;
       if (existingMatch) {
         match = {
           ...existingMatch,
           cause,
-          params: routeParams
+          params: previousMatch ? utils.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          search: previousMatch ? utils.replaceEqualDeep(previousMatch.search, preMatchSearch) : utils.replaceEqualDeep(existingMatch.search, preMatchSearch)
         };
       } else {
         const status = route.options.loader || route.options.beforeLoad || route.lazyFn || routeNeedsPreload(route) ? "pending" : "success";
@@ -1570,10 +1574,10 @@ class Router {
           id: matchId,
           index,
           routeId: route.id,
-          params: routeParams,
+          params: previousMatch ? utils.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
           pathname: path.joinPaths([this.basepath, interpolatedPath]),
           updatedAt: Date.now(),
-          search: {},
+          search: previousMatch ? utils.replaceEqualDeep(previousMatch.search, preMatchSearch) : preMatchSearch,
           searchError: void 0,
           status,
           isFetching: false,
@@ -1585,7 +1589,7 @@ class Router {
           abortController: new AbortController(),
           fetchCount: 0,
           cause,
-          loaderDeps,
+          loaderDeps: previousMatch ? utils.replaceEqualDeep(previousMatch.loaderDeps, loaderDeps) : loaderDeps,
           invalid: false,
           preload: false,
           links: (_d = (_c = route.options).links) == null ? void 0 : _d.call(_c),
@@ -1609,7 +1613,6 @@ class Router {
       if (!(opts == null ? void 0 : opts.preload)) {
         match.globalNotFound = globalNotFoundRouteId === route.id;
       }
-      match.search = utils.replaceEqualDeep(match.search, preMatchSearch);
       match.searchError = searchError;
       const parentMatchId = parentMatch == null ? void 0 : parentMatch.id;
       const parentContext = !parentMatchId ? this.options.context ?? {} : parentMatch.context ?? this.options.context ?? {};