@redneckz/wildless-cms-uni-blocks 0.14.590 → 0.14.591

package/mobile/bundle/bundle.umd.js

@@ -153,7 +153,7 @@
     const defaultBlockDecorator = ({ blockClassName, block, render }) => render({ blockClassName, block });
 
     const DEFAULT_ANCESTORS = [];
-    const defaultStyle$1 = 'col-span-12';
+    const defaultStyle$2 = 'col-span-12';
     function renderBlock$1(block, options, { className, ...extraProps } = {}) {
         const { key, blockDecorator = defaultBlockDecorator, blocksRegistry = {}, ancestors = DEFAULT_ANCESTORS, } = options;
         const { type } = block;
@@ -162,7 +162,7 @@
         }
         const BlockComponent = type && blocksRegistry[type];
         return blockDecorator({
-            blockClassName: style(block.style?.length ? block.style : defaultStyle$1, className),
+            blockClassName: style(block.style?.length ? block.style : defaultStyle$2, className),
             block,
             ancestors,
             // Adjusted by decorator block and blockClassName
@@ -1181,19 +1181,20 @@
     const Input = JSX(({ key, className = '', id, name, type = 'text', label, placeholder, value = '', valid = true, children, onChange, onFocus, onBlur, pattern, autoFocus = false, isTextarea = false, }) => {
         const inputRef = useRef(null);
         const handleChange = useCallback((e) => {
-            onChange && onChange(e.target?.value || '');
+            const valueWithoutSpace = (e.target?.value || '').trimStart();
+            onChange && onChange(valueWithoutSpace);
         }, [onChange]);
         useEffect(() => {
             if (autoFocus) {
                 inputRef.current?.focus();
             }
         }, [autoFocus, inputRef]);
-        const defaultStyle = 'w-full border rounded-md text-primary-text outline-none p-m';
         const paddingStyle = children ? 'pr-3xl' : '';
         const validStyle = getValidStyle(valid);
-        return (jsxs("div", { className: style('relative', className), children: [jsxs("label", { className: "space-y-xs", children: [renderLabel(label), isTextarea ? (jsx("textarea", { className: style('block resize-y min-h-24', defaultStyle, validStyle), id: style('textarea', id), name: name || id, placeholder: placeholder, value: value, onChange: handleChange, onFocus: onFocus, onBlur: onBlur }, key)) : (jsx("input", { type: type, className: style('h-14', defaultStyle, paddingStyle, validStyle), ref: inputRef, id: id, name: name || id, placeholder: placeholder, value: value, onChange: handleChange, onFocus: onFocus, onBlur: onBlur, pattern: pattern }, key))] }), children] }));
+        return (jsxs("div", { className: style('relative', className), children: [jsxs("label", { className: "space-y-xs", children: [renderLabel(label), isTextarea ? (jsx("textarea", { className: style('block resize-y min-h-24', defaultStyle$1, validStyle), id: style('textarea', id), name: name || id, placeholder: placeholder, value: value, onChange: handleChange, onFocus: onFocus, onBlur: onBlur }, key)) : (jsx("input", { type: type, className: style('h-14', defaultStyle$1, paddingStyle, validStyle), ref: inputRef, id: id, name: name || id, placeholder: placeholder, value: value, onChange: handleChange, onFocus: onFocus, onBlur: onBlur, pattern: pattern }, key))] }), children] }));
     });
     const getValidStyle = (valid) => (valid ? inputValidStyle : 'border-error');
+    const defaultStyle$1 = 'w-full border rounded-md text-primary-text outline-none p-m';
 
     const DEFAULT_HINTS_COUNT = 10;
     const getResponseHandler = (response) => {
@@ -1425,14 +1426,14 @@
     const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
-    const defaultValidator = required(ERROR_MESSAGE);
+    const defaultValidator = (errorMsg) => required(errorMsg ? errorMsg : ERROR_MESSAGE);
     const defaultSelectValidator = validator((_) => _?.key && _?.key !== '')(ERROR_MESSAGE);
-    const nameValidator = validator((_) => typeof _ === 'string' && _.length > 1)(ERROR_MESSAGE);
-    const lengthStringValidator = (maxLength) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= maxLength)(ERROR_MESSAGE);
-    const serieValidator = validator((_) => typeof _ === 'string' && _.length === 4)(ERROR_MESSAGE);
-    const numberValidator = validator((_) => typeof _ === 'string' && _.length === 6)(ERROR_MESSAGE);
-    const innValidator = validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(ERROR_MESSAGE);
-    const phoneValidator = pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(ERROR_MESSAGE);
+    const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1)(errorMsg ? errorMsg : ERROR_MESSAGE);
+    const lengthStringValidator = (maxLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= maxLength)(errorMsg ? errorMsg : ERROR_MESSAGE);
+    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 agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
     const snilsValidate = (snils) => {
         const snl = String(snils).replace(/[^0-9]+/g, '');
@@ -1451,55 +1452,56 @@
         }
         return false;
     };
-    const snilsValidator = validator(snilsValidate)(ERROR_MESSAGE);
+    const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
     const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2}$/.test(email);
