@tanstack/react-router 1.98.0 → 1.98.3

package/dist/esm/router.js

@@ -1,9 +1,10 @@
 import { createMemoryHistory, createBrowserHistory, parseHref } from "@tanstack/history";
 import { Store, batch } from "@tanstack/react-store";
 import invariant from "tiny-invariant";
-import { trimPath, trimPathLeft, parsePathname, resolvePath, cleanPath, trimPathRight, rootRouteId, pick, createControlledPromise, matchPathname, deepEqual, defaultStringifySearch, defaultParseSearch, interpolatePath, replaceEqualDeep, joinPaths, last, functionalUpdate } from "@tanstack/router-core";
+import { trimPath, trimPathLeft, parsePathname, resolvePath, cleanPath, trimPathRight, rootRouteId, pick, createControlledPromise, getLocationChangeInfo, matchPathname, deepEqual, defaultStringifySearch, defaultParseSearch, interpolatePath, replaceEqualDeep, joinPaths, last, functionalUpdate } from "@tanstack/router-core";
 import { isResolvedRedirect, isRedirect } from "./redirects.js";
 import { isNotFound } from "./not-found.js";
+import { setupScrollRestoration } from "./scroll-restoration.js";
 const componentTypes = [
   "component",
   "errorComponent",
@@ -54,6 +55,8 @@ class Router {
     this.shouldViewTransition = void 0;
     this.isViewTransitionTypesSupported = void 0;
     this.subscribers = /* @__PURE__ */ new Set();
+    this.isScrollRestoring = false;
+    this.isScrollRestorationSetup = false;
     this.startReactTransition = (fn) => fn();
     this.update = (newOptions) => {
       var _a;
@@ -105,6 +108,7 @@ class Router {
             };
           }
         });
+        setupScrollRestoration(this);
       }
       if (typeof window !== "undefined" && "CSS" in window && // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       typeof ((_a = window.CSS) == null ? void 0 : _a.supports) === "function") {
@@ -629,8 +633,6 @@ class Router {
           try {
             const next = this.latestLocation;
             const prevLocation = this.state.resolvedLocation;
-            const hrefChanged = prevLocation.href !== next.href;
-            const pathChanged = prevLocation.pathname !== next.pathname;
             this.cancelMatches();
             let pendingMatches;
             batch(() => {
@@ -650,18 +652,18 @@ class Router {
             if (!this.state.redirect) {
               this.emit({
                 type: "onBeforeNavigate",
-                fromLocation: prevLocation,
-                toLocation: next,
-                pathChanged,
-                hrefChanged
+                ...getLocationChangeInfo({
+                  resolvedLocation: prevLocation,
+                  location: next
+                })
               });
             }
             this.emit({
               type: "onBeforeLoad",
-              fromLocation: prevLocation,
-              toLocation: next,
-              pathChanged,
-              hrefChanged
+              ...getLocationChangeInfo({
+                resolvedLocation: prevLocation,
+                location: next
+              })
             });
             await this.loadMatches({
               sync: opts == null ? void 0 : opts.sync,
@@ -1337,7 +1339,7 @@ class Router {
         return false;
       }
       const pending = (opts == null ? void 0 : opts.pending) === void 0 ? !this.state.isLoading : opts.pending;
-      const baseLocation = pending ? this.latestLocation : this.state.resolvedLocation;
+      const baseLocation = pending ? this.latestLocation : this.state.resolvedLocation || this.state.location;
       const match = matchPathname(this.basepath, baseLocation.pathname, {
         ...opts,
         to: next.pathname
@@ -1647,7 +1649,7 @@ function getInitialRouterState(location) {
     isLoading: false,
     isTransitioning: false,
     status: "idle",
-    resolvedLocation: { ...location },
+    resolvedLocation: void 0,
     location,
     matches: [],
     pendingMatches: [],