fix preloadRoute to take string path

solidjs · Oct 14, 2024 · a22d7d2 · a22d7d2
1 parent 6dd0473
commit a22d7d2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.changeset/four-seahorses-live.md b/.changeset/four-seahorses-live.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+fix preloadRoute to take string path
diff --git a/src/data/events.ts b/src/data/events.ts
@@ -78,7 +78,7 @@ export function setupNativeEvents(
       if (!res) return;
       const [a, url] = res;
       transformUrl && (url.pathname = transformUrl(url.pathname));
-      router.preloadRoute(url, { preloadData: a.getAttribute("preload") !== "false" });
+      router.preloadRoute(url, a.getAttribute("preload") !== "false");
     }
 
     function handleAnchorMove(evt: Event) {
@@ -89,7 +89,7 @@ export function setupNativeEvents(
       if (lastElement === a) return;
       transformUrl && (url.pathname = transformUrl(url.pathname));
       preloadTimeout = setTimeout(() => {
-        router.preloadRoute(url, { preloadData: a.getAttribute("preload") !== "false" });
+        router.preloadRoute(url, a.getAttribute("preload") !== "false");
         lastElement = a;
       }, 20) as any;
     }

diff --git a/src/routing.ts b/src/routing.ts
@@ -77,7 +77,11 @@ export const useHref = (to: () => string | undefined) => {
 export const useNavigate = () => useRouter().navigatorFactory();
 export const useLocation = <S = unknown>() => useRouter().location as Location<S>;
 export const useIsRouting = () => useRouter().isRouting;
-export const usePreloadRoute = () => useRouter().preloadRoute;
+export const usePreloadRoute = () => {
+  const pre = useRouter().preloadRoute
+  return (url: string | URL, options: { preloadData?: boolean } = {} ) =>
+    pre(url instanceof URL ? url : new URL(url, mockBase), options.preloadData)
+}
 
 export const useMatch = <S extends string>(path: () => S, matchFilters?: MatchFilters<S>) => {
   const location = useLocation();
@@ -470,7 +474,7 @@ export function createRouterContext(
     }
   }
 
-  function preloadRoute(url: URL, options: { preloadData?: boolean } = {}) {
+  function preloadRoute(url: URL, preloadData?: boolean) {
     const matches = getRouteMatches(branches(), url.pathname);
     const prevIntent = intent;
     intent = "preload";
@@ -481,7 +485,7 @@ export function createRouterContext(
         (route.component as MaybePreloadableComponent).preload!();
       const { preload } = route;
       inPreloadFn = true;
-      options.preloadData &&
+      preloadData &&
         preload &&
         runWithOwner(getContext!(), () =>
           preload({

diff --git a/src/types.ts b/src/types.ts
@@ -172,7 +172,7 @@ export interface RouterContext {
   renderPath(path: string): string;
   parsePath(str: string): string;
   beforeLeave: BeforeLeaveLifecycle;
-  preloadRoute: (url: URL, options: { preloadData?: boolean }) => void;
+  preloadRoute: (url: URL, preloadData?: boolean) => void;
   singleFlight: boolean;
   submissions: Signal<Submission<any, any>[]>;
 }