Merge branch 'tw0517tw-shallow-compare'

Author: davidkpiano

package.json

@@ -72,7 +72,8 @@
   "dependencies": {
     "flat": "^2.0.0",
     "icepick": "^1.1.0",
-    "lodash": "^4.10.0"
+    "lodash": "^4.10.0",
+    "react-addons-shallow-compare": "^15.0.2"
   },
   "peerDependencies": {
     "react": "^0.14.0 || ^15.0.0",

src/components/field-component.js

@@ -1,4 +1,5 @@
 import React, { Component, PropTypes } from 'react';
+import shallowCompare from 'react-addons-shallow-compare';
 import connect from 'react-redux/lib/components/connect';
 
 import _get from 'lodash/get';
@@ -161,6 +162,10 @@ function createFieldClass(customControlPropsMap = {}, defaultProps = {}) {
   };
 
   class Field extends Component {
+    shouldComponentUpdate(nextProps, nextState) {
+      return shallowCompare(this, nextProps, nextState);
+    }
+
     render() {
       const { props } = this;
       const component = getFieldWrapper(props);

test/form-component-spec.js

@@ -625,7 +625,10 @@ describe('<Form> component', () => {
           errors={{
             bar: (val) => val !== 'bar' && 'bar invalid',
           }}
-          onSubmit={(val) => (submitValue = val, true)}
+          onSubmit={(val) => {
+            submitValue = val;
+            return true;
+          }}
         >
           <Field model="test.foo">
             <input type="text" />