eddev 2.0.0-beta.24 → 2.0.0-beta.241

package/dist/app/lib/routing/components/BackButton.d.ts

@@ -0,0 +1,50 @@
+import { ReactNode } from "react";
+import { RouteState } from "../types";
+type BackButtonProps = {
+    /**
+     * An optional matching function, which will stop the render button from appearing unless the function returns true.
+     *
+     * The below example will only render a back button if the last route was a project archive.
+     *
+     * eg. `filter={(route) => route.view === 'archive-projects'}`
+     *
+     * @param route The last route in the history stack.
+     */
+    filter?: (route: RouteState) => boolean;
+    /**
+     * Whether to use the top-most "global" route, or the "context" route.
+     *
+     * The "global" route is the top-most route, reflected in the URL bar.
+     *
+     * The "context" route will be the route that is currently being rendered, which may be different to the global route when using modals/overlays/route stacks/transitions.
+     *
+     * @default "context"
+     */
+    mode?: "global" | "context";
+    /**
+     * An optional href, which will be used if no back route is found.
+     *
+     * When used, the back button will always render.
+     */
+    fallbackHref?: string;
+    /**
+     * A function to render the back button, if one should be rendered.
+     *
+     * Receives a `route` prop to further inspect the route, and an `onClick` function to navigate back.
+     *
+     * @param props
+     * @returns
+     */
+    render: (props: {
+        route: RouteState;
+        onClick: (e?: any) => void;
+    }) => ReactNode;
+};
+/**
+ * Display a back button that will navigate to the previous page in the router's history.
+ *
+ * This will allow you to render a back button on the condition that the back button will not send the user to a different website.
+ */
+export declare function BackButton(props: BackButtonProps): ReactNode;
+export {};
+//# sourceMappingURL=BackButton.d.ts.map

package/dist/app/lib/routing/components/BackButton.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BackButton.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BackButton.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAW,MAAM,OAAO,CAAA;AAI1C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAGrC,KAAK,eAAe,GAAG;IACrB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAA;IACvC;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC3B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;;;;;OAOG;IACH,MAAM,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAA;KAAE,KAAK,SAAS,CAAA;CAChF,CAAA;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,aAmChD"}

package/dist/app/lib/routing/components/BackButton.js

@@ -0,0 +1,47 @@
+import { useMemo } from "react";
+import { useRoute } from "../hooks/useRoute";
+import { useRouter } from "../hooks/useRouter";
+import { useRouterState } from "../hooks/useRouterState";
+import { getLinkHandlerMode } from "../utils";
+/**
+ * Display a back button that will navigate to the previous page in the router's history.
+ *
+ * This will allow you to render a back button on the condition that the back button will not send the user to a different website.
+ */
+export function BackButton(props) {
+    const router = useRouter();
+    const prevRoute = useRouterState((state) => state.history[state.history.length - 2]);
+    const contextRoute = useRoute();
+    const activeRoute = useRouterState((state) => state.activeRoute);
+    const route = props.mode === "global" ? activeRoute : contextRoute;
+    const backAction = useMemo(() => {
+        if (prevRoute && (!props.filter || props.filter(prevRoute))) {
+            return (e) => {
+                const { mode } = getLinkHandlerMode(e, prevRoute.uri);
+                if (mode === "navigate") {
+                    e.preventDefault();
+                    history.back();
+                    // history.length
+                }
+                else if (mode === "ignore") {
+                    e.preventDefault();
+                }
+            };
+        }
+        else if (props.fallbackHref) {
+            return (e) => {
+                const { mode } = getLinkHandlerMode(e, props.fallbackHref);
+                if (mode === "navigate") {
+                    e.preventDefault();
+                    router.navigate(props.fallbackHref);
+                }
+                else if (mode === "ignore") {
+                    e.preventDefault();
+                }
+            };
+        }
+    }, [route, props.filter, props.fallbackHref]);
+    if (backAction) {
+        return props.render ? props.render({ route: prevRoute, onClick: backAction }) : null;
+    }
+}

