@redneckz/wildless-cms-uni-blocks 0.6.43 → 0.6.45

package/bundle/ProjectSettings.d.ts

@@ -7,6 +7,7 @@ export interface ProjectSettings {
     SITEMAP?: string;
     FOOTER?: string;
     CDN?: string;
+    BASE_PATH?: string;
     YANDEX_MAP_API_KEY?: string;
     YANDEX_METRIKA_ID?: string;
 }
@@ -21,6 +22,7 @@ export declare const projectSettings: {
     readonly SITEMAP: string | undefined;
     readonly FOOTER: string | undefined;
     readonly CDN: string | undefined;
+    readonly BASE_PATH: string | undefined;
     readonly YANDEX_MAP_API_KEY: string | undefined;
     readonly YANDEX_METRIKA_ID: string | undefined;
 };

package/bundle/bundle.umd.js

@@ -85,6 +85,11 @@
         get CDN() {
             return this._.CDN;
         }
+        get BASE_PATH() {
+            return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
+                ? `${this._.BASE_PATH}/`
+                : this._.BASE_PATH;
+        }
         get YANDEX_MAP_API_KEY() {
             return this._.YANDEX_MAP_API_KEY;
         }
@@ -175,7 +180,7 @@
         }
         async function auth() {
             try {
-                const userData = JSON.parse(globalThis.localStorage.getItem(STORAGE_KEY) || '');
+                const userData = JSON.parse(globalThis.localStorage?.getItem(STORAGE_KEY) || '');
                 if (userData?.token) {
                     return userData;
                 }
@@ -195,7 +200,7 @@
                     }),
                 });
                 const { token, name } = await response.json();
-                globalThis.localStorage.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
+                globalThis.localStorage?.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
                 return { token, name };
             }
             catch (e) {
@@ -585,6 +590,13 @@
         const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
         return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
     };
+    const getPathname = (href) => {
+        if (!href || !isURL(href)) {
+            return undefined;
+        }
+        const url = new URL(href);
+        return url.pathname;
+    };
     const getHash = (href) => {
         if (!href || !isURL(href)) {
             return undefined;
@@ -599,6 +611,7 @@
         isURL: isURL,
         withoutQuery: withoutQuery,
         getOrigin: getOrigin,
+        getPathname: getPathname,
         getHash: getHash,
         isHash: isHash
     });
@@ -650,10 +663,7 @@
                 'aria-label': props.text,
                 onClick: handlerDecorator((ev) => {
                     props.onClick && props.onClick(ev);
-                    const isLocalHref = href && !isURL(href);
-                    const isLocalTarget = !props.target || props.target === '_self';
-                    if (!isLocalHref || !isLocalTarget) {
-                        // Default handle
+                    if (isRemoteHref(href, props.target)) {
                         return;
                     }
                     ev?.preventDefault();
@@ -661,12 +671,13 @@
                         blockRouter.goto(href);
                     }
                     else {
-                        router.push(href);
+                        href && router.push(href);
                     }
                 }, props),
             };
         };
     }
