@redneckz/wildless-cms-uni-blocks 0.14.214 → 0.14.216

package/bundle/bundle.umd.js

@@ -434,8 +434,8 @@
     });
 
     /* eslint-disable @typescript-eslint/ban-types */
-    const handlerDecorator = (handler, targetContent) => {
-        return handlerDecorator._impl(handler, targetContent);
+    const handlerDecorator = (handler) => {
+        return handlerDecorator._impl(handler);
     };
     handlerDecorator._impl = (handler) => handler;
     handlerDecorator.setup = (impl) => {
@@ -450,7 +450,7 @@
             ...props,
             href: isRemote && !basePath ? props.href : adjustHref(router)(props.href, basePath),
             'aria-label': props.text,
-            onClick: handlerDecorator(handleHref(props), props),
+            onClick: handlerDecorator(handleHref(props)),
         });
         function handleHref({ href, target, onClick }) {
             return (ev) => {
@@ -467,6 +467,8 @@
         }
     }
 
+    const dataAttributes = (data = {}) => Object.entries(data).reduce((res, [k, v]) => ({ ...res, [`data-${k.toLowerCase()}`]: v }), {});
+
     /** @deprecated */
     const ButtonInner = JSX((props) => {
         const { text, aboveText, appendLeft, appendRight, version = 'primary' } = props;
@@ -522,7 +524,7 @@
         const buttonInner = children ?? jsx(ButtonInner, { ...adjustedProps });
         return disabled ? (jsx(DisabledButton, { ...adjustedProps, children: buttonInner })) : (jsx(RegularButton, { ...adjustedProps, children: buttonInner }));
     });
-    const RegularButton = JSX(({ className = '', href, rel, target, ariaLabel, version, rounded, onClick, type, children }) => (jsx("a", { className: getRegularButtonClasses({ className, version, rounded }), href: href, rel: rel, target: target, "aria-label": ariaLabel, role: href ? 'link' : 'button', onClick: onClick, type: type, children: children })));
+    const RegularButton = JSX(({ className = '', href, rel, target, ariaLabel, version, rounded, onClick, type, data, children, }) => (jsx("a", { className: getRegularButtonClasses({ className, version, rounded }), href: href, rel: rel, target: target, "aria-label": ariaLabel, role: href ? 'link' : 'button', onClick: onClick, type: type, ...dataAttributes(data), children: children })));
     const DisabledButton = JSX(({ className, ariaLabel, version, rounded, children }) => (jsx("button", { type: "button", "aria-disabled": "true", "aria-label": ariaLabel, tabIndex: -1, className: getDisabledButtonClasses({ className, rounded, version }), children: children })));
 
     function renderBackwardButton(version, handleClick) {
@@ -1321,7 +1323,7 @@
     const REGIONS_URL$1 = '/api/v1/premiumBranchesByRegions';
     function usePremiumBranchesByRegions() {
         const { data } = useAsyncData(REGIONS_URL$1, fetchJSONUnsafe);
-        return data || [];
+        return Array.isArray(data) ? data : [];
     }
 
     const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
@@ -1487,7 +1489,7 @@
     const REGIONS_URL = '/api/v1/regions';
     function useRegions() {
         const { data } = useAsyncData(REGIONS_URL, fetchJSONUnsafe);
-        return data || [];
+        return Array.isArray(data) ? data : [];
     }
 
     const RegionField = JSX(({ field, input }) => {
@@ -1500,7 +1502,7 @@
         const regions = useMemo(() => branchByRegions?.map(({ region }) => ({
             key: region,
             text: region,
-        })), []);
+        })), [branchByRegions]);
         return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", options: regions, ...getValidation(field('region'), validatorObj.region, input?.required) }));
     });
 
@@ -1551,12 +1553,11 @@
         const addressBranch = isPremium
             ? usePremiumBranchesByRegions()?.find((_) => _?.region === regionKey)?.branches
             : useBranches(regionKey)?.filter((branch) => branch?.address);
-        const { value, onChange } = field?.('addressBranch') || {};
         useEffect(() => {
-            if (value?.key !== '') {
-                onChange?.('');
+            if (field('region')?.value?.key !== '') {
+                field?.('addressBranch')?.onChange?.('');
             }
-        }, [value]);
+        }, [field('region')?.value]);
         return (jsx(SelectControl, { label: "\u0410\u0434\u0440\u0435\u0441", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0430\u0434\u0440\u0435\u0441", options: (addressBranch || []).map(({ address = '' }) => ({
                 key: address,
                 text: address,
@@ -1592,7 +1593,7 @@
     function useButton() {
         return (props) => ({
             ...props,
-            onClick: handlerDecorator(handleClick(props), props),
+            onClick: handlerDecorator(handleClick(props)),
         });
     }
     function handleClick({ disabled, onClick }) {
@@ -5780,16 +5781,22 @@
         return url.toString();
     };
 
-    const useNavigateHandler = () => {
+    const useNavigateHandler = handlerDecorator(() => {
         useEffect(() => {
             getSessionQuery(); //? Call first time for save query in sessionStorage
         }, []);
         useEventListener(globalThis, 'click', navigationHandler);
-    };
+    });
     const navigationHandler = (ev) => {
         const element = getAnchorElement(ev.target);
+        const [ymID] = projectSettings._.YANDEX_METRIKA_ID?.split(',').reverse() ?? [];
+        const targetName = element?.dataset?.ymtarget;
+        if ([ymID, targetName, globalThis.ym].every(Boolean)) {
+            globalThis.ym(ymID, 'reachGoal', targetName);
+        }
         if (isURL(element?.href)) {
             ev.preventDefault();
+            ev.stopPropagation();
             const url = adjustSessionQuery(element?.href) || element?.href;
             if (url) {
                 globalThis.location.href = url;
@@ -5954,7 +5961,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.213";
+    const packageVersion = "0.14.215";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;