Merge pull request #8 from nighca/disable-validation

Debug `disableValidationWhen`
qiniu · Nov 19, 2019 · 0165645 · 0165645
2 parents badf8e4 + c77dada
commit 0165645
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formstate-x",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Extended alternative for formstate",
   "repository": {
     "type": "git",

diff --git a/src/formState.spec.ts b/src/formState.spec.ts
@@ -871,16 +871,19 @@ describe('FormState (mode: array) validation', () => {
     runInAction(() => options.disabled = true)
 
     await state.validate()
+    expect(state.$[0].hasError).toBe(false)
     expect(state.hasError).toBe(false)
     expect(state.error).toBeUndefined()
 
     state.$[0].onChange('')
     await state.validate()
+    expect(state.$[0].hasError).toBe(false)
     expect(state.hasError).toBe(false)
     expect(state.error).toBeUndefined()
 
     runInAction(() => options.disabled = false)
     await delay()
+    expect(state.$[0].hasError).toBe(true)
     expect(state.hasError).toBe(true)
     expect(state.error).toBe('empty')
 

diff --git a/src/formState.ts b/src/formState.ts
@@ -239,6 +239,9 @@ export default class FormState<TFields extends ValidatableFields, TValue = Value
    */
   @action disableValidationWhen(predict: () => boolean) {
     this.shouldDisableValidation = predict
+    this.fields.forEach(
+      field => field.disableValidationWhen(predict)
+    )
     return this
   }
 

diff --git a/src/types.ts b/src/types.ts
@@ -49,6 +49,7 @@ export interface ComposibleValidatable<T, TValue = T> extends Validatable<T, TVa
   dirty: boolean
   _activated: boolean
   _validateStatus: ValidateStatus
+  disableValidationWhen: (predict: () => boolean) => this
 }
 
 /** Function to do dispose. */