@redneckz/wildless-cms-uni-blocks 0.14.576 → 0.14.577

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { FEEDBACK_TYPES, SERVICE_DIRECTIONS } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const FeedbackTypeField = JSX<CustomFieldProps>(({ field }) => {
+export const FeedbackTypeField = JSX<CustomFieldProps>(({ field, input }) => {
   const feedbackType = field('feedbackType');
   useEffect(() => {
     if (feedbackType?.value?.key === 'FEEDBACK') {
@@ -19,7 +19,7 @@ export const FeedbackTypeField = JSX<CustomFieldProps>(({ field }) => {
       label="Тема"
       placeholder="Выберите тему"
       options={FEEDBACK_TYPES}
-      {...withValidator(feedbackType, validatorObj.feedbackType)}
+      {...getValidation(feedbackType, validatorObj.feedbackType, input?.required)}
     />
   );
 });

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

@@ -0,0 +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 FullNameField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="ФИО"
+    {...getValidation(field('fullName'), validatorObj.fullName, input?.required)}
+    {...input}
+  />
+));

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

@@ -0,0 +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 InnField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="ИНН"
+    type="number"
+    {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+  />
+));

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

@@ -1,12 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ProcessPersonalDataField = JSX<CustomFieldProps>(({ field }) => (
+export const ProcessPersonalDataField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Согласие на обработку персональных данных"
-    {...withValidator(field('processPersonalDataLeadFlg'), validatorObj.processPersonalDataLeadFlg)}
+    {...getValidation(
+      field('processPersonalDataLeadFlg'),
+      validatorObj.processPersonalDataLeadFlg,
+      input?.required,
+    )}
   />
 ));

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

@@ -1,15 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { SERVICE_DIRECTIONS } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ServiceDirectionField = JSX<CustomFieldProps>(({ field }) => (
+export const ServiceDirectionField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Направление обслуживания"
     placeholder="Выберите направление"
     options={SERVICE_DIRECTIONS}
-    {...withValidator(field('serviceDirection'), validatorObj.serviceDirection)}
+    {...getValidation(field('serviceDirection'), validatorObj.serviceDirection, input?.required)}
   />
 ));

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

@@ -1,13 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { SERVICE_TYPES } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
-export const UltraPremiumField = JSX<CustomFieldProps>(({ field }) => (
+import { getValidation } from '../getValidation';
+
+export const UltraPremiumField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Тип обслуживания"
     options={SERVICE_TYPES}
-    {...withValidator(field('serviceType'), validatorObj.serviceType)}
+    {...getValidation(field('serviceType'), validatorObj.serviceType, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/getField.tsx

@@ -2,11 +2,14 @@ import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormC
 import { getRegionUrl } from '../../components/ApplicationForm/getRegionUrl';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { CheckboxWithError } from '../Checkbox/CheckboxWithError';
-import { DatePickerControl } from '../DatePicker/DatePickerControl';
 import { InputControl } from '../Input/InputControl';
 import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
 import { AmountField } from './Fields/AmountField';
+import { AnnualRevenueField } from './Fields/AnnualRevenueField';
+import { BankEmpoleeField } from './Fields/BankEmpoleeField';
+import { BirthdayField } from './Fields/BirthdayField';
+import { CollectionCountField } from './Fields/CollectionCountField';
 import { CommentField } from './Fields/CommentField';
 import { ConsentAssignmentField } from './Fields/ConsentAssignmentField';
 import { ConsentCollectionField } from './Fields/ConsentCollectionField';
@@ -14,9 +17,12 @@ import { ConsentInformField } from './Fields/ConsentInformField';
 import { ConsentPhotoFlg } from './Fields/ConsentPhotoField';
 import { ConsentProviderField } from './Fields/ConsentProviderField';
 import { ConsentToReceiveMaterialsField } from './Fields/ConsentToReceiveMaterialsField';
+import { DesiredMeetingDateField } from './Fields/DesiredMeetingDateField';
 import { EmailField } from './Fields/EmailField';
 import { FeedbackMethodField } from './Fields/FeedbackMethodField';
 import { FeedbackTypeField } from './Fields/FeedbackTypeField';
+import { FullNameField } from './Fields/FullNameField';
+import { InnField } from './Fields/InnField';
 import { IsClientField } from './Fields/IsClientField';
 import { LocalitiesField } from './Fields/LocalitiesField';
 import { MiddleNameField } from './Fields/MiddleNameField';
@@ -35,8 +41,6 @@ import { SurnameField } from './Fields/SurnameField';
 import { TermField } from './Fields/TermField';
 import { UltraPremiumField } from './Fields/UltraPremiumField';
 import { VedField } from './Fields/VedField';
-import { validatorObj } from './getObjectValidator';
-import { getValidation } from './getValidation';
 import { isRenderField } from './isRenderField';
 
 const PRODUCT_REF = {
@@ -46,7 +50,6 @@ const PRODUCT_REF = {
 export const getField =
   // eslint-disable-next-line max-lines-per-function
   (field: FormFieldRegisterer<any>, typeForm: string) => (input: FieldDef, i: number) => {
-    const { required, ...rest } = input;
     const isPremium = typeForm === 'ULTRASERVICE' || typeForm === 'PREMIUMSERVICE';
 
     const InputsMap = {
@@ -55,86 +58,48 @@ export const getField =
       middleName: <MiddleNameField field={field} input={input} />,
       phone: <PhoneField field={field} input={input} />,
       email: <EmailField field={field} input={input} />,
-      fullName: (
-        <InputControl
-          label="ФИО"
-          {...getValidation(field('fullName'), validatorObj.fullName, required)}
-          {...rest}
-        />
-      ),
-      inn: (
-        <InputControl
-          label="ИНН"
-          type="number"
-          {...getValidation(field('inn'), validatorObj.inn, required)}
-        />
-      ),
+      fullName: <FullNameField field={field} input={input} />,
+      inn: <InnField field={field} input={input} />,
       comment: <CommentField field={field} input={input} />,
-      region: isPremium ? (
-        <RegionPremiumField field={field} />
-      ) : (
-        <RegionField field={field} input={input} url={getRegionUrl(typeForm)} />
-      ),
       addressBranch: <AddressBranchField field={field} input={input} isPremium={isPremium} />,
-      birthday: (
-        <DatePickerControl
-          label="Дата рождения"
-          {...getValidation(field('birthday'), validatorObj.birthday, required)}
-        />
-      ),
-      desiredMeetingDate: (
-        <DatePickerControl
-          label="Желаемая дата встречи"
-          {...getValidation(field('desiredMeetingDate'), validatorObj.meetingDay, required)}
-        />
-      ),
+      birthday: <BirthdayField field={field} input={input} />,
+      desiredMeetingDate: <DesiredMeetingDateField field={field} input={input} />,
       product: <ProductField field={field} source={PRODUCT_REF} />,
       localities: <LocalitiesField field={field} input={input} />,
       isClient: <IsClientField field={field} />,
       partnerComments: <PartnerCommentsField field={field} input={input} />,
-      collectionCount: (
-        <InputControl
-          label="Количество объектов инкассации"
-          type="number"
-          {...getValidation(field('collectionCount'), validatorObj.collectionCount, required)}
-        />
-      ),
+      collectionCount: <CollectionCountField field={field} input={input} />,
       acquiringType: <AcquiringField field={field} input={input} />,
       onlineCheckout: <OnlineCheckoutField field={field} />,
       posTerminal: <PosTerminalField field={field} />,
-      serviceType: <UltraPremiumField field={field} />,
+      serviceType: <UltraPremiumField field={field} input={input} />,
       term: <TermField field={field} />,
       amount: <AmountField field={field} />,
-      annualRevenue: (
-        <InputControl
-          label="Годовая выручка, ₽"
-          {...getValidation(field('annualRevenue'), validatorObj.annualRevenue, required)}
-        />
-      ),
+      annualRevenue: <AnnualRevenueField field={field} input={input} />,
       vedTypes: <VedField field={field} />,
-      feedbackType: <FeedbackTypeField field={field} />,
-      feedbackMethod: <FeedbackMethodField field={field} />,
-      serviceDirection: <ServiceDirectionField field={field} />,
-      bankEmpolee: (
-        <InputControl
-          label="ФИО или должность обслуживавшего Вас сотрудника Банка"
-          {...field('bankEmpolee')}
-        />
-      ),
+      feedbackType: <FeedbackTypeField field={field} input={input} />,
+      feedbackMethod: <FeedbackMethodField field={field} input={input} />,
+      serviceDirection: <ServiceDirectionField field={field} input={input} />,
+      bankEmpolee: <BankEmpoleeField field={field} />,
+      secondaryPhone: <SecondaryPhoneField field={field} />,
+      consentToReceiveMaterials: <ConsentToReceiveMaterialsField field={field} input={input} />,
+      processPersonalDataLeadFlg: <ProcessPersonalDataField field={field} input={input} />,
+      consentProviderFlg: <ConsentProviderField field={field} input={input} />,
+      consentPhotoFlg: <ConsentPhotoFlg field={field} input={input} />,
+      consentAssignmentClaimsFlg: <ConsentAssignmentField field={field} input={input} />,
+      consentCollectionFlg: <ConsentCollectionField field={field} input={input} />,
+      consentInformFlg: <ConsentInformField field={field} input={input} />,
       applicationDate: (
         <InputControl label="Дата и время обращения в Банк" {...field('applicationDate')} />
       ),
-      secondaryPhone: <SecondaryPhoneField field={field} />,
       consentPfrFlg: (
         <CheckboxWithError text="Согласие на запрос в ПФР" {...field('consentPfrFlg')} />
       ),
-      consentToReceiveMaterials: <ConsentToReceiveMaterialsField field={field} />,
-      processPersonalDataLeadFlg: <ProcessPersonalDataField field={field} />,
-      consentProviderFlg: <ConsentProviderField field={field} />,
-      consentPhotoFlg: <ConsentPhotoFlg field={field} />,
-      consentAssignmentClaimsFlg: <ConsentAssignmentField field={field} />,
-      consentCollectionFlg: <ConsentCollectionField field={field} />,
-      consentInformFlg: <ConsentInformField field={field} />,
+      region: isPremium ? (
+        <RegionPremiumField field={field} />
+      ) : (
+        <RegionField field={field} input={input} url={getRegionUrl(typeForm)} />
+      ),
     };
 
     return isRenderField({ input, field }) ? (

package/mobile/src/ui-kit/ReportDialog/ReportDialog.tsx

@@ -2,14 +2,17 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type LinkDoc } from '../../components/LinkDocs/LinkDocsContent';
 import { useRouter } from '../../hooks/useRouter';
+import { type Picture } from '../../model/Picture';
 import { adjustHref } from '../../utils/adjustHref';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { useDialogManager } from '../DialogManager/useDialogManager';
 import { LinkButton } from '../LinkButton/LinkButton';
 import { RichText } from '../RichText/RichText';
+
 export interface ReportDialogProps extends LinkDoc {
   __html?: string;
+  icon?: Picture;
 }
 
 export const ReportDialog = JSX<ReportDialogProps>(({ href, __html, target }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.576",
+  "version": "0.14.577",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -7,9 +7,9 @@ import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps'
 import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import { getField } from '../../ui-kit/FormField/getField';
 import { validatorObj } from '../../ui-kit/FormField/getObjectValidator';
+import { getValidation } from '../../ui-kit/FormField/getValidation';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { renderErrorText } from '../../ui-kit/Input/renderErrorText';
-import { withValidator } from '../../validation/withValidator';
 import { type GroupedConsentsProps } from './ApplicationLeadFormContent';
 import { type FormState } from './getInitialFormState';
 
@@ -31,7 +31,7 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
       () =>
         inputs
           ?.filter((_) => _.required)
-          ?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)),
+          ?.some((_) => Boolean(getValidation(field(_?.name), validatorObj[_?.name], _?.required))),
       [inputs],
     );
 

package/src/components/LinkDocs/LinkDocs.tsx

@@ -72,13 +72,13 @@ const renderLinkDocItem =
     }
 
     if ('reportSource' in docBlockDef && docBlockDef?.reportSource?.__html) {
-      return renderModalItem(docBlockDef, i);
+      return renderModalItem(icon)(docBlockDef, i);
     }
 
     return renderDefaultItem(router, icon)(docBlockDef, i);
   };
 
-const renderModalItem = (props: LinkDocDef | AttachmentDocDef, i: number) => {
+const renderModalItem = (icon: Picture) => (props: LinkDocDef | AttachmentDocDef, i: number) => {
   const commonProps = {
     text: props.text,
     target: props.target,
@@ -89,6 +89,7 @@ const renderModalItem = (props: LinkDocDef | AttachmentDocDef, i: number) => {
     <div role="listitem" key={String(i)}>
       <ReportDialogButton
         {...commonProps}
+        icon={icon}
         href={isLinkDoc(props) ? props?.href : props?.attachment?.src}
       />
       <RichText __html={props?.__html} />

package/src/components/LinkDocs/RepordDialogButton.tsx

@@ -2,8 +2,10 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type ReportDialogProps } from '../../ui-kit/ReportDialog/ReportDialog';
 import { useReportDialog } from '../../ui-kit/ReportDialog/useReportDialog';
+import { Text } from '../../ui-kit/Text/Text';
+import { renderImg } from './renderDefaultItem';
 
-export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target, __html }) => {
+export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target, __html, icon }) => {
   if (!text && !__html) {
     return null;
   }
@@ -11,8 +13,12 @@ export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target,
   const openReportDialog = useCallback(() => reportDialog.open(), [reportDialog]);
 
   return (
-    <button className="text-primary-main" onClick={openReportDialog}>
-      {text}
+    <button
+      className="flex gap-s text-primary-text no-underline hover:text-primary-main"
+      onClick={openReportDialog}
+    >
+      {renderImg(icon)}
+      <Text font="font-light">{text}</Text>
     </button>
   );
 });

package/src/components/LinkDocs/linkDocsContentExample.ts

@@ -37,6 +37,7 @@ export const linkDocsContentExample: LinkDocsContent = {
       href: '/abc8/archive.zip',
       fileFormat: 'zip',
       fileSize: '2.3МБ',
+      __html: HTML,
     },
     {
       docType: 'Link',

package/src/components/LinkDocs/renderDefaultItem.tsx

@@ -38,7 +38,7 @@ export const renderDefaultItem =
     );
   };
 
-const renderImg = (icon?: Picture) =>
+export const renderImg = (icon?: Picture) =>
   icon ? <Img className={linkIconStyle} image={icon} width="24" height="24" /> : null;
 
 const getExtFromHref = (href?: string) => {

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

@@ -0,0 +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 AnnualRevenueField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Годовая выручка, ₽"
+    {...getValidation(field('annualRevenue'), validatorObj.annualRevenue, input?.required)}
+  />
+));

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

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

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

@@ -0,0 +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';
+
+export const BirthdayField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата рождения"
+    {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+  />
+));

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

@@ -0,0 +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 CollectionCountField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Количество объектов инкассации"
+    type="number"
+    {...getValidation(field('collectionCount'), validatorObj.collectionCount, input?.required)}
+  />
+));

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

@@ -1,12 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentAssignmentField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentAssignmentField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Прочие согласия (согласие на уступку прав требований)"
-    {...withValidator(field('consentAssignmentClaimsFlg'), validatorObj.consentAssignmentClaimsFlg)}
+    {...getValidation(
+      field('consentAssignmentClaimsFlg'),
+      validatorObj.consentAssignmentClaimsFlg,
+      input?.required,
+    )}
   />
 ));

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

