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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.202",
+  "version": "0.0.1-beta.203",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "tiny-warning": "^1.0.3",
     "@tanstack/store": "^0.0.1",
     "@gisatcz/cross-package-react-context": "^0.2.0",
-    "@tanstack/history": "0.0.1-beta.202"
+    "@tanstack/history": "0.0.1-beta.203"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/router.ts

@@ -1682,6 +1682,9 @@ export class Router<
       )
 
       const fromMatches = this.matchRoutes(fromPathname, from.search)
+      const stayingMatches = matches?.filter((d) =>
+        fromMatches?.find((e) => e.routeId === d.routeId),
+      )
 
       const prevParams = { ...last(fromMatches)?.params }
 
@@ -1702,7 +1705,7 @@ export class Router<
       pathname = interpolatePath(pathname, nextParams ?? {})
 
       const preSearchFilters =
-        matches
+        stayingMatches
           ?.map(
             (match) =>
               this.getRoute(match.routeId).options.preSearchFilters ?? [],
@@ -1711,7 +1714,7 @@ export class Router<
           .filter(Boolean) ?? []
 
       const postSearchFilters =
-        matches
+        stayingMatches
           ?.map(
             (match) =>
               this.getRoute(match.routeId).options.postSearchFilters ?? [],
@@ -1856,40 +1859,42 @@ export class Router<
 
     // 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