@tanstack/react-router 1.0.1 → 1.0.3

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

@@ -93,13 +93,15 @@
       push: (path, state) => {
         state = assignKey(state);
         tryNavigation(() => {
-          opts.pushState(path, state, onUpdate);
+          opts.pushState(path, state);
+          onUpdate();
         });
       },
       replace: (path, state) => {
         state = assignKey(state);
         tryNavigation(() => {
-          opts.replaceState(path, state, onUpdate);
+          opts.replaceState(path, state);
+          onUpdate();
         });
       },
       go: index => {
@@ -204,7 +206,7 @@
     };
 
     // This function queues up a call to update the browser history
-    const queueHistoryAction = (type, destHref, state, onUpdate) => {
+    const queueHistoryAction = (type, destHref, state) => {
       const href = createHref(destHref);
       if (!scheduled) {
         rollbackLocation = currentLocation;
@@ -219,9 +221,6 @@
         state,
         isPush: next?.isPush || type === 'push'
       };
-
-      // Notify subscribers
-      onUpdate();
       if (!scheduled) {
         // Schedule an update to the browser history
         scheduled = Promise.resolve().then(() => flush());
@@ -235,8 +234,8 @@
     var originalReplaceState = win.history.replaceState;
     const history = createHistory({
       getLocation,
-      pushState: (href, state, onUpdate) => queueHistoryAction('push', href, state, onUpdate),
-      replaceState: (href, state, onUpdate) => queueHistoryAction('replace', href, state, onUpdate),
+      pushState: (href, state) => queueHistoryAction('push', href, state),
+      replaceState: (href, state) => queueHistoryAction('replace', href, state),
       back: () => win.history.back(),
       forward: () => win.history.forward(),
       go: n => win.history.go(n),
@@ -1688,7 +1687,10 @@
   }
 
   const preloadWarning = 'Error preloading route! ☝️';
-  function useLinkProps(options) {
+  function useLinkProps({
+    from,
+    ...options
+  }) {
     const router = useRouter();
     const matchPathname = useMatch({
       strict: false,
@@ -2510,7 +2512,7 @@
     };
     navigate = ({
       from,
-      to = '',
+      to,
       ...rest
     }) => {
       // If this link simply reloads the current route,
@@ -2519,7 +2521,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}`);
@@ -2528,8 +2530,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 ({
@@ -3231,19 +3234,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
       });
     }, []);
   }