+    const isRemoteHref = (href, target) => isURL(href) || (target && target !== '_self') || href?.startsWith('/');
 
     const buttonStyleMap = {
         primary: 'text-white bg-primary-main hover:bg-primary-hover active:bg-primary-active',
@@ -2248,17 +2259,23 @@
     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 checkIsHrefSameOrigin = (href, router) => getOrigin(href) === getOrigin(router.href);
+    const checkIsHrefSameOrigin = (href, router) => [getOrigin(href), getOrigin(router.href)].every((link, _, arr) => Boolean(link) && link === arr[0]);
 
-    const isHrefActive = (href, router, cmp = (targetHref, baseHref) => baseHref.startsWith(targetHref)) => {
-        return cmp(withoutQuery(href), withoutQuery(isURL(href) ? router.href : router.pathname));
+    const normalizeURLPath = (href) => {
+        if (isURL(href) || href?.startsWith('/')) {
+            return href;
+        }
+        return `${projectSettings.BASE_PATH || ''}${href}`;
     };
 
+    const isHrefActive = (href, router, cmp = (targetHref, baseHref) => baseHref.startsWith(targetHref)) => cmp(withoutQuery(normalizeURLPath(href)), withoutQuery(isURL(href) ? router.href : getPathname(router.href)));
+
     const isSubItemActive = (router) => (subItem) => isHrefActive(subItem.href, router);
 
     const isTopItemActive = (router) => (topItem) => topItem.items?.some(isSubItemActive(router)) ||
         isHrefActive(topItem.href, router) ||
-        checkIsHrefSameOrigin(topItem.href, router);
+        checkIsHrefSameOrigin(topItem.href, router) ||
+        Boolean(projectSettings.BASE_PATH?.startsWith(topItem.href || '/'));
 
     const TEXT_CLASSES$2 = 'font-sans text-s-light';
     const LINK_CLASSES$1 = 'inline-block border border-solid bg-transparent text-center no-underline';
@@ -2303,11 +2320,8 @@
     }
 
     const REGION_URL = '/api/v1/region';
-    const localStorageLocation = globalThis?.localStorage.getItem('location');
-    const currentLocation = localStorageLocation
-        ? JSON.parse(localStorageLocation)
-        : null;
     function useLocation(defaultLocation) {
+        const currentLocation = getLocalStorageLocation();
         const [location, setLocation] = useState(currentLocation?.region ?? { name: defaultLocation });
         const { data } = useCachedAsyncData(REGION_URL, fetchJSONUnsafe);
         useEffect(() => {
@@ -2316,11 +2330,20 @@
                 : data || { name: defaultLocation });
         }, [data]);
         const onChangeLocation = useCallback((region) => {
-            globalThis?.localStorage.setItem('location', JSON.stringify({ manual: true, region }));
+            globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
             setLocation(region);
         }, [setLocation]);
         return [location, onChangeLocation];
     }
+    const getLocalStorageLocation = () => {
+        const localStorageLocation = globalThis.localStorage?.getItem('location');
+        try {
+            return localStorageLocation ? JSON.parse(localStorageLocation) : null;
+        }
+        catch (_) {
+            return null;
+        }
+    };
 
     const REGIONS_URL$1 = '/api/v1/regions';
     function useRegions() {
@@ -2480,15 +2503,10 @@
     const Header = JSX(({ bgColor = 'bg-white', className = '', showSubMenu = true, ...rest }) => {
         const router = useRouter();
         const { topItems, logo, defaultLocation, foreignOffices, officesLink } = useSWRResource(projectSettings.SITEMAP || 'sitemap', rest.options?.page?.fallback);
-        const activeTopItem = showSubMenu ? getActiveItem(topItems, router) : null;
+        const activeTopItem = topItems?.find(isTopItemActive(router));
         const topMenu = topItems?.map((_, i) => (jsx(TopItem, { active: _ === activeTopItem, "aria-label": _.text, bgColor: bgColor, ..._ }, String(i))));
         return (jsx(BlockWrapper, { tag: "header", className: `pt-6 px-20 ${bgColor} ${className} ${showSubMenu && activeTopItem?.items?.length ? 'pb-4' : 'pb-5'}`, ...rest, children: jsxs("div", { className: "container", children: [jsxs("div", { className: "flex items-center", children: [jsx(Logo, { className: "mr-8", bgColor: bgColor, logo: logo }), topMenu, jsx(HeaderSecondaryMenu, { className: "ml-auto", foreignOffices: foreignOffices, defaultLocation: defaultLocation, officesLink: officesLink, bgColor: bgColor })] }), jsx("div", { className: `mt-6 h-px ${BORDER_COLORS[bgColor]}` }), showSubMenu && activeTopItem?.items?.length ? (jsx(HeaderSubMenu, { subItems: activeTopItem.items, bgColor: bgColor })) : null] }) }));
     });
-    const getActiveItem = (topItems, router) => {
-        const [firstPortal] = topItems || [];
-        // Если по слагу невозможно понять к какому подпорталу этот слаг относиться, то выбираем первый подпортал.
-        return topItems?.find(isTopItemActive(router)) || firstPortal;
-    };
 
     const ImgBlock = JSX((props) => {
         const { className, image, ...rest } = props;
@@ -4107,7 +4125,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.6.43";
+    const packageVersion = "0.6.45";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;