@tanstack/react-router 0.0.1-beta.266 → 0.0.1-beta.268

package/build/types/RouterProvider.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-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';
@@ -18,7 +18,6 @@ export interface MatchLocation {
     caseSensitive?: boolean;
     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 = '', TMaskFrom extends RoutePaths<TRouteTree> = TFrom, TMaskTo extends string = ''>(opts: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>;
 export type MatchRouteFn<TRouteTree extends AnyRoute> = <TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>>(location: ToOptions<TRouteTree, TFrom, TTo>, opts?: MatchRouteOptions) => false | RouteById<TRouteTree, TResolved>['types']['allParams'];
 export type BuildLocationFn<TRouteTree extends AnyRoute> = (opts: BuildNextOptions) => ParsedLocation;

package/build/types/link.d.ts

@@ -1,25 +1,11 @@
 import * as React from 'react';
 import { Trim } from './fileRoute';
-import { LocationState, ParsedLocation } from './location';
+import { LocationState } from './location';
 import { AnyRoute, ReactNode } from './route';
 import { AllParams, FullSearchSchema, RouteByPath, RouteIds, RoutePaths } from './routeInfo';
 import { RegisteredRouter } from './router';
 import { MakeLinkOptions, MakeLinkPropsOptions } from './useNavigate';
 import { Expand, NoInfer, NonNullableUpdater, PickRequired, UnionToIntersection, Updater } 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}//` ? `${CleanPath<L>}/` : T extends `//${infer L}` ? `/${CleanPath<L>}` : T;
 export type Split<S, TIncludeTrailingSlash = true> = S extends unknown ? string extends S ? string[] : S extends string ? CleanPath<S> extends '' ? [] : TIncludeTrailingSlash extends true ? CleanPath<S> extends `${infer T}/` ? [...Split<T>, '/'] : CleanPath<S> extends `/${infer U}` ? Split<U> : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : [S] : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : S extends string ? [S] : never : never : never;
 export type ParsePathParams<T extends string> = keyof {

package/build/types/useBlocker.d.ts

@@ -1,8 +1,9 @@
 import { ReactNode } from './route';
-export declare function useBlocker(message: string, condition?: boolean | any): void;
-export declare function Block({ message, condition, children }: PromptProps): any;
+import { BlockerFn } from '@tanstack/history';
+export declare function useBlocker(blockerFn: BlockerFn, condition?: boolean | any): void;
+export declare function Block({ blocker, condition, children }: PromptProps): any;
 export type PromptProps = {
-    message: string;
+    blocker: BlockerFn;
     condition?: boolean | any;
     children?: ReactNode;
 };

package/build/umd/index.development.js

@@ -68,10 +68,11 @@
       location = opts.getLocation();
       subscribers.forEach(subscriber => subscriber());
     };
-    const tryNavigation = task => {
+    const tryNavigation = async task => {
       if (typeof document !== 'undefined' && blockers.length) {
         for (let blocker of blockers) {
-          if (!window.confirm(blocker.message)) {
+          const allowed = await blocker();
+          if (!allowed) {
             opts.onBlocked?.(onUpdate);
             return;
           }
@@ -117,18 +118,15 @@
         });
       },
       createHref: str => opts.createHref(str),
-      block: message => {
-        const payload = {
-          message
-        };
-        blockers.push(payload);
+      block: blocker => {
+        blockers.push(blocker);
         if (blockers.length === 1) {
           addEventListener(beforeUnloadEvent, beforeUnloadListener, {
             capture: true
           });
         }
         return () => {
-          blockers = blockers.filter(b => b !== payload);
+          blockers = blockers.filter(b => b !== blocker);
           if (!blockers.length) {
             stopBlocking();
           }
@@ -280,7 +278,6 @@
       window: win,
       parseLocation: () => {
         const hashHref = win.location.hash.split('#').slice(1).join('#') ?? '/';
-        console.log(hashHref);
         return parseHref(hashHref, win.history.state);
       },
       createHref: href => `${win.location.pathname}${win.location.search}#${href}`
@@ -3155,21 +3152,21 @@
     return `${path.join(' > ')}`.toLowerCase();
   }
 
-  function useBlocker(message, condition = true) {
+  function useBlocker(blockerFn, condition = true) {
     const {
       history
     } = useRouter();
     React__namespace.useEffect(() => {
       if (!condition) return;
-      return history.block(message);
+      return history.block(blockerFn);
     });
   }
   function Block({
-    message,
+    blocker,
     condition,
     children
   }) {
-    useBlocker(message, condition);
+    useBlocker(blocker, condition);
     return children ?? null;
   }