Release 0.16.8

Author: seeden

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-form-controlled",
-  "version": "0.16.7",
+  "version": "0.16.8",
   "description": "React controlled form components. The main idea is to make forms as simple as possible.",
   "author": {
     "name": "Zlatko Fedor",

src/Element.jsx

@@ -67,17 +67,6 @@ export default class Element extends Component {
     return this.state.value;
   }
 
-  getOriginalValue() {
-    const parent = this.getParent();
-    const { originalValue, valueIndex } = this.props;
-
-    if (valueIndex) {
-      return parent.props.index;
-    }
-
-    return originalValue;
-  }
-
   setValue(value, component = this) {
     //this.clearTimeout();
     this.setState({ value });

src/Fieldset.jsx

@@ -259,13 +259,13 @@ export default class Fieldset extends Element {
       }*/
 
       if (child.type && child.type.isElement) {
-        const { name, value: originalValue } = child.props;
+        const { name, value: childValue, valueIndex } = child.props;
 
         this.disableSmartUpdate(name);
 
         return cloneElement(child, {
           parent: this,
-          originalValue,
+          originalValue: valueIndex ? this.props.index : childValue,
           value: this.getChildValue(name),
         });
       }

src/FieldsetIndex.jsx

@@ -2,12 +2,6 @@ import React, { PropTypes } from 'react';
 import Element from './Element';
 
 export default class FieldsetIndex extends Element {
-  static contextTypes = {
-    ...Element.contextTypes,
-  };
-
-  static isElement = Element.isElement;
-
   static propTypes = {
     ...Element.propTypes,
     format: PropTypes.func,
@@ -17,6 +11,22 @@ export default class FieldsetIndex extends Element {
     name: '.',
   };
 
+  shouldComponentUpdate(nextProps, nextState) {
+    const { props } = this;
+
+    const oldFormat = props.format;
+    const oldIndex = props.parent.props.index;
+
+    const newFormat = nextProps.format;
+    const newIndex = nextProps.parent.props.index;
+
+    if (oldFormat(oldIndex) !== newFormat(newIndex)) {
+      return true;
+    }
+
+    return super.shouldComponentUpdate(nextProps, nextState);
+  }
+
   render() {
     const parent = this.getParent();
     const index = parent.props.index;

src/Form.jsx

@@ -19,17 +19,8 @@ function errorToProperty(err) {
 }
 
 export default class Form extends Fieldset {
-  static isElement = Fieldset.isElement;
   static isForm = true;
 
-  static childContextTypes = {
-    ...Fieldset.childContextTypes,
-  };
-
-  static contextTypes = {
-    parent: PropTypes.object,
-  };
-
   static propTypes = {
     onChange: PropTypes.func.isRequired,
     onSubmit: PropTypes.func.isRequired,

src/Input.jsx

@@ -32,7 +32,7 @@ export default class Input extends Element {
     if (target.type === 'checkbox') {
       value = !!target.checked;
     } else if (target.type === 'radio' && target.checked) {
-      value = this.getOriginalValue();
+      value = this.props.originalValue;
     } else if (target.type === 'number') {
       const fixedValue = value
         .replace(',', '.')
@@ -55,9 +55,9 @@ export default class Input extends Element {
 
   render() {
     const value = this.getValue();
-    const { type, path } = this.props;
+    const { type, path, originalValue } = this.props;
     const checked = (type === 'checkbox' && value)
-      || (type === 'radio' && value === this.getOriginalValue());
+      || (type === 'radio' && value === originalValue);
 
     return (
       <input

src/utils/shallowCompare.js

@@ -39,7 +39,7 @@ export default function shallowEqual(objA, objB, ignore = []) {
   // Test for A's keys different from B.
   for (let i = 0; i < keysA.length; i++) {
     const propName = keysA[i];
-    if (ignore.indexOf(propName) !== -1) {
+    if (ignore.indexOf(propName) !== -1 || typeof objA[propName] === 'function') {
       continue;
     }