@tanstack/react-router 0.0.1-beta.207 → 0.0.1-beta.208

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.207",
+  "version": "0.0.1-beta.208",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -42,7 +42,7 @@
     "@babel/runtime": "^7.16.7",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "0.0.1-beta.207"
+    "@tanstack/history": "0.0.1-beta.208"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/RouterProvider.tsx

@@ -858,6 +858,7 @@ export function RouterProvider<
                 preload: !!preload,
                 meta: parentMeta,
                 location: state.location, // TODO: This might need to be latestLocationRef.current...?
+                navigate: (opts) => navigate({ ...opts, from: match.pathname }),
               })) ?? ({} as any)
 
             const meta = {
@@ -925,6 +926,9 @@ export function RouterProvider<
                   parentMatchPromise,
                   abortController: match.abortController,
                   meta: match.meta,
+                  location: state.location,
+                  navigate: (opts) =>
+                    navigate({ ...opts, from: match.pathname }),
                 })
 
                 await Promise.all([componentsPromise, loaderPromise])

package/src/react.tsx

@@ -598,6 +598,20 @@ export function useNavigate<
   )
 }
 
+export function typedNavigate<
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
+  TDefaultFrom extends RoutePaths<TRouteTree> = '/',
+>(navigate: (opts: NavigateOptions<any>) => Promise<void>) {
+  return navigate as <
+    TFrom extends RoutePaths<TRouteTree> = TDefaultFrom,
+    TTo extends string = '',
+    TMaskFrom extends RoutePaths<TRouteTree> = '/',
+    TMaskTo extends string = '',
+  >(
+    opts?: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,
+  ) => Promise<void>
+}
+
 export function useMatchRoute<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
 >() {

package/src/route.ts

@@ -11,7 +11,7 @@ import {
   UnionToIntersection,
   Assign,
 } from './utils'
-import { ParsePathParams, ToSubOptions } from './link'
+import { NavigateOptions, ParsePathParams, ToSubOptions } from './link'
 import {
   ErrorRouteComponent,
   PendingRouteComponent,
@@ -154,6 +154,7 @@ type BeforeLoadFn<
   params: TAllParams
   meta: TParentRoute['types']['allMeta']
   location: ParsedLocation
+  navigate: (opts: NavigateOptions<AnyRoute>) => Promise<void>
 }) => Promise<TRouteMeta> | TRouteMeta | void
 
 export type UpdatableRouteOptions<
@@ -265,6 +266,8 @@ export interface LoadFnContext<
   params: TAllParams
   search: TFullSearchSchema
   meta: Expand<Assign<TAllContext, TRouteMeta>>
+  location: ParsedLocation<TFullSearchSchema>
+  navigate: (opts: NavigateOptions<AnyRoute>) => Promise<void>
 }
 
 export type SearchFilter<T, U = T> = (prev: T) => U