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

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

@@ -1,10 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type JSONRefObject } from '../../../data/JSONRefObject';
 import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
-import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
 
 export interface ProductFieldProps extends CustomFieldProps, UniBlockProps {
   source?: JSONRefObject & {
@@ -12,12 +10,12 @@ export interface ProductFieldProps extends CustomFieldProps, UniBlockProps {
   };
 }
 
-export const ProductField = JSX<ProductFieldProps>(({ field, source }) => (
+export const ProductField = JSX<ProductFieldProps>(({ field, input, source }) => (
   <SelectControl
     placeholder="Выберите продукт"
     label="Продукт"
     options={arrayToOptions(source?.productList)}
-    {...withValidator(field('product'), validatorObj.product)}
+    {...field(input?.name ?? '')}
   />
 ));
 

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

@@ -3,13 +3,10 @@ import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useRegions } from '../../../hooks/useRegions';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 import { getRegionUrl } from './getRegionUrl';
 
 export const RegionField = JSX<CustomFieldProps>(({ field, input, params }) => {
   const url = getRegionUrl(params?.typeForm as string | undefined);
-
   const regions = useRegions(url);
 
   return (
@@ -21,7 +18,7 @@ export const RegionField = JSX<CustomFieldProps>(({ field, input, params }) => {
         () => regions?.map(({ code = '', name = '' }) => ({ key: code, text: name })),
         [regions],
       )}
-      {...getValidation(field('region'), validatorObj.region, input?.required)}
+      {...field(input?.name ?? '')}
     />
   );
 });

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

@@ -4,8 +4,6 @@ import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
 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 RegionPremiumField = JSX<CustomFieldProps>(({ field, input }) => {
   const branchByRegions = useBranchesByRegions(true);
@@ -23,7 +21,7 @@ export const RegionPremiumField = JSX<CustomFieldProps>(({ field, input }) => {
       label="Регион"
       placeholder="Выберите регион"
       options={regions as Option[]}
-      {...getValidation(field('region'), validatorObj.region, input?.required)}
+      {...field(input?.name ?? '')}
     />
   );
 });

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

@@ -3,8 +3,6 @@ import { useLeadFormData } from '../../../hooks/useLeadFormData';
 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 RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: regions } = useLeadFormData('REGION_RF');
@@ -16,7 +14,7 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       placeholder="Выберите регион"
       isSearch={true}
       options={formatRegions as Option[]}
-      {...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required)}
+      {...field(input?.name ?? '')}
     />
   );
 });

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

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

