@tanstack/react-router 1.16.6 → 1.17.3

package/src/router.ts

@@ -1,3 +1,4 @@
+import * as React from 'react'
 import {
   HistoryLocation,
   HistoryState,
@@ -133,8 +134,8 @@ export interface RouterOptions<
   hydrate?: (dehydrated: TDehydrated) => void
   routeMasks?: RouteMask<TRouteTree>[]
   unmaskOnReload?: boolean
-  Wrap?: (props: { children: any }) => JSX.Element
-  InnerWrap?: (props: { children: any }) => JSX.Element
+  Wrap?: (props: { children: any }) => React.ReactNode
+  InnerWrap?: (props: { children: any }) => React.ReactNode
   /**
    * @deprecated
    * Use `notFoundComponent` instead.

package/src/useNavigate.tsx

@@ -5,12 +5,26 @@ import { LinkOptions, NavigateOptions } from './link'
 import { AnyRoute } from './route'
 import { RoutePaths } from './routeInfo'
 import { RegisteredRouter } from './router'
-import { StringLiteral } from './utils'
 
-export function useNavigate<
+export type UseNavigateResult<TDefaultFrom extends string> = <
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TDefaultFrom extends RoutePaths<TRouteTree> | string = RoutePaths<TRouteTree>,
->(_defaultOpts?: { from?: StringLiteral<TDefaultFrom> }) {
+  TFrom extends RoutePaths<TRouteTree> | string = TDefaultFrom,
+  TTo extends string = '',
+  TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom,
+  TMaskTo extends string = '',
+>({
+  from,
+  ...rest
+}: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>
+
+export function useNavigate<
+  TDefaultFrom extends string = string,
+>(_defaultOpts?: {
+  from?:
+    | TDefaultFrom
+    | RoutePaths<RegisteredRouter['routeTree']>
+    | (string & {})
+}) {
   const { navigate } = useRouter()
 
   const matchPathname = useMatch({
@@ -18,23 +32,14 @@ export function useNavigate<
     select: (s) => s.pathname,
   })
 
-  return React.useCallback(
-    <
-      TFrom extends RoutePaths<TRouteTree> | string = TDefaultFrom,
-      TTo extends string = '',
-      TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom,
-      TMaskTo extends string = '',
-    >({
-      from,
-      ...rest
-    }: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => {
-      return navigate({
-        from: rest?.to ? matchPathname : undefined,
-        ...(rest as any),
-      })
-    },
-    [],
-  )
+  const result: UseNavigateResult<TDefaultFrom> = ({ from, ...rest }) => {
+    return navigate({
+      from: rest?.to ? matchPathname : undefined,
+      ...(rest as any),
+    })
+  }
+
+  return React.useCallback(result, [])
 }
 
 // NOTE: I don't know of anyone using this. It's undocumented, so let's wait until someone needs it