@redneckz/wildless-cms-uni-blocks 0.14.724 → 0.14.725

package/bundle/bundle.umd.js

@@ -1555,8 +1555,6 @@
     const isValidationSuccess = (info) => !info?.length;
     const validator = (predicate) => (message) => (_) => predicate(_) ? [] : [message];
 
-    const pattern = (regexp) => validator((_) => typeof _ === 'string' && regexp.test(_));
-
     const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
@@ -1572,7 +1570,9 @@
     const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
     const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
     const innValidator = (errorMsg) => validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
-    const phoneValidator = (errorMsg) => pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(errorMsg);
+    const phoneValidate = (email) => /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+    const phoneValidator = (errorMsg) => validator(phoneValidate)(errorMsg);
+    const phoneOptionalValidator = (errorMsg) => validator((_) => !_ || phoneValidate(_))(errorMsg);
     const agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
     const snilsValidate = (snils) => {
         const snl = String(snils).replace(/[^0-9]+/g, '');
@@ -1619,7 +1619,7 @@
         region: defaultSelectValidator(),
         addressBranch: defaultSelectValidator(),
         phone: phoneValidator('Укажите номер телефона'),
-        secondaryPhone: phoneValidator('Укажите номер телефона'),
+        secondaryPhone: phoneOptionalValidator('Укажите номер телефона'),
         organizationPhone: phoneValidator('Укажите номер телефона'),
         birthday: defaultValidator('Укажите дату рождения'),
         limitedBirthday: limitedBirthdayValidator(),
@@ -4399,9 +4399,7 @@
         }, [responseType]);
         return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [jsxs("form", { onSubmit: onSubmit, children: [sections.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field, { typeForm }))] }, `section-${i}`))), renderAgreementSubmit(fieldName ? field('consentDataProcessing') : undefined, link, button)] }), isContacts ? renderContacts() : null] }));
     });
-    const getFilteredInputs = (inputs, data) => inputs
-        .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
-        .filter((input) => !input?.condition ||
+    const getFilteredInputs = (inputs, data) => inputs.filter((input) => !input?.condition ||
         input?.condition.values.find((_) => {
             const dataValue = data?.[input?.condition?.name ?? ''];
             return _ === (dataValue?.key ?? dataValue);
@@ -10495,7 +10493,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.723";
+    const packageVersion = "0.14.724";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;