Fix potential validation paused bug (#237)

erikras · web-flow · commit df58c61c71c6 · 2018-04-23T19:24:30.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "eslint-plugin-import": "^2.11.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.7.0",
-    "final-form": "^4.6.0",
+    "final-form": "^4.6.1",
     "flow-bin": "^0.70.0",
     "glow": "^1.2.2",
     "husky": "^0.14.3",
@@ -58,7 +58,7 @@
     "prop-types": "^15.6.1",
     "react": "^16.3.2",
     "react-dom": "^16.3.2",
-    "rollup": "^0.58.1",
+    "rollup": "^0.58.2",
     "rollup-plugin-babel": "^3.0.4",
     "rollup-plugin-commonjs": "^9.1.0",
     "rollup-plugin-flow": "^1.1.1",
@@ -69,7 +69,7 @@
     "typescript": "^2.8.1"
   },
   "peerDependencies": {
-    "final-form": "^4.2.0",
+    "final-form": "^4.6.1",
     "prop-types": "^15.6.0",
     "react": "^15.3.0 || ^16.0.0-0"
   },
diff --git a/src/ReactFinalForm.js b/src/ReactFinalForm.js
@@ -42,6 +42,7 @@ export default class ReactFinalForm extends React.Component<Props, State> {
   state: State
   form: FormApi
   mounted: boolean
+  resumeValidation: ?boolean
   unsubscriptions: Unsubscribe[]
 
   static childContextTypes = {
@@ -131,12 +132,13 @@ export default class ReactFinalForm extends React.Component<Props, State> {
 
   componentWillUpdate() {
     if (this.form) {
+      this.resumeValidation = !this.form.isValidationPaused()
       this.form.pauseValidation()
     }
   }
 
   componentDidUpdate() {
-    if (this.form) {
+    if (this.form && this.resumeValidation) {
       this.form.resumeValidation()
     }
   }
@@ -153,10 +155,7 @@ export default class ReactFinalForm extends React.Component<Props, State> {
         if (this.props[key] === nextProps[key]) {
           return
         }
-        // istanbul ignore next
-        if (this.form.setConfig) {
-          this.form.setConfig(key, nextProps[key])
-        }
+        this.form.setConfig(key, nextProps[key])
       }
     )
     // istanbul ignore next

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ export default class ReactFinalForm extends React.Component<Props, State> {`
`42`	`42`	`state: State`
`43`	`43`	`form: FormApi`
`44`	`44`	`mounted: boolean`
	`45`	`+ resumeValidation: ?boolean`
`45`	`46`	`unsubscriptions: Unsubscribe[]`
`46`	`47`
`47`	`48`	`static childContextTypes = {`
`@@ -131,12 +132,13 @@ export default class ReactFinalForm extends React.Component<Props, State> {`
`131`	`132`
`132`	`133`	`componentWillUpdate() {`
`133`	`134`	`if (this.form) {`
	`135`	`+ this.resumeValidation = !this.form.isValidationPaused()`
`134`	`136`	`this.form.pauseValidation()`
`135`	`137`	`}`
`136`	`138`	`}`
`137`	`139`
`138`	`140`	`componentDidUpdate() {`
`139`		`- if (this.form) {`
	`141`	`+ if (this.form && this.resumeValidation) {`
`140`	`142`	`this.form.resumeValidation()`
`141`	`143`	`}`
`142`	`144`	`}`
`@@ -153,10 +155,7 @@ export default class ReactFinalForm extends React.Component<Props, State> {`
`153`	`155`	`if (this.props[key] === nextProps[key]) {`
`154`	`156`	`return`
`155`	`157`	`}`
`156`		`- // istanbul ignore next`
`157`		`- if (this.form.setConfig) {`
`158`		`- this.form.setConfig(key, nextProps[key])`
`159`		`- }`
	`158`	`+ this.form.setConfig(key, nextProps[key])`
`160`	`159`	`}`
`161`	`160`	`)`
`162`	`161`	`// istanbul ignore next`