@redneckz/wildless-cms-uni-blocks 0.14.1017 → 0.14.1018

package/bundle/bundle.umd.js

@@ -1203,6 +1203,9 @@
     const cyrillicPattern = /^[а-яё-]*$/i;
     const isCyrillic = (_ = '') => cyrillicPattern.test(_);
 
+    const cyrillicWithNumbersPattern = /^(?!\s*$)(?:[\p{Script=Cyrillic}]|\P{L})*$/u;
+    const isCyrillicWithNumbers = (_ = '') => cyrillicWithNumbersPattern.test(_);
+
     const isDateValid = (value, limits) => {
         if (!value || isNaN(value.getTime())) {
             return false;
@@ -1227,23 +1230,27 @@
     const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
 
     const ERROR_MESSAGE$1 = 'Некорректно заполненное поле';
+    const ERROR_SELECT_MESSAGE = 'Выберите вариант ответа';
     const defaultValidator = (errorMsg) => required(errorMsg ?? ERROR_MESSAGE$1);
-    const defaultSelectValidator = (errorMsg) => validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE$1);
+    const defaultSelectValidator = (errorMsg) => validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_SELECT_MESSAGE);
     const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE$1);
+    const fullNameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && isFullName(_))(errorMsg ?? ERROR_MESSAGE$1);
     const innValidator = (errorMsg) => validator((_) => isValidInnLength(_))(errorMsg);
     const innDadataValidator = (errorMsg) => validator((_) => Boolean(_?.text) && isValidInnLength(_.text))(errorMsg);
