Optimize disable validate (#75)

* optimize validate when state disabled

* update test case

* update validateResult

* update comment

src/fieldState.spec.ts

@@ -367,6 +367,17 @@ describe('FieldState validation', () => {
     expect(state.hasError).toBe(false)
     expect(state.error).toBeUndefined()
 
+    runInAction(() => options.disabled = false)
+
+    await delay()
+    expect(state.validating).toBe(false)
+    expect(state.validated).toBe(false)
+    expect(state.hasError).toBe(false)
+    expect(state.error).toBeUndefined()
+
+    runInAction(() => options.disabled = true)
+
+    await delay()
     state.onChange('123')
     await delay()
     state.onChange('')

src/fieldState.ts

@@ -69,6 +69,17 @@ export default class FieldState<TValue> extends Disposable implements Composible
     return !!this.error
   }
 
+  /**
+   * The most recent validation result.
+   * If state is disabled and later enabled, the result of the last validation is obtained.
+   * If you need to clear the validation result, please use the reset function.
+   */
+  @computed private get validateResult(): ValidateResult<TValue> {
+    return this.hasError
+      ? { hasError: true, error: this.error } as const
+      : { hasError: false, value: this.value } as const
+  }
+
   /**
    * If the validation has been done.
    * It does not means validation passed.
@@ -152,6 +163,10 @@ export default class FieldState<TValue> extends Disposable implements Composible
    * Fire a validation behavior.
    */
   async validate(): Promise<ValidateResult<TValue>> {
+    if (this.validationDisabled) {
+      return this.validateResult
+    }
+
     const validation = this.validation
 
     action('activate-and-sync-_value-when-validate', () => {
@@ -172,11 +187,7 @@ export default class FieldState<TValue> extends Disposable implements Composible
       { name: 'return-validate-when-not-validating' }
     )
 
-    return (
-      this.hasError
-      ? { hasError: true, error: this.error } as const
-      : { hasError: false, value: this.value } as const
-    )
+    return this.validateResult
   }
 
   /**

src/formState.spec.ts

@@ -473,6 +473,18 @@ describe('FormState (mode: object) validation', () => {
     expect(state.ownError).toBeUndefined()
     expect(state.error).toBeUndefined()
 
+    runInAction(() => options.disabled = false)
+
+    await delay()
+    expect(state.validating).toBe(false)
+    expect(state.validated).toBe(false)
+    expect(state.hasError).toBe(false)
+    expect(state.ownError).toBeUndefined()
+    expect(state.error).toBeUndefined()
+
+    runInAction(() => options.disabled = true)
+
+    await delay()
     state.$.foo.onChange('')
     await state.validate()
     expect(state.hasOwnError).toBe(false)

src/formState.ts

@@ -137,6 +137,17 @@ export default class FormState<TFields extends ValidatableFields, TValue = Value
     return !!this.error
   }
 
+  /**
+   * The most recent validation result.
+   * If state is disabled and later enabled, the result of the last validation is obtained.
+   * If you need to clear the validation result, please use the reset function.
+   */
+  @computed private get validateResult(): ValidateResult<TValue> {
+    return this.hasError
+      ? { hasError: true, error: this.error } as const
+      : { hasError: false, value: this.value } as const
+  }
+
   /**
    * If the validation has been done.
    * It does not means validation passed.
@@ -219,6 +230,10 @@ export default class FormState<TFields extends ValidatableFields, TValue = Value
    * Fire a validation behavior.
    */
   async validate(): Promise<ValidateResult<TValue>> {
+    if (this.validationDisabled) {
+      return this.validateResult
+    }
+
     action('activate-when-validate', () => {
       this._activated = true
     })()
@@ -234,11 +249,7 @@ export default class FormState<TFields extends ValidatableFields, TValue = Value
       { name: 'return-validate-when-not-validating' }
     )
 
-    return (
-      this.hasError
-      ? { hasError: true, error: this.error } as const
-      : { hasError: false, value: this.value } as const
-    )
+    return this.validateResult
   }
 
   /**

src/types.ts

@@ -42,7 +42,6 @@ export interface Validatable<T, TValue = T> {
   validated: boolean
   validationDisabled: boolean
   validate(): Promise<ValidateResult<TValue>>
-
   // To see if there are requirements: enableAutoValidation, disableAutoValidation
   // enableAutoValidation: () => void
   // disableAutoValidation: () => void