package/dist/app/lib/routing/components/BrowserRouter.d.ts

@@ -1,7 +1,13 @@
 import { PropsWithChildren } from "react";
-import { type RouterAPI } from "../types.js";
+import { RouterAPIState, type RouterAPI } from "../types.js";
 type Props = PropsWithChildren<{
     routerRef?: React.MutableRefObject<RouterAPI | null>;
+    onReady?: () => void;
 }>;
+export declare function getClientRouter(): {
+    state: RouterAPIState;
+    api: RouterAPI;
+} | null;
 export declare function BrowserRouter(props: Props): import("react/jsx-runtime").JSX.Element;
 export {};
+//# sourceMappingURL=BrowserRouter.d.ts.map

package/dist/app/lib/routing/components/BrowserRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuD,MAAM,OAAO,CAAA;AAK9F,OAAO,EAGL,cAAc,EAId,KAAK,SAAS,EAGf,MAAM,aAAa,CAAA;AAWpB,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAC,CAAA;AAuEF,wBAAgB,eAAe;WAFJ,cAAc;SAAO,SAAS;SAIxD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,2CAgezC"}

package/dist/app/lib/routing/components/BrowserRouter.js

@@ -1,12 +1,20 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState, useTransition } from "react";
-import { isRelative, parseURL, resolveURL } from "ufo";
-import { RouterContext, RouterStateContext } from "../context.js";
+import { isEqual, isRelative, parseURL, resolveURL } from "ufo";
+import { clientMetaTags, RouterContext, RouterStateContext } from "../context.js";
+import { $routeMetaStore } from "../hooks/useRouteMeta.js";
 import { RouteLoader } from "../loader.js";
-import { getLinkHandlerMode, getRouteMeta, normalizeRoute, parseQuery, stringifyRouteLink } from "../utils.js";
+import { getLinkHandlerMode, getRouteMeta, isSamePathname, normalizeRoute, parseQuery, stringifyRouteLink, } from "../utils.js";
 import { AppRenderer } from "./RouteRenderer.js";
-import { $routeMetaStore } from "../hooks/useRouteMeta.js";
+// Create a global RouteLoader instance
 const loader = new RouteLoader();
+// Create a unique ID for each history entry
+let historyStamp = String(new Date().getTime());
+let historyIndex = 0;
+function getHistoryId() {
+    return historyStamp + historyIndex++;
+}
+// Set up the initial route data
 let initialRoute;
 let initialRouteHydrated = false;
 if (env.client && !env.admin) {
@@ -24,10 +32,9 @@ if (env.client && !env.admin) {
         search: "",
         query: {},
         view: initialData.view,
-        meta: {
-            tags: initialData.meta?.head,
-        },
+        meta: getRouteMeta(initialData),
     });
+    history.replaceState(historyStateForRoute(initialRoute), "", document.location.href);
     $routeMetaStore.data = getRouteMeta(initialData);
 }
 function parseHrefPath(url) {
@@ -59,22 +66,19 @@ function historyStateForRoute(route) {
         state: route.returnState,
     };
 }
