change contextTypes to formControl.

Author: MinJieLiu

lib/Field.js

@@ -1,6 +1,6 @@
 {
   "name": "react-validate-framework",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "React validation framework.",
   "main": "lib/index.js",
   "scripts": {

lib/Field.js.map

@@ -4,26 +4,28 @@ import PropTypes from 'prop-types';
 /**
  * Field component
  * @param FormComponent
- * @param fieldType
+ * @param fieldType - Input type
  * @param name
- * @param props
- * @param fields
- * @param initField
- * @param onFormChange
+ * @param props - Other params
+ * @param fields - ContextType
+ * @param init - ContextType
+ * @param onFormChange - ContextType
  * @constructor
  */
 const Field = (FormComponent, fieldType, {
   name,
   ...props
 }, {
-  fields,
-  initField,
-  onFormChange,
+  formControl: {
+    fields,
+    init,
+    onFormChange,
+  },
 }) => {
   // Initialize field.
   if (!fields[name]) {
     // Checkbox uses an array
-    initField({
+    init({
       [name]: fieldType === 'checkbox' ? [] : '',
     });
   }
@@ -42,9 +44,7 @@ Field.propTypes = {
 };
 
 Field.contextTypes = {
-  fields: PropTypes.object.isRequired,
-  initField: PropTypes.func.isRequired,
-  onFormChange: PropTypes.func.isRequired,
+  formControl: PropTypes.object.isRequired,
 };
 
 export default Field;

lib/FormControl.js

@@ -28,9 +28,7 @@ export default (schemas, methods) => FormComponent => (
     };
 
     static childContextTypes = {
-      fields: PropTypes.object.isRequired,
-      initField: PropTypes.func.isRequired,
-      onFormChange: PropTypes.func.isRequired,
+      formControl: PropTypes.object.isRequired,
     };
 
     static defaultProps = {
@@ -76,9 +74,7 @@ export default (schemas, methods) => FormComponent => (
 
     getChildContext() {
       return {
-        fields: this.state.fields,
-        initField: this.init,
-        onFormChange: this.onFormChange,
+        formControl: this,
       };
     }
 

lib/FormControl.js.map

@@ -1,24 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const propTypes = {
-  name: PropTypes.string.isRequired,
-  htmlFor: PropTypes.string,
-};
-
-const contextTypes = {
-  fields: PropTypes.object.isRequired,
-};
-
 /**
  * Error message component
  * @param name
  * @param htmlFor
- * @param props
- * @param fields
+ * @param props - Other params
+ * @param fields - ContextType
  * @constructor
  */
-const Message = ({ name, htmlFor, ...props }, { fields }) => (
+const Message = ({ name, htmlFor, ...props }, { formControl: { fields } }) => (
   <label
     htmlFor={htmlFor}
     {...props}
@@ -27,7 +18,13 @@ const Message = ({ name, htmlFor, ...props }, { fields }) => (
   </label>
 );
 
-Message.propTypes = propTypes;
-Message.contextTypes = contextTypes;
+Message.propTypes = {
+  name: PropTypes.string.isRequired,
+  htmlFor: PropTypes.string,
+};
+
+Message.contextTypes = {
+  formControl: PropTypes.object.isRequired,
+};
 
 export default Message;