@@ -2,14 +2,12 @@ import { JSX } from '@redneckz/uni-jsx';
 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, input }) => (
   <SelectControl
     label="Направление обслуживания"
     placeholder="Выберите направление"
     options={SERVICE_DIRECTIONS}
-    {...getValidation(field('serviceDirection'), validatorObj.serviceDirection, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

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

@@ -4,8 +4,6 @@ import { getGenderFromName } from '../../../api/RetailAPI/getGenderFromName';
 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 SEX_TYPES: RadioButtonItem[] = [
   { id: 'male', text: 'Мужской' },
@@ -32,7 +30,7 @@ export const SexField = JSX<CustomFieldProps>(({ field, input }) => {
       label="Пол"
       orientation="horizontal"
       items={SEX_TYPES}
-      {...getValidation(field('sex'), validatorObj.sex, input?.required)}
+      {...field(input?.name ?? '')}
     />
   );
 });

package/src/ui-kit/FormField/Fields/ShareholderFlgField.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 ShareholderFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Я являюсь акционером / участником / членом / пайщиком / вкладчиком с долей участия более 20% уставного капитала юридического лица"
-    {...getValidation(field('shareholderFlg'), validatorObj.shareholderFlg, input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

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

@@ -1,14 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputSnilsControl } from '../../Input/InputSnilsControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
 
 export const SnilsField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputSnilsControl
-    label="СНИЛС"
-    maxLength={14}
-    {...getValidation(field('snils'), validatorObj.snils, input?.required)}
-    {...input}
-  />
+  <InputSnilsControl label="СНИЛС" maxLength={14} {...field(input?.name ?? '')} {...input} />
 ));

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

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

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

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

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { RadioButtonGroup, type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
@@ -10,14 +10,13 @@ export const VED_TYPES: RadioButtonItem[] = [
   { id: 'otherIssues', text: 'Иные вопросы ВЭД' },
 ];
 
-export const VedField = JSX<CustomFieldProps>(({ field }) => {
-  const { value, onChange } = field('vedTypes');
-  useEffect(() => {
-    if (value !== 'currencyControl') {
-      field?.('inn')?.onChange?.('');
-      field?.('region')?.onChange?.('');
+export const VedField = JSX<CustomFieldProps>(({ field, input }) => {
+  const handleChange = useCallback((_: string | undefined) => {
+    if (_ !== 'currencyControl') {
+      field('inn').onChange?.('');
+      field('region').onChange?.('');
     }
-  }, [value]);
+  }, []);
 
   return (
     <div className="py-m gap-m grid @xl:flex @xl:items-center">
@@ -25,8 +24,7 @@ export const VedField = JSX<CustomFieldProps>(({ field }) => {
         className="whitespace-normal"
         orientation="horizontal"
         items={VED_TYPES}
-        value={value}
-        onChange={(_) => onChange && onChange(_)}
+        {...field(input?.name ?? '', { onChange: handleChange })}
       />
     </div>
   );

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

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

@@ -1,14 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Checkbox } from '../../Checkbox/Checkbox';
 import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
-
-const FIELD_NAME = 'consentToReceiveMaterials';
 
 export const ConsentToReceiveMaterialsField = JSX<CustomFieldProps>(({ field, input }) => (
   <Checkbox
     text="Согласен на получение информационных и аналитических материалов по электронной почте"
-    {...getValidation(field(FIELD_NAME), validatorObj[FIELD_NAME], input?.required)}
+    {...field(input?.name ?? '')}
   />
 ));

package/src/ui-kit/FormField/SelectField.tsx

@@ -4,8 +4,6 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 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 interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   source?: DictionaryItem[];
@@ -21,7 +19,6 @@ export const SelectField = UniBlock<SelectFieldProps>(
     field,
     source,
     fieldName,
-    input,
     placeholder = 'Выберите из списка',
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     options,
@@ -37,7 +34,7 @@ export const SelectField = UniBlock<SelectFieldProps>(
       <SelectControl
         placeholder={placeholder}
         options={leadOptions}
-        {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+        {...field(fieldName)}
         {...rest}
       />
     );

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

@@ -1,6 +1,6 @@
 //TODO: Убрать обращение к компонентам т.к. ApplicationForm
 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';
 import { type VNode } from '../../model/VNode';
 import { InputControl } from '../Input/InputControl';
@@ -44,26 +44,26 @@ const PRODUCT_REF = {
 };
 
 const InputsMap = {
-  fullName: (props: CustomFieldProps) => <FullNameField {...props} />,
-  addressBranch: (props: CustomFieldProps) => <AddressBranchField {...props} />,
-  desiredMeetingDate: (props: CustomFieldProps) => <DesiredMeetingDateField {...props} />,
+  fullName: FullNameField,
+  addressBranch: AddressBranchField,
+  desiredMeetingDate: DesiredMeetingDateField,
   product: (props: CustomFieldProps) => <ProductField {...props} source={PRODUCT_REF} />,
-  localities: (props: CustomFieldProps) => <LocalitiesField {...props} />,
-  isClient: (props: CustomFieldProps) => <IsClientField {...props} />,
-  partnerComments: (props: CustomFieldProps) => <PartnerCommentsField {...props} />,
-  collectionCount: (props: CustomFieldProps) => <CollectionCountField {...props} />,
-  acquiringType: (props: CustomFieldProps) => <AcquiringField {...props} />,
-  onlineCheckout: (props: CustomFieldProps) => <OnlineCheckoutField {...props} />,
-  posTerminal: (props: CustomFieldProps) => <PosTerminalField {...props} />,
-  serviceType: (props: CustomFieldProps) => <UltraPremiumField {...props} />,
-  term: (props: CustomFieldProps) => <TermField {...props} />,
-  amount: (props: CustomFieldProps) => <AmountField {...props} />,
-  annualRevenue: (props: CustomFieldProps) => <AnnualRevenueField {...props} />,
-  vedTypes: (props: CustomFieldProps) => <VedField {...props} />,
-  feedbackMethod: (props: CustomFieldProps) => <FeedbackMethodField {...props} />,
-  serviceDirection: (props: CustomFieldProps) => <ServiceDirectionField {...props} />,
-  bankEmpolee: (props: CustomFieldProps) => <BankEmpoleeField {...props} />,
-  secondaryPhone: (props: CustomFieldProps) => <SecondaryPhoneField {...props} />,
+  localities: LocalitiesField,
+  isClient: IsClientField,
+  partnerComments: PartnerCommentsField,
+  collectionCount: CollectionCountField,
+  acquiringType: AcquiringField,
+  onlineCheckout: OnlineCheckoutField,
+  posTerminal: PosTerminalField,
+  serviceType: UltraPremiumField,
+  term: TermField,
+  amount: AmountField,
+  annualRevenue: AnnualRevenueField,
+  vedTypes: VedField,
+  feedbackMethod: FeedbackMethodField,
+  serviceDirection: ServiceDirectionField,
+  bankEmpolee: BankEmpoleeField,
+  secondaryPhone: SecondaryPhoneField,
   applicationDate: (props: CustomFieldProps) => (
     <InputControl label="Дата и время обращения в Банк" {...props} />
   ),
@@ -73,18 +73,16 @@ const InputsMap = {
     ) : (
       <RegionField {...props} />
     ),
-  consentToReceiveMaterials: (props: CustomFieldProps) => (
-    <ConsentToReceiveMaterialsField {...props} />
-  ),
+  consentToReceiveMaterials: ConsentToReceiveMaterialsField,
 
-  surname: (props: CustomFieldProps) => <SurnameField {...props} />,
-  name: (props: CustomFieldProps) => <NameField {...props} />,
-  middleName: (props: CustomFieldProps) => <MiddleNameField {...props} />,
-  birthday: (props: CustomFieldProps) => <BirthdayField {...props} />,
-  phone: (props: CustomFieldProps) => <PhoneField {...props} />,
-  email: (props: CustomFieldProps) => <EmailField {...props} />,
-  inn: (props: CustomFieldProps) => <InnField {...props} />,
-  comment: (props: CustomFieldProps) => <CommentField {...props} />,
+  surname: SurnameField,
+  name: NameField,
+  middleName: MiddleNameField,
+  birthday: BirthdayField,
+  phone: PhoneField,
+  email: EmailField,
+  inn: InnField,
+  comment: CommentField,
 };
 
 export const getField =

package/src/ui-kit/FormField/getObjectValidator.tsx

@@ -1,6 +1,6 @@
 import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
+import { type FieldValidatorsMap } from '../../hooks/useForm/FormOptions';
 import { type Validator } from '../../validation/validator';
-import { getNamesFromInput } from './getNamesFromInput';
 import {
   addressDaDataValidator,
   addressOrganizationValidator,
@@ -124,10 +124,35 @@ export const validatorObj: Record<string, Validator> = {
   ...validatorCreditCardObj,
 };
 
-export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {
-  const requiredInputs = getNamesFromInput(inputs.filter((_: FieldDef) => Boolean(_?.required)));
+export const getFormValidator = <FormState extends Record<string, any>>(
+  fieldDefs: FieldDef[],
+): ((_: FormState) => FieldValidatorsMap<FormState>) => {
+  const requiredFields = fieldDefs.filter((_) => Boolean(_?.required && _?.name));
 
-  return Object.fromEntries(
-    requiredInputs.map((_) => [_, validatorObj?.[_ || '']]).filter(([, validator]) => validator),
+  const hasConditions = requiredFields.some((_) => _.condition?.values);
+  const requiredFieldValidatorsMap: FieldValidatorsMap<FormState> = Object.fromEntries(
+    requiredFields.filter(byNonEmptyValidator).map(({ name }) => [name, validatorObj[name ?? '']]),
   );
+
+  return (formState) =>
+    hasConditions
+      ? Object.fromEntries(
+          requiredFields
+            .filter(byNonEmptyValidator)
+            .filter(byCondition(formState))
+            .map(({ name }) => [name, validatorObj[name ?? '']]),
+        )
+      : requiredFieldValidatorsMap;
 };
+
+const byNonEmptyValidator = ({ name }: FieldDef): boolean => Boolean(validatorObj[name ?? '']);
+
+const byCondition =
+  <FormState extends Record<string, any>>(formState: FormState) =>
+  (fieldDef: FieldDef) =>
+    !fieldDef?.condition ||
+    fieldDef.condition.values.find((_) => {
+      const dependencyValue = formState?.[fieldDef?.condition?.name ?? ''];
+
+      return _ === (dependencyValue?.key ?? dependencyValue);
+    });

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

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 
 const ESIA_FIELD_NAME = 'esiaAccountTypeCd';
 

package/src/ui-kit/FormField/isRenderField.tsx

@@ -1,5 +1,5 @@
 import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 
 export function isRenderField({
   input,

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

@@ -1,5 +1,5 @@
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type CreditFormDictionarySlice } from '../../hooks/useRetailFormStore';
 import {
   getEmployeesNumberOption,

package/src/ui-kit/RadioButtonGroup/RadioButtonGroup.tsx

@@ -29,9 +29,9 @@ export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
     items,
     value,
     className,
-    onChange: onChangeCheckedItem,
     disabled = false,
     orientation = 'horizontal',
+    onChange: onChangeCheckedItem,
   }) => (
     <div className="grid gap-xs whitespace-nowrap">
       {label ? (
@@ -52,7 +52,7 @@ export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
             isRadio
             text={text}
             value={value === id}
-            onChange={() => onChangeCheckedItem && onChangeCheckedItem(id)}
+            onChange={() => onChangeCheckedItem?.(id)}
             disabled={disabled}
           />
         ))}

package/src/ui-kit/RadioButtonGroup/RadioButtonGroupControl.tsx

@@ -5,13 +5,9 @@ import { renderErrorText } from '../Input/renderErrorText';
 import { RadioButtonGroup, type RadioButtonGroupProps } from './RadioButtonGroup';
 
 export const RadioButtonGroupControl = JSX<RadioButtonGroupProps>(
-  ({ className, label, onChange, error, ...rest }) => (
+  ({ className, label, error, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
-      <RadioButtonGroup
-        label={getRequiredLabel({ label, errors: rest?.errors })}
-        onChange={(_) => onChange && onChange(_)}
-        {...rest}
-      />
+      <RadioButtonGroup label={getRequiredLabel({ label, errors: rest?.errors })} {...rest} />
       {renderErrorText(error)}
     </div>
   ),

package/src/ui-kit/ResponseTypeDialog/ResponseTypeDialog.tsx

@@ -5,39 +5,36 @@ import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';
 
 export interface ResponseNotificationProps {
-  responseType?: 'OK' | 'Fail';
+  ok?: boolean;
   typeForm?: string;
   onClose?: () => void;
 }
 
-export const ResponseTypeDialog = JSX<ResponseNotificationProps>(
-  ({ responseType, typeForm, onClose }) => {
-    const responseOK = responseType === 'OK';
-    const statusIcon = responseOK ? 'ResponseOKIcon' : 'ResponseFailIcon';
+export const ResponseTypeDialog = JSX<ResponseNotificationProps>(({ ok, typeForm, onClose }) => {
+  const statusIcon = ok ? 'ResponseOKIcon' : 'ResponseFailIcon';
 
-    const responseOKDescription =
-      typeForm === 'ANTIFRAUD'
-        ? `Сообщение отправлено. Для уточнения информации с Вами могут связаться работники Банка либо Вы
+  const responseOKDescription =
+    typeForm === 'ANTIFRAUD'
+      ? `Сообщение отправлено. Для уточнения информации с Вами могут связаться работники Банка либо Вы
   можете самостоятельно позвонить по номеру контакт-центра +78001000100. Будьте внимательны, работники Банка
    не звонят с использованием мессенджеров.`
-        : 'Совсем скоро мы с вами свяжемся';
+      : 'Совсем скоро мы с вами свяжемся';
 
-    return (
-      <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto" onClose={onClose}>
-        <div className="flex flex-col gap-lg items-center rounded-md space-x-m">
-          <Img image={{ icon: statusIcon, iconVersion: 'normal' }} width="136" height="136" />
-          <Headline
-            className="w-full"
-            title={responseOK ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку'}
-            description={responseOK ? responseOKDescription : 'Пожалуйста, повторите позднее'}
-            headlineVersion="XS"
-            isEmbedded={true}
-          />
-          <Button type="button" onClick={onClose}>
-            Хорошо
-          </Button>
-        </div>
-      </Dialog>
-    );
-  },
-);
+  return (
+    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto" onClose={onClose}>
+      <div className="flex flex-col gap-lg items-center rounded-md space-x-m">
+        <Img image={{ icon: statusIcon, iconVersion: 'normal' }} width="136" height="136" />
+        <Headline
+          className="w-full"
+          title={ok ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку'}
+          description={ok ? responseOKDescription : 'Пожалуйста, повторите позднее'}
+          headlineVersion="XS"
+          isEmbedded={true}
+        />
+        <Button type="button" onClick={onClose}>
+          Хорошо
+        </Button>
+      </div>
+    </Dialog>
+  );
+});

package/src/ui-kit/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -55,7 +55,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
         setTimeNextReq(180);
         setIsTimerStarted(true);
       } else {
-        captchaDialog.open({ phoneNumber, sendCode: handleSendCode, onClose });
+        captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
       }
     }, [phoneNumber, onClose]);
 

package/src/utils/getRequiredLabel.ts

@@ -1,4 +1,5 @@
 import type { DefaultControlType } from '../model/DefaultControlType';
 
+// TODO Базовая функицональность всех Control - надо вынести и привязать к required флагу
 export const getRequiredLabel = ({ label, errors }: DefaultControlType) =>
   label && errors ? `${label}*` : label;

package/src/validation/objectValidator.ts

@@ -1,10 +1,12 @@
 import { type ValidationInfo, type Validator } from './validator';
 
 export const objectValidator =
-  <VMap extends Record<string, Validator>>(validatorsMap: VMap) =>
-  <O extends Partial<{ [P in keyof VMap]: Parameters<VMap[P]>[0] }>>(o: O): ValidationInfo =>
+  <O extends Record<string, any>>(
+    validatorsMap: { [K in keyof O]?: Validator<O[K]> } | undefined,
+  ) =>
+  (o: O): ValidationInfo =>
     (o &&
-      (Object.entries(validatorsMap).flatMap(([key, validator]) =>
-        validator(o[key]),
+      (Object.entries(validatorsMap ?? {}).flatMap(([key, validator]) =>
+        validator ? validator(o[key]) : [],
       ) as ValidationInfo)) ||
     [];

package/bundle/components/CarouselTariffsCard/CarouselTariffsCardAction.d.ts

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export declare type CarouselTariffsCardAction = {
-    type: 'fold';
-    isUnfolded: boolean;
-    parent: Slot;
-};