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

package/mobile/src/ui-kit/Input/useInputPopup.tsx

@@ -0,0 +1,85 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { getDaDataHints } from '../../api/dadataHints/dadataHints';
+import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { hintsListsOptions } from '../../api/dadataHints/hintsListsOptions';
+import { debounce } from '../../utils/debounce';
+import { usePopupManager } from '../PopupManager/usePopupManager';
+import { InputPopup } from './InputPopup';
+
+interface InputPopupOptions {
+  isOpen?: boolean;
+  name: string;
+  value?: string;
+  onChange: (e: string) => void;
+}
+
+export function useInputPopup({ isOpen, value, name, onChange }: InputPopupOptions) {
+  const prevInputValue = useRef(value);
+  const currentInputValue = useRef(value);
+  const [hintsList, setHintsList] = useState<Array<DaDataSuggestion>>([]);
+  const popup = usePopupManager();
+
+  const defaultHintsListOptions = hintsListsOptions[name];
+
+  const close = useCallback(() => {
+    currentInputValue.current = value;
+    popup.close();
+  }, [value]);
+
+  const handleChange = useCallback(
+    (option: string) => {
+      close();
+      currentInputValue.current = option;
+      onChange && onChange(option);
+    },
+    [close, onChange],
+  );
+
+  const inputRef = useRef<HTMLDivElement | null>(null);
+
+  const getHintsList = useMemo(
+    () => async (searchValue: string) => {
+      if (!defaultHintsListOptions) {
+        return;
+      }
+      const result = await getDaDataHints({
+        url: defaultHintsListOptions.url,
+        requestData: {
+          ...defaultHintsListOptions?.requestData,
+        },
+        query: searchValue,
+      });
+      if (result?.length) {
+        setHintsList(result);
+      }
+    },
+    [],
+  );
+
+  const debouncedGetHintsList = useMemo(() => debounce(getHintsList, 300), [getHintsList]);
+
+  useEffect(() => {
+    if (!isOpen || !inputRef.current || currentInputValue.current === value) {
+      close();
+
+      return;
+    }
+
+    const inputElement = inputRef.current;
+    const { top, left, width, height } = inputElement.getBoundingClientRect();
+
+    if (value && prevInputValue.current !== value) {
+      debouncedGetHintsList(value);
+
+      prevInputValue.current = value;
+    }
+
+    popup.update(<InputPopup options={hintsList} value={value} onChange={handleChange} />, {
+      top: top + globalThis.scrollY + height,
+      left,
+      width,
+    });
+  }, [isOpen, hintsList, value, handleChange]);
+
+  return inputRef;
+}

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.575",
+  "version": "0.14.577",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -210,7 +210,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "69 kB",
+      "limit": "70 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/api/LeadServiceAPI.ts

@@ -2,20 +2,6 @@ import { type JSONRecord, type JSONScalar } from '@redneckz/json-op';
 import { formatDate } from '../utils/formatDate';
 import { formatPhone } from '../utils/formatPhone';
 
-interface DaDataSuggestion<T> {
-  value?: string;
-  unrestricted_value?: string;
-  data?: T;
-}
-
-interface DaDataAddress {
-  city?: string | null;
-}
-
-export interface DaDataResult {
-  suggestions?: DaDataSuggestion<DaDataAddress>[];
-}
-
 export type LeadRequest = Record<string, JSONRecord | JSONScalar | null> & {
   typeForm?: string;
   addressBranch?: string;

package/src/api/dadataHints/dadataHints.ts

@@ -0,0 +1,33 @@
+import { type DaDataSuggestion, type ListRequestOption } from './dadataHintsType';
+
+const DEFAULT_HINTS_COUNT = 10;
+
+const getResponseHandler = (response: { suggestions: Array<DaDataSuggestion> }) => {
+  const responseData: Array<DaDataSuggestion> = response?.suggestions || [];
+
+  return responseData.map((item) => ({
+    ...item,
+    processedValue: item?.value,
+  }));
+};
+
+export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaDataSuggestion>> => {
+  const { url, query, requestData = {} } = options;
+
+  const result = fetch(`/api/v1/suggestions/${url}`, {
+    method: 'POST',
+    mode: 'cors',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      count: DEFAULT_HINTS_COUNT,
+      ...requestData,
+      query,
+    }),
+  })
+    .then((response) => response.json())
+    .then(getResponseHandler);
+
+  return result;
+};

