@tanstack/router-core 1.162.9 → 1.163.3

package/dist/cjs/router.d.cts

@@ -1,5 +1,5 @@
-import { Store } from '@tanstack/store';
 import { loadRouteChunk } from './load-matches.cjs';
+import { Store } from '@tanstack/store';
 import { LRUCache } from './lru-cache.cjs';
 import { ProcessRouteTreeResult, ProcessedTree } from './new-process-route-tree.cjs';
 import { SearchParser, SearchSerializer } from './searchParams.cjs';

package/dist/esm/router.d.ts

@@ -1,5 +1,5 @@
-import { Store } from '@tanstack/store';
 import { loadRouteChunk } from './load-matches.js';
+import { Store } from '@tanstack/store';
 import { LRUCache } from './lru-cache.js';
 import { ProcessRouteTreeResult, ProcessedTree } from './new-process-route-tree.js';
 import { SearchParser, SearchSerializer } from './searchParams.js';

package/dist/esm/router.js

@@ -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.js";
@@ -137,7 +137,7 @@ class RouterCore {
             getInitialRouterState(this.latestLocation)
           );
         } else {
-          this.__store = new Store(getInitialRouterState(this.latestLocation));
+          this.__store = createStore(getInitialRouterState(this.latestLocation));
           setupScrollRestoration(this);
         }
       }
@@ -729,8 +729,9 @@ class RouterCore {
                 this.startTransition(() => {
                   this.startViewTransition(async () => {
                     let exitingMatches = [];
-                    let enteringMatches = [];
-                    let stayingMatches = [];
+                    let hookExitingMatches = [];
+                    let hookEnteringMatches = [];
+                    let hookStayingMatches = [];
                     batch(() => {
                       this.__store.setState((s) => {
                         const previousMatches = s.matches;
@@ -738,11 +739,18 @@ class RouterCore {
                         exitingMatches = previousMatches.filter(
                           (match) => !newMatches.some((d) => d.id === match.id)
                         );
-                        enteringMatches = newMatches.filter(
-                          (match) => !previousMatches.some((d) => d.id === match.id)
+                        hookExitingMatches = previousMatches.filter(
+                          (match) => !newMatches.some((d) => d.routeId === match.routeId)
                         );
-                        stayingMatches = newMatches.filter(
-                          (match) => previousMatches.some((d) => d.id === match.id)
+                        hookEnteringMatches = newMatches.filter(
+                          (match) => !previousMatches.some(
+                            (d) => d.routeId === match.routeId
+                          )
+                        );
+                        hookStayingMatches = newMatches.filter(
+                          (match) => previousMatches.some(
+                            (d) => d.routeId === match.routeId
+                          )
                         );
                         return {
                           ...s,
@@ -767,9 +775,9 @@ class RouterCore {
                       this.clearExpiredCache();
                     });
                     [
-                      [exitingMatches, "onLeave"],
-                      [enteringMatches, "onEnter"],
-                      [stayingMatches, "onStay"]
+                      [hookExitingMatches, "onLeave"],
+                      [hookEnteringMatches, "onEnter"],
+                      [hookStayingMatches, "onStay"]
                     ].forEach(([matches, hook]) => {
                       matches.forEach((match) => {
                         this.looseRoutesById[match.routeId].options[hook]?.(