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

package/src/components/CreditForm/useCreditFormAPI.tsx

@@ -4,23 +4,16 @@ import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { getCreditFormTaskData } from '../../services/retail/adaptors/getCreditFormTaskData';
 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 { getInitialFormState } from './getInitialFormState';
 
 interface CreditFormApiProps {
   step: number;
-  inputs: FieldRetailDef[];
   onNextStep: () => void;
   onFinish?: () => void;
 }
 
 export const useCreditFormAPI = ({
   step,
-  inputs,
   onNextStep,
   onFinish,
 }: CreditFormApiProps): [LeadFormState, (formData: LeadFormState) => void, boolean] => {
@@ -55,14 +48,6 @@ export const useCreditFormAPI = ({
 
   const handleSubmit = useCallback(
     async (formData: LeadFormState) => {
-      const feedbackValidator = objectValidator(
-        getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
-      );
-
-      if (!isValidationSuccess(feedbackValidator(formData))) {
-        return;
-      }
-
       startSending();
       retailFormStore.leadForm = formData;
 
@@ -96,8 +81,3 @@ export const useCreditFormAPI = ({
 
   return [initialState, handleSubmit, isSending];
 };
-
-const getValue =
-  (formData: LeadFormState): GetValue =>
-  (name) =>
-    formData[name];

package/src/components/Depository/Depository.tsx

@@ -1,5 +1,5 @@
 import { useCallback, 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 { NotFound } from '../../ui-kit/NotFound/NotFound';
 import { Pagination } from '../../ui-kit/Pagination/Pagination';

package/src/components/Depository/DepositoryFilter.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { Button } from '../../ui-kit/Button/Button';
 import { DatePicker } from '../../ui-kit/DatePicker/DatePicker';
 import { SearchInput } from '../../ui-kit/SearchDialog/SearchInput';

package/src/components/OfficesAtmsMap/OfficesAtmsMapLayout.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm } from '../../hooks/useForm';
+import { useForm } from '../../hooks/useForm/useForm';
 import { type VNode } from '../../model/VNode';
 import { ClientOnly } from '../../ui-kit/ClientOnly';
 import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';

package/src/components/OfficesAtmsMap/renderFiltrationForm.tsx

@@ -1,4 +1,4 @@
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type VNode } from '../../model/VNode';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';

package/src/hooks/useAspects/handleAspects.ts

@@ -2,13 +2,13 @@ import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
 import { type Aspects, type AspectsAttribute } from './useAspects';
 
 export type HandleAspectsProps = {
-  aspectsAttributes: AspectsAttribute[];
+  aspectsAttributes?: AspectsAttribute[];
   aspects: Aspects;
   ev: PreventableEventWithTarget;
 };
 
 export const handleAspects = ({ aspectsAttributes, aspects, ev }: HandleAspectsProps) => {
-  for (const { aspectName, params } of aspectsAttributes) {
+  for (const { aspectName, params } of aspectsAttributes ?? []) {
     aspects[aspectName ?? '']?.(ev, params);
   }
 };

package/src/hooks/useForm/FieldOptions.ts

@@ -0,0 +1,8 @@
+import { type Validator } from '../../validation/validator';
+
+export interface FieldOptions<In = any, Out = In> {
+  parse?: (_: In) => Out;
+  format?: (_: Out) => In;
+  validator?: Validator<Out>;
+  onChange?: (_: Out) => any;
+}

package/src/hooks/useForm/FormOptions.ts

@@ -0,0 +1,18 @@
+import type { PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
+import type { Validator } from '../../validation/validator';
+
+export type FieldValidatorsMap<FormState extends Record<string, any>> = {
+  [fieldName in keyof FormState]?: Validator<FormState[fieldName] | undefined>;
+};
+
+export type FormValidator<FormState extends Record<string, any>> = (
+  _: FormState,
+) => FieldValidatorsMap<FormState>;
+
+export interface FormOptions<FormState extends Record<string, any>> {
+  resetOnSubmit?: boolean;
+  formValidator?: FormValidator<FormState>;
+  normalizer?: (_: FormState) => FormState;
+  onChange?: (_: FormState) => void;
+  onSubmit?: (_: FormState, ev: PreventableEventWithTarget) => void;
+}

package/src/hooks/useForm/shallowCompare.ts

@@ -0,0 +1,2 @@
+export const shallowCompare = (a: Record<string, any>, b: Record<string, any>): boolean =>
+  a && b && (a === b || Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]));

package/src/hooks/useForm/useForm.ts

@@ -0,0 +1,98 @@
+import { useCallback, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { type ControlProps } from '../../ui-kit/ControlProps';
+import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
+import { type ValidationInfo } from '../../validation/validator';
+import { type FieldOptions } from './FieldOptions';
+import { type FormOptions } from './FormOptions';
+import { useFormValidator } from './useFormValidator';
+import { useNormalizedFormState } from './useNormalizedFormState';
+
+export interface FieldProps<V> extends ControlProps<V> {
+  isDirty?: boolean;
+  errors?: ValidationInfo;
+  error?: ValidationInfo[0];
+}
+
+export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(
+  fieldName: N,
+  options?: FieldOptions<V, FormState[N]>,
+) => FieldProps<V extends undefined ? FormState[N] : V>;
+
+export interface FormOperators<FormState extends Record<string, any>> {
+  errors: ValidationInfo;
+  field: FormFieldRegisterer<FormState>;
+  update: (_: FormState) => void;
+  reset: () => void;
+  onSubmit?: (ev: PreventableEvent) => void;
+}
+
+export function useForm<FormState extends Record<string, any>>(
+  initialState: FormState,
+  { resetOnSubmit, formValidator, normalizer, onChange, onSubmit }: FormOptions<FormState> = {},
+): [FormState, FormOperators<FormState>] {
+  const [formState, setFormState] = useNormalizedFormState<FormState>(
+    initialState,
+    normalizer,
+    onChange,
+  );
+
+  const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = useBool(false);
+  const dirtyFieldsMap = useRef<Record<string, boolean>>({});
+
+  const [fieldValidatorsMap, { isValid, errors }] = useFormValidator(formState, formValidator);
+
+  const field: FormFieldRegisterer<FormState> = useCallback(
+    (fieldName, options = {}) => {
+      const { parse, format, onChange: onFieldChange } = options;
+      const value = formState[fieldName];
+      const isDirty = isDirtyForm || dirtyFieldsMap.current?.[String(fieldName)];
+      const fieldValidator = options?.validator ?? fieldValidatorsMap[fieldName];
+      const fieldErrors: ValidationInfo = isDirty && fieldValidator ? fieldValidator(value) : [];
+
+      return {
+        value: format ? (format(value) as any) : value,
+        isDirty,
+        errors: fieldValidator && fieldErrors, // TODO Костыль
+        error: fieldErrors[0],
+        onChange: (_) => {
+          dirtyFieldsMap.current ||= {};
+          dirtyFieldsMap.current[String(fieldName)] = true;
+          const fieldVal = parse ? parse(_) : _;
+          onFieldChange?.(fieldVal as FormState[typeof fieldName]);
+          setFormState((prev) => ({ ...prev, [fieldName]: fieldVal }));
+        },
+      };
+    },
+    [formState, isDirtyForm, fieldValidatorsMap, setFormState],
+  );
+
+  const update = useCallback(
+    (_: FormState) => {
+      dirtyFieldsMap.current = _;
+      setFormState(_);
+    },
+    [setFormState],
+  );
+
+  const reset = useCallback(() => {
+    dirtyFieldsMap.current = {};
+    markAsClean();
+    setFormState(initialState);
+  }, [initialState, setFormState]);
+
+  const handleSubmit = useCallback(
+    (ev: PreventableEvent) => {
+      ev.preventDefault();
+      if (isValid) {
+        resetOnSubmit && reset();
+        onSubmit?.(formState, ev);
+      } else {
+        markAsDirty();
+      }
+    },
+    [resetOnSubmit, formState, isValid, reset, onSubmit],
+  );
+
+  return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
+}

package/src/hooks/useForm/useFormValidator.ts

@@ -0,0 +1,24 @@
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { objectValidator } from '../../validation/objectValidator';
+import { isValidationSuccess, type ValidationInfo } from '../../validation/validator';
+import type { FieldValidatorsMap, FormValidator } from './FormOptions';
+
+const EMPTY_VALIDATORS_MAP: FieldValidatorsMap<any> = {};
+const NO_ERRORS = [];
+
+export function useFormValidator<FormState extends Record<string, any>>(
+  formState: FormState,
+  formValidator: FormValidator<FormState> | undefined,
+): [FieldValidatorsMap<FormState>, { isValid: boolean; errors: ValidationInfo }] {
+  const validatorsMap = useMemo(
+    () => formValidator?.(formState) ?? EMPTY_VALIDATORS_MAP,
+    [formValidator, formState],
+  );
+  const errors = useMemo(
+    () => objectValidator(validatorsMap)(formState) ?? NO_ERRORS,
+    [validatorsMap, formState],
+  );
+  const isValid = isValidationSuccess(errors);
+
+  return [validatorsMap, { isValid, errors }];
+}

package/src/hooks/useForm/useNormalizedFormState.ts

@@ -0,0 +1,37 @@
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { shallowCompare } from './shallowCompare';
+
+export function useNormalizedFormState<FormState extends Record<string, any>>(
+  initialState: FormState,
+  normalizer?: (_: FormState) => FormState,
+  onChange?: (_: FormState) => void,
+): [FormState, (_: FormState | ((prev: FormState) => FormState)) => void] {
+  const [formState, setFormStateUnsafe] = useState<FormState>(initialState);
+
+  const setFormState = useCallback(
+    (_: FormState | ((prevState: FormState) => FormState)) =>
+      setFormStateUnsafe((prevState) => {
+        const rawState = _ instanceof Function ? _(prevState) : _;
+        const normalizedState = normalizer ? normalizer(rawState) : rawState;
+
+        const hasChangedWithNormalization = !shallowCompare(rawState, normalizedState);
+        const nextState = hasChangedWithNormalization ? normalizedState : rawState;
+
+        const hasChanged = !shallowCompare(prevState, nextState);
+        if (hasChanged) {
+          onChange?.(nextState);
+        }
+
+        return nextState;
+      }),
+    [normalizer, onChange],
+  );
+
+  useEffect(() => {
+    if (normalizer) {
+      setFormStateUnsafe(normalizer);
+    }
+  }, [normalizer]);
+
+  return [formState, setFormState];
+}

package/src/services/retail/external/types.ts

@@ -1,4 +1,4 @@
-export { type FormFieldRegisterer } from '../../../hooks/useForm';
+export { type FormFieldRegisterer } from '../../../hooks/useForm/useForm';
 export { type AspectsProps } from '../../../model/AspectsProps';
 export { type ColumnsCount } from '../../../model/ColumnCount';
 export { type LabelProps, type TextProps, type TitleProps } from '../../../model/HeadlineType';

package/src/services/retail/inputs.tsx

@@ -1,4 +1,3 @@
-import { type CustomFieldProps } from '../../ui-kit/FormField/CustomFieldProps';
 import { AddressFactField } from '../../ui-kit/FormField/Fields/AddressFactField';
 import { AddressField } from '../../ui-kit/FormField/Fields/AddressField';
 import { AddressMatchField } from '../../ui-kit/FormField/Fields/AddressMatchField';
@@ -61,82 +60,80 @@ import { TotalIncomeField } from '../../ui-kit/FormField/Fields/TotalIncomeField
 import { WagesField } from '../../ui-kit/FormField/Fields/WagesField';
 
 export const InputsApplicationLeadMap = {
-  limitedBirthday: (props: CustomFieldProps) => <LimitedBirthdayField {...props} />,
+  limitedBirthday: LimitedBirthdayField,
 };
 
 export const InputsConsentsMap = {
-  processPersonalDataFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentProviderFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentOthersFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentInformFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
-  consentPfrFlg: (props: CustomFieldProps) => <ConsentField {...props} />,
+  processPersonalDataFlg: ConsentField,
+  consentProviderFlg: ConsentField,
+  consentOthersFlg: ConsentField,
+  consentInformFlg: ConsentField,
+  consentPfrFlg: ConsentField,
 };
 
 export const InputsRetailMap = {
-  organization: (props: CustomFieldProps) => <OrganizationField {...props} />,
-  organizationAddress: (props: CustomFieldProps) => <AddressField {...props} />,
-  organizationPhone: (props: CustomFieldProps) => <PhoneField {...props} />,
-  organizationName: (props: CustomFieldProps) => <OrganizationNameField {...props} />,
-  legalForm: (props: CustomFieldProps) => <LegalFormField {...props} />,
-  generalSeniority: (props: CustomFieldProps) => <GeneralSeniorityField {...props} />,
-  lastJobExperience: (props: CustomFieldProps) => <LastJobExperienceField {...props} />,
-  experience5Years: (props: CustomFieldProps) => <Experience5YearsField {...props} />,
-  jobsNumber: (props: CustomFieldProps) => <JobsNumberField {...props} />,
-  beginDate: (props: CustomFieldProps) => <BeginDateField {...props} />,
-  addressFact: (props: CustomFieldProps) => <AddressFactField {...props} />,
-  addressRegistration: (props: CustomFieldProps) => <AddressField {...props} />,
-  addressRetail: (props: CustomFieldProps) => <AddressRetailField {...props} />,
-  addressMatch: (props: CustomFieldProps) => <AddressMatchField {...props} />,
-  sex: (props: CustomFieldProps) => <SexField {...props} />,
-  limitedBirthday: (props: CustomFieldProps) => <LimitedBirthdayField {...props} />,
-  birthPlace: (props: CustomFieldProps) => <BirthPlaceField {...props} />,
-  education: (props: CustomFieldProps) => <EducationField {...props} />,
-  housing: (props: CustomFieldProps) => <HousingField {...props} />,
-  amountWorkers: (props: CustomFieldProps) => <AmountWorkersField {...props} />,
-  employment: (props: CustomFieldProps) => <EmploymentField {...props} />,
-  employerActivities: (props: CustomFieldProps) => <EmployerActivitiesField {...props} />,
-  employerOrganization: (props: CustomFieldProps) => <EmployerOrganizationField {...props} />,
-  positionOrganization: (props: CustomFieldProps) => <PositionOrganizationField {...props} />,
-  familyStatus: (props: CustomFieldProps) => <FamilyStatusField {...props} />,
-  familyMembers: (props: CustomFieldProps) => <FamilyMembersField {...props} />,
-  children: (props: CustomFieldProps) => <ChildrenField {...props} />,
-  dependents: (props: CustomFieldProps) => <DependentsField {...props} />,
-  totalIncome: (props: CustomFieldProps) => <TotalIncomeField {...props} />,
-  expenses: (props: CustomFieldProps) => <ExpensesField {...props} />,
-  snils: (props: CustomFieldProps) => <SnilsField {...props} />,
-  conscription: (props: CustomFieldProps) => <ConscriptionField {...props} />,
-  armyIdFlg: (props: CustomFieldProps) => <ArmyIdFlgField {...props} />,
-  dulSerie: (props: CustomFieldProps) => <DulSerieField {...props} />,
-  dulNumber: (props: CustomFieldProps) => <DulNumberField {...props} />,
-  dulIssueDateField: (props: CustomFieldProps) => <DulIssueDateField {...props} />,
-  dulSubdivisionCode: (props: CustomFieldProps) => <DulSubdivisionCodeField {...props} />,
-  dulIssuedBy: (props: CustomFieldProps) => <DulIssuedByField {...props} />,
-  participantDateRegistration: (props: CustomFieldProps) => (
-    <ParticipantDateRegistrationField {...props} />
-  ),
-  retirementIncome: (props: CustomFieldProps) => <RetirementIncomeField {...props} />,
-  otherIncome: (props: CustomFieldProps) => <OtherIncomeField {...props} />,
-  wages: (props: CustomFieldProps) => <WagesField {...props} />,
-  mandatoryPayments: (props: CustomFieldProps) => <MandatoryPaymentsField {...props} />,
-  disablePeopleFlg: (props: CustomFieldProps) => <DisablePeopleFlgField {...props} />,
-  bankruptcyFlg: (props: CustomFieldProps) => <BankruptcyFlgField {...props} />,
-  shareholderFlg: (props: CustomFieldProps) => <ShareholderFlgField {...props} />,
-  legalEntityName: (props: CustomFieldProps) => <LegalEntityNameField {...props} />,
-  creditInRshbCd: (props: CustomFieldProps) => <CreditInRshbCdField {...props} />,
-  bankEmployeeCode: (props: CustomFieldProps) => <BankEmpoleeCodeField {...props} />,
-  partInBusiness: (props: CustomFieldProps) => <PartInBusinessField {...props} />,
-  regionRetail: (props: CustomFieldProps) => <RegionRetailField {...props} />,
-  infoCard: (props: CustomFieldProps) => <InfoCardField {...props} />,
-  calculator: (props: CustomFieldProps) => <CreditCalcField {...props} />,
-  confirmationIncome: (props: CustomFieldProps) => <ConfirmationIncomeField {...props} />,
+  organization: OrganizationField,
+  organizationAddress: AddressField,
+  organizationPhone: PhoneField,
+  organizationName: OrganizationNameField,
+  legalForm: LegalFormField,
+  generalSeniority: GeneralSeniorityField,
+  lastJobExperience: LastJobExperienceField,
+  experience5Years: Experience5YearsField,
+  jobsNumber: JobsNumberField,
+  beginDate: BeginDateField,
+  addressFact: AddressFactField,
+  addressRegistration: AddressField,
+  addressRetail: AddressRetailField,
+  addressMatch: AddressMatchField,
+  sex: SexField,
+  limitedBirthday: LimitedBirthdayField,
+  birthPlace: BirthPlaceField,
+  education: EducationField,
+  housing: HousingField,
+  amountWorkers: AmountWorkersField,
+  employment: EmploymentField,
+  employerActivities: EmployerActivitiesField,
+  employerOrganization: EmployerOrganizationField,
+  positionOrganization: PositionOrganizationField,
+  familyStatus: FamilyStatusField,
+  familyMembers: FamilyMembersField,
+  children: ChildrenField,
+  dependents: DependentsField,
+  totalIncome: TotalIncomeField,
+  expenses: ExpensesField,
+  snils: SnilsField,
+  conscription: ConscriptionField,
+  armyIdFlg: ArmyIdFlgField,
+  dulSerie: DulSerieField,
+  dulNumber: DulNumberField,
+  dulIssueDateField: DulIssueDateField,
+  dulSubdivisionCode: DulSubdivisionCodeField,
+  dulIssuedBy: DulIssuedByField,
+  participantDateRegistration: ParticipantDateRegistrationField,
+  retirementIncome: RetirementIncomeField,
+  otherIncome: OtherIncomeField,
+  wages: WagesField,
+  mandatoryPayments: MandatoryPaymentsField,
+  disablePeopleFlg: DisablePeopleFlgField,
+  bankruptcyFlg: BankruptcyFlgField,
+  shareholderFlg: ShareholderFlgField,
+  legalEntityName: LegalEntityNameField,
+  creditInRshbCd: CreditInRshbCdField,
+  bankEmployeeCode: BankEmpoleeCodeField,
+  partInBusiness: PartInBusinessField,
+  regionRetail: RegionRetailField,
+  infoCard: InfoCardField,
+  calculator: CreditCalcField,
+  confirmationIncome: ConfirmationIncomeField,
 };
 
 export const InputRetailCardMap = {
-  addressCourier: (props: CustomFieldProps) => <AddressField {...props} />,
-  paymentSystem: (props: CustomFieldProps) => <PaymentSystemField {...props} />,
-  currency: (props: CustomFieldProps) => <CurrencyField {...props} />,
-  cardCategory: (props: CustomFieldProps) => <CardCategoryField {...props} />,
-  codeWord: (props: CustomFieldProps) => <CodeWordField {...props} />,
-  methodObtain: (props: CustomFieldProps) => <MethodObtainField {...props} />,
-  deliveryDate: (props: CustomFieldProps) => <DeliveryDateFiels {...props} />,
+  addressCourier: AddressField,
+  paymentSystem: PaymentSystemField,
+  currency: CurrencyField,
+  cardCategory: CardCategoryField,
+  codeWord: CodeWordField,
+  methodObtain: MethodObtainField,
+  deliveryDate: DeliveryDateFiels,
 };

package/src/services/retail/model/LeadFormState.ts

@@ -148,6 +148,6 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   loanAmount?: number;
   creditPeriod?: number;
   paymentTypeCd?: PaymentType;
+  // TODO: Only fields with value should be in state. Currently, for compatibility, all fields from NameFieldDef are listed here
+  infoCard?: string;
 }
-
-export { type NameFieldDef } from '../../../ui-kit/FormField/NameFieldDef';

package/src/services/retail/model/NameFieldDef.ts

@@ -0,0 +1,89 @@
+type NameFieldApplicationBaseDef =
+  | 'surname'
+  | 'name'
+  | 'middleName'
+  | 'limitedBirthday'
+  | 'email'
+  | 'phone'
+  | 'inn';
+
+type NameFieldConsentDef =
+  | 'processPersonalDataFlg'
+  | 'consentProviderFlg'
+  | 'consentInformFlg'
+  | 'consentPfrFlg'
+  | 'consentOthersFlg';
+
+type NameFieldCreditCardDef =
+  | 'addressCourier'
+  | 'paymentSystem'
+  | 'currency'
+  | 'cardCategory'
+  | 'codeWord'
+  | 'confirmationIncome'
+  | 'methodObtain'
+  | 'deliveryDate';
+
+type NameFieldRetailDef =
+  | 'organization'
+  | 'organizationAddress'
+  | 'organizationPhone'
+  | 'organizationName'
+  | 'legalForm'
+  | 'generalSeniority'
+  | 'lastJobExperience'
+  | 'experience5Years'
+  | 'jobsNumber'
+  | 'beginDate'
+  | 'addressFact'
+  | 'addressRegistration'
+  | 'addressRetail'
+  | 'addressMatch'
+  | 'sex'
+  | 'birthPlace'
+  | 'education'
+  | 'housing'
+  | 'amountWorkers'
+  | 'employment'
+  | 'employerActivities'
+  | 'employerOrganization'
+  | 'positionOrganization'
+  | 'familyStatus'
+  | 'familyMembers'
+  | 'children'
+  | 'dependents'
+  | 'totalIncome'
+  | 'expenses'
+  | 'snils'
+  | 'conscription'
+  | 'armyIdFlg'
+  | 'dulSerie'
+  | 'dulNumber'
+  | 'dulIssueDateField'
+  | 'dulSubdivisionCode'
+  | 'dulIssuedBy'
+  | 'participantDateRegistration'
+  | 'retirementIncome'
+  | 'rentalIncome'
+  | 'otherIncome'
+  | 'otherPayments'
+  | 'additionalIncome'
+  | 'wages'
+  | 'mandatoryPayments'
+  | 'disablePeopleFlg'
+  | 'bankruptcyFlg'
+  | 'shareholderFlg'
+  | 'legalEntityName'
+  | 'creditInRshbCd'
+  | 'bankEmployeeCode'
+  | 'partInBusiness'
+  | 'regionRetail'
+  | 'calculator'
+  | 'infoCard'
+  | 'comment';
+
+export type NameFieldDef =
+  | NameFieldApplicationBaseDef
+  | NameFieldConsentDef
+  | NameFieldRetailDef
+  | NameFieldCreditCardDef;

package/src/services/retail/model/RetailFormContent.ts

@@ -1,5 +1,5 @@
 import { type LabelProps, type LinkButtonVersion, type TextProps } from '../external/types';
-import { type NameFieldDef } from './LeadFormState';
+import { type NameFieldDef } from './NameFieldDef';
 
 interface Required {
   /** @title Обязательно для заполнения */

package/src/services/retail/utils/calculateInputs.ts

@@ -1,4 +1,3 @@
-import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { type Option } from '../../../ui-kit/Select/Option';
 import { type LeadFormState } from '../model/LeadFormState';
 import { type FieldRetailDef } from '../model/RetailFormContent';
@@ -28,24 +27,24 @@ export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[]
 const checkIsRetiree = (step: number, getValue: GetValue) =>
   step === 2 && getValue('employment')?.key === 'RETIREE';
 
-const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
+const checkBusinessOwner = ({ name }: FieldRetailDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
-const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
+const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldRetailDef, getValue: GetValue) =>
   name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
 
-const checkAddressFact = ({ name }: FieldDef, getValue: GetValue) =>
+const checkAddressFact = ({ name }: FieldRetailDef, getValue: GetValue) =>
   name === 'addressFact' && getValue('addressMatch');
 
-export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
+export const checkCondition = ({ condition }: FieldRetailDef, getValue: GetValue) =>
   condition?.name &&
   condition?.values?.some((_) => {
-    const dataValue = getValue(condition?.name as keyof LeadFormState);
+    const dataValue = getValue(condition?.name);
 
     return _ !== ((dataValue as Option)?.key ?? dataValue);
   });
 
-const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
+const checkConsentPfrFlg = ({ name }: FieldRetailDef, getValue: GetValue) =>
   name === 'snils' && isSnilsRequired(getValue);
 
 const isSnilsRequired = (getValue: GetValue) =>

package/src/ui-kit/BaseFiltration/FiltrationForm.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type VNode } from '../../model/VNode';
 import { joinList } from '../../utils/joinList';
 import { Button } from '../Button/Button';

package/src/ui-kit/BaseFiltration/useFiltrationForm.ts

@@ -1,5 +1,5 @@
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm, type FormOperatorProps } from '../../hooks/useForm';
+import { useForm, type FormOperators } from '../../hooks/useForm/useForm';
 import { resolveBlockProps } from '../../hooks/useJSONRef/resolveBlockProps';
 import { type BlockDef, type ContentPageDef } from '../../model/ContentPageDef';
 import { identity } from '../../utils/fp/identity';
@@ -21,11 +21,11 @@ export const useFiltrationForm = <FormState extends Record<string, any>>(
     blocksToRender: BlockDef[] | undefined;
     blocksWithProps: [BlockDef, Record<string, any> | undefined][];
   },
-  FormOperatorProps<FormState>,
+  FormOperators<FormState>,
 ] => {
   const blocks = block?.blocks || [];
 
-  const [filtrationState, { field, reset, update }] = useForm(initialFormState);
+  const [filtrationState, operators] = useForm(initialFormState);
 
   const blocksWithProps = useMemo(
     () =>
@@ -41,5 +41,5 @@ export const useFiltrationForm = <FormState extends Record<string, any>>(
       ? blocks
       : filterBlocks(blocksWithProps, filtrationState)(normalize);
 
-  return [filtrationState, { blocksToRender, blocksWithProps }, { field, reset, update }];
+  return [filtrationState, { blocksToRender, blocksWithProps }, operators];
 };

package/src/ui-kit/Calculator/setDefaultParamsCalc.tsx

@@ -6,7 +6,7 @@ import {
   type DepositCalculatorParams,
   type DepositCalculatorSourceBookParams,
 } from '../../components/CalculatorDeposit/getDepositCalculatorParams';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { clamp } from '../../utils/clamp';
 
 interface ParamsCalcProps {