package/src/api/dadataHints/dadataHintsType.ts

@@ -0,0 +1,33 @@
+import { type Nullable } from '../../utils/Nullable';
+import { type HintOption } from './hintsListsOptions';
+
+export interface DaDataSuggestion {
+  value: string;
+  unrestricted_value: string;
+  data: DaDataResponseItem;
+  processedValue: string;
+}
+
+export type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
+
+export interface DaDataFio {
+  surname: Nullable<string>;
+  name: Nullable<string>;
+  patronymic: Nullable<string>;
+  gender: DaDataGender;
+  qc: '0' | '1';
+  source: null;
+}
+
+export interface DaDataEmail {
+  domain: Nullable<string>;
+  local: string;
+}
+
+export type DaDataResponseItem = DaDataFio | DaDataEmail;
+
+export interface ListRequestOption {
+  url: string;
+  query?: string;
+  requestData?: HintOption['requestData'];
+}

package/src/api/dadataHints/hintsListsOptions.ts

@@ -0,0 +1,44 @@
+export const NAME_HINTS_LIST_OPTIONS = {
+  url: 'suggest/fio',
+  requestData: {
+    parts: ['NAME'],
+    gender: 'UNKNOWN',
+  },
+};
+
+export const SURNAME_HINTS_LIST_OPTIONS = {
+  url: 'suggest/fio',
+  requestData: {
+    parts: ['SURNAME'],
+    gender: 'UNKNOWN',
+  },
+};
+
+export const PATRONYMIC_HINTS_LIST_OPTIONS = {
+  url: 'suggest/fio',
+  requestData: {
+    parts: ['PATRONYMIC'],
+    gender: 'UNKNOWN',
+  },
+};
+
+export const EMAIL_HINTS_LIST_OPTIONS = {
+  url: 'suggest/email',
+};
+
+export type HintsListOptions = Record<string, HintOption>;
+
+export const hintsListsOptions: HintsListOptions = {
+  name: NAME_HINTS_LIST_OPTIONS,
+  surname: SURNAME_HINTS_LIST_OPTIONS,
+  middleName: PATRONYMIC_HINTS_LIST_OPTIONS,
+  email: EMAIL_HINTS_LIST_OPTIONS,
+};
+
+export type HintOption = {
+  url: string;
+  requestData?: {
+    parts?: string[];
+    gender?: string;
+  };
+};

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -75,6 +75,7 @@ export type FieldDefaultDef = Required &
   LabelProps &
   ConditionFieldProps & {
     name: NameFieldDef;
+    dadata?: boolean;
   };
 
 /**

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -22,12 +22,12 @@ export default {
           {
             columns: 2,
             inputs: [
-              { fieldType: 'common', name: 'surname', required: true },
-              { fieldType: 'common', name: 'name', required: true },
-              { fieldType: 'common', name: 'middleName' },
+              { fieldType: 'common', name: 'surname', required: true, dadata: true },
+              { fieldType: 'common', name: 'name', required: true, dadata: true },
+              { fieldType: 'common', name: 'middleName', dadata: true },
               { fieldType: 'common', name: 'birthday', required: true },
               { fieldType: 'common', name: 'phone', required: true },
-              { fieldType: 'common', name: 'email', required: true },
+              { fieldType: 'common', name: 'email', required: true, dadata: true },
             ],
           },
           {

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -85,6 +85,7 @@ export type FieldDefaultDef = Required &
 export type FieldCommonDef = FieldDefaultDef & {
   /** @default "common" */
   fieldType: 'common';
+  dadata?: boolean;
 };
 
 /**

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/index.ts

@@ -1,6 +1,5 @@
 export { setupHooks } from '@redneckz/uni-jsx/lib/hooks';
 export { setup } from '@redneckz/uni-jsx/lib/setup';
-export { DaDataAPI } from './api/DaDataAPI';
 export { Blocks } from './components/Blocks';
 export { ContentPage } from './components/ContentPage/ContentPage';
 export { handlerDecorator } from './hooks/handlerDecorator';

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/EmailField.tsx

@@ -0,0 +1,18 @@
+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}
+    />
+  );
+});

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