@tanstack/router-core 0.0.1-beta.202 → 0.0.1-beta.203

package/build/umd/index.development.js

@@ -1872,6 +1872,7 @@
         const fromPathname = dest.from ?? from.pathname;
         let pathname = resolvePath(this.basepath ?? '/', fromPathname, `${dest.to ?? ''}`);
         const fromMatches = this.matchRoutes(fromPathname, from.search);
+        const stayingMatches = matches?.filter(d => fromMatches?.find(e => e.routeId === d.routeId));
         const prevParams = {
           ...last(fromMatches)?.params
         };
@@ -1885,8 +1886,8 @@
           });
         }
         pathname = interpolatePath(pathname, nextParams ?? {});
-        const preSearchFilters = matches?.map(match => this.getRoute(match.routeId).options.preSearchFilters ?? []).flat().filter(Boolean) ?? [];
-        const postSearchFilters = matches?.map(match => this.getRoute(match.routeId).options.postSearchFilters ?? []).flat().filter(Boolean) ?? [];
+        const preSearchFilters = stayingMatches?.map(match => this.getRoute(match.routeId).options.preSearchFilters ?? []).flat().filter(Boolean) ?? [];
+        const postSearchFilters = stayingMatches?.map(match => this.getRoute(match.routeId).options.postSearchFilters ?? []).flat().filter(Boolean) ?? [];
 
         // Pre filters first
         const preFilteredSearch = preSearchFilters?.length ? preSearchFilters?.reduce((prev, next) => next(prev), from.search) : from.search;
@@ -1975,36 +1976,35 @@
 
       // If the next urls are the same and we're not replacing,
       // do nothing
-      if (isSameUrl && !next.replace) {
-        return;
-      }
-      let {
-        maskedLocation,
-        ...nextHistory
-      } = next;
-      if (maskedLocation) {
-        nextHistory = {
-          ...maskedLocation,
-          state: {
-            ...maskedLocation.state,
-            __tempKey: undefined,
-            __tempLocation: {
-              ...nextHistory,
-              search: nextHistory.searchStr,
-              state: {
-                ...nextHistory.state,
-                __tempKey: undefined,
-                __tempLocation: undefined,
-                key: undefined
+      if (!isSameUrl || next.replace) {
+        let {
+          maskedLocation,
+          ...nextHistory
+        } = next;
+        if (maskedLocation) {
+          nextHistory = {
+            ...maskedLocation,
+            state: {
+              ...maskedLocation.state,
+              __tempKey: undefined,
+              __tempLocation: {
+                ...nextHistory,
+                search: nextHistory.searchStr,
+                state: {
+                  ...nextHistory.state,
+                  __tempKey: undefined,
+                  __tempLocation: undefined,
+                  key: undefined
+                }
               }
             }
+          };
+          if (nextHistory.unmaskOnReload ?? this.options.unmaskOnReload ?? false) {
+            nextHistory.state.__tempKey = this.tempLocationKey;
           }
-        };
-        if (nextHistory.unmaskOnReload ?? this.options.unmaskOnReload ?? false) {
-          nextHistory.state.__tempKey = this.tempLocationKey;
         }
+        this.history[next.replace ? 'replace' : 'push'](nextHistory.href, nextHistory.state);
       }
-      this.history[next.replace ? 'replace' : 'push'](nextHistory.href, nextHistory.state);
       this.resetNextScroll = next.resetScroll ?? true;
       return this.latestLoadPromise;
     };