Improve redirect function

Author: ije

framework/core/redirect.ts

@@ -2,19 +2,20 @@ import util from "../../lib/util.ts";
 import events from "./events.ts";
 
 let routerReady = false;
-let hasPreRedirect = false;
+let preRedirect: { url: URL; replace?: boolean } | null = null;
 
 const onrouterready = (_: Record<string, unknown>) => {
   events.off("routerready", onrouterready);
-  if (hasPreRedirect) {
-    events.emit("popstate", { type: "popstate", resetScroll: true });
+  if (preRedirect) {
+    events.emit("popstate", { type: "popstate", ...preRedirect });
+    preRedirect = null;
   }
   routerReady = true;
 };
 events.on("routerready", onrouterready);
 
 export function redirect(url: string, replace?: boolean) {
-  const { location, history } = window;
+  const { location } = window;
 
   if (!util.isFilledString(url)) {
     return;
@@ -25,15 +26,10 @@ export function redirect(url: string, replace?: boolean) {
     return;
   }
 
-  if (replace) {
-    history.replaceState(null, "", new URL(url, location.href));
-  } else {
-    history.pushState(null, "", new URL(url, location.href));
-  }
-
+  const redirectOptions = { url: new URL(url, location.href), replace };
   if (routerReady) {
-    events.emit("popstate", { type: "popstate", resetScroll: true });
-  } else if (!hasPreRedirect) {
-    hasPreRedirect = true;
+    events.emit("popstate", { type: "popstate", ...redirectOptions });
+  } else {
+    preRedirect = redirectOptions;
   }
 }

framework/react/link.ts

@@ -93,7 +93,7 @@ export function Link(props: LinkProps) {
       timerRef.current = setTimeout(() => {
         timerRef.current = null;
         prefetch();
-      }, 300);
+      }, 150);
     }
   }, [prefetch, href, propOnMouseEnter]);
   const onMouseLeave = useCallback((e: MouseEvent) => {

framework/react/router.ts

@@ -134,7 +134,7 @@ export const Router: FC<RouterProps> = ({ ssrContext }) => {
       });
     };
     const onpopstate = async (e: Record<string, unknown>) => {
-      const url = new URL(window.location.href);
+      const url = (e.url as URL | undefined) || new URL(window.location.href);
       const matches = matchRoutes(url, routes);
       const modules = await Promise.all(matches.map(async ([ret, meta]) => {
         const { filename } = meta;
@@ -159,7 +159,12 @@ export const Router: FC<RouterProps> = ({ ssrContext }) => {
       }));
       setModules(modules);
       setUrl(url);
-      if (e.resetScroll) {
+      if (e.url) {
+        if (e.replace) {
+          history.replaceState(null, "", e.url as URL);
+        } else {
+          history.pushState(null, "", e.url as URL);
+        }
         window.scrollTo(0, 0);
       }
     };