@redneckz/wildless-cms-uni-blocks 0.14.861 → 0.14.863

package/bundle/bundle.umd.js

@@ -936,10 +936,10 @@
     const EXCLUSIONS = ['/portal-resources']; // portal-resources are handled only at compile-time
     const fetchRefs = async (refs) => Object.fromEntries((await Promise.allSettled(unique(refs)
         .filter(($ref) => !EXCLUSIONS.some((_) => $ref.startsWith(_)))
-        .map(async ($ref) => [
-        $ref,
-        (refsCache[$ref] ||= await fetchJSONUnsafe($ref)),
-    ])))
+        .map(async ($ref) => {
+        refsCache[$ref] ||= await fetchJSONUnsafe($ref);
+        return [$ref, refsCache[$ref]];
+    })))
         .filter((res) => res.status === 'fulfilled')
         .map(({ value }) => value));
 
@@ -1036,8 +1036,7 @@
                 if (!response?.ok) {
                     return null;
                 }
-                const data = await response.json();
-                return data;
+                return await response.json();
             }
             catch (e) {
                 return null;
@@ -2788,7 +2787,7 @@
         const responseHandler = getResponseHandler(responseItemHandler);
         const queryPrefixValue = queryPrefix ? `${queryPrefix}, ` : '';
         const combinedQuery = `${queryPrefixValue}${query}`;
-        const result = globalThis
+        return globalThis
             ?.fetch?.(`/api/v1/suggestions/${url}`, {
             method: 'POST',
             mode: 'cors',
@@ -2803,7 +2802,6 @@
         })
             .then((response) => response.json())
             .then(responseHandler);
-        return result;
     };
 
     const NAME_HINTS_LIST_OPTIONS = {
@@ -3184,7 +3182,7 @@
             .filter((_) => !_.status)
             .map((_) => _.short?.toLowerCase())
             .join(', ');
-        const rows = [
+        return [
             buildScheduleText({
                 workTime: workingWeekday?.workTime,
                 lunchHour: workingWeekday?.lunchHour,
@@ -3192,7 +3190,6 @@
             }),
             buildScheduleText({ workTime: workingSaturday?.workTime, lunchHour: workingSaturday?.lunchHour, daysOff }, true),
         ].filter(Boolean);
-        return rows;
     };
 
     const WEEKDAY_MAP = [
@@ -3926,7 +3923,7 @@
 
     const feedbackById = async (id, convertToPng = false) => {
         const response = await doRequest(`/feedback/file?id=${encodeURIComponent(id)}&convertToPngFlg=${convertToPng}`, 'GET');
-        return response ? await response.blob() : new Blob();
+        return response ? response.blob() : new Blob();
     };
 
     const DocumentDialog = JSX(({ src, onClose, onDocumentRead }) => {
@@ -4195,10 +4192,10 @@
     const CalculatorCredit = UniBlock(({ className, title, calcSource, buttons, footnote, paramsViewSettings, defaultParams, onChange, ...rest }) => {
         const defaultParamsCals = getDefaultParamsMin(calcSource?.rateRows);
         const handleChange = useCallback((params) => {
-            const calcParams = getCreditCalculatorParams(params, calcSource, paramsViewSettings);
+            const _calcParams = getCreditCalculatorParams(params, calcSource, paramsViewSettings);
             onChange?.({
                 ...params,
-                monthlyPayment: calcParams.monthlyPayment,
+                monthlyPayment: _calcParams.monthlyPayment,
                 rate: defaultParamsCals?.rate ?? 0,
             });
         }, [paramsViewSettings, calcSource]);
@@ -5071,11 +5068,10 @@
             }
         }, [onTick, onEnd]);
         const { start } = useInterval(handleTick, period);
-        const restart = useCallback((_) => {
+        return useCallback((_) => {
             counter.current = _;
             start();
         }, []);
-        return restart;
     }
 
     const sendCode = (body) => doRequest('/sms/sendCode', 'POST', body)
@@ -5116,7 +5112,7 @@
         .then((res) => res.text())
         .then((text) => text !== 'ERROR');
 
-    const createCaptcha = (phoneNumber) => doRequest(`/sms/createCaptcha?phoneNumber=${encodeURIComponent(phoneNumber)}`, 'GET').then(async (res) => (res ? await res.blob() : new Blob()));
+    const createCaptcha = (phoneNumber) => doRequest(`/sms/createCaptcha?phoneNumber=${encodeURIComponent(phoneNumber)}`, 'GET').then(async (res) => (res ? res.blob() : new Blob()));
 
     const CaptchaDialog = JSX(({ phoneNumber, sendCode, onClose }) => {
         const [captcha, setCaptcha] = useState('');
@@ -5714,14 +5710,13 @@
 
     const useSaveUserData = () => {
         const leadFormStore = useLeadFormStore();
-        const saveUserData = useCallback(({ participantId, taskId, profileId, programId: programNumber, formData }) => {
+        return useCallback(({ participantId, taskId, profileId, programId: programNumber, formData }) => {
             leadFormStore.participantId = participantId;
             leadFormStore.taskId = taskId;
             leadFormStore.profileId = profileId;
             leadFormStore.programId = programNumber;
             leadFormStore.leadForm = formData;
         }, []);
-        return saveUserData;
     };
 
     const getAspectsWithInclude = (data, include) => data?.map(({ aspectName, params }) => ({
@@ -5731,7 +5726,7 @@
 
     const useSendLeadFormAspects = ({ data }) => {
         const aspects = useAspects();
-        const sendAspects = useCallback((ProfileId, TaskId) => {
+        return useCallback((ProfileId, TaskId) => {
             const snowplowParams = JSON.stringify({
                 ProfileId,
                 TaskId,
@@ -5742,7 +5737,6 @@
                 ev: {},
             });
         }, [data]);
-        return sendAspects;
     };
 
     /* eslint-disable max-lines */
@@ -5948,7 +5942,7 @@
         const fd = new FormData();
         fd.append('documentCategory', documentCategory);
         fd.append('file', file, `file.${isPDF ? 'pdf' : 'xml'}`);
-        const res = await globalThis
+        return await globalThis
             ?.fetch?.(`/light-api-cash/v1/file`, {
             method: 'POST',
             headers: {
@@ -5958,7 +5952,6 @@
             body: fd,
         })
             .then((response) => response.json());
-        return res;
     };
 
     const parseEsiaProfile = async (esiaProfile, isDebit) => {
@@ -7595,7 +7588,7 @@
                 // eslint-disable-next-line camelcase
                 access_token: accessToken,
             });
-            if (res?.status == 401) {
+            if (Number(res?.status) === 401) {
                 navigator.assign(PORTAL_NATURAL_URL);
             }
             if (res?.ok) {
@@ -10383,11 +10376,6 @@
 
     const StickyBottomMenu = JSX(() => (jsx("div", { className: "hidden", role: "none" })));
 
-    const getUrlParams = (params = '') => {
-        const href = globalThis?.location?.href;
-        return href ? new URL(href).searchParams.get(params) : null;
-    };
-
     const badgeBgStyleMap = {
         primary: 'bg-white/30',
         secondary: 'bg-main-divider',
@@ -10532,24 +10520,19 @@
         const id = getId(block || {});
         const router = useRouter();
         const isEveryLink = tabs.every((_) => _?.type === 'link');
-        const query = new URLSearchParams(globalThis?.location?.search || '');
-        const currentQueryParam = query.get[id];
+        const query = new URLSearchParams(decodeURIComponent(globalThis?.location?.search || ''));
+        const tabId = getTabId(id);
         const tabsCounted = showCounter
             ? tabs.map((_) => ({
                 ..._,
                 count: _?.type === 'group' ? block?.slots?.[_?.tabName ?? '']?.length ?? 0 : 0,
             }))
             : tabs;
-        const [activeTabIndex, setActiveTabIndex] = useState(getInitSelectedIndex(tabsCounted, getUrlParams(id)));
+        const defaultSelectedTabIndex = tabsCounted.findIndex((_) => Boolean(_?.selected));
+        const defaultQueryTabIndex = tabsCounted.findIndex((_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === tabId);
+        const defaultTabIndex = tabId ? defaultQueryTabIndex : defaultSelectedTabIndex;
+        const [activeTabIndex, setActiveTabIndex] = useState(getDefaultIndex(defaultTabIndex));
         const activeItem = tabsCounted[activeTabIndex];
-        const defaultSelectedTab = tabsCounted.findIndex((_) => Boolean(_.selected));
-        //TODO: Вынести в отдельный хук
-        useEffect(() => {
-            const defaultTabIndex = currentQueryParam
-                ? tabsCounted.findIndex((_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === currentQueryParam)
-                : defaultSelectedTab;
-            setActiveTabIndex(defaultTabIndex === -1 ? 0 : defaultTabIndex);
-        }, [defaultSelectedTab, currentQueryParam]);
         const slotName = getSlotName(tabsCounted[activeTabIndex], activeTabIndex);
         const updateUrlSearchTabParam = (_, i) => {
             if (_.text) {
@@ -10586,12 +10569,16 @@
     }, {
         slots: ({ tabs }) => tabs?.map(getSlotName)?.filter(Boolean) || [],
     });
+    const getDefaultIndex = (index) => (index && index !== -1 ? index : 0);
     const getId = ({ __id, anchor }) => anchor ?? __id ?? 'tabs';
     const getItems = (tabs, tabsCounted) => (tabsCounted?.length ? tabsCounted : tabs);
     const getSlotName = (tab, index) => tab?.type === 'group' ? tab?.tabName || `Слот №${index + 1}` : '';
-    const getInitSelectedIndex = (tabs, paramsId) => paramsId
-        ? Number(paramsId)
-        : tabs.reduce((selectedIndex, tab, i) => (tab.selected ? i : selectedIndex), 0);
+    const getTabId = (id) => decodeURIComponent(globalThis?.location?.search
+        .replace('?', '')
+        .replace('+', ' ')
+        .split('&')
+        .find((_) => _.split('=').find((param) => param === id))
+        ?.split('=')?.[1] ?? '');
 
     const FIRST_CELL_STYLES = 'w-80 flex-shrink-0 sticky left-0 bg-white';
     const renderHeader = ({ title, icon }) => (jsxs("div", { className: style('flex gap-m items-center', FIRST_CELL_STYLES), role: "cell", children: [icon ? (jsx(Img, { className: "hidden lg:block max-w-6 shrink-0", image: icon, width: "24", height: "24" })) : null, title ? (jsx(Text, { size: "text-m", font: "font-light", color: "text-primary-text", children: title })) : null] }));
@@ -10941,7 +10928,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.860";
+    const packageVersion = "0.14.862";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;