@@ -1,12 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentCollectionField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentCollectionField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Прочие согласия (согласие на взыскание по исполнительной надписи нотариуса)"
-    {...withValidator(field('consentCollectionFlg'), validatorObj.consentCollectionFlg)}
+    {...getValidation(
+      field('consentCollectionFlg'),
+      validatorObj.consentCollectionFlg,
+      input?.required,
+    )}
   />
 ));

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentInformField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentInformField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Согласие на информирование о продуктах и услугах Банка"
-    {...withValidator(field('consentInformFlg'), validatorObj.consentInformFlg)}
+    {...getValidation(field('consentInformFlg'), validatorObj.consentInformFlg, input?.required)}
   />
 ));

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentPhotoFlg = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentPhotoFlg = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Прочие согласия (согласие на фотографирование)"
-    {...withValidator(field('consentPhotoFlg'), validatorObj.consentPhotoFlg)}
+    {...getValidation(field('consentPhotoFlg'), validatorObj.consentPhotoFlg, input?.required)}
   />
 ));

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

@@ -1,12 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const ConsentProviderField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentProviderField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Согласие об использовании простой электронной подписи"
-    {...withValidator(field('consentProviderFlg'), validatorObj.consentProviderFlg)}
+    {...getValidation(
+      field('consentProviderFlg'),
+      validatorObj.consentProviderFlg,
+      input?.required,
+    )}
   />
 ));

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

