@tanstack/router-core 1.162.9 → 1.163.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-core",
-  "version": "1.162.9",
+  "version": "1.163.3",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/router.ts

@@ -1,4 +1,4 @@
-import { Store } from '@tanstack/store'
+import { createStore } from '@tanstack/store'
 import { createBrowserHistory, parseHref } from '@tanstack/history'
 import { isServer } from '@tanstack/router-core/isServer'
 import { batch } from './utils/batch'
@@ -42,6 +42,7 @@ import {
   executeRewriteOutput,
   rewriteBasepath,
 } from './rewrite'
+import type { Store } from '@tanstack/store'
 import type { LRUCache } from './lru-cache'
 import type {
   ProcessRouteTreeResult,
@@ -1132,7 +1133,7 @@ export class RouterCore<
           getInitialRouterState(this.latestLocation),
         ) as unknown as Store<any>
       } else {
-        this.__store = new Store(getInitialRouterState(this.latestLocation))
+        this.__store = createStore(getInitialRouterState(this.latestLocation))
 
         setupScrollRestoration(this)
       }
@@ -2405,9 +2406,16 @@ export class RouterCore<
 
                   // Commit the pending matches. If a previous match was
                   // removed, place it in the cachedMatches
+                  //
+                  // exitingMatches uses match.id (routeId + params + loaderDeps) so
+                  // navigating /foo?page=1 → /foo?page=2 correctly caches the page=1 entry.
                   let exitingMatches: Array<AnyRouteMatch> = []
-                  let enteringMatches: Array<AnyRouteMatch> = []
-                  let stayingMatches: Array<AnyRouteMatch> = []
+
+                  // Lifecycle-hook identity uses routeId only so that navigating between
+                  // different params/deps of the same route fires onStay (not onLeave+onEnter).
+                  let hookExitingMatches: Array<AnyRouteMatch> = []
+                  let hookEnteringMatches: Array<AnyRouteMatch> = []
+                  let hookStayingMatches: Array<AnyRouteMatch> = []
 
                   batch(() => {
                     this.__store.setState((s) => {
@@ -2417,12 +2425,22 @@ export class RouterCore<
                       exitingMatches = previousMatches.filter(
                         (match) => !newMatches.some((d) => d.id === match.id),
                       )
-                      enteringMatches = newMatches.filter(
+
+                      // Lifecycle-hook identity: routeId only (route presence in tree)
+                      hookExitingMatches = previousMatches.filter(
+                        (match) =>
+                          !newMatches.some((d) => d.routeId === match.routeId),
+                      )
+                      hookEnteringMatches = newMatches.filter(
                         (match) =>
-                          !previousMatches.some((d) => d.id === match.id),
+                          !previousMatches.some(
+                            (d) => d.routeId === match.routeId,
+                          ),
                       )
-                      stayingMatches = newMatches.filter((match) =>
-                        previousMatches.some((d) => d.id === match.id),
+                      hookStayingMatches = newMatches.filter((match) =>
+                        previousMatches.some(
+                          (d) => d.routeId === match.routeId,
+                        ),
                       )
 
                       return {
@@ -2454,9 +2472,9 @@ export class RouterCore<
                   //
                   ;(
                     [
-                      [exitingMatches, 'onLeave'],
-                      [enteringMatches, 'onEnter'],
-                      [stayingMatches, 'onStay'],
+                      [hookExitingMatches, 'onLeave'],
+                      [hookEnteringMatches, 'onEnter'],
+                      [hookStayingMatches, 'onStay'],
                     ] as const
                   ).forEach(([matches, hook]) => {
                     matches.forEach((match) => {