@tanstack/react-router 1.0.1 → 1.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.0.1"
+    "@tanstack/history": "1.0.2"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/link.tsx

@@ -172,9 +172,9 @@ export type SearchParamOptions<
   TFromSearchEnsured = '/' extends TFrom
     ? FullSearchSchema<TRouteTree>
     : Expand<
-          PickRequired<
-            RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
-          >
+        PickRequired<
+          RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
+        >
       >,
   TFromSearchOptional = Omit<
     FullSearchSchema<TRouteTree>,
@@ -352,9 +352,16 @@ export function useLinkProps<
   TTo extends string = '',
   TMaskFrom extends RoutePaths<TRouteTree> = '/',
   TMaskTo extends string = '',
->(
-  options: UseLinkPropsOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,
-): React.AnchorHTMLAttributes<HTMLAnchorElement> {
+>({
+  from,
+  ...options
+}: UseLinkPropsOptions<
+  TRouteTree,
+  TFrom,
+  TTo,
+  TMaskFrom,
+  TMaskTo
+>): React.AnchorHTMLAttributes<HTMLAnchorElement> {
   const router = useRouter()
   const matchPathname = useMatch({
     strict: false,
@@ -416,7 +423,6 @@ export function useLinkProps<
   }
 
   const next = router.buildLocation(dest as any)
-
   const preload = userPreload ?? router.options.defaultPreload
   const preloadDelay =
     userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0

package/src/router.ts

@@ -945,14 +945,14 @@ export class Router<
     })
   }
 
-  navigate: NavigateFn<TRouteTree> = ({ from, to = '', ...rest }) => {
+  navigate: NavigateFn<TRouteTree> = ({ from, to, ...rest }) => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
 
     // If this `to` is a valid external URL, return
     // null for LinkUtils
     const toString = String(to)
-    const fromString = typeof from === 'undefined' ? from : String(from)
+    // const fromString = from !== undefined ? String(from) : from
     let isExternal
 
     try {
@@ -967,8 +967,9 @@ export class Router<
 
     return this.buildAndCommitLocation({
       ...rest,
-      from: fromString,
-      to: toString,
+      from,
+      to,
+      // to: toString,
     })
   }
 

package/src/useNavigate.tsx

@@ -10,25 +10,27 @@ import { useLayoutEffect } from './utils'
 export function useNavigate<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TDefaultFrom extends RoutePaths<TRouteTree> = '/',
->(defaultOpts?: { from?: TDefaultFrom }) {
-  const { navigate } = useRouter()
+>(_defaultOpts?: { from?: TDefaultFrom }) {
+  const { navigate, buildLocation } = useRouter()
+
   const matchPathname = useMatch({
     strict: false,
     select: (s) => s.pathname,
   })
+
   return React.useCallback(
     <
       TFrom extends RoutePaths<TRouteTree> = TDefaultFrom,
       TTo extends string = '',
       TMaskFrom extends RoutePaths<TRouteTree> = '/',
       TMaskTo extends string = '',
-    >(
-      opts?: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,
-    ) => {
+    >({
+      from,
+      ...rest
+    }: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => {
       return navigate({
-        from: opts?.to ? matchPathname : undefined,
-        ...defaultOpts,
-        ...(opts as any),
+        from: rest?.to ? matchPathname : undefined,
+        ...(rest as any),
       })
     },
     [],