@tanstack/react-router 1.12.7 → 1.12.10

package/src/link.tsx

@@ -215,11 +215,12 @@ export type ParamOptions<
           TParamVariant
         >,
   TReducer = ParamsReducer<TFromParams, TToParams>,
-> = Expand<WithoutEmpty<PickRequired<TToParams>>> extends never
-  ? Partial<MakeParamOption<TParamVariant, true | TReducer>>
-  : TFromParams extends Expand<WithoutEmpty<PickRequired<TToParams>>>
-    ? MakeParamOption<TParamVariant, true | TReducer>
-    : MakeParamOption<TParamVariant, TReducer>
+> =
+  Expand<WithoutEmpty<PickRequired<TToParams>>> extends never
+    ? Partial<MakeParamOption<TParamVariant, true | TReducer>>
+    : TFromParams extends Expand<WithoutEmpty<PickRequired<TToParams>>>
+      ? MakeParamOption<TParamVariant, true | TReducer>
+      : MakeParamOption<TParamVariant, TReducer>
 
 type MakeParamOption<
   TParamVariant extends ParamVariant,
@@ -281,12 +282,10 @@ export type LinkOptions<
   disabled?: boolean
 }
 
-export type CheckPath<TRouteTree extends AnyRoute, TPath, TPass> = Exclude<
-  TPath,
-  RoutePaths<TRouteTree>
-> extends never
-  ? TPass
-  : CheckPathError<TRouteTree, Exclude<TPath, RoutePaths<TRouteTree>>>
+export type CheckPath<TRouteTree extends AnyRoute, TPath, TPass> =
+  Exclude<TPath, RoutePaths<TRouteTree>> extends never
+    ? TPass
+    : CheckPathError<TRouteTree, Exclude<TPath, RoutePaths<TRouteTree>>>
 
 export type CheckPathError<TRouteTree extends AnyRoute, TInvalids> = {
   to: RoutePaths<TRouteTree>
@@ -555,6 +554,14 @@ export interface LinkComponent<TProps extends Record<string, any> = {}> {
 }
 
 export const Link: LinkComponent = React.forwardRef((props: any, ref) => {
+  if (props.href) {
+    return <a {...props} ref={ref} />
+  }
+
+  return <InternalLink {...props} ref={ref} />
+})
+
+const InternalLink: LinkComponent = React.forwardRef((props: any, ref) => {
   const linkProps = useLinkProps(props)
 
   return (

package/src/router.ts

@@ -509,13 +509,14 @@ export class Router<
       state,
     }: HistoryLocation): ParsedLocation<FullSearchSchema<TRouteTree>> => {
       const parsedSearch = this.options.parseSearch(search)
+      const searchStr = this.options.stringifySearch(parsedSearch)
 
       return {
         pathname: pathname,
-        searchStr: search,
+        searchStr,
         search: replaceEqualDeep(previousLocation?.search, parsedSearch) as any,
         hash: hash.split('#').reverse()[0] ?? '',
-        href: `${pathname}${search}${hash}`,
+        href: `${pathname}${searchStr}${hash}`,
         state: replaceEqualDeep(previousLocation?.state, state) as HistoryState,
       }
     }

package/src/routerContext.tsx

@@ -1,11 +1,18 @@
 import * as React from 'react'
 import { Router } from './router'
 
-export let routerContext = React.createContext<Router<any>>(null!)
-if (typeof document !== 'undefined') {
+let routerContext = React.createContext<Router<any>>(null!)
+
+export function getRouterContext() {
+  if (typeof document === 'undefined') {
+    return routerContext
+  }
+
   if (window.__TSR_ROUTER_CONTEXT__) {
-    routerContext = window.__TSR_ROUTER_CONTEXT__
-  } else {
-    window.__TSR_ROUTER_CONTEXT__ = routerContext as any
+    return window.__TSR_ROUTER_CONTEXT__
   }
+
+  window.__TSR_ROUTER_CONTEXT__ = routerContext as any
+
+  return routerContext
 }

package/src/useRouter.tsx

@@ -2,16 +2,12 @@ import * as React from 'react'
 import warning from 'tiny-warning'
 import { AnyRoute } from './route'
 import { RegisteredRouter, Router } from './router'
-import { routerContext } from './routerContext'
+import { getRouterContext } from './routerContext'
 
 export function useRouter<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
 >(opts?: { warn?: boolean }): Router<TRouteTree> {
-  const resolvedContext =
-    typeof document !== 'undefined'
-      ? window.__TSR_ROUTER_CONTEXT__ || routerContext
-      : routerContext
-  const value = React.useContext(resolvedContext)
+  const value = React.useContext(getRouterContext())
   warning(
     !((opts?.warn ?? true) && !value),
     'useRouter must be used inside a <RouterProvider> component!',