@redneckz/wildless-cms-uni-blocks 0.14.737 → 0.14.739

package/src/ui-kit/FormField/BaseFieldDef.ts

@@ -0,0 +1,8 @@
+export interface BaseFieldDef {
+  name?: string;
+  required?: boolean;
+  condition?: {
+    name: string;
+    values: string[];
+  };
+}

package/src/ui-kit/FormField/CustomFieldProps.ts

@@ -1,5 +1,5 @@
 import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 
 export interface CustomFieldProps {

package/src/ui-kit/FormField/Fields/AcquiringField.tsx

@@ -2,8 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const ACQUIRING_TYPES: Option[] = [
   {
@@ -29,7 +27,7 @@ export const AcquiringField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Вид эквайринга"
     placeholder="Выберите эквайринг"
     options={ACQUIRING_TYPES}
-    {...getValidation(field('acquiringType'), validatorObj.acquiringType, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));
 

package/src/ui-kit/FormField/Fields/AddressBranchField.tsx

@@ -5,9 +5,7 @@ import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
 import { type FormTypeFieldDef } from '../../../model/FormTypeFieldDef';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
 import { getPremium } from '../getPremium';
-import { getValidation } from '../getValidation';
 
 interface RegionFieldProps extends CustomFieldProps {
   isPremium?: boolean;
@@ -36,7 +34,7 @@ export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, params
         key: address,
         text: address,
       }))}
-      {...getValidation(field('addressBranch'), validatorObj.addressBranch, input?.required)}
+      {...field(input?.name ?? '')}
       isSearch={true}
     />
   );

package/src/ui-kit/FormField/Fields/AddressFactField.tsx

@@ -3,8 +3,6 @@ import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
   const fieldName = 'addressFact';
@@ -61,7 +59,7 @@ export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
     <InputControl
       label="Адрес"
       disabled={value}
-      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+      {...field(fieldName)}
       value={fieldValue?.fullAddress}
       onChange={onChange}
       {...input}

package/src/ui-kit/FormField/Fields/AddressField.tsx

@@ -3,8 +3,6 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
 export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
@@ -39,7 +37,7 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
     <InputControl
       disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
       label="Адрес"
-      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+      {...field(fieldName)}
       value={fieldValue?.fullAddress}
       onChange={onChange}
       {...input}

package/src/ui-kit/FormField/Fields/AddressMatchField.tsx

@@ -1,14 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const AddressMatchField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
     <CheckboxWithError
       text="Адрес фактического места жительства совпадает с адресом регистрации"
-      {...getValidation(field('addressMatch'), validatorObj.addressMatch, input?.required)}
+      {...field(input?.name ?? '')}
     />
   );
 });

package/src/ui-kit/FormField/Fields/AddressRetailField.tsx

@@ -8,15 +8,13 @@ import { ClientOnly } from '../../ClientOnly';
 import { SelectControl } from '../../Select/SelectControl';
 import { YandexMap } from '../../YandexMap/YandexMap';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
   const [offices, setOffices] = useState<OfficeType[]>([]);
   const { data } = useLeadFormData('REGION_RF');
 
   const regionValue = field('regionRetail')?.value || {};
-  const fieldBranch = field('addressRetail');
+  const addressField = field(input?.name ?? '');
 
   useEffect(() => {
     (async () => {
@@ -25,7 +23,7 @@ export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
     })();
 
     if (regionValue?.key) {
-      field?.('addressRetail')?.onChange?.('');
+      addressField.onChange?.('');
     }
   }, [regionValue.key]);
 
@@ -35,8 +33,6 @@ export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
     getBalloon: getOfficePoint,
   });
 
-  const isRegionSelected = Boolean(regionValue?.key);
-
   return (
     <div>
       <SelectControl
@@ -46,11 +42,7 @@ export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
           key: id?.toString() || '',
           text: address,
         }))}
-        {...getValidation(
-          field('addressRetail'),
-          validatorObj.addressRetail,
-          input?.required && isRegionSelected,
-        )}
+        {...addressField}
         isSearch={true}
       />
       <div className="h-[600px]">
@@ -59,7 +51,7 @@ export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
             points={points}
             isLoad={!data}
             className="h-full"
-            selectedAddress={fieldBranch?.value?.text}
+            selectedAddress={addressField?.value?.text}
           />
         </ClientOnly>
       </div>

package/src/ui-kit/FormField/Fields/AmountField.tsx

@@ -6,12 +6,12 @@ const MIN_CREDIT_AMOUNT = 1000;
 const MAX_CREDIT_AMOUNT = 1000000000;
 const ITEMS_CREDIT_AMOUNT = ['От 1 000 ₽', 'До 1 000 000 000 ₽'];
 