-    const emailValidator = validator((_) => emailValidate(_))(ERROR_MESSAGE);
+    const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
 
     const validatorObj = {
-        typeForm: defaultValidator,
-        surname: nameValidator,
-        name: nameValidator,
+        typeForm: defaultValidator(),
+        surname: nameValidator('Укажите свою фамилию'),
+        name: nameValidator('Укажите своё имя'),
+        middleName: nameValidator('Укажите своё отчество'),
         region: defaultSelectValidator,
         addressBranch: defaultSelectValidator,
-        phone: phoneValidator,
-        secondaryPhone: phoneValidator,
-        birthday: defaultValidator,
-        education: defaultValidator,
-        housing: defaultValidator,
-        employment: defaultValidator,
-        organization: defaultValidator,
-        amountWorkers: defaultValidator,
-        employerActivities: defaultValidator,
-        employerOrganization: defaultValidator,
-        positionOrganization: defaultValidator,
-        email: emailValidator,
-        dulSerie: serieValidator,
-        dulNumber: numberValidator,
-        dulIssueDateField: defaultValidator,
-        dulSubdivisionCode: numberValidator,
-        dulIssuedBy: defaultValidator,
-        fullName: nameValidator,
-        inn: innValidator,
-        legalForm: defaultValidator,
-        organizationName: defaultValidator,
-        generalSeniority: defaultValidator,
-        lastJobExperience: defaultValidator,
-        experience5Years: defaultValidator,
-        jobsNumber: defaultValidator,
-        beginDate: defaultValidator,
-        fullAddress: defaultValidator,
-        partnerComments: defaultValidator,
-        collectionCount: defaultValidator,
-        comment: defaultValidator,
+        phone: phoneValidator('Укажите номер телефона'),
+        secondaryPhone: phoneValidator('Укажите номер телефона'),
+        birthday: defaultValidator('Укажите дату рождения'),
+        education: defaultValidator('Выберите ваше образование'),
+        housing: defaultValidator('Выберите тип жилья'),
+        employment: defaultValidator('Выберите информацию о трудоустройстве'),
+        organization: defaultValidator('Выберите тип организации'),
+        amountWorkers: defaultValidator('Выберите информацию о количестве сотрудников'),
+        employerActivities: defaultValidator('Выберите вид деятельности организации'),
+        employerOrganization: defaultValidator('Выберите вид организации'),
+        positionOrganization: defaultValidator('Выберите вашу должность'),
+        dulSerie: serieValidator('Укажите серию паспорта'),
+        dulNumber: numberValidator('Укажите номер паспорта'),
+        dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+        dulSubdivisionCode: numberValidator('Укажите код подразделения'),
+        dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
+        email: emailValidator('Укажите электронную почту'),
+        fullName: nameValidator(),
+        inn: innValidator('Укажите ИНН'),
+        legalForm: defaultValidator('Укажите ОПФ'),
+        organizationName: defaultValidator('Укажите наименование организации'),
+        generalSeniority: defaultValidator(),
+        lastJobExperience: defaultValidator('Укажите стаж на последнем месте работы'),
+        experience5Years: defaultValidator('Укажите общий стаж за последние 5 лет'),
+        jobsNumber: defaultValidator('Укажите количество лет стажа'),
+        beginDate: defaultValidator('Укажите дату заключения трудового договора'),
+        fullAddress: defaultValidator(),
+        partnerComments: defaultValidator(),
+        collectionCount: defaultValidator(),
+        comment: defaultValidator(),
         acquiringType: defaultSelectValidator,
         feedbackMethod: defaultSelectValidator,
         serviceType: defaultSelectValidator,
         serviceDirection: defaultSelectValidator,
-        meetingDay: defaultValidator,
-        product: defaultValidator,
-        localities: defaultValidator,
+        meetingDay: defaultValidator(),
+        product: defaultValidator(),
+        localities: defaultValidator(),
         consentDataProcessing: agreementValidator,
-        annualRevenue: defaultValidator,
+        annualRevenue: defaultValidator(),
         consentToReceiveMaterials: agreementValidator,
         processPersonalDataLeadFlg: agreementValidator,
         consentProviderFlg: agreementValidator,
@@ -1508,14 +1510,14 @@
         consentAssignmentClaimsFlg: agreementValidator,
         consentCollectionFlg: agreementValidator,
         consentInformFlg: agreementValidator,
-        familyStatus: defaultValidator,
-        children: lengthStringValidator(2),
-        familyMembers: lengthStringValidator(2),
-        dependents: lengthStringValidator(2),
-        totalIncome: lengthStringValidator(19),
-        expenses: lengthStringValidator(10),
-        snils: snilsValidator,
-        conscription: defaultValidator,
+        familyStatus: defaultValidator('Выберите семейное положение'),
+        children: lengthStringValidator(2, 'Укажите количество детей'),
+        familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
+        dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
+        totalIncome: lengthStringValidator(19, 'Укажите среднемесячный доход от основной зарплаты'),
+        expenses: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
+        snils: snilsValidator('Некорректный номер СНИЛС'),
+        conscription: defaultValidator(),
         armyIdFlg: agreementValidator,
     };
     const getObjectValidator = (inputs) => {
@@ -2034,7 +2036,7 @@
         return (jsx(SelectControl, { label: "\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0443\u043D\u043A\u0442", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0433\u043E\u0440\u043E\u0434, \u0433\u0434\u0435 \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0441\u0435\u0440\u0432\u0438\u0441", options: localities, ...getValidation(field('localities'), validatorObj.localities, input?.required), isSearch: true }));
     });
 
-    const MiddleNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0442\u0447\u0435\u0441\u0442\u0432\u043E (\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E, \u043F\u0440\u0438 \u043D\u0430\u043B\u0438\u0447\u0438\u0438)", ...field('middleName'), ...input })));
+    const MiddleNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0442\u0447\u0435\u0441\u0442\u0432\u043E (\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E, \u043F\u0440\u0438 \u043D\u0430\u043B\u0438\u0447\u0438\u0438)", ...getValidation(field('middleName'), validatorObj.middleName), ...input })));
 
     const NameField = JSX(({ field, input }) => {
         const { required, ...rest } = input;
@@ -7058,7 +7060,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.589";
+    const packageVersion = "0.14.590";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;