@tanstack/react-router 0.0.1-beta.267 → 0.0.1-beta.269

package/package.json

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

package/src/RouterProvider.tsx

@@ -2,13 +2,7 @@ import * as React from 'react'
 import warning from 'tiny-warning'
 import { useStore } from '@tanstack/react-store'
 import { Matches } from './Matches'
-import {
-  LinkInfo,
-  LinkOptions,
-  NavigateOptions,
-  ResolveRelativePath,
-  ToOptions,
-} from './link'
+import { NavigateOptions, ResolveRelativePath, ToOptions } from './link'
 import { ParsedLocation } from './location'
 import { AnyRoute } from './route'
 import { RouteById, RoutePaths } from './routeInfo'
@@ -19,7 +13,7 @@ import {
   RouterOptions,
   RouterState,
 } from './router'
-import { NoInfer, PickAsRequired, pick, useLayoutEffect } from './utils'
+import { NoInfer, pick, useLayoutEffect } from './utils'
 import { MatchRouteOptions } from './Matches'
 import { RouteMatch } from './Matches'
 
@@ -36,13 +30,6 @@ export interface MatchLocation {
   from?: string
 }
 
-export type BuildLinkFn<TRouteTree extends AnyRoute> = <
-  TFrom extends RoutePaths<TRouteTree> = '/',
-  TTo extends string = '',
->(
-  dest: LinkOptions<TRouteTree, TFrom, TTo>,
-) => LinkInfo
-
 export type NavigateFn<TRouteTree extends AnyRoute> = <
   TFrom extends RoutePaths<TRouteTree> = '/',
   TTo extends string = '',

package/src/link.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { useMatch } from './Matches'
 import { useRouter, useRouterState } from './RouterProvider'
 import { Trim } from './fileRoute'
-import { LocationState, ParsedLocation } from './location'
+import { LocationState } from './location'
 import { AnyRoute, ReactNode } from './route'
 import {
   AllParams,
@@ -24,23 +24,6 @@ import {
   functionalUpdate,
 } from './utils'
 
-export type LinkInfo =
-  | {
-      type: 'external'
-      href: string
-    }
-  | {
-      type: 'internal'
-      next: ParsedLocation
-      handleFocus: (e: any) => void
-      handleClick: (e: any) => void
-      handleEnter: (e: any) => void
-      handleLeave: (e: any) => void
-      handleTouchStart: (e: any) => void
-      isActive: boolean
-      disabled?: boolean
-    }
-
 export type CleanPath<T extends string> = T extends `${infer L}//${infer R}`
   ? CleanPath<`${CleanPath<L>}/${CleanPath<R>}`>
   : T extends `${infer L}//`
@@ -177,7 +160,6 @@ export type ToSubOptions<
   // The source route path. This is automatically set when using route-level APIs, but for type-safe relative routing on the router itself, this is required
   from?: TFrom
   // // When using relative route paths, this option forces resolution from the current path, instead of the route API's path or `from` path
-  // fromCurrent?: boolean
 } & CheckPath<TRouteTree, NoInfer<TResolved>, {}> &
   SearchParamOptions<TRouteTree, TFrom, TTo, TResolved> &
   PathParamOptions<TRouteTree, TFrom, TResolved>

package/src/router.ts

@@ -30,6 +30,7 @@ import {
   functionalUpdate,
   last,
   pick,
+  Timeout,
 } from './utils'
 import {
   ErrorRouteComponent,
@@ -41,7 +42,6 @@ import { ParsedLocation } from './location'
 import { LocationState } from './location'
 import { SearchSerializer, SearchParser } from './searchParams'
 import {
-  BuildLinkFn,
   BuildLocationFn,
   CommitLocationOptions,
   InjectedHtmlEntry,
@@ -227,7 +227,7 @@ export class Router<
     Math.random() * 10000000,
   )}`
   resetNextScroll: boolean = true
-  navigateTimeout: NodeJS.Timeout | null = null
+  navigateTimeout: Timeout | null = null
   latestLoadPromise: Promise<void> = Promise.resolve()
   subscribers = new Set<RouterListener<RouterEvent>>()
   pendingMatches: AnyRouteMatch[] = []

package/src/useBlocker.tsx

@@ -1,26 +1,27 @@
 import * as React from 'react'
 import { ReactNode } from './route'
 import { useRouter } from './RouterProvider'
+import { BlockerFn } from '@tanstack/history'
 
 export function useBlocker(
-  message: string,
+  blockerFn: BlockerFn,
   condition: boolean | any = true,
 ): void {
   const { history } = useRouter()
 
   React.useEffect(() => {
     if (!condition) return
-    return history.block(message)
+    return history.block(blockerFn)
   })
 }
 
-export function Block({ message, condition, children }: PromptProps) {
-  useBlocker(message, condition)
+export function Block({ blocker, condition, children }: PromptProps) {
+  useBlocker(blocker, condition)
   return (children ?? null) as ReactNode
 }
 
 export type PromptProps = {
-  message: string
+  blocker: BlockerFn
   condition?: boolean | any
   children?: ReactNode
 }

package/src/injectHtml.ts

@@ -1,28 +0,0 @@
-// export function useInjectHtml() {
-//   const { } = useRouter()
-//   return React.useCallback(
-//     (html: string | (() => Promise<string> | string)) => {
-//       router.injectHtml(html)
-//     },
-//     [],
-//   )
-// }
-// export function useDehydrate() {
-//   const { } = useRouter()
-//   return React.useCallback(function dehydrate<T>(
-//     key: any,
-//     data: T | (() => Promise<T> | T),
-//   ) {
-//     return router.dehydrateData(key, data)
-//   },
-//   [])
-// }
-// export function useHydrate() {
-//   const { } = useRouter()
-//   return function hydrate<T = unknown>(key: any) {
-//     return router.hydrateData(key) as T
-//   }
-// }
-// This is the messiest thing ever... I'm either seriously tired (likely) or
-// there has to be a better way to reset error boundaries when the
-// router's location key changes.