-export const AmountField = JSX<CustomFieldProps>(({ field }) => (
+export const AmountField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputRange
     title="Сумма, ₽"
     items={ITEMS_CREDIT_AMOUNT}
     min={MIN_CREDIT_AMOUNT}
     max={MAX_CREDIT_AMOUNT}
-    {...field('amount')}
+    {...field(input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/Fields/AnnualRevenueField.tsx

@@ -1,12 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const AnnualRevenueField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="Годовая выручка, ₽"
-    {...getValidation(field('annualRevenue'), validatorObj.annualRevenue, input?.required)}
-  />
+  <InputControl label="Годовая выручка, ₽" {...field(input?.name ?? '')} />
 ));

package/src/ui-kit/FormField/Fields/ArmyIdFlgField.tsx

@@ -1,12 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const ArmyIdFlgField = JSX<CustomFieldProps>(({ field, input }) => (
-  <CheckboxWithError
-    text="Наличие военного билета"
-    {...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg, input?.required)}
-  />
+  <CheckboxWithError text="Наличие военного билета" {...field(input?.name ?? '')} />
 ));

package/src/ui-kit/FormField/Fields/BankEmployeeCodeField.tsx

@@ -1,15 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const BankEmpoleeCodeField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Код представителя Банка"
     placeholder="Введите код"
     isInteger={true}
-    {...getValidation(field('bankEmployeeCode'), validatorObj.bankEmployeeCode, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/src/ui-kit/FormField/Fields/BankEmpoleeField.tsx

@@ -2,9 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-export const BankEmpoleeField = JSX<CustomFieldProps>(({ field }) => (
+export const BankEmpoleeField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ФИО или должность обслуживавшего Вас сотрудника Банка"
-    {...field('bankEmpolee')}
+    {...field(input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/Fields/BankruptcyFlgField.tsx

@@ -1,12 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const BankruptcyFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="В отношении меня ведётся производство по делу о банкротстве"
-    {...getValidation(field('bankruptcyFlg'), validatorObj.bankruptcyFlg, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/Fields/BeginDateField.tsx

@@ -1,13 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата начала работы на текущем месте"
-    {...getValidation(field('beginDate'), validatorObj.beginDate, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/src/ui-kit/FormField/Fields/BirthPlaceField.tsx

@@ -1,8 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
 const FIELD_NAME = 'birthPlace';
@@ -10,7 +8,7 @@ const FIELD_NAME = 'birthPlace';
 export const BirthPlaceField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Место рождения"
-    {...getValidation(field('birthPlace'), validatorObj.birthPlace, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
     disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
   />

package/src/ui-kit/FormField/Fields/BirthdayField.tsx

@@ -1,12 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const BirthdayField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl
-    label="Дата рождения"
-    {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
-  />
+  <DatePickerControl label="Дата рождения" {...field(input?.name ?? '')} />
 ));

package/src/ui-kit/FormField/Fields/ChildrenField.tsx

@@ -1,15 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const ChildrenField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Количество детей до 18 лет"
     placeholder="Введите значение"
     isInteger={true}
-    {...getValidation(field('children'), validatorObj.children, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/src/ui-kit/FormField/Fields/CodeWordField.tsx

@@ -1,13 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const CodeWordField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="Кодовое слово"
-    {...getValidation(field('codeWord'), validatorObj.codeWord, input?.required)}
-    {...input}
-  />
+  <InputControl label="Кодовое слово" {...field(input?.name ?? '')} {...input} />
 ));

package/src/ui-kit/FormField/Fields/CollectionCountField.tsx

@@ -1,13 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const CollectionCountField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Количество объектов инкассации"
     isInteger={true}
-    {...getValidation(field('collectionCount'), validatorObj.collectionCount, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/Fields/CommentField.tsx

@@ -1,13 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const CommentField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     className="col-span-2"
-    {...getValidation(field('comment'), validatorObj.comment, input?.required)}
+    {...field(input?.name ?? '')}
     placeholder="Ваше сообщение"
     isTextarea={true}
   />

package/src/ui-kit/FormField/Fields/ConsentField.tsx

@@ -2,15 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import { CONSENTS } from '../../../components/ApplicationLeadForm/consents';
 import { CheckboxWithDoc } from '../../Checkbox/CheckboxWithDoc';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const ConsentField = JSX<CustomFieldProps>(({ field, input }) =>
   input && input.name ? (
     <CheckboxWithDoc
       text={CONSENTS[input.name]?.text}
       docId={CONSENTS[input.name]?.docId}
-      {...getValidation(field(input.name), validatorObj[input.name], input?.required)}
+      {...field(input.name)}
     />
   ) : null,
 );

package/src/ui-kit/FormField/Fields/CurrencyField.tsx

@@ -1,22 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
-export const CurrencyField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { value, onChange } = field('currency');
+const CURRENCY_TYPES = [{ id: '810', text: 'Рубли' }];
 
-  const currencyTypes = [{ id: '810', text: 'Рубли' }];
-
-  return (
-    <RadioButtonGroupControl
-      label="Валюта"
-      orientation="horizontal"
-      items={currencyTypes}
-      value={value}
-      onChange={(_) => onChange?.(_)}
-      {...getValidation(field('currency'), validatorObj.currency, input?.required)}
-    />
-  );
-});
+export const CurrencyField = JSX<CustomFieldProps>(({ field, input }) => (
+  <RadioButtonGroupControl
+    label="Валюта"
+    orientation="horizontal"
+    items={CURRENCY_TYPES}
+    {...field(input?.name ?? '')}
+  />
+));

package/src/ui-kit/FormField/Fields/DeliveryDateFiels.tsx

@@ -1,12 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl
-    label="Дата доставки"
-    {...getValidation(field('deliveryDate'), validatorObj.deliveryDate, input?.required)}
-  />
+  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} />
 ));

package/src/ui-kit/FormField/Fields/DependentsField.tsx

@@ -1,8 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const DependentsField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
@@ -10,7 +8,7 @@ export const DependentsField = JSX<CustomFieldProps>(({ field, input }) => (
     placeholder="За исключение детей до 18 лет"
     isInteger={true}
     maxLength={2}
-    {...getValidation(field('dependents'), validatorObj.dependents, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/src/ui-kit/FormField/Fields/DesiredMeetingDateField.tsx

@@ -1,16 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const DesiredMeetingDateField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl
-    label="Желаемая дата встречи"
-    {...getValidation(
-      field('desiredMeetingDate'),
-      validatorObj.desiredMeetingDate,
-      input?.required,
-    )}
-  />
+  <DatePickerControl label="Желаемая дата встречи" {...field(input?.name ?? '')} />
 ));

package/src/ui-kit/FormField/Fields/DisablePeopleFlgField.tsx

@@ -1,12 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const DisablePeopleFlgField = JSX<CustomFieldProps>(({ field, input }) => (
-  <CheckboxWithError
-    text="Являюсь инвалидом"
-    {...getValidation(field('disablePeopleFlg'), validatorObj.disablePeopleFlg, input?.required)}
-  />
+  <CheckboxWithError text="Являюсь инвалидом" {...field(input?.name ?? '')} />
 ));

package/src/ui-kit/FormField/Fields/DulIssueDateField.tsx

@@ -1,16 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-const FIELD_NAME = 'dulIssueDateField';
-
 export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата выдачи"
-    {...getValidation(field(FIELD_NAME), validatorObj.dulIssueDateField, input?.required)}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    {...field(input?.name ?? '')}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/Fields/DulIssuedByField.tsx

@@ -3,12 +3,8 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-const FIELD_NAME = 'dulIssuedBy';
-
 export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } =
     field('dulSubdivisionCode');
@@ -19,10 +15,10 @@ export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
 
   return (
     <InputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
       label="Кем выдан"
       {...input}
-      {...getValidation(field(FIELD_NAME), validatorObj.dulIssuedBy, input?.required)}
+      {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
       daDataQueryPrefix={dulSubdivisionCode}
     />

package/src/ui-kit/FormField/Fields/DulNumberField.tsx

@@ -1,18 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-const FIELD_NAME = 'dulNumber';
-
 export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     label="Номер документа"
     isInteger={true}
     maxLength={6}
-    {...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/Fields/DulSerieField.tsx

@@ -1,18 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-const FIELD_NAME = 'dulSerie';
-
 export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     label="Серия документа"
     isInteger={true}
     maxLength={4}
-    {...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/Fields/DulSubdivisionCodeField.tsx

@@ -3,12 +3,8 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-const FIELD_NAME = 'dulSubdivisionCode';
-
 export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input }) => {
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
@@ -16,12 +12,12 @@ export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input })
 
   return (
     <InputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
       label="Код подразделения"
       isInteger={true}
       maxLength={6}
       {...input}
-      {...getValidation(field(FIELD_NAME), validatorObj.dulSubdivisionCode, input?.required)}
+      {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
     />
   );

package/src/ui-kit/FormField/Fields/EmailField.tsx

@@ -1,18 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const EmailField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { required, ...rest } = input as FieldDef;
-
-  return (
-    <InputControl
-      label="Электронная почта"
-      {...getValidation(field('email'), validatorObj.email, required)}
-      {...rest}
-    />
-  );
+  return <InputControl label="Электронная почта" {...field(input?.name ?? '')} {...input} />;
 });