eddev 0.2.66 → 0.3.0-beta1

package/routing/routing.d.ts

@@ -33,7 +33,15 @@ declare type RouteContextType = {
     propagateCandidate(next: RouteItem, prev: RouteItem): AnyPromise;
     propagateLeaving(current: RouteItem, next: RouteItem, parentLeaving: boolean): AnyPromise;
     getFirstMatch: (item: RouteItem) => RouteContextType | undefined;
+    /**
+     * Navigate to a specific page
+     * @param path The relative URL to navigate to
+     */
+    navigate: (path: string) => void;
+    preload: (path: string) => void;
+    /** @deprecated Use navigate() instead */
     onNavigate: (path: string) => void;
+    /** @deprecated Use preload() instead */
     onPreload: (path: string) => void;
     dispose: () => void;
     update: () => void;
@@ -62,6 +70,8 @@ declare type SwitchProps = {
     children: ReactNode | ReactNode[];
 };
 export declare const isInternalPageLink: (href: string) => boolean;
+export declare const urlPathsMatch: (a: string, b: string) => boolean;
+export declare const urlDescendentsMatch: (a: string, b: string) => boolean;
 export declare const Link: import("react").ForwardRefExoticComponent<APropsWithoutRef & {
     preload?: boolean | undefined;
 } & {

package/routing/routing.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteItemContext = exports.Switch = exports.Link = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useRouter = exports.useRoute = void 0;
+exports.RouteItemContext = exports.Switch = exports.Link = exports.urlDescendentsMatch = exports.urlPathsMatch = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useRouter = exports.useRoute = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var react_merge_refs_1 = __importDefault(require("react-merge-refs"));
@@ -77,6 +77,8 @@ function createRouteContext(opts) {
         status: "inactive",
         currentMatch: false,
         isSwitch: !!opts.isSwitch,
+        navigate: opts.onNavigate,
+        preload: opts.onPreload,
         onNavigate: opts.onNavigate,
         onPreload: opts.onPreload,
         propagateChange: function (item, matches) {
@@ -172,8 +174,8 @@ function createRouteContext(opts) {
                 config: config,
                 parent: ctx,
                 isSwitch: opts.isSwitch,
-                onNavigate: ctx.onNavigate,
-                onPreload: ctx.onPreload,
+                onNavigate: ctx.navigate,
+                onPreload: ctx.preload,
                 dispose: function () {
                     var i = ctx.children.indexOf(child);
                     if (i !== -1)
@@ -325,6 +327,20 @@ var isInternalPageLink = function (href) {
     }
 };
 exports.isInternalPageLink = isInternalPageLink;
+var urlPathsMatch = function (a, b) {
+    var urlA = (0, url_parse_1.default)(a, true);
+    var urlB = (0, url_parse_1.default)(b, true);
+    return urlA.pathname.replace(/\/$/, "") === urlB.pathname.replace(/\/$/, "");
+};
+exports.urlPathsMatch = urlPathsMatch;
+var urlDescendentsMatch = function (a, b) {
+    var urlA = (0, url_parse_1.default)(a, true);
+    var urlB = (0, url_parse_1.default)(b, true);
+    if (urlB.pathname === "/")
+        return false;
+    return urlA.pathname.replace(/\/$/, "").startsWith(urlB.pathname.replace(/\/$/, ""));
+};
+exports.urlDescendentsMatch = urlDescendentsMatch;
 exports.Link = (0, react_1.forwardRef)(function (props, ref) {
     // @ts-ignore
     if (process.serverless) {
@@ -335,14 +351,24 @@ exports.Link = (0, react_1.forwardRef)(function (props, ref) {
     var router = (0, react_1.useContext)(RouterContext);
     (0, react_1.useEffect)(function () {
         if (props.preload && localRef.current && (0, exports.isInternalPageLink)(localRef.current.href)) {
-            router === null || router === void 0 ? void 0 : router.onPreload(localRef.current.href);
+            router === null || router === void 0 ? void 0 : router.preload(localRef.current.href);
         }
     }, [props.preload]);
-    return ((0, jsx_runtime_1.jsx)("a", __assign({ ref: (0, react_merge_refs_1.default)([localRef, ref]) }, props, { onMouseEnter: function (e) {
+    var isActive = (0, react_1.useMemo)(function () {
+        if (!(router === null || router === void 0 ? void 0 : router.item.pathname) || !props.href)
+            return false;
+        return (0, exports.urlPathsMatch)(router === null || router === void 0 ? void 0 : router.item.pathname, props.href);
+    }, [router === null || router === void 0 ? void 0 : router.item.pathname, props.href]);
+    var isDescendentActive = (0, react_1.useMemo)(function () {
+        if (!(router === null || router === void 0 ? void 0 : router.item.pathname) || !props.href)
+            return false;
+        return (0, exports.urlDescendentsMatch)(router === null || router === void 0 ? void 0 : router.item.pathname, props.href);
+    }, [router === null || router === void 0 ? void 0 : router.item.pathname, props.href]);
+    return ((0, jsx_runtime_1.jsx)("a", __assign({ ref: (0, react_merge_refs_1.default)([localRef, ref]) }, props, { "data-active": isActive ? true : undefined, "data-child-active": isDescendentActive ? true : undefined, onMouseEnter: function (e) {
             if (props.onMouseEnter) {
                 props.onMouseEnter(e);
             }
-            router === null || router === void 0 ? void 0 : router.onPreload(e.currentTarget.href);
+            router === null || router === void 0 ? void 0 : router.preload(e.currentTarget.href);
         }, onClick: function (e) {
             if (process.admin) {
                 e.preventDefault();
@@ -354,7 +380,7 @@ exports.Link = (0, react_1.forwardRef)(function (props, ref) {
             if (!e.isDefaultPrevented() && router && !e.ctrlKey && !e.metaKey) {
                 var href = e.currentTarget.href;
                 if ((0, exports.isInternalPageLink)(href)) {
-                    router.onNavigate(e.currentTarget.href);
+                    router.navigate(e.currentTarget.href);
                     e.preventDefault();
                 }
             }