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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.167",
+  "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.167"
+    "@tanstack/react-store": "0.0.1-beta.169"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/fileRoute.ts

@@ -2,7 +2,6 @@ import { ParsePathParams } from './link'
 import {
   AnyRoute,
   ResolveFullPath,
-  AnySearchSchema,
   ResolveFullSearchSchema,
   MergeParamsFromParent,
   RouteContext,

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/route.ts

@@ -11,11 +11,30 @@ export type AnySearchSchema = {}
 export type AnyContext = {}
 export interface RouteMeta {}
 export interface RouteContext {}
-export interface RegisterRouteComponent<TProps> {
+export interface RegisterRouteComponent<
+  TLoader = unknown,
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TAllContext extends AnyContext = AnyContext,
+> {
   // RouteComponent: unknown // This is registered by the framework
 }
-export interface RegisterRouteErrorComponent<TProps> {
-  // RouteErrorComponent: unknown // This is registered by the framework
+export interface RegisterErrorRouteComponent<
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TAllContext extends AnyContext = AnyContext,
+> {
+  // ErrorRouteComponent: unknown // This is registered by the framework
+}
+export interface RegisterPendingRouteComponent<
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TAllContext extends AnyContext = AnyContext,
+> {
+  // PendingRouteComponent: unknown // This is registered by the framework
 }
 export interface RegisterRouteProps<
   TLoader = unknown,
@@ -44,19 +63,55 @@ export interface RegisterPendingRouteProps<
   // PendingRouteProps: unknown // This is registered by the framework
 }
 
-export type RegisteredRouteComponent<TProps> =
-  RegisterRouteComponent<TProps> extends {
-    RouteComponent: infer T
-  }
-    ? T
-    : (props: TProps) => unknown
+export type RegisteredRouteComponent<
+  TLoader = unknown,
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TAllContext extends AnyContext = AnyContext,
+> = RegisterRouteComponent<
+  TLoader,
+  TFullSearchSchema,
+  TAllParams,
+  TRouteContext,
+  TAllContext
+> extends {
+  RouteComponent: infer T
+}
+  ? T
+  : () => unknown
 
-export type RegisteredRouteErrorComponent<TProps> =
-  RegisterRouteErrorComponent<TProps> extends {
-    RouteErrorComponent: infer T
-  }
-    ? T
-    : (props: TProps) => unknown
+export type RegisteredErrorRouteComponent<
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TAllContext extends AnyContext = AnyContext,
+> = RegisterErrorRouteComponent<
+  TFullSearchSchema,
+  TAllParams,
+  TRouteContext,
+  TAllContext
+> extends {
+  ErrorRouteComponent: infer T
+}
+  ? T
+  : () => unknown
+
+export type RegisteredPendingRouteComponent<
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TAllContext extends AnyContext = AnyContext,
+> = RegisterPendingRouteComponent<
+  TFullSearchSchema,
+  TAllParams,
+  TRouteContext,
+  TAllContext
+> extends {
+  PendingRouteComponent: infer T
+}
+  ? T
+  : () => unknown
 
 export type RegisteredRouteProps<
   TLoader = unknown,
@@ -74,7 +129,7 @@ export type RegisteredRouteProps<
   RouteProps: infer T
 }
   ? T
-  : (props: {}) => unknown
+  : {}
 
 export type RegisteredErrorRouteProps<
   TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
@@ -90,7 +145,7 @@ export type RegisteredErrorRouteProps<
   ErrorRouteProps: infer T
 }
   ? T
-  : (props: {}) => unknown
+  : {}
 
 export type RegisteredPendingRouteProps<
   TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
@@ -106,7 +161,7 @@ export type RegisteredPendingRouteProps<
   PendingRouteProps: infer T
 }
   ? T
-  : (props: {}) => unknown
+  : {}
 
 export type PreloadableObj = { preload?: () => Promise<void> }
 
@@ -325,31 +380,25 @@ export type UpdatableRouteOptions<
   wrapInSuspense?: boolean
   // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`
   component?: RegisteredRouteComponent<
-    RegisteredRouteProps<
-      TLoader,
-      TFullSearchSchema,
-      TAllParams,
-      TRouteContext,
-      TAllContext
-    >
+    TLoader,
+    TFullSearchSchema,
+    TAllParams,
+    TRouteContext,
+    TAllContext
   >
   // The content to be rendered when the route encounters an error
-  errorComponent?: RegisteredRouteErrorComponent<
-    RegisteredErrorRouteProps<
-      TFullSearchSchema,
-      TAllParams,
-      TRouteContext,
-      TAllContext
-    >
+  errorComponent?: RegisteredErrorRouteComponent<
+    TFullSearchSchema,
+    TAllParams,
+    TRouteContext,
+    TAllContext
   > //
   // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
