@tanstack/router-core 0.0.1-beta.168 → 0.0.1-beta.169

package/package.json

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

package/src/link.ts

@@ -124,6 +124,7 @@ export type NavigateOptions<
 > = ToOptions<TRouteTree, TFrom, TTo> & {
   // `replace` is a boolean that determines whether the navigation should replace the current history entry or push a new one.
   replace?: boolean
+  resetScroll?: boolean
 }
 
 export type ToOptions<

package/src/router.ts

@@ -318,6 +318,7 @@ export class Router<
   __store: Store<RouterState<TRouteTree>>
   state: RouterState<TRouteTree>
   dehydratedData?: TDehydrated
+  resetNextScroll = false
 
   constructor(options: RouterConstructorOptions<TRouteTree, TDehydrated>) {
     this.options = {
@@ -1124,6 +1125,7 @@ export class Router<
     hash,
     replace,
     params,
+    resetScroll,
   }: NavigateOptions<TRouteTree, TFrom, TTo>) => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
@@ -1151,6 +1153,7 @@ export class Router<
       hash,
       replace,
       params,
+      resetScroll,
     })
   }
 
@@ -1214,6 +1217,7 @@ export class Router<
     preloadDelay: userPreloadDelay,
     disabled,
     state,
+    resetScroll,
   }: LinkOptions<TRouteTree, TFrom, TTo>): LinkInfo => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
@@ -1237,6 +1241,7 @@ export class Router<
       hash,
       replace,
       state,
+      resetScroll,
     }
 
     const next = this.buildNext(nextOpts)
@@ -1676,7 +1681,7 @@ export class Router<
   }
 
   #commitLocation = async (
-    location: BuildNextOptions & { replace?: boolean },
+    location: BuildNextOptions & { replace?: boolean; resetScroll?: boolean },
   ) => {
     const next = this.buildNext(location)
     const id = '' + Date.now() + Math.random()
@@ -1704,6 +1709,9 @@ export class Router<
       ...next.state,
     })
 
+    this.resetNextScroll = location.resetScroll ?? true
+    console.log('resetScroll', this.resetNextScroll)
+
     return this.latestLoadPromise
   }
 

package/src/scroll-restoration.ts

@@ -144,6 +144,10 @@ export function restoreScrollPositions(
   opts?: ScrollRestorationOptions,
 ) {
   if (pathDidChange) {
+    if (!router.resetNextScroll) {
+      return
+    }
+
     const getKey = opts?.getKey || defaultGetKey
 
     pathDidChange = false