Release 0.17.21

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-form-controlled",
-  "version": "0.17.20",
+  "version": "0.17.21",
   "description": "Intuitive react forms for building powerful applications",
   "author": {
     "name": "Zlatko Fedor",
@@ -38,12 +38,13 @@
   },
   "dependencies": {
     "diacritics": "^1.3.0",
-    "lodash": "^4.17.4"
+    "lodash": "^4.17.4",
+    "prop-types": "^15.5.8"
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
     "babel-core": "^6.24.1",
-    "babel-eslint": "^7.2.1",
+    "babel-eslint": "^7.2.2",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-proto-to-assign": "^6.23.0",
@@ -60,13 +61,13 @@
     "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-util": "^3.0.8",
-    "react": "^15.4.2",
-    "react-addons-test-utils": "^15.4.2",
+    "react": "^15.5.4",
+    "react-addons-test-utils": "^15.5.1",
     "eslint-plugin-jsx-a11y": "^4.0.0",
-    "react-dom": "^15.4.2",
+    "react-dom": "^15.5.4",
     "jest": "^19.0.2",
     "jest-cli": "^19.0.2",
-    "enzyme": "^2.8.0"
+    "enzyme": "^2.8.2"
   },
   "peerDependencies": {
     "react": "15.x"

src/Button.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes, cloneElement } from 'react';
+import React, { cloneElement } from 'react';
+import PropTypes from 'prop-types';
 import Element from './Element';
 import wait from './utils/wait';
 

src/Down.jsx

@@ -6,6 +6,6 @@ export default class Down extends Button {
   };
 
   async process() {
-    return await this.getParent().down();
+    return this.getParent().down();
   }
 }

src/Element.jsx

@@ -1,4 +1,5 @@
-import { Component, PropTypes } from 'react';
+import { Component } from 'react';
+import PropTypes from 'prop-types';
 import shallowEqual from './utils/shallowCompare';
 
 export default class Element extends Component {

src/Fieldset.jsx

@@ -1,6 +1,6 @@
-import React, { PropTypes, createElement } from 'react';
+import React, { createElement } from 'react';
+import PropTypes from 'prop-types';
 import get from 'lodash/get';
-import isPlainObject from 'lodash/isPlainObject';
 import Element from './Element';
 import set from './utils/set';
 import traverse from './utils/traverse';
@@ -35,7 +35,7 @@ export default class Fieldset extends Element {
   constructor(...args) {
     super(...args);
 
-    this.children = [];
+    this.registeredChildren = [];
   }
 
   getIndexes() {
@@ -67,8 +67,8 @@ export default class Fieldset extends Element {
   }
 
   notifyChildren() {
-    const { children } = this;
-    children.forEach(child => child.originalValueChanged());
+    const { registeredChildren } = this;
+    registeredChildren.forEach(child => child.originalValueChanged());
   }
 
   registerChild(child, name) {
@@ -78,7 +78,7 @@ export default class Fieldset extends Element {
       return;
     }
 
-    this.children.push(child);
+    this.registeredChildren.push(child);
   }
 
   unregisterChild(child, name) {
@@ -88,9 +88,9 @@ export default class Fieldset extends Element {
       return;
     }
 
-    const pos = this.children.indexOf(child);
+    const pos = this.registeredChildren.indexOf(child);
     if (pos !== -1) {
-      this.children.splice(pos, 1);
+      this.registeredChildren.splice(pos, 1);
     }
   }
 

src/Form.jsx

@@ -1,4 +1,5 @@
-import { PropTypes, createElement } from 'react';
+import { createElement } from 'react';
+import PropTypes from 'prop-types';
 import Fieldset from './Fieldset';
 
 export default class Form extends Fieldset {

src/If.jsx

@@ -1,4 +1,5 @@
-import { PropTypes, Children } from 'react';
+import { Children } from 'react';
+import PropTypes from 'prop-types';
 import Element from './Element';
 
 export default class If extends Element {

src/Input.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Element from './Element';
 
 function fixUncontrolledValue(value) {

src/Integrate.jsx

@@ -1,4 +1,5 @@
-import { PropTypes, cloneElement } from 'react';
+import { cloneElement } from 'react';
+import PropTypes from 'prop-types';
 import Element from './Element';
 
 export default class Integrate extends Element {

src/ProvideProps.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes, cloneElement } from 'react';
+import React, { cloneElement } from 'react';
+import PropTypes from 'prop-types';
 import Element from './Element';
 
 export default class ProvideProps extends Element {

src/Remove.jsx

@@ -6,6 +6,6 @@ export default class Remove extends Button {
   };
 
   async process() {
-    return await this.getParent().remove();
+    return this.getParent().remove();
   }
 }

src/Select.jsx

@@ -1,5 +1,6 @@
 import isPlainObject from 'lodash/isPlainObject';
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Element from './Element';
 
 const PLACEHOLDER_VALUE = ''; // null and undefined is uncontrolled value

src/Textarea.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Input from './Input';
 
 export default class Textarea extends Input {

src/Up.jsx

@@ -6,6 +6,6 @@ export default class Up extends Button {
   };
 
   async process() {
-    return await this.getParent().up();
+    return this.getParent().up();
   }
 }

src/Working.jsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import ProvideProps from './ProvideProps';
 
 export default class Working extends ProvideProps {

src/utils/markAsDirty.js

@@ -24,7 +24,7 @@ export default function markAsDirty(value, originalPath, updateCallback) {
   const parts = path.split('.');
 
   let current = start;
-  for (let i = 0; i < parts.length; i++) {
+  for (let i = 0; i < parts.length; i += 1) {
     const key = parts[i];
     current[key] = dirty(current[key]);
 

src/utils/traverse.js

@@ -3,7 +3,8 @@ import Element from '../Element';
 
 export default function traverse(child, processCallback, replaceCallback) {
   if (Array.isArray(child)) {
-    return Children.map(child, children => traverse(children, processCallback, replaceCallback));
+    return Children
+      .map(child, children => traverse(children, processCallback, replaceCallback));
   }
 
   if (!child || typeof child === 'string') {
@@ -28,14 +29,16 @@ export default function traverse(child, processCallback, replaceCallback) {
     }
   }
 
-  if (child.props && child.props.children) {
-    const children = traverse(child.props.children, processCallback, replaceCallback);
+  // support for preact
+  const children = (child.props && child.props.children) || child.children;
+  if (children) {
+    const traversedChildren = traverse(children, processCallback, replaceCallback);
     // speed up
-    if (children === child.props.children) {
+    if (traversedChildren === children) {
       return child;
     }
 
-    return cloneElement(child, {}, children);
+    return cloneElement(child, {}, traversedChildren);
   }
 
   return child;