@redneckz/wildless-cms-uni-blocks 0.14.736 → 0.14.738

package/mobile/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/mobile/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} />;
 });

package/mobile/src/ui-kit/FormField/Fields/ExpensesField.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 ExpensesField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Обязательные расходы в месяц"
     placeholder="Введите значение"
     isInteger={true}
-    {...getValidation(field('expenses'), validatorObj.expenses, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/Experience5YearsField.tsx

@@ -3,17 +3,14 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { clamp } from '../../../utils/clamp';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
-const FIELD_NAME = 'experience5Years';
 const MAX_YEARS = 5;
 const MIN_YEARS = 0;
 
 export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) =>
-      field(FIELD_NAME)?.onChange?.(String(clamp(Number(value), MIN_YEARS, MAX_YEARS))),
+      field(input?.name ?? '')?.onChange?.(String(clamp(Number(value), MIN_YEARS, MAX_YEARS))),
     [],
   );
 
@@ -22,7 +19,7 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Стаж"
       placeholder="За последние 5 лет"
       type="number"
-      {...getValidation(field(FIELD_NAME), validatorObj[FIELD_NAME], input?.required)}
+      {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
     />

package/mobile/src/ui-kit/FormField/Fields/FamilyMembersField.tsx

@@ -3,8 +3,8 @@ import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-export const FamilyMembersField = JSX<CustomFieldProps>(({ field }) => {
-  const { value, onChange } = field('familyMembers');
+export const FamilyMembersField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { value, onChange } = field(input?.name ?? '');
   const familyStatusKey = field('familyStatus')?.value?.key;
   const adultsCount = familyStatusKey === 'MARRIED' ? 2 : 1;
   const childrenCount = Number(field('children')?.value);
@@ -12,7 +12,7 @@ export const FamilyMembersField = JSX<CustomFieldProps>(({ field }) => {
   const totalCount = adultsCount + childrenCount + dependentsCount;
 
   useEffect(() => {
-    field?.('familyMembers')?.onChange?.(totalCount);
+    onChange?.(totalCount);
   }, [familyStatusKey, childrenCount, dependentsCount]);
 
   return (
@@ -22,7 +22,7 @@ export const FamilyMembersField = JSX<CustomFieldProps>(({ field }) => {
       type="number"
       disabled={true}
       value={value}
-      onChange={(_) => onChange?.(_)}
+      onChange={onChange}
     />
   );
 });

package/mobile/src/ui-kit/FormField/Fields/FeedbackMethodField.tsx

@@ -2,13 +2,11 @@ import { JSX } from '@redneckz/uni-jsx';
 import { SelectControl } from '../../Select/SelectControl';
 import { FEEDBACK_METHOD } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const FeedbackMethodField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Способ получения ответа"
     options={FEEDBACK_METHOD}
-    {...getValidation(field('feedbackMethod'), validatorObj.feedbackMethod, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/FullNameField.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 FullNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="ФИО"
-    {...getValidation(field('fullName'), validatorObj.fullName, input?.required)}
-    {...input}
-  />
+  <InputControl label="ФИО" {...field(input?.name ?? '')} {...input} />
 ));

package/mobile/src/ui-kit/FormField/Fields/GeneralSeniorityField.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 GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
@@ -10,7 +8,7 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     type="number"
     maxLength={2}
     placeholder="Количество лет"
-    {...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/InnField.tsx

@@ -4,8 +4,6 @@ import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType'
 import { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
@@ -22,7 +20,7 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
       isInteger={true}
       maxLength={12}
       {...input}
-      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+      {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/IsClientField.tsx

@@ -2,6 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-export const IsClientField = JSX<CustomFieldProps>(({ field }) => (
-  <CheckboxWithError {...field('isClient')} text='Являюсь клиентом банка АО "Россельхозбанк"' />
+export const IsClientField = JSX<CustomFieldProps>(({ field, input }) => (
+  <CheckboxWithError
+    {...field(input?.name ?? '')}
+    text='Являюсь клиентом банка АО "Россельхозбанк"'
+  />
 ));

package/mobile/src/ui-kit/FormField/Fields/JobsNumberField.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 JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
@@ -10,7 +8,7 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     placeholder="Количество мест"
     isInteger={true}
     maxLength={2}
-    {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LastJobExperienceField.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 LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
@@ -10,7 +8,7 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     placeholder="Количество лет"
     type="number"
     maxLength={2}
-    {...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LegalEntityNameField.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 LegalEntityNameField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
     <InputControl
       label="Наименование юридического лица"
       {...input}
-      {...getValidation(field('legalEntityName'), validatorObj.legalEntityName, input?.required)}
+      {...field(input?.name ?? '')}
       disabled={!field?.('shareholderFlg')?.value}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/LegalFormField.tsx

@@ -1,14 +1,12 @@
 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 LegalFormField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ОПФ"
     placeholder="ООО, ПАО  и др."
-    {...getValidation(field('legalForm'), validatorObj.legalForm, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LimitedBirthdayField.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 = 'limitedBirthday';
-
 export const LimitedBirthdayField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата рождения"
-    {...getValidation(field(FIELD_NAME), validatorObj.limitedBirthday, input?.required)}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    {...field(input?.name ?? '')}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LocalitiesField.tsx

@@ -1,11 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { getOutServiceRegions } from '../../../api/OutServiceAPI/OutServiceAPI';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 type RegionFieldProps = CustomFieldProps;
 
@@ -15,22 +13,23 @@ export const LocalitiesField = JSX<RegionFieldProps>(({ field, input }) => {
 
   const { data: regions } = useAsyncData('outServiceRegions', getOutServiceRegions);
 
-  const localities = regions
-    ?.find((_) => _.code === regionKey)
-    ?.localities?.map((_) => ({ key: _, text: _ }));
+  const localities = useMemo(
+    () => regions?.find((_) => _.code === regionKey)?.localities?.map((_) => ({ key: _, text: _ })),
+    [regions, regionKey],
+  );
 
   useEffect(() => {
     if (regionKey !== '') {
-      field?.('localities')?.onChange?.('');
+      field?.(input?.name ?? '')?.onChange?.('');
     }
-  }, [regionKey]);
+  }, [regionKey, input?.name ?? '']);
 
   return (
     <SelectControl
       label="Населенный пункт"
       placeholder="Выберите город, где доступен сервис"
       options={localities}
-      {...getValidation(field('localities'), validatorObj.localities, input?.required)}
+      {...field(input?.name ?? '')}
       isSearch={true}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/MandatoryPaymentsField.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 MandatoryPaymentsField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Обязательные выплаты"
     placeholder="Введите значение"
     isInteger={true}
-    {...getValidation(field('mandatoryPayments'), validatorObj.mandatoryPayments, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/MethodObtainField.tsx

@@ -2,8 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const METHODS_OF_OBTAIN: RadioButtonItem[] = [
   { id: 'office', text: 'В отделении Банка' },
@@ -14,6 +12,6 @@ export const MethodObtainField = JSX<CustomFieldProps>(({ field, input }) => (
   <RadioButtonGroupControl
     orientation="horizontal"
     items={METHODS_OF_OBTAIN}
-    {...getValidation(field('methodObtain'), validatorObj.methodObtain, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/MiddleNameField.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 = 'middleName';
-
 export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Отчество (Обязательно, при наличии)"
     maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
-    {...getValidation(field(FIELD_NAME), validatorObj.middleName, input?.required)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/NameField.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';
 
 export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,7 +8,7 @@ export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Имя"
     maxLength={60}
     disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
-    {...getValidation(field('name'), validatorObj.name, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/OnlineCheckoutField.tsx

@@ -3,8 +3,8 @@ import { SlideCheckbox } from '../../SlideCheckbox/SlideCheckbox';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { isAcquiringTrade } from './AcquiringField';
 
-export const OnlineCheckoutField = JSX<CustomFieldProps>(({ field }) =>
+export const OnlineCheckoutField = JSX<CustomFieldProps>(({ field, input }) =>
   isAcquiringTrade(field('acquiringType')?.value?.key as string) ? (
-    <SlideCheckbox type="radio" text="Хочу онлайн-кассу" {...field('onlineCheckout')} />
+    <SlideCheckbox type="radio" text="Хочу онлайн-кассу" {...field(input?.name ?? '')} />
   ) : null,
 );

package/mobile/src/ui-kit/FormField/Fields/OrganizationNameField.tsx

@@ -4,8 +4,6 @@ import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType'
 import { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
@@ -20,7 +18,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
     <InputControl
       label="Наименование организации"
       {...input}
-      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
+      {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/OtherIncomeField.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 OtherIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Иные доходы"
     placeholder="Введите значение"
     isInteger={true}
-    {...getValidation(field('otherIncome'), validatorObj.otherIncome, input?.required)}
+    {...field(input?.name ?? '')}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/PartInBusinessField.tsx

@@ -3,17 +3,14 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { clamp } from '../../../utils/clamp';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 const MAX_PART = 100;
 const MIN_PART = 0;
-const FIELD_NAME = 'partInBusiness';
 
 export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) =>
-      field(FIELD_NAME)?.onChange?.(String(clamp(Number(value), MIN_PART, MAX_PART))),
+      field(input?.name ?? '')?.onChange?.(String(clamp(Number(value), MIN_PART, MAX_PART))),
     [],
   );
 
@@ -23,7 +20,7 @@ export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
       placeholder="в %"
       isInteger={true}
       maxLength={3}
-      {...getValidation(field(FIELD_NAME), validatorObj.partInBusiness, input?.required)}
+      {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
     />

package/mobile/src/ui-kit/FormField/Fields/ParticipantDateRegistrationField.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 ParticipantDateRegistrationField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl
-    label="Дата регистрации по месту жительства"
-    {...getValidation(
-      field('participantDateRegistration'),
-      validatorObj.participantDateRegistration,
-      input?.required,
-    )}
-  />
+  <DatePickerControl label="Дата регистрации по месту жительства" {...field(input?.name ?? '')} />
 ));

package/mobile/src/ui-kit/FormField/Fields/PartnerCommentsField.tsx

@@ -1,19 +1,12 @@
 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 PartnerCommentsField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { required, ...rest } = input as FieldDef;
-
-  return (
-    <InputControl
-      {...getValidation(field('partnerComments'), validatorObj.partnerComments, required)}
-      placeholder="Укажите интересующий вас вопрос"
-      isTextarea={true}
-      {...rest}
-    />
-  );
-});
+export const PartnerCommentsField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    {...field(input?.name ?? '')}
+    placeholder="Укажите интересующий вас вопрос"
+    isTextarea={true}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/PaymentSystemField.tsx

@@ -1,44 +1,40 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
 import { getPaymentSystems } from '../../../api/RetailAPI/getPaymentSystems';
-import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { useAsyncEffect } from '../../../hooks/useAsyncEffect';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
-export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { value, onChange } = field('paymentSystem');
-  const [programId] = useLocalStorage<string>('programId');
+const optionKey = (option: { key?: string } | undefined) => option?.key;
 
+export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const [paymentSystemOptions, setPaymentSystemOptions] = useState<Option[]>([]);
 
-  useEffect(() => {
+  const localStore = useLocalStore<{ programId: string }>();
+  useAsyncEffect(async () => {
+    const { programId } = localStore;
     if (programId) {
-      (async () => {
-        const fetchedPaymentSystems = await getPaymentSystems(programId);
-        setPaymentSystemOptions(fetchedPaymentSystems || []);
-      })();
+      const fetchedPaymentSystems = await getPaymentSystems(programId);
+      setPaymentSystemOptions(fetchedPaymentSystems ?? []);
     }
   }, []);
 
-  const handleChange = useCallback(
-    (type: string) => onChange?.(paymentSystemOptions?.find((_) => _.key === type)),
-    [paymentSystemOptions, onChange],
+  const items = useMemo(
+    () => paymentSystemOptions?.map((_) => ({ id: _.key, text: _.text })) ?? [],
+    [paymentSystemOptions],
   );
 
   return (
     <RadioButtonGroupControl
       label="Платежная система"
       orientation="horizontal"
-      items={formatPaymentSystems(paymentSystemOptions)}
-      {...getValidation(field('paymentSystem'), validatorObj.paymentSystem, input?.required)}
-      value={value?.key}
-      onChange={handleChange}
+      items={items}
+      {...field(input?.name ?? '', {
+        format: optionKey,
+        parse: (key?: string) => paymentSystemOptions?.find((_) => _.key === key),
+      })}
     />
   );
 });
-
-const formatPaymentSystems = (paymentSystems: Option[]) =>
-  paymentSystems?.map((_) => ({ id: _.key, text: _.text })) ?? [];

package/mobile/src/ui-kit/FormField/Fields/PhoneField.tsx

@@ -1,8 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputPhoneControl } from '../../Input/InputPhoneControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
 export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => {
@@ -11,7 +9,7 @@ export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
     <InputPhoneControl
       label="Телефон"
-      {...getValidation(field(fieldName), validatorObj.phone, input?.required)}
+      {...field(fieldName)}
       disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
       {...input}
     />