-  pendingComponent?: RegisteredRouteComponent<
-    RegisteredPendingRouteProps<
-      TFullSearchSchema,
-      TAllParams,
-      TRouteContext,
-      TAllContext
-    >
+  pendingComponent?: RegisteredPendingRouteComponent<
+    TFullSearchSchema,
+    TAllParams,
+    TRouteContext,
+    TAllContext
   >
   // Filter functions that can manipulate search params *before* they are passed to links and navigate
   // calls that match this route.

package/src/router.ts

@@ -27,9 +27,8 @@ import {
   AnyContext,
   AnyPathParams,
   RegisteredRouteComponent,
-  RegisteredRouteErrorComponent,
-  RegisteredRouteProps,
-  RegisteredErrorRouteProps,
+  RegisteredErrorRouteComponent,
+  RegisteredPendingRouteComponent,
 } from './route'
 import {
   RoutesById,
@@ -157,30 +156,23 @@ export interface RouterOptions<
   defaultPreload?: false | 'intent'
   defaultPreloadDelay?: number
   defaultComponent?: RegisteredRouteComponent<
-    RegisteredRouteProps<
-      unknown,
-      AnySearchSchema,
-      AnyPathParams,
-      AnyContext,
-      AnyContext
-    >
+    unknown,
+    AnySearchSchema,
+    AnyPathParams,
+    AnyContext,
+    AnyContext
   >
-  defaultErrorComponent?: RegisteredRouteErrorComponent<
-    RegisteredErrorRouteProps<
-      AnySearchSchema,
-      AnyPathParams,
-      AnyContext,
-      AnyContext
-    >
+  defaultErrorComponent?: RegisteredErrorRouteComponent<
+    AnySearchSchema,
+    AnyPathParams,
+    AnyContext,
+    AnyContext
   >
-  defaultPendingComponent?: RegisteredRouteComponent<
-    RegisteredRouteProps<
-      unknown,
-      AnySearchSchema,
-      AnyPathParams,
-      AnyContext,
-      AnyContext
-    >
+  defaultPendingComponent?: RegisteredPendingRouteComponent<
+    AnySearchSchema,
+    AnyPathParams,
+    AnyContext,
+    AnyContext
   >
   defaultMaxAge?: number
   defaultGcMaxAge?: number
@@ -326,6 +318,7 @@ export class Router<
   __store: Store<RouterState<TRouteTree>>
   state: RouterState<TRouteTree>
   dehydratedData?: TDehydrated
+  resetNextScroll = false
 
   constructor(options: RouterConstructorOptions<TRouteTree, TDehydrated>) {
     this.options = {
@@ -803,8 +796,8 @@ export class Router<
         params: routeParams,
         pathname: joinPaths([this.basepath, interpolatedPath]),
         updatedAt: Date.now(),
-        invalidAt: 9999999999999,
-        preloadInvalidAt: 9999999999999,
+        invalidAt: Infinity,
+        preloadInvalidAt: Infinity,
         routeSearch: {},
         search: {} as any,
         status: hasLoaders ? 'pending' : 'success',
@@ -912,8 +905,6 @@ export class Router<
       maxAge?: number
     },
   ) => {
-    this.cleanMatches()
-
     if (!opts?.preload) {
       resolvedMatches.forEach((match) => {
         // Update each match with its latest route data
@@ -927,10 +918,13 @@ export class Router<
           paramsError: match.paramsError,
           searchError: match.searchError,
           params: match.params,
+          preloadInvalidAt: 0,
         }))
       })
     }
 
+    this.cleanMatches()
+
     let firstBadMatchIndex: number | undefined
 
     // Check each match middleware to see if the route can be accessed
@@ -1105,6 +1099,8 @@ export class Router<
     })
 
     await Promise.all(matchPromises)
+
+    this.cleanMatches()
   }
 
   reload = () => {
@@ -1129,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
@@ -1156,6 +1153,7 @@ export class Router<
       hash,
       replace,
       params,
+      resetScroll,
     })
   }
 
@@ -1219,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
@@ -1242,6 +1241,7 @@ export class Router<
       hash,
       replace,
       state,
+      resetScroll,
     }
 
     const next = this.buildNext(nextOpts)
@@ -1681,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()
@@ -1709,6 +1709,9 @@ export class Router<
       ...next.state,
     })
 
+    this.resetNextScroll = location.resetScroll ?? true
+    console.log('resetScroll', this.resetNextScroll)
+
     return this.latestLoadPromise
   }
 
@@ -1766,7 +1769,7 @@ export class Router<
       (opts?.maxAge ??
         route.options.maxAge ??
         this.options.defaultMaxAge ??
-        9999999999999)
+        Infinity)
 
     this.setRouteMatch(id, (s) => ({
       ...s,
@@ -1778,9 +1781,6 @@ export class Router<
       preloadInvalidAt,
       invalidAt,
     }))
-
-    if (this.state.matches.find((d) => d.id === id)) {
-    }
   }
 
   invalidate = async (opts?: {

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