Linting

Author: davidkpiano

src/components/form-component.js

@@ -1,4 +1,4 @@
-/* eslint-disable */
+
 // TODO: Fix all eslint issues
 import React, { Component, PropTypes } from 'react';
 import connect from 'react-redux/lib/components/connect';
@@ -10,73 +10,85 @@ import actions from '../actions';
 import { validate, isValid } from '../utils';
 
 class Form extends Component {
-  handleSubmit(e) {
-    e.preventDefault();
+  constructor(props) {
+    super(props);
 
+    this.handleSubmit = this.handleSubmit.bind(this);
+  }
+  componentDidUpdate(prevProps) {
+    /* eslint-disable react/prop-types */
     const {
-      model,
       validators,
-      onSubmit,
-      dispatch
+      model,
+      dispatch,
+      validateOn,
     } = this.props;
-    const modelValue = _get(this.props, model);
+    /* eslint-enable react/prop-types */
 
-    const valid = isValid(mapValues(validators, (validator, field) => {
+    if (validateOn !== 'change') return;
+
+    mapValues(validators, (validator, field) => {
       const fieldModel = [model, field].join('.');
       const value = _get(this.props, fieldModel);
-      const validity = validate(validator, value);
 
-      dispatch(actions.setValidity(fieldModel, validate(validator, value)));
+      if (value === _get(prevProps, fieldModel)) return;
 
-      return isValid(validity);
-    }));
+      const validity = validate(validator, value);
 
-    if (onSubmit && !!valid) {
-      onSubmit(modelValue);
-    }
+      dispatch(actions.setValidity(fieldModel, validity));
+    });
   }
 
-  componentDidUpdate(prevProps) {
+  handleSubmit(e) {
+    e.preventDefault();
+
+    /* eslint-disable react/prop-types */
     const {
-      validators,
       model,
-      modelValue,
+      validators,
+      onSubmit,
       dispatch,
-      validateOn
     } = this.props;
+    /* eslint-enable react/prop-types */
 
-    if (validateOn !== 'change') return;
+    const modelValue = _get(this.props, model);
 
-    mapValues(validators, (validator, field) => {
+    const valid = isValid(mapValues(validators, (validator, field) => {
       const fieldModel = [model, field].join('.');
       const value = _get(this.props, fieldModel);
-
-      if (value === _get(prevProps, fieldModel)) return;
-
       const validity = validate(validator, value);
 
       dispatch(actions.setValidity(fieldModel, validate(validator, value)));
-    });
+
+      return isValid(validity);
+    }));
+
+    if (onSubmit && !!valid) {
+      onSubmit(modelValue);
+    }
   }
 
   render() {
+    /* eslint-disable react/prop-types */
     return (
       <form
         {...this.props}
-        onSubmit={(e) => this.handleSubmit(e)}
+        onSubmit={this.handleSubmit}
       >
         { this.props.children }
       </form>
     );
+    /* eslint-enable react/prop-types */
   }
 }
 
-Form.PropTypes = {
+Form.propTypes = {
   validators: PropTypes.object,
   validateOn: PropTypes.oneOf([
     'change',
   ]),
-  model: PropTypes.string.isRequired
+  model: PropTypes.string.isRequired,
+  onSubmit: PropTypes.func,
 };
 
 export default connect(identity)(Form);