@redneckz/wildless-cms-uni-blocks 0.14.194 → 0.14.196

package/bundle/bundle.umd.js

@@ -3849,7 +3849,7 @@
     const handleInputSell = (setCalcState, currencyRatesSell) => (value, currencyFrom, currencyTo) => {
         setCalcState({ inputSell: formatValue(value), selectBuy: currencyTo });
         const rate = currencyRatesSell.find((_) => _.currency?.currency === currencyTo)?.buyExchangeRate ||
-            currencyRatesSell.find((_) => _.currency?.currency === currencyFrom)?.saleExchangeRate;
+            currencyRatesSell.find((_) => _.currency?.currency === currencyFrom)?.buyExchangeRate;
         if (rate) {
             setCalcState({
                 inputBuy: String(calculateResult(value, rate, currencyFrom === Currency.RUB) || ''),
@@ -3859,7 +3859,7 @@
     const handleInputBuy = (setCalcState, currencyRatesBuy) => (value, currencyTo, currencyFrom) => {
         setCalcState({ inputBuy: formatValue(value), selectSell: currencyFrom });
         const rate = currencyRatesBuy.find((_) => _.currency?.currency === currencyFrom)?.saleExchangeRate ||
-            currencyRatesBuy.find((_) => _.currency?.currency === currencyTo)?.buyExchangeRate;
+            currencyRatesBuy.find((_) => _.currency?.currency === currencyTo)?.saleExchangeRate;
         if (rate) {
             setCalcState({
                 inputSell: String(calculateResult(value, rate, currencyTo === Currency.RUB) || ''),
@@ -4753,7 +4753,12 @@
             clusterHideIconOnBalloonOpen: false,
             geoObjectHideIconOnBalloonOpen: false,
         });
-        const geoObjects = points.map((point) => new yandexMaps.Placemark(point, {}, {
+        const geoObjects = points.map(({ coords, content }) => new yandexMaps.Placemark(coords, {
+            balloonContentHeader: content?.header,
+            balloonContentBody: content?.body,
+            balloonContentFooter: content?.footer,
+            hintContent: content?.hint,
+        }, {
             iconLayout: 'default#image',
             iconImageHref: '/icons/MapMarkerSingleIcon.svg',
             iconImageSize: [78, 84],
@@ -4761,9 +4766,7 @@
         }));
         clusterer.add(geoObjects);
         map.geoObjects.add(clusterer);
-        // TODO: Fix
-        // @ts-ignore
-        map.setBounds(yandexMaps.util.bounds.fromPoints(points)).then(() => {
+        map.setBounds(yandexMaps.util.bounds.fromPoints(points.map((_) => _.coords))).then(() => {
             if (map.getZoom() > 10) {
                 map.setZoom(10);
             }
@@ -4882,7 +4885,7 @@
         getArraySumAndAverage(mapByIndex(points, 0)),
         getArraySumAndAverage(mapByIndex(points, 1)),
     ];
-    const mapByIndex = (arr, index) => arr.map((a) => a[index]);
+    const mapByIndex = (points, index) => points.map((_) => _.coords[index]);
     const getArraySumAndAverage = (arr) => arr.length && arr.reduce((a, b) => a + b) / arr.length;
 
     const FILTRATION_LABELS = {
@@ -4895,15 +4898,18 @@
     };
     const renderFiltrationForm = (filters, { field, reset }) => (jsxs("div", { className: "pb-2xl", children: [filters?.length ? (jsx("div", { className: "flex flex-col sm:flex-row sm:flex-wrap gap-3xl pb-2xl", children: filters.map((key) => (jsx(Checkbox, { text: FILTRATION_LABELS[key], ...field(key) }, key))) })) : null, jsx(LinkButton, { version: "transparent", className: "text-secondary-text [&>*]:p-0", onClick: reset, text: "\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0444\u0438\u043B\u044C\u0442\u0440", appendRight: jsx(Icon, { name: "CloseIcon", width: "16", height: "16" }) })] }));
 
-    const defaultRenderCard = () => null;
+    const defaultEmptyFunction = () => void 0;
     const defaultFilterItems = () => [];
-    const OfficesAtmsMapLayout = JSX(({ className, data = [], renderCard = defaultRenderCard, filterItems = defaultFilterItems, initFilterState = {}, descriptionData, title, }) => {
+    const OfficesAtmsMapLayout = JSX(({ className, data = [], renderCard = defaultEmptyFunction, filterItems = defaultFilterItems, getBalloon = defaultEmptyFunction, initFilterState = {}, descriptionData, title, }) => {
         const [filtrationState, { field, reset }] = useForm(initFilterState);
         const [filteredItems, points, lengthItems] = useMemo(() => {
             const _filteredItems = filterItems(data, filtrationState);
             const _points = _filteredItems
-                .map((_) => [_.gpsLatitude, _.gpsLongitude].filter(Boolean))
-                .filter((_) => _ && _.length === 2);
+                .map((_) => ({
+                coords: [Number(_.gpsLatitude), Number(_.gpsLongitude)].filter(Boolean),
+                content: getBalloon(_),
+            }))
+                .filter((_) => _.coords && _.coords.length === 2);
             return [_filteredItems, _points, _filteredItems.length];
         }, [data, filtrationState]);
         return (jsxs("div", { className: style('space-y-1', className), children: [jsxs("div", { className: "bg-white", children: [jsxs("div", { className: "p-6xl pb-0", children: [jsxs("div", { className: "flex flex-col sm:flex-row gap-xs mb-2xl", children: [jsx(Heading, { headingType: "h2", children: title }), lengthItems ? (jsx(Text, { size: "text-h2", color: "text-secondary-text", children: `(${lengthItems})` })) : null] }), descriptionData ? renderDescriptionBlock$1(descriptionData) : null, renderFiltrationForm(Object.keys(initFilterState), { field, reset })] }), jsx("div", { className: "h-[600px]", children: jsx(ClientOnly, { children: jsx(YandexMap, { points: points, className: "h-full" }) }) })] }), filteredItems.map(renderCard)] }));
@@ -4938,7 +4944,7 @@
         const additionalInfo = [
             {
                 label: 'Устройство',
-                value: capitalizedFirstLetter(terminalType),
+                value: capitalizedFirstLetter$1(terminalType),
             },
             { label: 'Модуль приема наличных', value: billAcceptorEnable ? 'Да' : 'Нет' },
             {
@@ -4951,14 +4957,19 @@
             },
             { label: 'Регистрационный номер', value: atmCode },
         ];
-        return (jsxs("div", { className: "bg-white col-span-12 p-3xl sm:border-green sm:border", children: [jsxs("div", { className: "sm:flex sm:justify-between", children: [jsxs("div", { children: [jsx(Text, { size: "text-h4", children: capitalizedFirstLetter(location) }), address ? (jsxs("div", { className: "flex pb-xl pt-xs gap-2xs", children: [jsx(Icon, { name: "GeolocationIcon", width: "24", height: "24" }), jsx(Text, { size: "text-l", children: address })] })) : null] }), jsx(Badge, { color: "green", children: capitalizedFirstLetter(workTime) })] }), jsx("div", { className: "hidden sm:block", children: jsx(CardRow, { className: "flex-wrap", children: additionalInfo?.map(renderInfo) }) }), jsx(Foldable, { className: "block sm:hidden", renderFoldableSection: ({ isUnfolded }) => {
+        return (jsxs("div", { className: "bg-white col-span-12 p-3xl sm:border-green sm:border", children: [jsxs("div", { className: "sm:flex sm:justify-between", children: [jsxs("div", { children: [jsx(Text, { size: "text-h4", children: capitalizedFirstLetter$1(location) }), address ? (jsxs("div", { className: "flex pb-xl pt-xs gap-2xs", children: [jsx(Icon, { name: "GeolocationIcon", width: "24", height: "24" }), jsx(Text, { size: "text-l", children: address })] })) : null] }), jsx(Badge, { color: "green", children: capitalizedFirstLetter$1(workTime) })] }), jsx("div", { className: "hidden sm:block", children: jsx(CardRow, { className: "flex-wrap", children: additionalInfo?.map(renderInfo) }) }), jsx(Foldable, { className: "block sm:hidden", renderFoldableSection: ({ isUnfolded }) => {
                         return (jsx(FoldableSection, { isUnfolded: isUnfolded, children: jsx(CardRow, { className: "flex-wrap", children: additionalInfo?.map(renderInfo) }) }));
                     }, 
                     //** TODO: Remove styles with refactoring  DefaultFoldButton*/
                     renderFoldButton: ({ isUnfolded, onToggle }) => renderFoldButton$1({ isUnfolded, onToggle }) })] }, String(index)));
     };
+    const getAtmPoint = ({ address = '', terminalType, atmCode = '' }) => {
+        const header = `${capitalizedFirstLetter$1(terminalType)} №${atmCode}`;
+        const body = address.toUpperCase();
+        return { header, body };
+    };
     const renderInfo = (item, index) => (jsx(CardCell, { ...item }, String(index)));
-    const capitalizedFirstLetter = (text) => text ? `${text?.charAt(0)?.toUpperCase()}${text?.slice(1)}` : '';
+    const capitalizedFirstLetter$1 = (text) => text ? `${text?.charAt(0)?.toUpperCase()}${text?.slice(1)}` : '';
 
     const EMPTY_VALUE$2 = [];
     function useAtms(regionCode) {
@@ -4986,7 +4997,7 @@
         const [currentLocation] = useLocation();
         const regionCode = currentLocation?.code ?? '000';
         const officesData = useAtms(regionCode);
-        return (jsx(OfficesAtmsMapLayout, { className: className, filterItems: filterItems$1, data: officesData, initFilterState: INITIAL_FILTRATION_STATE$1, renderCard: renderAtmCard, title: `Банкоматы филиала ${currentLocation?.name}`, descriptionData: data }));
+        return (jsx(OfficesAtmsMapLayout, { className: className, filterItems: filterItems$1, data: officesData, initFilterState: INITIAL_FILTRATION_STATE$1, renderCard: renderAtmCard, getBalloon: getAtmPoint, title: `Банкоматы филиала ${currentLocation?.name}`, descriptionData: data }));
     });
     const filterItems$1 = (data, filtrationState) => {
         const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
@@ -5002,6 +5013,22 @@
     };
 
     const getScheduleDescription = (workScheduleWeek) => {
+        const rows = getDateDescription(workScheduleWeek);
+        return jsx(CardCell, { label: "\u0420\u0435\u0436\u0438\u043C \u0440\u0430\u0431\u043E\u0442\u044B", value: rows, className: "max-w-none" });
+    };
+    const buildScheduleText = ({ workTime = '', lunchHour = '', daysOff = '' }, isSaturday = false) => {
+        if (!workTime) {
+            return '';
+        }
+        return [
+            `${isSaturday ? 'Суббота' : 'Будние дни'}: ${workTime}`,
+            lunchHour ? `перерыв: ${lunchHour}` : '',
+            daysOff ? `не работает: ${daysOff}` : '',
+        ]
+            .filter(Boolean)
+            .join('; ');
+    };
+    const getDateDescription = (workScheduleWeek) => {
         const workingWeekday = workScheduleWeek.find((_) => _.key !== 'workingSaturday' && Boolean(_.status) && Boolean(_.workTime));
         const workingSaturday = workScheduleWeek.find((_) => _.key === 'workingSaturday' && Boolean(_.status) && Boolean(_.workTime));
         const daysOff = workScheduleWeek
@@ -5016,19 +5043,7 @@
             }),
             buildScheduleText({ workTime: workingSaturday?.workTime, lunchHour: workingSaturday?.lunchHour, daysOff }, true),
         ].filter(Boolean);
-        return jsx(CardCell, { label: "\u0420\u0435\u0436\u0438\u043C \u0440\u0430\u0431\u043E\u0442\u044B", value: rows, className: "max-w-none" });
-    };
-    const buildScheduleText = ({ workTime = '', lunchHour = '', daysOff = '' }, isSaturday = false) => {
-        if (!workTime) {
-            return '';
-        }
-        return [
-            `${isSaturday ? 'Суббота' : 'Будние дни'}: ${workTime}`,
-            lunchHour ? `перерыв: ${lunchHour}` : '',
-            daysOff ? `не работает: ${daysOff}` : '',
-        ]
-            .filter(Boolean)
-            .join('; ');
+        return rows;
     };
 
     const WEEKDAY_MAP = [
@@ -5098,6 +5113,24 @@
     };
     const renderDay = ({ title, status, workTime, lunchHour, hasLunch }, index) => (jsx(CardCell, { label: title, value: status && workTime ? workTime : '', subText: getSubTextLunch({ lunchHour, hasLunch, status }), subColor: !status || hasLunch ? 'text-error' : 'text-green-dark' }, String(index)));
 
+    const renderWorkSchedule = (workSchedule) => {
+        const workScheduleWeek = getWorkScheduleWeek(workSchedule);
+        const timeOfWork = workSchedule ? getDateDescription(workScheduleWeek) : '';
+        if (!workSchedule) {
+            return null;
+        }
+        if (!workSchedule.businessScheduleVisibleTag) {
+            return renderMatchingTimeOfWork(timeOfWork);
+        }
+        if (workSchedule.businessScheduleVisibleTag && !workSchedule.businessScheduleDescription) {
+            return renderIndividualTimeOfWork(timeOfWork);
+        }
+        return renderDefaultTimeOfWork(timeOfWork);
+    };
+    const renderIndividualTimeOfWork = (timeOfWork) => `<p><b>Режим обслуживания физ.лиц:<br/></b>${timeOfWork}</p>`;
+    const renderDefaultTimeOfWork = (timeOfWork) => `<p><b>Режим обслуживания физ.лиц:<br/></b>${timeOfWork}</p> <p><b>Режим обслуживания юр.лиц:<br/></b>${timeOfWork}</p>`;
+    const renderMatchingTimeOfWork = (timeOfWork) => `<p><b>Режим обслуживания физ. и юр. лиц:<br/></b> ${timeOfWork}</p>`;
+
     const renderOfficeCard = ({ name, address, phone, fax, phoneBusiness, phoneNatural, phoneCallCentre, phoneCurrencyControl, workSchedule, exchangeRate, }, index) => {
         if (!workSchedule) {
             return null;
@@ -5136,6 +5169,12 @@
                     ? renderBusinessSchedule(workSchedule?.businessScheduleDescription)
                     : null, exchangeRate?.currencies?.length ? (jsx(CardRow, { className: "flex-wrap", children: exchangeRate?.currencies?.map(renderCurrency) })) : null] }));
     };
+    const capitalizedFirstLetter = (text) => text ? `${text?.charAt(0)?.toUpperCase()}${text?.slice(1)}` : '';
+    const getOfficePoint = ({ name = '', address = '', workSchedule }) => {
+        const header = capitalizedFirstLetter(name);
+        const body = `${address} ${renderWorkSchedule(workSchedule)}`;
+        return { header, body };
+    };
 
     const EMPTY_VALUE$1 = [];
     function useOffices(regionCode) {
@@ -5159,7 +5198,7 @@
         const [currentLocation] = useLocation();
         const regionCode = currentLocation?.code ?? '000';
         const officesData = useOffices(regionCode);
-        return (jsx(OfficesAtmsMapLayout, { className: className, filterItems: filterItems, data: officesData, initFilterState: INITIAL_FILTRATION_STATE, renderCard: renderOfficeCard, title: `Офисы филиала ${currentLocation?.name}` }));
+        return (jsx(OfficesAtmsMapLayout, { className: className, filterItems: filterItems, data: officesData, initFilterState: INITIAL_FILTRATION_STATE, renderCard: renderOfficeCard, getBalloon: getOfficePoint, title: `Офисы филиала ${currentLocation?.name}` }));
     });
     const filterItems = (data, filtrationState) => {
         const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
@@ -5317,10 +5356,14 @@
 
     const getCoordinates = (data) => {
         if (Array.isArray(data)) {
-            return data.map((_) => _.gpsLatitude && _.gpsLongitude ? [_.gpsLatitude, _.gpsLongitude] : []);
+            return data
+                .map((_) => ({
+                coords: [_.gpsLatitude, _.gpsLongitude].filter(Boolean),
+            }))
+                .filter((_) => _.coords && _.coords.length === 2);
         }
         if (data?.gpsLatitude && data?.gpsLongitude) {
-            return [[data.gpsLatitude, data.gpsLongitude]];
+            return [{ coords: [data.gpsLatitude, data.gpsLongitude] }];
         }
         return [];
     };
@@ -6031,7 +6074,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.193";
+    const packageVersion = "0.14.195";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;