-    const phoneValidate = (email) => /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
-    const russianPhoneValidate = (email) => /^(\+7)?[\s-]?\(?[3489][0-9]{2}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+    const phoneValidate = (phone) => /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(phone);
+    const russianPhoneValidate = (phone) => /^(\+7)?[\s-]?\(?[3489][0-9]{2}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(phone);
     const phoneValidator = (errorMsg) => validator(phoneValidate)(errorMsg);
     const russianPhoneValidator = (errorMsg) => validator(russianPhoneValidate)(errorMsg);
     const agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
     const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
     const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
-    const isValidInnLength = (value) => typeof value === 'string' && (value.length === 10 || value.length === 12);
     const birthdayValidator = (errorMsg) => validator((_) => isDateValid(_, { maxLimit: new Date() }))(errorMsg);
+    const cyrillicWithNumbersValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 0 && isCyrillicWithNumbers(_))(errorMsg ?? ERROR_MESSAGE$1);
+    const isValidInnLength = (value) => typeof value === 'string' && (value.length === 10 || value.length === 12);
+    const isFullName = (value) => /^[а-яА-ЯёЁ]+(?:-[а-яА-ЯёЁ]+)*(?:\s+[а-яА-ЯёЁ]+(?:-[а-яА-ЯёЁ]+)*)+$/.test(value);
 
     const validatorObj$1 = {
-        fullName: defaultValidator(),
+        fullName: fullNameValidator('Укажите полное ФИО на кириллице (без сокращений)'),
         addressBranch: defaultSelectValidator(),
         desiredMeetingDate: defaultValidator(),
         product: defaultValidator(),
@@ -1277,20 +1284,20 @@
         callbackTime: defaultValidator(),
         questionProduct: defaultValidator(),
         russianPhone: russianPhoneValidator('Укажите номер телефона'),
-        cityOfResidence: defaultValidator(),
+        cityOfResidence: cyrillicWithNumbersValidator('Укажите город проживания на кириллице'),
         internshipStartDate: defaultValidator(),
         internshipEndDate: defaultValidator(),
-        university: defaultValidator(),
-        fieldOfStudy: defaultValidator(),
-        courseYear: defaultValidator(),
-        graduationYear: defaultValidator(),
+        university: defaultValidator('Укажите ВУЗ'),
+        fieldOfStudy: defaultValidator('Укажите направление обучения'),
+        courseYear: defaultValidator('Укажите курс'),
+        graduationYear: defaultValidator('Укажите год окончания'),
         averageGrade: defaultValidator(),
-        skillsAndKnowledge: defaultValidator(),
+        skillsAndKnowledge: defaultValidator(''),
         educationLevel: defaultSelectValidator(),
-        motivationForInternship: defaultValidator(),
-        workExperience: defaultValidator(),
+        motivationForInternship: defaultValidator(''),
+        workExperience: defaultValidator(''),
         internshipDirection: defaultValidator(),
-        workingHours: defaultValidator(),
+        workingHours: defaultSelectValidator(),
     };
     const getFormValidator = (fieldDefs, externalValidatorObj = {}) => {
         const requiredFields = fieldDefs.filter((_) => Boolean(_?.required && _?.name));
@@ -1766,6 +1773,8 @@
         consentToReceiveMaterials: false,
         consentDataProcessing: false,
         addressRetail: { key: '', text: '' },
+        fileUpload: '',
+        fileId: '',
     };
     const getInitialFormState$2 = (inputs, typeForm = '') => {
         const formState = Object.fromEntries(inputs.map((_) => [
@@ -2319,10 +2328,6 @@
 
     const ApplierTypeField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u0422\u0438\u043F \u043E\u0431\u0440\u0430\u0442\u0438\u0432\u0448\u0435\u0433\u043E\u0441\u044F", ...input, options: APPLIER_TYPES, ...field('applierType') })));
 
-    const AverageGradeField = JSX(({ field, input }) => {
-        return (jsx(InputControl, { label: "\u0421\u0440\u0435\u0434\u043D\u0438\u0439 \u0431\u0430\u043B\u043B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F", type: "number", ...field(input?.name ?? ''), ...input }));
-    });
-
     const BankEmpoleeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0418\u041E \u0438\u043B\u0438 \u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\u044C \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u0432\u0448\u0435\u0433\u043E \u0412\u0430\u0441 \u0441\u043E\u0442\u0440\u0443\u0434\u043D\u0438\u043A\u0430 \u0411\u0430\u043D\u043A\u0430", ...field(input?.name ?? ''), ...input })));
 
     const useElementSpace = (ref, heightEl) => {
@@ -3056,7 +3061,7 @@
 
     const InputFile = JSX(
     // eslint-disable-next-line max-lines-per-function
-    ({ key, className, id, name, type = 'file', label, valid = true, pattern, autoFocus = false, extensions, children, onFocus, onBlur, maxSizeMB, error, onFileChanged = noop, }) => {
+    ({ key, className, id, name, type = 'file', label, valid = true, pattern, autoFocus = false, extensions, children, onFocus, onBlur, maxSizeMB, error, isReset, onFileChanged = noop, }) => {
         const inputRef = useRef(null);
         const [selectedFile, setSelectedFile] = useState(null);
         const [uploadError, setUploadError] = useState('');
@@ -3073,6 +3078,11 @@
                 inputRef.current?.focus();
             }
         }, [autoFocus, inputRef]);
+        useEffect(() => {
+            if (isReset) {
+                handleResetFile();
+            }
+        }, [isReset]);
         const handleFileChange = async (file) => {
             handleResetFile();
             if (file) {
@@ -3118,10 +3128,11 @@
 
     const FileUploadField = JSX(({ field, input }) => {
         const [fileId, setFileId] = useState('');
+        const fileIdField = field('fileId');
         useEffect(() => {
-            field('fileId')?.onChange?.(fileId);
+            fileIdField?.onChange?.(fileId);
         }, [fileId]);
-        return (jsx(InputFileControl, { type: "file", label: input?.name ?? '', ...field(input?.name ?? ''), ...input, onFileChanged: setFileId }));
+        return (jsx(InputFileControl, { type: "file", label: input?.name ?? '', ...field(input?.name ?? ''), ...input, onFileChanged: setFileId, isReset: !fileIdField?.value }));
     });
 
     const FullNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0418\u041E", ...field(input?.name ?? ''), ...input })));
@@ -3159,6 +3170,7 @@
         const [endDate, setEndDate] = useState();
         const [internshipStartDateError, setInternshipStartDateError] = useState('');
         const [internshipStartDateValue, setInternshipStartDateValue] = useState();
+        const today = new Date();
         useEffect(() => {
             setEndDate(field('internshipEndDate').value);
         }, [field('internshipEndDate').value]);
@@ -3167,7 +3179,7 @@
             field(input?.name ?? '')?.onChange?.(value);
             setInternshipStartDateError(isDateValid(value, { maxLimit: endDate }) ? '' : INTERNSHIP_START_DATE_ERROR);
         };
-        return (jsx(DatePickerControl, { label: input?.label || 'Дата начала практики', ...field(input?.name ?? ''), ...input, value: internshipStartDateValue, error: internshipStartDateError || field(input?.name ?? '')?.error, errors: [internshipStartDateError ?? field(input?.name ?? '')?.error], onChange: handleInputChange, maxDate: endDate }));
+        return (jsx(DatePickerControl, { label: input?.label || 'Дата начала практики', ...field(input?.name ?? ''), ...input, value: internshipStartDateValue, error: internshipStartDateError || field(input?.name ?? '')?.error, errors: [internshipStartDateError ?? field(input?.name ?? '')?.error], onChange: handleInputChange, minDate: today, maxDate: endDate }));
     });
 
     const CheckboxWithError = JSX(({ className, text, value, key, disabled, error, onChange }) => (jsxs("div", { className: style('shrink-0', className), children: [jsx(Checkbox, { text: text, value: value, disabled: disabled, onChange: onChange }, key), renderErrorText(error)] })));
@@ -3203,6 +3215,8 @@
 
     const NameField$1 = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0418\u043C\u044F", maxLength: 60, disabled: isEsiaAuthorize(field, input), ...field(input?.name ?? ''), ...input })));
 
+    const NumbersField = JSX(({ field, input, label }) => (jsx(InputControl, { label: label, type: "number", ...field(input?.name ?? ''), ...input })));
+
     const SlideCheckbox = JSX(({ value = false, text, type = 'checkbox', onChange }) => (jsxs("div", { role: type, "aria-checked": value, className: "flex justify-start items-center w-full cursor-pointer mb-s", onClick: () => onChange && onChange(!value), children: [jsx("div", { className: style('relative flex-shrink-0 duration-300 w-9 h-5 mr-s rounded-2xl', value ? 'bg-primary-main' : 'bg-main-divider'), children: jsx("div", { className: style('absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full', value ? 'left-1/2' : 'left-[5%]') }) }), text ? (jsx(Text, { size: "text-l", font: "font-light", color: "text-primary-text", children: text })) : null] })));
 
     const OnlineCheckoutField = JSX(({ field, input }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 \u043E\u043D\u043B\u0430\u0439\u043D-\u043A\u0430\u0441\u0441\u0443", ...field(input?.name ?? ''), ...input })) : null);
@@ -3391,11 +3405,11 @@
         internshipStartDate: InternshipStartDateField,
         internshipEndDate: InternshipEndDateField,
         university: (props) => jsx(TextField, { ...props, label: "\u0412\u0423\u0417" }),
-        courseYear: (props) => jsx(TextField, { ...props, label: "\u041A\u0443\u0440\u0441" }),
-        graduationYear: (props) => jsx(TextField, { ...props, label: "\u0413\u043E\u0434 \u043E\u043A\u043E\u043D\u0447\u0430\u043D\u0438\u044F" }),
+        courseYear: (props) => jsx(NumbersField, { ...props, label: "\u041A\u0443\u0440\u0441" }),
+        graduationYear: (props) => jsx(NumbersField, { ...props, label: "\u0413\u043E\u0434 \u043E\u043A\u043E\u043D\u0447\u0430\u043D\u0438\u044F" }),
         fieldOfStudy: (props) => jsx(TextField, { ...props, label: "\u041D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F" }),
         educationLevel: (props) => (jsx(SelectField$1, { ...props, label: "\u0421\u0442\u0443\u043F\u0435\u043D\u044C \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F", options: EDUCATION_LEVEL })),
-        averageGrade: AverageGradeField,
+        averageGrade: (props) => (jsx(NumbersField, { ...props, label: "\u0421\u0440\u0435\u0434\u043D\u0438\u0439 \u0431\u0430\u043B\u043B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F" })),
         skillsAndKnowledge: CommentField,
         workExperience: CommentField,
         motivationForInternship: CommentField,
@@ -14288,7 +14302,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1016";
+    const packageVersion = "0.14.1017";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;