@redneckz/wildless-cms-uni-blocks 0.8.5 → 0.8.7

package/bundle/bundle.umd.js

@@ -342,7 +342,7 @@
             .concat(1);
     }
 
-    const normalizeAnchor = (rawAnchor) => rawAnchor?.replace('#', '');
+    const normalizeAnchor = (rawAnchor) => rawAnchor?.replace('#', '') || '';
     const getURLWithAnchor = (rawAnchor) => `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
     class BlockRouter {
         static inst = new BlockRouter();
@@ -658,10 +658,8 @@
     const isURL = (href) => Boolean(href?.includes('//'));
     const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
     const isHash = (href) => Boolean(href?.startsWith('#'));
-    const withoutQuery = (href) => (href || '').replace(/\/?\?.*/, '');
-    const getOrigin = (href) => (isURL(href) ? new URL(href).origin : undefined);
-    const getPathname = (href) => (isURL(href) ? new URL(href).pathname : undefined);
-    const getHash = (href) => (isURL(href) ? new URL(href).hash : undefined);
+    const withoutQuery = (href) => (href || '').replace(/\?.*/, '').replace(/\/$/, '');
+    const joinPath = (...path) => path.filter(Boolean).join('/').replace(/\/+/g, '/');
 
     var url = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -669,9 +667,7 @@
         isLocalURL: isLocalURL,
         isHash: isHash,
         withoutQuery: withoutQuery,
-        getOrigin: getOrigin,
-        getPathname: getPathname,
-        getHash: getHash
+        joinPath: joinPath
     });
 
     /* eslint-disable @typescript-eslint/ban-types */
@@ -704,28 +700,35 @@
     function useLink(isRemote) {
         const router = useRouter();
         const blockRouter = useBlockRouter();
-        const handleLocalURL = (href, target) => (ev) => {
-            if (isRemote || !isLocalURL(href, target)) {
-                // Proceed with native handle
-                return;
-            }
-            // Client routing
-            ev?.preventDefault();
-            if (isHash(href)) {
-                blockRouter.goto(href);
-            }
-            else if (href) {
-                router.push(href);
-            }
-        };
         return (props) => ({
             ...props,
+            href: adjustHref(props.href),
             'aria-label': props.text,
-            onClick: handlerDecorator((ev) => {
-                props.onClick && props.onClick(ev);
-                handleLocalURL(props.href, props.target)(ev);
-            }, props),
+            onClick: handlerDecorator(handleHref(props), props),
         });
+        function adjustHref(href) {
+            const isRelativeToBase = !isRemote && href?.startsWith('/');
+            return projectSettings.BASE_PATH && href && isRelativeToBase
+                ? joinPath(projectSettings.BASE_PATH, href)
+                : href;
+        }
+        function handleHref({ href, target, onClick }) {
+            return (ev) => {
+                onClick && onClick(ev);
+                if (isRemote || !isLocalURL(href, target)) {
+                    // Default routing
+                    return;
+                }
+                // Client routing
+                ev?.preventDefault();
+                if (isHash(href)) {
+                    blockRouter.goto(href);
+                }
+                else if (href) {
+                    router.push(href);
+                }
+            };
+        }
     }
 
     const buttonStyleMap = {
@@ -2457,8 +2460,8 @@
         return currencies?.filter((_) => _?.currency?.id === 1 || _?.currency?.id === 2) || [];
     };
 
-    function useSWRResource(fileName, fallback = {}) {
-        const { data } = useAsyncData(`/wcms-resources/${fileName}.json`, fetchJSONUnsafe, {
+    function useSWRResource(filename, fallback = {}) {
+        const { data } = useAsyncData(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
             fallback,
         });
         return data || {};
@@ -2544,16 +2547,10 @@
         return (jsx("div", { className: className, children: links?.length ? (jsx("div", { className: "flex justify-between items-center gap-5 py-5 border-solid border-x-0 border-y border-y-main-divider", children: links.map((_, i) => (jsx(HorizontalNavigationLink, { index: i, className: "text-l-light max-w-[292px]", ..._ }, String(i)))) })) : null }));
     });
 
-    const cmp = (a) => (b) => a?.href === b?.href;
-    const substitute = (items, substitution) => (items || []).map((_) => substitution?.find(cmp(_)) || _);
-    const subtract = (minuend, subtrahend) => (minuend || []).filter((_) => !subtrahend?.find(cmp(_)));
-    const mergeTopItems = (left, right) => substitute(left, right).concat(subtract(right, left));
-
-    const Sitemap = JSX(({ className = '', items, fallback }) => {
+    const Sitemap = JSX(({ className = '', fallback }) => {
         const link = useLink();
         const sitemap = useSWRResource(projectSettings.SITEMAP || 'sitemap', fallback);
-        const mergedItems = mergeTopItems(sitemap.topItems, items);
-        return (jsx("div", { className: `flex flex-grow items-start justify-between gap-[54px] xl:gap-5 ${className}`, children: mergedItems?.map((_, i) => renderColumn(link(_), i)) }));
+        return (jsx("div", { className: `flex flex-grow items-start justify-between gap-[54px] xl:gap-5 ${className}`, children: sitemap.topItems?.map((_, i) => renderColumn(link(_), i)) }));
     });
     const renderColumn = (menuItem, index) => {
         const { text, items, href, target, onClick } = menuItem;
@@ -2640,13 +2637,11 @@
     const renderMonthNames = (item, colSize) => item.month?.map((_, i) => (jsx("div", { style: { flexBasis: `${colSize}%` }, children: _.text }, `monthName-${i}`)));
     const renderMonthImages = (item) => item.month?.map((_) => _.image?.src ? (jsx("div", { className: "h-[207px] border-r pr-3 mr-3 border-main-divider last:border-r-0 last:pr-0 last:mr-0", children: jsx(ImgInner, { image: _.image, className: "flex" }) }, `monthImage-${_.image.src}`)) : null);
 
-    const isHrefActive = (router) => ({ href }) => {
-        const { BASE_PATH } = projectSettings;
-        const relativeHref = BASE_PATH && href?.startsWith(BASE_PATH) ? href.substring(BASE_PATH.length) : href;
-        return withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(relativeHref));
-    };
+    const isHrefActive = (router) => ({ href }) => withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(href));
 
-    const isTopItemActive = (router) => (topItem) => topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
+    const isTopItemActive = (router) => (topItem) => projectSettings.BASE_PATH
+        ? isHrefActive({ pathname: projectSettings.BASE_PATH })(topItem)
+        : topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
 
     const TopItem = JSX(({ className = '', active, flat, children, ...rest }) => {
         const link = useLink(true);
@@ -4562,7 +4557,7 @@
         return (jsx("div", { className: "flex items-end absolute bottom-0 right-0 h-full pointer-events-none", children: jsx(LikeControl, { className: "rounded-tl-lg sticky bottom-0 pointer-events-auto" }) }));
     }
 
-    const packageVersion = "0.8.5";
+    const packageVersion = "0.8.7";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;