@redneckz/wildless-cms-uni-blocks 0.14.673 → 0.14.675

package/bundle/bundle.umd.js

@@ -1332,7 +1332,10 @@
     const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, maxLength, dadata = false, disabled = false, }) => {
         const [isOpen, { setFalse: close, setTrue: open }] = useBool();
         const popupRef = useOutsideClick(close);
-        const handleChange = useCallback((v) => (maxLength ? v.length <= maxLength && onChange(v) : onChange(v)), [onChange]);
+        const handleChange = useCallback((v) => {
+            dadata && !isOpen && open();
+            maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
+        }, [dadata, isOpen, onChange]);
         const inputRef = useInputPopup({
             isOpen: isOpen && dadata,
             name,
@@ -1426,10 +1429,11 @@
     const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
+    const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
     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);
@@ -1457,9 +1461,11 @@
     const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
     const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
     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 addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
+    const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && address.city && address.house))(ADDRESS_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(),
@@ -1694,7 +1700,7 @@
             if (value) {
                 field('addressFact')?.onChange?.(field('addressRegistration').value);
             }
-        }, [value]);
+        }, [value, field('addressRegistration').value]);
         const onDaDataChange = useCallback((item) => {
             field?.(fieldName)?.onChange?.({
                 apartment: item?.data?.flat,
@@ -6368,7 +6374,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) => {
@@ -6939,7 +6946,7 @@
         'Параметры карты',
         'Персональные данные',
         'Данные о трудоустройстве',
-        'Данные о доходах и расходах',
+        'Семейное положение и доход',
         'Дополнительные сведения',
         'Выбор способа получения',
     ];
@@ -7236,7 +7243,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) => {
@@ -7724,7 +7732,7 @@
         '',
         'Персональные данные',
         'Данные о трудоустройстве',
-        'Данные о доходах и расходах',
+        'Семейное положение и доход',
         'Дополнительные сведения',
         'Отделение Банка',
     ];
@@ -10021,7 +10029,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.672";
+    const packageVersion = "0.14.674";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;