Also fixing some broken lint tests

Author: andrewmtam

src/components/control-component-factory.js

@@ -157,12 +157,6 @@ function createControlClass(s) {
       this.handleLoad();
     }
 
-    UNSAFE_componentWillReceiveProps({ modelValue }) {
-      if (modelValue !== this.props.modelValue) {
-        this.setViewValue(modelValue);
-      }
-    }
-
     shouldComponentUpdate(nextProps, nextState) {
       return !shallowEqual(this.props, nextProps, {
         deepKeys: ['controlProps'],
@@ -388,6 +382,13 @@ function createControlClass(s) {
       return this.props.getValue(event, this.props);
     }
 
+    /* eslint-disable camelcase */
+    UNSAFE_componentWillReceiveProps({ modelValue }) {
+      if (modelValue !== this.props.modelValue) {
+        this.setViewValue(modelValue);
+      }
+    }
+
     handleIntents() {
       const {
         model,

src/components/form-component.js

@@ -101,12 +101,6 @@ function createFormClass(s = defaultStrategy) {
       clearGetFormCacheForModel(this.props.model);
     }
 
-    UNSAFE_componentWillReceiveProps(nextProps) {
-      if (containsEvent(nextProps.validateOn, 'change')) {
-        this.validate(nextProps);
-      }
-    }
-
     shouldComponentUpdate(nextProps, nextState) {
       return deepCompareChildren(this, nextProps, nextState);
     }
@@ -123,6 +117,13 @@ function createFormClass(s = defaultStrategy) {
       }
     }
 
+    /* eslint-disable camelcase */
+    UNSAFE_componentWillReceiveProps(nextProps) {
+      if (containsEvent(nextProps.validateOn, 'change')) {
+        this.validate(nextProps);
+      }
+    }
+
     handleUpdate() {
       if (this.props.onUpdate) {
         this.props.onUpdate(this.props.formValue);