indicator-ui 1.1.40 → 1.1.42

package/dist/types/src/hooks/forms/lib/createFormServices.d.ts

@@ -27,4 +27,4 @@ export declare function createFormServices<T, F = Nullable<Undefinable<T>>>(deps
     highlightField: <P extends ExtendFormPath<F>>(path: P) => Promise<boolean>;
     highlightFields: (paths: ExtendFormPath<F>[]) => Promise<boolean>;
     highlightFormErrors: () => Promise<boolean>;
-}): UseFormServices<T, F>;
+}): UseFormServices<T>;

package/dist/types/src/hooks/forms/lib/scheme.d.ts

@@ -1,8 +1,9 @@
-import { ExtendFormPath, ExtendFormValue, FieldConfigType, FormDefaultValues, FormPath, FormSchemeType, GetProcessArrayFieldValue } from '../types';
+import { ExtendFormPath, ExtendFormValue, FieldConfigType, FormDefaultValues, FormPath, FormSchemeType, GetProcessArrayFieldValue, UseFormServices } from '../types';
 import { Form, FormValidateFun } from '../classes';
 type PropsOptionsType<T> = {
     form: Form<T>;
     formValidateFun: FormValidateFun<T>;
+    services: UseFormServices<T>;
 };
 /** Полностью заменяет валидаторы поля */
 export declare function processValidators<T, F>(path: FormPath<T>, _config: FieldConfigType<T, F>, options: PropsOptionsType<T>): void;

package/dist/types/src/hooks/forms/types/scheme.d.ts

@@ -1,7 +1,7 @@
 import { FocusEvent, SetStateAction } from 'react';
 import { Nullable, Undefinable } from '../../../types';
 import { ExtendFormPath, ExtendFormValue, FormErrorType, FormPath, FormValue } from './formTypes';
