@redneckz/wildless-cms-uni-blocks 0.14.672 → 0.14.674

package/bundle/bundle.umd.js

@@ -1429,7 +1429,7 @@
     const defaultValidator = (errorMsg) => required(errorMsg ?? ERROR_MESSAGE);
     const defaultSelectValidator = (errorMsg) => validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
     const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 0 && _.length <= 2)(errorMsg ?? ERROR_MESSAGE);
-    const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1)(errorMsg ?? ERROR_MESSAGE);
+    const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
     const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
     const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
     const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
@@ -1459,7 +1459,9 @@
     const addressDaDataValidate = (address) => Boolean(address.region && address.city && address.house);
     const addressDaDataValidator = () => validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');
     const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && address.city && address.house))('Укажите регион, город/населенный пункт, улицу, дом');
-    const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && /^[\u0400-\u04FF\d]+$/u.test(_))(errorMsg ?? ERROR_MESSAGE);
+    const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
+    const cyrillicPattern = /^[\u0400-\u04FF\d]+$/u;
+    const isCyrillic = (_ = '') => cyrillicPattern.test(_);
 
     const validatorObj = {
         typeForm: defaultValidator(),
@@ -1975,7 +1977,7 @@
     //       Сейчас реализован поиск среди тестовых данных
     // TODO: Также выяснить что делать когда ничего не найдено
     // TODO: На макетах также когда есть поле поиска нет кнопки открыть на карте.
-    const YandexMap = JSX(({ points, className = '', zoom = 5, isLoad }) => {
+    const YandexMap = JSX(({ points, className = '', zoom = 5, isLoad, selectedAddress }) => {
         const map = useRef(null);
         const parentDiv = useRef(null);
         const yandexMaps = useYandexMaps();
@@ -1999,7 +2001,16 @@
                     renderClusterer({ yandexMaps, map: map.current, points, isLoad });
                 });
             }
-        }, [yandexMaps, points, zoom, isLoad]);
+            // zoom к выбранному отделению банка в рамках задачи по retail
+            if (map.current && selectedAddress) {
+                yandexMaps?.geocode(selectedAddress).then((res) => {
+                    const firstGeoObject = res.geoObjects.get(0);
+                    const coords = firstGeoObject.geometry.getCoordinates();
+                    map.current.setCenter(coords);
+                    map.current.setZoom(18);
+                });
+            }
+        }, [yandexMaps, points, zoom, isLoad, selectedAddress]);
         if (!yandexMaps) {
             return null;
         }
@@ -2475,7 +2486,7 @@
         const { data } = useLeadFormData('REGION_RF');
         const regionValue = field('regionRetail')?.value || {};
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        field('addressRetail');
+        const fieldBranch = field('addressRetail');
         useEffect(() => {
             (async () => {
                 const officesList = await fetchRegionOffices(regionValue?.key ?? '');
@@ -2494,7 +2505,7 @@
         return (jsxs("div", { children: [jsx(SelectControl, { label: "\u0410\u0434\u0440\u0435\u0441 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u044F", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435", options: offices.map(({ id, address = '' }) => ({
                         key: id?.toString() || '',
                         text: address,
-                    })), ...getValidation(field('addressRetail'), validatorObj.addressRetail, input?.required && isRegionSelected), isSearch: true }), jsx("div", { className: "h-[600px]", children: jsx(ClientOnly, { children: jsx(YandexMap, { points: points, isLoad: !data, className: "h-full" }) }) })] }));
+                    })), ...getValidation(field('addressRetail'), validatorObj.addressRetail, input?.required && isRegionSelected), isSearch: true }), jsx("div", { className: "h-[600px]", children: jsx(ClientOnly, { children: jsx(YandexMap, { points: points, isLoad: !data, className: "h-full", selectedAddress: fieldBranch?.value?.text }) }) })] }));
     });
 
     const useNormalizedInput = (props, { normalize, format }) => {
@@ -6359,7 +6370,8 @@
 
     const StepsNavigationButtons$1 = JSX(({ step, onPrevStep }) => {
         const isFirstStep = step === 0;
-        return (jsxs("div", { className: "flex justify-between gap-m", children: [jsx(Button, { onClick: onPrevStep, className: style('w-full @xl:w-auto'), type: "button", version: "secondary", disabled: isFirstStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(Button, { className: "w-full @xl:w-auto", type: "submit", children: "\u0414\u0430\u043B\u0435\u0435" })] }));
+        const isFinalStep = step === 6;
+        return (jsxs("div", { className: "flex justify-between gap-m", children: [jsx(Button, { onClick: onPrevStep, type: "button", version: "secondary", disabled: isFirstStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(Button, { type: "submit", children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
     });
 
     const getFifthStepData$1 = (formData) => {
@@ -6930,7 +6942,7 @@
         'Параметры карты',
         'Персональные данные',
         'Данные о трудоустройстве',
-        'Данные о доходах и расходах',
+        'Семейное положение и доход',
         'Дополнительные сведения',
         'Выбор способа получения',
     ];
@@ -7227,7 +7239,8 @@
 
     const StepsNavigationButtons = JSX(({ step, onPrevStep }) => {
         const isFirstStep = step === 0;
-        return (jsxs("div", { className: 'flex justify-between', children: [jsx(Button, { onClick: onPrevStep, className: style('w-full @xl:w-auto'), type: "button", version: "secondary", disabled: isFirstStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(Button, { className: style('w-full @xl:w-auto'), type: "submit", children: "\u0414\u0430\u043B\u0435\u0435" })] }));
+        const isFinalStep = step === 5;
+        return (jsxs("div", { className: 'flex justify-between gap-m', children: [jsx(Button, { onClick: onPrevStep, type: "button", version: "secondary", disabled: isFirstStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(Button, { type: "submit", children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
     });
 
     const getFifthStepData = (formData) => {
@@ -7715,7 +7728,7 @@
         '',
         'Персональные данные',
         'Данные о трудоустройстве',
-        'Данные о доходах и расходах',
+        'Семейное положение и доход',
         'Дополнительные сведения',
         'Отделение Банка',
     ];
@@ -10012,7 +10025,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.671";
+    const packageVersion = "0.14.673";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;