@tanstack/react-router 1.0.0 → 1.0.2

package/build/types/link.d.ts

@@ -85,7 +85,7 @@ export type CheckIdError<TRouteTree extends AnyRoute, TInvalids> = {
     'Valid Route IDs': RouteIds<TRouteTree>;
 };
 export type ResolveRelativePath<TFrom, TTo = '.'> = TFrom extends string ? TTo extends string ? TTo extends '.' ? TFrom : TTo extends `./` ? Join<[TFrom, '/']> : TTo extends `./${infer TRest}` ? ResolveRelativePath<TFrom, TRest> : TTo extends `/${infer TRest}` ? TTo : Split<TTo> extends ['..', ...infer ToRest] ? Split<TFrom> extends [...infer FromRest, infer FromTail] ? ToRest extends ['/'] ? Join<[...FromRest, '/']> : ResolveRelativePath<Join<FromRest>, Join<ToRest>> : never : Split<TTo> extends ['.', ...infer ToRest] ? ToRest extends ['/'] ? Join<[TFrom, '/']> : ResolveRelativePath<TFrom, Join<ToRest>> : CleanPath<Join<['/', ...Split<TFrom>, ...Split<TTo>]>> : never : never;
-export declare function useLinkProps<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = '/', TMaskTo extends string = ''>(options: UseLinkPropsOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>): React.AnchorHTMLAttributes<HTMLAnchorElement>;
+export declare function useLinkProps<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = '/', TMaskTo extends string = ''>({ from, ...options }: UseLinkPropsOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>): React.AnchorHTMLAttributes<HTMLAnchorElement>;
 export interface LinkComponent<TProps extends Record<string, any> = {}> {
     <TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = '/', TMaskTo extends string = ''>(props: LinkProps<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> & TProps & React.RefAttributes<HTMLAnchorElement>): ReactNode;
 }

package/build/types/useNavigate.d.ts

@@ -3,9 +3,9 @@ import { LinkOptions, NavigateOptions } from './link';
 import { AnyRoute } from './route';
 import { RoutePaths } from './routeInfo';
 import { RegisteredRouter } from './router';
-export declare function useNavigate<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDefaultFrom extends RoutePaths<TRouteTree> = '/'>(defaultOpts?: {
+export declare function useNavigate<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDefaultFrom extends RoutePaths<TRouteTree> = '/'>(_defaultOpts?: {
     from?: TDefaultFrom;
-}): <TFrom extends RoutePaths<TRouteTree> = TDefaultFrom, TTo extends string = "", TMaskFrom extends RoutePaths<TRouteTree> = "/", TMaskTo extends string = "">(opts?: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> | undefined) => Promise<void>;
+}): <TFrom extends RoutePaths<TRouteTree> = TDefaultFrom, TTo extends string = "", TMaskFrom extends RoutePaths<TRouteTree> = "/", TMaskTo extends string = "">({ from, ...rest }: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>;
 export declare function Navigate<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = '/', TMaskTo extends string = ''>(props: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>): null;
 export type UseLinkPropsOptions<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = '/', TMaskTo extends string = ''> = ActiveLinkOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> & React.AnchorHTMLAttributes<HTMLAnchorElement>;
 export type LinkProps<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = '/', TMaskTo extends string = ''> = ActiveLinkOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> & Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {

package/build/umd/index.development.js

@@ -1125,6 +1125,7 @@
     return provider;
   }
   function Transitioner() {
+    const mountLoadCount = React__namespace.useRef(0);
     const router = useRouter();
     const routerState = useRouterState({
       select: s => pick(s, ['isLoading', 'location', 'resolvedLocation', 'isTransitioning'])
@@ -1202,7 +1203,8 @@
       }
     }, [routerState.isTransitioning, isTransitioning, routerState.isLoading, routerState.resolvedLocation, routerState.location]);
     useLayoutEffect$1(() => {
-      if (!window.__TSR_DEHYDRATED__) {
+      if (!window.__TSR_DEHYDRATED__ && !mountLoadCount.current) {
+        mountLoadCount.current++;
         tryLoad();
       }
     }, []);
@@ -1686,7 +1688,10 @@
   }
 
   const preloadWarning = 'Error preloading route! ☝️';
-  function useLinkProps(options) {
+  function useLinkProps({
+    from,
+    ...options
+  }) {
     const router = useRouter();
     const matchPathname = useMatch({
       strict: false,
@@ -2508,7 +2513,7 @@
     };
     navigate = ({
       from,
-      to = '',
+      to,
       ...rest
     }) => {
       // If this link simply reloads the current route,
@@ -2517,7 +2522,7 @@
       // 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 {
         new URL(`${toString}`);
@@ -2526,8 +2531,9 @@
       invariant(!isExternal, 'Attempting to navigate to external url with this.navigate!');
       return this.buildAndCommitLocation({
         ...rest,
-        from: fromString,
-        to: toString
+        from,
+        to
+        // to: toString,
       });
     };
     loadMatches = async ({
@@ -3229,19 +3235,22 @@
     return children ?? null;
   }
 
-  function useNavigate(defaultOpts) {
+  function useNavigate(_defaultOpts) {
     const {
-      navigate
+      navigate,
+      buildLocation
     } = useRouter();
     const matchPathname = useMatch({
       strict: false,
       select: s => s.pathname
     });
-    return React__namespace.useCallback(opts => {
+    return React__namespace.useCallback(({
+      from,
+      ...rest
+    }) => {
       return navigate({
-        from: opts?.to ? matchPathname : undefined,
-        ...defaultOpts,
-        ...opts
+        from: rest?.to ? matchPathname : undefined,
+        ...rest
       });
     }, []);
   }