-import { UseFormServices } from '../..';
+import { UseFormServices } from './services';
 export type StringFieldValidators = Partial<{
     /** Минимальная длина строки */
     minStr: number;
@@ -67,9 +67,7 @@ export type ArrayFieldValidators = Partial<{
     /** Максимальное количество элементов в массиве */
     maxItemCount: number;
 }>;
-export type FormValidateCustomFunType<T, F> = (value: F | undefined, options: {
-    getField: <P extends FormPath<T>>(path: P) => FormValue<T, P> | undefined;
-}) => Promise<FormErrorType> | FormErrorType;
+export type FormValidateCustomFunType<T, F> = (value: F | null | undefined, services: UseFormServices<T>) => Promise<FormErrorType> | FormErrorType;
 export type BaseFieldValidators<T, F> = Partial<{
     /** Поле обязательное */
     required: ValidatorOption<boolean>;

package/dist/types/src/hooks/forms/types/services.d.ts

@@ -1,7 +1,7 @@
 import { ExtendFormPath, FormErrorsType, FormErrorType, FormPath, FormValue } from './formTypes';
 import { Form } from '../classes';
 import { Nullable, Undefinable } from '../../../types';
-export type UseFormServices<T, F = Nullable<Undefinable<T>>> = {
+export type UseFormServices<T> = Nullable<Undefinable<T>> extends infer F ? {
     /** Работа с данными формы */
     form: {
         /** Получить актуальные данные формы */
@@ -56,4 +56,4 @@ export type UseFormServices<T, F = Nullable<Undefinable<T>>> = {
         /** Подсветить все ошибки формы */
         form: () => Promise<boolean>;
     };
-};
+} : never;

package/dist/types/src/hooks/forms/useForm.d.ts

@@ -9,12 +9,12 @@ type PropsType<Form, T> = {
     useInstanceRefApi?: boolean;
     initFormData?: T;
     scheme?: FormSchemeType<T>;
-    onSubmit?: (data: Form, event: React.SubmitEvent<HTMLFormElement>, services: UseFormServices<Form, T>) => void | Promise<void>;
+    onSubmit?: (data: Form, event: React.SubmitEvent<HTMLFormElement>, services: UseFormServices<Form>) => void | Promise<void>;
     /** Callback при ошибки валидации полей */
     onSubmitError?: (event: {
         errors: FormErrorsType<T>;
-    }, services: UseFormServices<Form, T>) => void;
-    onSubmitAttempt?: (data: T | undefined | null, event: React.SubmitEvent<HTMLFormElement>, services: UseFormServices<Form, T>) => void;
+    }, services: UseFormServices<Form>) => void;
+    onSubmitAttempt?: (data: T | undefined | null, event: React.SubmitEvent<HTMLFormElement>, services: UseFormServices<Form>) => void;
     watch?: FormWatchType<Form>;
     /** Отключить вызов watch-коллбэков для родительских путей при изменении вложенного поля */
     offWatchDeep?: boolean;
@@ -215,37 +215,38 @@ type PropsType<Form, T> = {
  * @template Form Полный тип формы
  * @template T Тип начальных данных
  */
-export declare function useForm<F, T extends Nullable<Undefinable<F>> = Nullable<Undefinable<F>>>(props?: PropsType<F, T>): {
-    formData: T | undefined;
-    setFormData: (formData: T) => void;
-    setFormDataSilent: (formData: T) => void;
-    getFormData: () => T | undefined;
-    errors: FormErrorsType<T>;
-    setErrors: (errors: FormErrorsType<T>) => void;
-    getField: <P extends FormPath<T>>(path: P) => FormValue<T, P> | undefined;
-    getFieldSync: <P extends FormPath<T>>(path: P) => FormValue<T, P> | undefined;
-    setField: <P extends FormPath<T>>(path: P, value: FormValue<T, P> | null | undefined) => void;
-    setFieldSilent: <P extends FormPath<T>>(path: P, value: FormValue<T, P> | null | undefined) => void;
-    getError: <P extends FormPath<T>>(path: P) => FormErrorType | undefined;
-    hasChildPathsErrors: <P extends FormPath<T>>(path: P) => boolean;
-    setError: <P extends FormPath<T>>(path: P, error: FormErrorType) => void;
-    highlightField: <P extends ExtendFormPath<T>>(path: P) => Promise<boolean>;
-    highlightFields: (paths: ExtendFormPath<T>[]) => Promise<boolean>;
+export declare function useForm<TForm, TFormNullable extends Nullable<Undefinable<TForm>> = Nullable<Undefinable<TForm>>>(props?: PropsType<TForm, TFormNullable>): {
+    formData: TFormNullable | undefined;
+    setFormData: (formData: TFormNullable) => void;
+    setFormDataSilent: (formData: TFormNullable) => void;
+    getFormData: () => TFormNullable | undefined;
+    getFormDataSync: () => TFormNullable | undefined;
+    errors: FormErrorsType<TFormNullable>;
+    setErrors: (errors: FormErrorsType<TFormNullable>) => void;
+    getField: <P extends FormPath<TFormNullable>>(path: P) => FormValue<TFormNullable, P> | undefined;
+    getFieldSync: <P extends FormPath<TFormNullable>>(path: P) => FormValue<TFormNullable, P> | undefined;
+    setField: <P extends FormPath<TFormNullable>>(path: P, value: FormValue<TFormNullable, P> | null | undefined) => void;
+    setFieldSilent: <P extends FormPath<TFormNullable>>(path: P, value: FormValue<TFormNullable, P> | null | undefined) => void;
+    getError: <P extends FormPath<TFormNullable>>(path: P) => FormErrorType | undefined;
+    hasChildPathsErrors: <P extends FormPath<TFormNullable>>(path: P) => boolean;
+    setError: <P extends FormPath<TFormNullable>>(path: P, error: FormErrorType) => void;
+    highlightField: <P extends ExtendFormPath<TFormNullable>>(path: P) => Promise<boolean>;
+    highlightFields: (paths: ExtendFormPath<TFormNullable>[]) => Promise<boolean>;
     highlightFormErrors: () => Promise<boolean>;
-    isFieldValid: <P extends ExtendFormPath<T>>(path: P) => Promise<boolean>;
-    areFieldsValid: (paths: ExtendFormPath<T>[]) => Promise<boolean>;
+    isFieldValid: <P extends ExtendFormPath<TFormNullable>>(path: P) => Promise<boolean>;
+    areFieldsValid: (paths: ExtendFormPath<TFormNullable>[]) => Promise<boolean>;
     isFormValid: () => Promise<boolean>;
     clearForm: () => void;
     clearFormSilent: () => void;
     clearErrors: () => void;
-    clearField: (_path: FormPath<T> | FormPath<T>[]) => void;
-    clearFieldSilent: (_path: FormPath<T> | FormPath<T>[]) => void;
+    clearField: (_path: FormPath<TFormNullable> | FormPath<TFormNullable>[]) => void;
+    clearFieldSilent: (_path: FormPath<TFormNullable> | FormPath<TFormNullable>[]) => void;
     register: {
-        (): FieldPropsType<FormValue<T, "">, "update">;
-        <P extends FormPath<T>>(path: P, config?: FormSchemeType<T>[P]): FieldPropsType<FormValue<T, P>, "update">;
+        (): FieldPropsType<FormValue<TFormNullable, "">, "update">;
+        <P extends FormPath<TFormNullable>>(path: P, config?: FormSchemeType<TFormNullable>[P]): FieldPropsType<FormValue<TFormNullable, P>, "update">;
     };
     registerForm: (refsInstance?: FormInstance) => Pick<React.DetailedHTMLProps<React.FormHTMLAttributes<HTMLFormElement>, HTMLFormElement>, "ref" | "onReset" | "onSubmit" | "noValidate"> & Pick<InstanceRefAttributes<HTMLFormElement>, "instanceRef">;
-    getValidForm: () => Promise<F | null>;
+    getValidForm: () => Promise<TForm | null>;
     submitForm: () => void;
     resetForm: () => void;
 };

package/package.json

@@ -11,7 +11,7 @@
     "react-components",
     "ui-kit"
   ],
-  "version": "1.1.40",
+  "version": "1.1.42",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",