removed erros and ajv

Author: seeden

README.md

@@ -20,6 +20,8 @@
     "input",
     "select",
     "react-select",
+    "textarea",
+    "redux-form",
     "redux"
   ],
   "private": false,
@@ -36,10 +38,8 @@
   },
   "dependencies": {
     "diacritics": "^1.2.3",
-    "ajv": "^4.10.0",
     "lodash": "^4.17.2",
-    "core-decorators": "^0.15.0",
-    "react-addons-shallow-compare": "^15.4.1"
+    "core-decorators": "^0.15.0"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",

__tests__/ErrorAlert.jsx

@@ -13,6 +13,8 @@ export default class Element extends Component {
     fieldset: PropTypes.object.isRequired,
   };
 
+  state = {};
+
   constructor(props, context) {
     super(props, context);
 

package.json

@@ -58,24 +58,22 @@ export default class Fieldset extends Element {
     super.setValue(value, component, notifyChildren);
 
     if (notifyChildren) {
-      const { children } = this;
-      children.forEach(child => child.originalValueChanged());
+      this.notifyChildren();
     }
   }
 
   originalValueChanged() {
     super.originalValueChanged();
+    this.notifyChildren();
+  }
 
+  notifyChildren() {
     const { children } = this;
     children.forEach(child => child.originalValueChanged());
   }
 
   registerChild(child, name) {
-    if (typeof name === 'undefined') {
-      return;
-    }
-
-    if (name[0] === '.') {
+    if (name && name[0] === '.') {
       const parent = this.getParent();
       parent.registerChild(child, name.substr(1));
       return;
@@ -85,11 +83,7 @@ export default class Fieldset extends Element {
   }
 
   unregisterChild(child, name) {
-    if (typeof name === 'undefined') {
-      return;
-    }
-
-    if (name[0] === '.') {
+    if (name && name[0] === '.') {
       const parent = this.getParent();
       parent.unregisterChild(child, name.substr(1));
       return;

src/Element.jsx

@@ -1,21 +1,8 @@
 import { PropTypes, createElement } from 'react';
-import Ajv from 'ajv';
 import { autobind } from 'core-decorators';
 import Fieldset from './Fieldset';
 
-function errorToProperty(err) {
-  const { params = {} } = err;
-
-  if (params.missingProperty) {
-    return params.missingProperty;
-  }
-
-  return undefined;
-}
-
 export default class Form extends Fieldset {
-  static isForm = true;
-
   static propTypes = {
     onSubmit: PropTypes.func,
     onChange: PropTypes.func,
@@ -28,6 +15,7 @@ export default class Form extends Fieldset {
     children: PropTypes.node,
     tagName: PropTypes.string.isRequired,
     debounce: PropTypes.number,
+    validate: PropTypes.func,
   };
 
   static defaultProps = {
@@ -63,56 +51,6 @@ export default class Form extends Fieldset {
       : this;
   }
 
-  getStateFromProps(props, context) {
-    const { schema } = props;
-
-    let validator = this.validator;
-    if (schema && (!validator || validator.schema !== schema)) {
-      const ajv = this.ajv = this.ajv || Ajv({
-        allErrors: true,
-        async: true,
-      });
-      validator = ajv.compile({
-        $async: true,
-        ...schema,
-      });
-      validator.schema = schema;
-    }
-
-    return {
-      ...super.getStateFromProps(props, context),
-      validator,
-    };
-  }
-
-  async validate(value) {
-    const { validator } = this.state;
-    if (!validator) {
-      return [];
-    }
-
-    try {
-      await validator(value);
-      return [];
-    } catch (e) {
-      const { errors } = e;
-
-      return errors.map((err) => {
-        const prop = errorToProperty(err);
-        const path = err.dataPath ? err.dataPath.substr(1) : null;
-
-        const fullPath = path && prop
-          ? `${path}.${prop}`
-          : path || prop;
-
-        return {
-          ...err,
-          path: fullPath,
-        };
-      });
-    }
-  }
-
   getErrors(path, exactMatch) {
     const errors = this.errors || [];
     if (!path) {
@@ -150,15 +88,34 @@ export default class Form extends Fieldset {
   async onSubmit(evn) {
     evn.preventDefault();
 
-    const { onSubmit, onError } = this.props;
+    if (this.working) {
+      return;
+    }
+
+    this.working = true;
+    this.notifyChildren();
+
+    const { onSubmit, onError, validate } = this.props;
     const value = this.getValue();
-    const errors = this.errors = await this.validate(value);
+
+    this.errors = validate
+      ? await validate(value)
+      : [];
+
+    const errors = this.errors;
 
     if (!errors.length && onSubmit) {
-      onSubmit(value);
-    } else if (errors.length && onError) {
-      onError(errors);
+      await onSubmit(value);
+    } else if (errors && errors.length && onError) {
+      await onError(errors);
     }
+
+    this.working = false;
+    this.notifyChildren();
+  }
+
+  isWorking() {
+    return !!this.working;
   }
 
   setValue(value, component, notifyChildren) {

src/ErrorAlert.jsx

@@ -0,0 +1,33 @@
+import ProvideProps from './ProvideProps';
+
+export default class Working extends ProvideProps {
+  componentDidMount() {
+    const form = this.getForm();
+    form.registerChild(this);
+  }
+
+  componentWillUnmount() {
+    const form = this.getForm();
+    form.unregisterChild(this);
+  }
+
+  originalValueChanged() {
+    const form = this.getForm();
+
+    this.setState({
+      isWorking: form.isWorking(),
+    });
+  }
+
+  renderEmptyChildren({ isWorking }) {
+    return (
+      <span>{isWorking ? 'working' : 'idle'}</span>
+    );
+  }
+
+  getProps() {
+    return {
+      isWorking: this.state.isWorking,
+    };
+  }
+}

src/Fieldset.jsx

@@ -2,7 +2,6 @@ export default from './Form';
 export Input from './Input';
 export Select from './Select';
 export Textarea from './Textarea';
-export ErrorAlert from './ErrorAlert';
 export Fieldset from './Fieldset';
 export Tbody from './Tbody';
 export Word from './Word';
@@ -18,3 +17,4 @@ export Value from './Value';
 export ProvideProps from './ProvideProps';
 export ProvideIndexes from './ProvideIndexes';
 export Button from './Button';
+export Working from './Working';

src/Form.jsx

@@ -13,7 +13,7 @@ export default function set(currentValue, originalPath, value) {
   }
 
   let current = start;
-  for (let i = 0; i < parts.length; i++) {
+  for (let i = 0; i < parts.length; i += 1) {
     const key = parts[i];
     if (!key) {
       throw new Error('Path is not complete');