-let index = 0;
-function getHistoryId() {
-    return String(index++);
+let clientRouter = null;
+export function getClientRouter() {
+    return clientRouter;
 }
-let lastRouterState = null;
 export function BrowserRouter(props) {
     const pendingRoute = useRef(null);
     const [transitioning, startTransition] = useTransition();
+    const pendingNavigationClick = useRef(null);
     const [routerState, setRouterState] = useState(() => ({
         activeRoute: initialRoute,
         history: [initialRoute],
         blockers: [],
     }));
-    if (lastRouterState !== routerState) {
-        lastRouterState = routerState;
-    }
     const { internals, api } = useMemo(() => {
         let subscribers = new Set();
         let state = routerState;
@@ -83,8 +87,27 @@ export function BrowserRouter(props) {
                 ...state,
                 ...update,
             };
+            if (state?.activeRoute?.meta?.tags) {
+                if (env.serverless) {
+                    clientMetaTags.setMetaTags(state.activeRoute.meta.tags ?? []);
+                }
+                else {
+                    const title = state.activeRoute.meta.tags.find((tag) => tag.tagName === "title")?.inner;
+                    if (title)
+                        document.title = title;
+                }
+            }
             setRouterState(state);
         };
+        // If a dynamic compojnent fails to load during a page transition, we need to reload the page
+        subscribers.add((event) => {
+            if (event.type === "error:component-load-failed") {
+                if (state?.pendingRoute) {
+                    console.warn("Failed to load route component. May be a deployment mismatch.");
+                    window.location.href = state.pendingRoute.uri;
+                }
+            }
+        });
         const internals = {
             transitionEnded: null,
             updateRoute: null,
@@ -176,6 +199,7 @@ export function BrowserRouter(props) {
             emitEvent({
                 type: "navigate:start",
                 link,
+                linkData: args.linkData,
                 currentRoute: currentRoute,
                 hasPreloadedData: hasRouteData,
                 goingBack: !!args.goingBack,
@@ -185,11 +209,26 @@ export function BrowserRouter(props) {
             });
             if (cancelled)
                 return;
-            const data = await loader.loadRouteData(parseHrefPath(args.url));
-            if (!data.view) {
-                console.error("No `view` property in route data");
-                return;
-            }
+            const data = await loader.loadRouteData(parseHrefPath(args.url)).catch((err) => {
+                emitEvent({
+                    type: "error",
+                    url: args.url,
+                    error: err,
+                    critical: true,
+                    linkData: args.linkData,
+                });
+                return {
+                    view: "_error",
+                    viewType: "react",
+                    appData: loader.appData,
+                    viewData: {
+                        data: {
+                            code: 500,
+                            error: err,
+                        },
+                    },
+                };
+            });
             const lazyComponent = loader.getRouteComponent(data.view);
             if (!lazyComponent) {
                 console.error(`No component found for view: ${data.view}`);
@@ -200,14 +239,13 @@ export function BrowserRouter(props) {
                     hash: link.hash,
                     search: "",
                     query: link.query,
-                    pathname: link.pathname,
+                    pathname: data.canonical ?? link.pathname,
                     view: data.view,
                     props: data.viewData?.data ?? {},
                     component: lazyComponent,
                     returnState: args.restoreState ?? {},
-                    meta: {
-                        tags: data.meta?.head,
-                    },
+                    meta: getRouteMeta(data),
+                    linkData: args.linkData,
                 });
             setState({
                 pendingRoute: route,
@@ -217,12 +255,14 @@ export function BrowserRouter(props) {
                 currentRoute,
                 loadedRoute: route,
                 link,
+                linkData: args.linkData,
             });
             emitEvent({
                 type: "navigate:will-change",
                 currentRoute,
                 loadedRoute: route,
                 link,
+                linkData: args.linkData,
             });
             internals.transitionEnded = () => {
                 internals.transitionEnded = null;
@@ -235,8 +275,18 @@ export function BrowserRouter(props) {
                     currentRoute: route,
                     lastRoute: currentRoute,
                     link,
+                    linkData: args.linkData,
                 });
                 $routeMetaStore.data = route.meta;
+                pendingNavigationClick.current = null;
+                // Update the 'Edit Page' button, if there is one
+                if (route.meta.editLink) {
+                    const button = document.querySelector("#wp-admin-bar-edit a");
+                    if (button) {
+                        button.setAttribute("href", route.meta.editLink);
+                        button.innerHTML = "Edit Page";
+                    }
+                }
             };
             startTransition(() => {
                 pendingRoute.current = route;
@@ -248,13 +298,18 @@ export function BrowserRouter(props) {
         }
         const api = {
             loader: loader,
-            async navigate(url) {
+            hostname: window?._PAGE_DATA?.hostname,
+            async navigate(url, args) {
                 doRouteTransition({
                     url: url,
                     shouldPush: true,
                     goingBack: false,
+                    linkData: args?.linkData,
                 });
             },
+            getState() {
+                return state;
+            },
             replaceHash(hash) {
                 replaceRoute({
                     ...getActiveRoute(),
@@ -265,6 +320,7 @@ export function BrowserRouter(props) {
                 replaceRoute({
                     ...getActiveRoute(),
                     query,
+                    returnState: captureState(),
                 });
             },
             async prefetch(url) {
@@ -273,12 +329,12 @@ export function BrowserRouter(props) {
                     if (loader.hasRouteData(link.pathname))
                         return;
                     emitEvent({ type: "preload:start", currentRoute: getActiveRoute(), link });
-                    const data = await loader.loadRouteData(link.pathname).then((data) => {
+                    await loader.loadRouteData(link.pathname).then((data) => {
                         emitEvent({ type: "preload:data-ready", currentRoute: getActiveRoute(), link, data });
                     });
                 }
                 catch (err) {
-                    emitEvent({ type: "error", error: err, critical: false });
+                    emitEvent({ type: "error", error: err, critical: false, linkData: undefined });
                 }
             },
             async preload(url) {
@@ -296,7 +352,7 @@ export function BrowserRouter(props) {
                     }
                 }
                 catch (err) {
-                    emitEvent({ type: "error", error: err, critical: false });
+                    emitEvent({ type: "error", error: err, critical: false, linkData: undefined });
                 }
             },
             subscribe(fn) {
@@ -305,9 +361,37 @@ export function BrowserRouter(props) {
                     subscribers.delete(fn);
                 };
             },
-            handleClickEvent(e, originalHref) {
-                const { mode, href } = getLinkHandlerMode(e, originalHref);
-                if (mode === "ignore") {
+            handleClickEvent(e, originalHref, preferBack, eventTarget, linkData) {
+                const { mode, href, isSameUrl } = getLinkHandlerMode(e, originalHref, state.activeRoute);
+                let cancelled = false;
+                // If the same link has only just been clicked very recently, ignore it.
+                // Likely this is a double-click, or the page has taken a bit longer to load than the user expected.
+                if (pendingNavigationClick.current && pendingNavigationClick.current.href === href) {
+                    const pendingAge = Date.now() - pendingNavigationClick.current.startTime;
+                    if (pendingAge < 1000) {
+                        e.preventDefault();
+                        return;
+                    }
+                }
+                else {
+                    pendingNavigationClick.current = { startTime: Date.now(), href: href };
+                }
+                if (href) {
+                    emitEvent({
+                        type: "clicked",
+                        currentRoute: getActiveRoute(),
+                        link: parseRouteLink(href),
+                        linkData,
+                        mode,
+                        href,
+                        isSameUrl,
+                        target: (eventTarget || e.currentTarget || e.target),
+                        cancel() {
+                            cancelled = true;
+                        },
+                    });
+                }
+                if (mode === "ignore" || cancelled) {
                     e.preventDefault();
                     return;
                 }
@@ -316,10 +400,55 @@ export function BrowserRouter(props) {
                 }
                 else if (mode === "navigate" && href) {
                     e.preventDefault();
-                    api.navigate(href);
+                    if (preferBack) {
+                        const lastState = state.history.length > 1 && state.history[state.history.length - 2];
+                        if (lastState) {
+                            const doesMatch = preferBack === "exact" ? isEqual(href, lastState.uri) : isSamePathname(href, lastState.uri);
+                            if (doesMatch) {
+                                history.back();
+                                return;
+                            }
+                        }
+                    }
+                    api.navigate(href, {
+                        linkData,
+                    });
                 }
             },
             emitEvent,
+            restoreRoute(route) {
+                const stack = state.history;
+                // Is the route in our history stack? (going back)
+                const index = stack.findIndex((item) => item.id === route.id);
+                if (index >= 0) {
+                    return doRouteTransition({
+                        url: route.uri,
+                        route,
+                        goingBack: true,
+                        history: stack.slice(0, index),
+                        restoreState: route.returnState,
+                        shouldPush: false,
+                    });
+                }
+                // Is the route in our history _cache_? (probably going forward)
+                if (historyCache.has(route.id)) {
+                    return doRouteTransition({
+                        url: route.uri,
+                        route,
+                        goingBack: false,
+                        history: stack,
+                        restoreState: route.returnState,
+                        shouldPush: false,
+                    });
+                }
+                return doRouteTransition({
+                    url: route.uri,
+                    goingBack: false,
+                    history: stack,
+                    restoreState: route.returnState,
+                    shouldPush: false,
+                });
+            },
         };
         return {
             api,
@@ -348,6 +477,7 @@ export function BrowserRouter(props) {
         // Handle popState
         // const router = useRouterStore.getState()
         const onPopState = (e) => {
+            // console.log("Popped", e.state)
             internals.poppedState?.(document.location.href, e.state ?? {});
         };
         window.addEventListener("popstate", onPopState);
@@ -355,5 +485,12 @@ export function BrowserRouter(props) {
             window.removeEventListener("popstate", onPopState);
         };
     }, []);
+    useEffect(() => {
+        props.onReady?.();
+    }, []);
+    clientRouter = {
+        state: routerState,
+        api,
+    };
     return (_jsx(RouterContext.Provider, { value: api, children: _jsx(RouterStateContext.Provider, { value: routerState, children: _jsx(AppRenderer, {}) }) }));
 }

package/dist/app/lib/routing/components/ClientOnly.d.ts

@@ -10,3 +10,4 @@ type Props = PropsWithChildren<{
  */
 export declare function ClientOnly(props: Props): string | number | boolean | Iterable<import("react").ReactNode> | import("react/jsx-runtime").JSX.Element | null;
 export {};
+//# sourceMappingURL=ClientOnly.d.ts.map

package/dist/app/lib/routing/components/ClientOnly.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClientOnly.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/ClientOnly.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAGnD,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,qEAAqE;IACrE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B,CAAC,CAAA;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,oHAMtC"}

package/dist/app/lib/routing/components/ClientOnly.js

@@ -1,14 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment } from "react";
-import { useIsSSR } from "../hooks/useIsSSR.js";
+import { useHydrating } from "../hooks/useHydrating.js";
 /**
  * Renders children, but only on the client.
  *
  * The optional 'fallback' prop can be used to show a loading state or placeholder content while the client bundle is loading.
  */
 export function ClientOnly(props) {
-    const mounted = useIsSSR();
-    if (!mounted)
+    const mounted = useHydrating();
+    if (mounted)
         return props.fallback ?? null;
     return _jsx(Fragment, { children: props.children });
 }

package/dist/app/lib/routing/components/Link.d.ts

@@ -1,9 +1,28 @@
-import { ComponentPropsWithRef, ElementType, ReactElement } from "react";
-type Props<T extends ElementType = "a"> = NoInfer<Omit<ComponentPropsWithRef<T>, "href">> & {
+import { ComponentPropsWithRef, ElementType, MouseEvent, ReactElement } from "react";
+import { LinkClickData } from "../types.js";
+type Props<T extends ElementType = "a"> = NoInfer<Omit<ComponentPropsWithRef<T>, "href" | "target">> & {
     href?: string | null;
     target?: string | null;
     as?: T;
+    preferBack?: boolean | "exact";
+    linkData?: LinkClickData;
 };
+export declare function useLinkProps<T extends ElementType = "a">(props: Exclude<Props<T>, "as">, ref?: React.Ref<HTMLAnchorElement>): ({
+    ref: import("react").Ref<HTMLAnchorElement> | undefined;
+    "data-active": boolean | "path" | "query" | "exact" | undefined;
+    "data-child-active": boolean | undefined;
+    "data-pending": "path" | "query" | "exact" | undefined;
+} & Exclude<Props<T>, "as"> & {
+    href: string;
+    onMouseEnter: (e: MouseEvent) => void;
+    onPointerDown: (e: PointerEvent) => void;
+    onClick: (e: MouseEvent) => void;
+}) | ({
+    ref: import("react").Ref<HTMLAnchorElement> | undefined;
+} & Exclude<Props<T>, "as"> & {
+    href: string | undefined;
+    onClick: (e: MouseEvent) => void;
+});
 export declare const Link: <T extends ElementType = "a">(props: Props<T>) => ReactElement;
 /**
  * Provides information about the given href parameter, such as whether it is active, whether a child page is active, or whether it is loading.
@@ -24,3 +43,4 @@ export declare function useLinkState(href: string): {
     pending: "path" | "query" | "exact" | undefined;
 };
 export {};
+//# sourceMappingURL=Link.d.ts.map

package/dist/app/lib/routing/components/Link.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/Link.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAsC,MAAM,OAAO,CAAA;AAIxH,OAAO,EAAE,aAAa,EAAc,MAAM,aAAa,CAAA;AAKvD,KAAK,KAAK,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,GAAG;IACrG,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,EAAE,CAAC,EAAE,CAAC,CAAA;IACN,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;IAC9B,QAAQ,CAAC,EAAE,aAAa,CAAA;CACzB,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EACtD,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAC9B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;;;;;;;sBAuBd,UAAU;uBAOT,YAAY;iBAOlB,UAAU;;;;;iBA9BR,UAAU;GAwC5B;AAED,eAAO,MAAM,IAAI,EAIX,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,CAAA;AAKpE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;EA6BxC"}

package/dist/app/lib/routing/components/Link.js

@@ -1,33 +1,58 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { forwardRef, useMemo } from "react";
+import { createElement, forwardRef, useMemo } from "react";
 import { parseURL, resolveURL, withoutTrailingSlash } from "ufo";
-import { useIsSSR } from "../hooks/useIsSSR.js";
+import { useHydrating } from "../hooks/useHydrating.js";
 import { useRouter } from "../hooks/useRouter.js";
-import { isSameOrigin } from "../utils.js";
+import { addTrailingSlash, getLinkHandlerMode, isSameOrigin } from "../utils.js";
 import { useRoute } from "../hooks/useRoute.js";
 import { useRouterState } from "../hooks/useRouterState.js";
-export const Link = forwardRef((props, ref) => {
-    const Comp = props.as || "a";
+export function useLinkProps(props, ref) {
     if (env.admin) {
-        return (_jsx(Comp, { ref: ref, ...props, href: props.href ?? undefined, onClick: (e) => {
+        return {
+            ref: ref,
+            ...props,
+            href: props.href ?? undefined,
+            onClick: (e) => {
                 props.onClick?.(e);
                 e.preventDefault();
-            } }));
-    }
-    else {
-        const preload = useRouter((r) => r.preload);
-        const handleClickEvent = useRouter((r) => r.handleClickEvent);
-        const state = useLinkState(props.href ?? "");
-        return (_jsx(Comp, { ref: ref, "data-active": state.active ?? undefined, "data-child-active": state.childActive ?? undefined, "data-pending": state.pending ?? undefined, ...props, href: props.href ?? undefined, onMouseEnter: (e) => {
-                if (props.onMouseEnter) {
-                    props.onMouseEnter(e);
-                }
-                preload(props.href);
-            }, onClick: (e) => {
-                props.onClick?.(e);
-                handleClickEvent(e, props.href ?? undefined);
-            } }));
+            },
+        };
     }
+    const router = useRouter();
+    const state = useLinkState(props.href ?? "");
+    const finalProps = {
+        ref: ref,
+        "data-active": state.active ?? undefined,
+        "data-child-active": state.childActive ?? undefined,
+        "data-pending": state.pending ?? undefined,
+        ...props,
+        href: addTrailingSlash(props.href),
+        onMouseEnter: (e) => {
+            props.onMouseEnter?.(e);
+            const mode = getLinkHandlerMode(e, props.href);
+            if (mode.mode === "navigate") {
+                router.preload(props.href);
+            }
+        },
+        onPointerDown: (e) => {
+            props.onPointerDown?.(e);
+            const mode = getLinkHandlerMode(e, props.href);
+            if (mode.mode === "navigate") {
+                router.preload(props.href);
+            }
+        },
+        onClick: (e) => {
+            props.onClick?.(e);
+            router.handleClickEvent(e, props.href ?? undefined, props.preferBack, undefined, props.linkData);
+        },
+    };
+    delete finalProps.preferBack;
+    delete finalProps.linkData;
+    return finalProps;
+}
+export const Link = forwardRef(({ as, ...props }, ref) => {
+    const Comp = as || "a";
+    const finalProps = useLinkProps(props, ref);
+    return createElement(Comp, finalProps);
 });
 // @ts-ignore
 Link.displayName = "Link";
@@ -39,7 +64,7 @@ Link.displayName = "Link";
 export function useLinkState(href) {
     const route = useRoute();
     const pendingRoute = useRouterState((r) => r.pendingRoute);
-    const isSSR = useIsSSR();
+    const isSSR = useHydrating();
     const state = useMemo(() => {
         // If we're in SSR mode, do a quick and dirty check, which relies on the href being relative.
         if (isSSR) {
@@ -55,8 +80,8 @@ export function useLinkState(href) {
         }
         const hrefUrl = parseURL(resolveURL(href));
         const active = route ? compareUri(route, hrefUrl) : undefined;
-        const childActive = !active && route ? isSubpath(hrefUrl.pathname, route.pathname) : undefined;
-        const pending = pendingRoute ? compareUri(pendingRoute, hrefUrl) : undefined;
+        const childActive = !active && route ? isSubpath(hrefUrl.pathname, route.pathname) || undefined : undefined;
+        const pending = pendingRoute ? compareUri(pendingRoute, hrefUrl) || undefined : undefined;
         return {
             active,
             childActive,
@@ -84,6 +109,9 @@ function compareUri(route, href) {
     }
 }
 function isSubpath(parentPath, childPath) {
+    if (parentPath === "/" || childPath === "/") {
+        return false;
+    }
     if (withoutTrailingSlash(parentPath) === withoutTrailingSlash(childPath)) {
         return false;
     }

package/dist/app/lib/routing/components/NativeLinkHandler.d.ts

@@ -0,0 +1,10 @@
+import { HTMLProps, JSX } from "react";
+type Props<T extends keyof JSX.IntrinsicElements> = {
+    as?: T;
+} & HTMLProps<T>;
+/**
+ * Use this component to wrap any HTML element that contains <a> tags that are not already handled by the router.
+ */
+export declare function NativeLinkHandler<T extends keyof JSX.IntrinsicElements = "div">({ as, ...props }: Props<T>): import("react/jsx-runtime").JSX.Element;
+export {};
+//# sourceMappingURL=NativeLinkHandler.d.ts.map

package/dist/app/lib/routing/components/NativeLinkHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeLinkHandler.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/NativeLinkHandler.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAGtD,KAAK,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,CAAC,iBAAiB,IAAI;IAClD,EAAE,CAAC,EAAE,CAAC,CAAA;CACP,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;AAEhB;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,CAAC,iBAAiB,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,2CAqB1G"}