@@ -1,10 +1,16 @@
 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 ConsentToReceiveMaterialsField = JSX<CustomFieldProps>(({ field }) => (
+export const ConsentToReceiveMaterialsField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Согласен на получение информационных и аналитических материалов по электронной почте"
-    {...field('consentToReceiveMaterials')}
+    {...getValidation(
+      field('consentToReceiveMaterials'),
+      validatorObj.consentToReceiveMaterials,
+      input?.required,
+    )}
   />
 ));

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

@@ -0,0 +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';
+
+export const DesiredMeetingDateField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата рождения"
+    {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+  />
+));

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

@@ -1,14 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { withValidator } from '../../../validation/withValidator';
 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 }) => (
+export const FeedbackMethodField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Способ получения ответа"
     options={FEEDBACK_METHOD}
-    {...withValidator(field('feedbackMethod'), validatorObj.feedbackMethod)}
+    {...getValidation(field('feedbackMethod'), validatorObj.feedbackMethod, input?.required)}
   />
 ));

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { FEEDBACK_TYPES, SERVICE_DIRECTIONS } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
-export const FeedbackTypeField = JSX<CustomFieldProps>(({ field }) => {
+export const FeedbackTypeField = JSX<CustomFieldProps>(({ field, input }) => {
   const feedbackType = field('feedbackType');
   useEffect(() => {
     if (feedbackType?.value?.key === 'FEEDBACK') {
@@ -19,7 +19,7 @@ export const FeedbackTypeField = JSX<CustomFieldProps>(({ field }) => {
       label="Тема"
       placeholder="Выберите тему"
       options={FEEDBACK_TYPES}
-      {...withValidator(feedbackType, validatorObj.feedbackType)}
+      {...getValidation(feedbackType, validatorObj.feedbackType, input?.required)}
     />
   );
 });

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

@@ -0,0 +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 FullNameField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="ФИО"
+    {...getValidation(field('fullName'), validatorObj.fullName, input?.required)}
+    {...input}
+  />
+));