fix: better type for ValidatorType

gravity-ui · Mar 18, 2024 · 9d0bcc1 · 9d0bcc1
1 parent c6bba62
commit 9d0bcc1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - release-v*
+      - release/v*
 
 jobs:
   release:

diff --git a/src/dialog/Dialog/Dialog.tsx b/src/dialog/Dialog/Dialog.tsx
@@ -56,8 +56,8 @@ import {CollapsibleSection} from '../CollapsibleSection/CollapsibleSection';
 const bDialog = dfCN('dialog');
 const bPage = dfCN('page-dialog');
 
-function composeValidators<T>(...validators: Array<ValidatorType<T>>) {
-    return async (value: T, allValues: object | undefined, state?: FieldState<T>) => {
+function composeValidators<T, FormValuesT>(...validators: Array<ValidatorType<T, FormValuesT>>) {
+    return async (value: T, allValues: FormValuesT, state?: FieldState<T>) => {
         for (const validate of validators) {
             try {
                 const res = await validate(value, allValues, state);
@@ -179,7 +179,7 @@ export interface ControlField<
     tooltip?: React.ReactNode;
     warning?: React.ReactNode;
 
-    validator?: ValidatorType<V>;
+    validator?: ValidatorType<V, FormValues>;
     validateFields?: string[];
 
     subscribers?: Updates;

diff --git a/src/dialog/types.ts b/src/dialog/types.ts
@@ -1,8 +1,8 @@
 import type {FieldState} from 'final-form';
 
-export type ValidatorType<T> = (
+export type ValidatorType<T, FormValues> = (
     value: T,
-    allValues?: Record<string, any>,
+    allValues?: FormValues,
     fieldState?: FieldState<T>,
 ) => PromiseOrValue<string | undefined>;
 
@@ -23,7 +23,7 @@ export interface ControlStaticApi<V> {
     isEmpty?: (value: V) => boolean;
     getDefaultValue: () => V;
     hasErrorRenderer?: boolean;
-    validate?: ValidatorType<V>;
+    validate?: ValidatorType<V, any>;
     format?: (value: V, name: string) => any;
     isEqual?: (a: V, b: V) => boolean;
 

diff --git a/src/stories/dialog/register/RegisterControls.stories.tsx b/src/stories/dialog/register/RegisterControls.stories.tsx
@@ -87,7 +87,7 @@ function Demo() {
                     '\n    isEmpty?: (value: V) => boolean;' +
                     '\n    getDefaultValue: () => V;' +
                     '\n    hasErrorRenderer?: boolean;' +
-                    '\n    validate?: ValidatorType<V>;' +
+                    '\n    validate?: ValidatorType<V, any>;' +
                     '\n    format?: (value: V, name: string) => any;' +
                     '\n }\n\n'}
             </code>