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

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm } from '../../hooks/useForm';
+import { useForm } from '../../hooks/useForm/useForm';
 import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
+import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { Loader } from '../../ui-kit/Loader/Loader';
@@ -26,21 +27,25 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       [applicationFormData],
     );
 
+    const formValidator = useMemo(() => getFormValidator(inputs), [inputs]);
+
     const [initialFormState, { isLoading }] = useInitApplicationLead(inputs, nextStepLink);
-    const { handleSubmit, responseStatus, isSending } = useApplicationLeadApi({
-      inputs,
+    const { isSending, ok, handleSubmit } = useApplicationLeadApi({
       programId,
       nextStepLink,
     });
 
-    const [, { field, onSubmit }] = useForm(initialFormState, { onSubmit: handleSubmit });
+    const [, { field, onSubmit }] = useForm(initialFormState, {
+      formValidator,
+      onSubmit: handleSubmit,
+    });
 
     const responseTypeDialog = useDialog(ResponseTypeDialog);
     useEffect(() => {
-      if (responseStatus) {
-        responseTypeDialog.open({ responseType: responseStatus });
+      if (ok !== undefined) {
+        responseTypeDialog.open({ ok });
       }
-    }, [responseStatus]);
+    }, [ok]);
 
     return (
       <ApplicationFormLayout

package/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -28,7 +28,7 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(({ inputs = [], field,
   const handleGeneralToggle = (value: boolean) => {
     for (const item of inputs) {
       const itemField = field(item.name as keyof LeadFormState);
-      itemField?.onChange && itemField.onChange(value);
+      itemField.onChange?.(value);
     }
   };
 
@@ -54,7 +54,10 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(({ inputs = [], field,
         unfoldedByDefault
         renderFoldableSection={({ isUnfolded }) => (
           <FoldableSection isUnfolded={isUnfolded} className="flex flex-col pl-2xl">
-            {inputs.map(getField(field, {}, InputsConsentsMap))}
+            {
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+              inputs.map(getField<FieldRetailDef>(field, {}, { ...InputsConsentsMap }))
+            }
           </FoldableSection>
         )}
         renderFoldButton={renderGeneralCheckbox(

package/src/components/ApplicationLeadForm/renderAgreementSubmit.tsx

@@ -1,4 +1,4 @@
-import { type FieldProps } from '../../hooks/useForm';
+import { type FieldProps } from '../../hooks/useForm/useForm';
 import { type LinkProps } from '../../model/LinkProps';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { agreementValidator } from '../../ui-kit/FormField/validators';

package/src/components/ApplicationLeadForm/renderInputs.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { InputsApplicationLeadMap } from '../../services/retail/inputs';
 import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { getField } from '../../ui-kit/FormField/getField';
@@ -9,7 +10,7 @@ export const renderInputs = ({ field, inputs }: GroupedConsentsProps) => {
 
   return consentInputs.length > 2 ? (
     <div>
-      {restInputs.map(getField(field, {}, { ...InputsApplicationLeadMap }))}
+      {restInputs.map(getField<FieldRetailDef>(field, {}, { ...InputsApplicationLeadMap }))}
       <GroupedConsents inputs={consentInputs} field={field} />
     </div>
   ) : (
@@ -17,7 +18,9 @@ export const renderInputs = ({ field, inputs }: GroupedConsentsProps) => {
   );
 };
 
-const splitInputs = (inputs?: FieldRetailDef[]) => ({
-  consentInputs: inputs?.filter((_) => Object.keys(CONSENTS).includes(_.name || '')) || [],
-  restInputs: inputs?.filter((_) => !Object.keys(CONSENTS).includes(_.name || '')) || [],
+const splitInputs = (
+  inputs: FieldRetailDef[] = [],
+): { consentInputs: FieldRetailDef[]; restInputs: FieldRetailDef[] } => ({
+  consentInputs: inputs.filter(({ name }) => Object.keys(CONSENTS).includes(String(name))),
+  restInputs: inputs.filter(({ name }) => !Object.keys(CONSENTS).includes(String(name))),
 });

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -7,34 +7,25 @@ import { getTaskById } from '../../api/RetailAPI/getTaskById';
 import { updateUserProfile } from '../../api/RetailAPI/updateUserProfile';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
-import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { getUpdateUserProfileData } from '../../services/retail/utils/getUpdateUserProfile';
 import { useConsentBkiDialog } from '../../ui-kit/ConsentBkiDialog/useConsentBkiDialog';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { useDraftDialog } from '../../ui-kit/DraftDialog/useDraftDialog';
 import { useEsiaLoginDialog } from '../../ui-kit/EsiaLoginDialog/useEsiaLoginDialog';
-import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { VerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/VerifyPhoneDialog';
 import { formatPhone } from '../../utils/formatPhone';
-import { objectValidator } from '../../validation/objectValidator';
-import { isValidationSuccess } from '../../validation/validator';
 import { CONSENTS } from './consents';
 import { getLeadFormTaskData } from './getLeadFormTaskData';
 import { useSaveUserData, type UserData } from './useSaveUserData';
 
 interface ApplicationLeadApiProps {
-  inputs: FieldRetailDef[];
   programId: string;
   nextStepLink: string;
 }
 
-export const useApplicationLeadApi = ({
-  inputs,
-  programId,
-  nextStepLink,
-}: ApplicationLeadApiProps) => {
-  const [responseStatus, setResponseStatus] = useState<'OK' | 'Fail' | ''>('');
+export const useApplicationLeadApi = ({ programId, nextStepLink }: ApplicationLeadApiProps) => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
+  const [ok, setOK] = useState<boolean | undefined>();
   const saveUserData = useSaveUserData();
 
   const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
@@ -43,11 +34,6 @@ export const useApplicationLeadApi = ({
   const draftDialog = useDraftDialog();
 
   const handleSubmit = useCallback(async (formData: LeadFormState) => {
-    const feedbackValidator = objectValidator(getObjectValidator(inputs));
-    if (!isValidationSuccess(feedbackValidator(formData))) {
-      return;
-    }
-
     try {
       startSending();
       const profileId = await createUserProfile({
@@ -81,7 +67,7 @@ export const useApplicationLeadApi = ({
               await sendCurrentTask();
             }
           } catch {
-            setResponseStatus('Fail');
+            setOK(false);
           }
         };
 
@@ -95,15 +81,11 @@ export const useApplicationLeadApi = ({
         endSending();
       }
     } catch {
-      setResponseStatus('Fail');
+      setOK(false);
     }
   }, []);
 
-  return {
-    handleSubmit,
-    responseStatus,
-    isSending,
-  };
+  return { isSending, ok, handleSubmit };
 };
 
 const getAcceptedConsents = (formData: LeadFormState): string[] =>

package/src/components/CalculatorBonus/CalculatorBonus.tsx

@@ -1,5 +1,5 @@
 import { type JSONRefObject } from '../../data/JSONRefObject';
-import { useForm } from '../../hooks/useForm';
+import { useForm } from '../../hooks/useForm/useForm';
 import { CalculatorLayout } from '../../ui-kit/Calculator/CalculatorLayout';
 import { CalculatorStyle } from '../../ui-kit/Calculator/CalculatorStyle';
 import { CalculatorValue } from '../../ui-kit/Calculator/CalculatorValue';

package/src/components/CalculatorBusinessDeposit/CalculatorBusinessDeposit.tsx

@@ -1,4 +1,4 @@
-import { useForm, type FormFieldRegisterer } from '../../hooks/useForm';
+import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { CalculatorLayout } from '../../ui-kit/Calculator/CalculatorLayout';
 import { CalculatorStyle } from '../../ui-kit/Calculator/CalculatorStyle';
 import {

package/src/components/CalculatorCredit/CalculatorCredit.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable max-lines, max-lines-per-function */
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type JSONRefObject } from '../../data/JSONRefObject';
-import { useForm, type FormFieldRegisterer } from '../../hooks/useForm';
+import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { DEFAULT_MONTHS } from '../../ui-kit/Calculator/calculatorConstants';
 import { CalculatorLayout } from '../../ui-kit/Calculator/CalculatorLayout';
 import { CalculatorStyle } from '../../ui-kit/Calculator/CalculatorStyle';
@@ -62,19 +62,18 @@ export const CalculatorCredit = UniBlock<CalculatorDepositProps>(
   }) => {
     const defaultParamsCals = getDefaultParamsMin(calcSource?.rateRows);
 
-    const [userInputParams, { field, isDirty }] = useForm({
-      moneyValue: getMoneyDefaultValue(defaultParams, CREDIT_DEFAULT_SUM),
-      monthsValue: getMonthsDefaultValue(defaultParams, DEFAULT_MONTHS),
-      isAnnuity: Boolean(defaultParams?.isAnnuity),
-      isInsurance: Boolean(defaultParams?.isEnableInsurance),
-      isSalaryClient: Boolean(defaultParams?.isEnableSalaryClient),
-      isPensionClient: Boolean(defaultParams?.isEnablePensionClient),
-      isStateEmployee: Boolean(defaultParams?.isEnableStateEmployee),
-    });
-
-    useEffect(() => {
-      isDirty && onChange?.(userInputParams);
-    }, [userInputParams, isDirty]);
+    const [userInputParams, { field }] = useForm(
+      {
+        moneyValue: getMoneyDefaultValue(defaultParams, CREDIT_DEFAULT_SUM),
+        monthsValue: getMonthsDefaultValue(defaultParams, DEFAULT_MONTHS),
+        isAnnuity: Boolean(defaultParams?.isAnnuity),
+        isInsurance: Boolean(defaultParams?.isEnableInsurance),
+        isSalaryClient: Boolean(defaultParams?.isEnableSalaryClient),
+        isPensionClient: Boolean(defaultParams?.isEnablePensionClient),
+        isStateEmployee: Boolean(defaultParams?.isEnableStateEmployee),
+      },
+      { onChange },
+    );
 
     const calcParams = getCreditCalculatorParams(userInputParams, calcSource, paramsViewSettings);
     const paymentTypeElement = renderPaymentType({

package/src/components/CalculatorDeposit/CalculatorDeposit.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable max-lines, max-lines-per-function */
 import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type JSONRefObject } from '../../data/JSONRefObject';
-import { useForm } from '../../hooks/useForm';
+import { useForm } from '../../hooks/useForm/useForm';
 import { Button } from '../../ui-kit/Button/Button';
 import { CalculatorLayout } from '../../ui-kit/Calculator/CalculatorLayout';
 import { CalculatorStyle } from '../../ui-kit/Calculator/CalculatorStyle';
@@ -78,7 +78,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
         isNewClient: Boolean(defaultParams?.isNewClient),
         currency: DEFAULT_CURRENCY,
       },
-      { normalize },
+      { normalizer: normalize },
     );
 
     const currencyValue = field?.('currency')?.value ?? DEFAULT_CURRENCY;

package/src/components/CalculatorDeposit/renderDepositParamsForm.tsx

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { renderBinaryRadioButtonGroup } from '../../ui-kit/Calculator/renderBinaryRadioButtonGroup';
 import { renderPayout } from '../../ui-kit/Calculator/renderPayout';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';

package/src/components/CalculatorRefinancing/CalculatorRefinancing.tsx

@@ -1,5 +1,5 @@
 import { type JSONRefObject } from '../../data/JSONRefObject';
-import { useForm, type FormFieldRegisterer } from '../../hooks/useForm';
+import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { CalculatorLayout } from '../../ui-kit/Calculator/CalculatorLayout';
 import { CalculatorStyle } from '../../ui-kit/Calculator/CalculatorStyle';
 import { CalculatorValue } from '../../ui-kit/Calculator/CalculatorValue';

package/src/components/CardTransfer/CardTransfer.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm } from '../../hooks/useForm';
+import { useForm } from '../../hooks/useForm/useForm';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
 import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';

package/src/components/CarouselTariffsCard/CarouselTariffsCard.tsx

@@ -1,9 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { defaultEventBus } from '../../EventBus/defaultEventBus';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type AspectsDef } from '../../model/AspectsProps';
-import { type Slot } from '../../model/ContentPageDef';
-import { type VNode } from '../../model/VNode';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
@@ -16,6 +13,7 @@ import { getAspectsAttributes } from '../../utils/dataAttributes';
 import { isIcon } from '../../utils/isIcon';
 import { style } from '../../utils/style';
 import { type CarouselTariffsCardContent } from './CarouselTariffsCardContent';
+import { carouselTariffsCardEventBus } from './carouselTariffsCardEventBus';
 import { renderCardInfo } from './renderCardInfo';
 
 export interface CarouselTariffsCardProps extends CarouselTariffsCardContent, UniBlockProps {}
@@ -43,14 +41,22 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
 
     useEffect(
       () =>
-        defaultEventBus.subscribe('fold', (event) => {
-          if (event && options?.parent !== undefined && event.parent === options?.parent) {
+        carouselTariffsCardEventBus.subscribe('fold', (event) => {
+          if (event && options?.parent && event.parent === options?.parent) {
             setIsVisible(event.isUnfolded);
           }
         }),
       [options?.parent],
     );
 
+    const toggle = useCallback(() => {
+      carouselTariffsCardEventBus.fire('fold', {
+        type: 'fold',
+        isUnfolded: !isVisible,
+        parent: options?.parent,
+      });
+    }, [isVisible, options?.parent]);
+
     return (
       <BlockWrapper className={style('flex flex-col', className)} defaultPadding="p-2xl" {...rest}>
         {isIcon(icon) ? (
@@ -70,10 +76,10 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
                 <FoldableSection isUnfolded={isVisible}>{hiddenCells}</FoldableSection>
               </div>
             )}
-            renderFoldButton={
-              cardCells.length >= visibleCellsCount
-                ? renderFoldButton(options?.parent, data, isVisible)
-                : null
+            renderFoldButton={() =>
+              cardCells.length >= visibleCellsCount ? (
+                <FoldButton data={data} isUnfolded={isVisible} onClick={toggle} />
+              ) : null
             }
           />
         ) : (
@@ -84,27 +90,24 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
   },
 );
 
-const renderFoldButton =
-  (parent?: Slot, data?: AspectsDef[], isUnfolded = false) =>
-  (): VNode =>
-    (
-      <button
-        className="w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center"
-        onClick={() => {
-          if (parent !== undefined) {
-            defaultEventBus.fire('fold', { type: 'fold', isUnfolded: !isUnfolded, parent });
-          }
-        }}
-        type="button"
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...(isUnfolded ? getAspectsAttributes(data) : {})}
-      >
-        <div>{isUnfolded ? 'Скрыть' : 'Подробнее о тарифе'}</div>
-        <Icon
-          className="text-primary-text"
-          name={isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon'}
-          width="16"
-          height="16"
-        />
-      </button>
-    );
+const FoldButton = JSX<{
+  data?: AspectsDef[];
+  isUnfolded?: boolean;
+  onClick?: () => void;
+}>(({ data, isUnfolded = false, onClick }) => (
+  <button
+    className="w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center"
+    type="button"
+    onClick={onClick}
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    {...(isUnfolded ? getAspectsAttributes(data) : {})}
+  >
+    <div>{isUnfolded ? 'Скрыть' : 'Подробнее о тарифе'}</div>
+    <Icon
+      className="text-primary-text"
+      name={isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon'}
+      width="16"
+      height="16"
+    />
+  </button>
+));

package/src/components/CarouselTariffsCard/carouselTariffsCardEventBus.ts

@@ -0,0 +1,12 @@
+import { EventBus } from '@redneckz/uni-jsx/lib/EventBus/EventBus';
+import { type Slot } from '../../model/ContentPageDef';
+
+export type CarouselTariffsCardAction = {
+  type: 'fold';
+  isUnfolded: boolean;
+  parent?: Slot;
+};
+
+export const carouselTariffsCardEventBus = new EventBus<{
+  fold: CarouselTariffsCardAction;
+}>();

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -44,7 +44,7 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
     scrollToTop();
   }, []);
 
-  const sections = useMemo(() => stepsSectionsMap[step], [step]);
+  const sections = stepsSectionsMap[step];
 
   const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
 

package/src/components/CreditCardForm/CreditCardFormContent.ts

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type TitleProps } from '../../model/HeadlineType';
 import { type InputSectionsType, type SectionsRetailProps } from '../../model/InputSectionsType';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm } from '../../hooks/useForm';
+import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm/useForm';
 import { type SectionsRetailProps } from '../../model/InputSectionsType';
-import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
-import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
+import { type LeadFormState } from '../../services/retail/model/LeadFormState';
+import { calculateInputs } from '../../services/retail/utils/calculateInputs';
+import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -21,18 +22,27 @@ export interface CreditCardFormStepProps {
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
-      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldRetailDef[],
+      () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs || []),
       [sections],
     );
 
+    const formValidator = useCallback(
+      (formState: LeadFormState) =>
+        // TODO Слишком сложно
+        getFormValidator(calculateInputs((_) => formState[_])(inputs, step))(formState),
+      [inputs],
+    );
+
     const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
       step,
-      inputs,
       onNextStep,
       onFinish,
     });
 
-    const [, { field, onSubmit: handleSubmit }] = useForm(initialState, { onSubmit });
+    const [, { field, onSubmit: handleSubmit }] = useForm(initialState, {
+      formValidator,
+      onSubmit,
+    });
 
     return isFormFinished ? (
       <CreditCardFormStatusTracker />

package/src/components/CreditCardForm/renderInputs.tsx

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { InputRetailCardMap, InputsRetailMap } from '../../services/retail/inputs';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
@@ -10,5 +10,9 @@ export interface RenderInputsProps {
   params?: Record<string, any>;
 }
 
+const InputsMap = { ...InputsRetailMap, ...InputRetailCardMap };
+
 export const renderInputs = ({ field, inputs, params }: RenderInputsProps) =>
-  inputs.map(getField(field, params, { ...InputsRetailMap, ...InputRetailCardMap }));
+  inputs.map(
+    getField<FieldRetailDef>(field, params, InputsMap),
+  );

package/src/components/CreditCardForm/renderStep.tsx

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
 import { calculateInputs, type GetValue } from '../../services/retail/utils/calculateInputs';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -3,24 +3,17 @@ import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
-import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
-import { calculateInputs, type GetValue } from '../../services/retail/utils/calculateInputs';
-import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
-import { objectValidator } from '../../validation/objectValidator';
-import { isValidationSuccess } from '../../validation/validator';
 import { getCreditCardFormTaskData } from './getCreditCardFormTaskData';
 import { getInitialFormState } from './getInitialFormState';
 
 interface CreditFormApiProps {
   step: number;
-  inputs: FieldRetailDef[];
   onNextStep: () => void;
   onFinish?: () => void;
 }
 
 export const useCreditCardFormAPI = ({
   step,
-  inputs,
   onNextStep,
   onFinish,
 }: CreditFormApiProps): [LeadFormState, (formData: LeadFormState) => void, boolean] => {
@@ -52,14 +45,6 @@ export const useCreditCardFormAPI = ({
 
   const handleSubmit = useCallback(
     async (formData: LeadFormState) => {
-      const feedbackValidator = objectValidator(
-        getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
-      );
-
-      if (!isValidationSuccess(feedbackValidator(formData))) {
-        return;
-      }
-
       startSending();
       retailFormStore.leadForm = formData;
 
@@ -93,8 +78,3 @@ export const useCreditCardFormAPI = ({
 
   return [initialState, handleSubmit, isSending];
 };
-
-const getValue =
-  (formData: LeadFormState): GetValue =>
-  (name) =>
-    formData[name];

package/src/components/CreditForm/CreditForm.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
 import { type JSONRefObject } from '../../data/JSONRefObject';
@@ -48,9 +48,9 @@ export const CreditForm = UniBlock<CreditFormProps>(({ className, programsSource
     scrollToTop();
   }, []);
 
-  const sections = useMemo(() => stepsSectionsMap[step], [step]);
-
+  const sections = stepsSectionsMap[step];
   const isStartStep = step === 0;
+
   const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
 
   return (

package/src/components/CreditForm/CreditFormStep.tsx

@@ -1,9 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm } from '../../hooks/useForm';
+import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm/useForm';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
-import { type SectionsProps, type SectionsRetailProps } from '../../model/InputSectionsType';
-import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
+import { type SectionsRetailProps } from '../../model/InputSectionsType';
+import type { LeadFormState } from '../../services/retail/model/LeadFormState';
+import { calculateInputs } from '../../services/retail/utils/calculateInputs';
+import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { CreditFormStatusTracker } from './CreditFormStatusTracker';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
 import { renderStep } from './renderStep';
@@ -26,18 +28,27 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
     const inputs = useMemo(
-      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldRetailDef[],
+      () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],
     );
 
+    const formValidator = useCallback(
+      (formState: LeadFormState) =>
+        // TODO Слишком сложно
+        getFormValidator(calculateInputs((_) => formState[_])(inputs, step))(formState),
+      [inputs],
+    );
+
     const [initialState, onSubmit, isSending] = useCreditFormAPI({
       step,
-      inputs,
       onNextStep,
       onFinish,
     });
 
-    const [, { field, onSubmit: handleSubmit }] = useForm(initialState, { onSubmit });
+    const [, { field, onSubmit: handleSubmit }] = useForm(initialState, {
+      formValidator,
+      onSubmit,
+    });
 
     return isFormFinished ? (
       <CreditFormStatusTracker />

package/src/components/CreditForm/renderInputs.tsx

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { InputsRetailMap } from '../../services/retail/inputs';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
@@ -11,4 +11,4 @@ export interface RenderInputsProps {
 }
 
 export const renderInputs = ({ field, inputs, params }: RenderInputsProps) =>
-  inputs.map(getField(field, params, { ...InputsRetailMap }));
+  inputs.map(getField<FieldRetailDef>(field, params, { ...InputsRetailMap }));

package/src/components/CreditForm/renderStep.tsx

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type SectionsRetailProps } from '../../model/InputSectionsType';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
 import { calculateInputs, type GetValue } from '../../services/retail/utils/calculateInputs';