fix: log different error message, close: react-component#124

HunDunDM · Dec 8, 2017 · 98792e2 · 98792e2
1 parent 3594c92
commit 98792e2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-form",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "React High Order Form Component",
   "keywords": [
     "react",

diff --git a/src/createFieldsStore.js b/src/createFieldsStore.js
@@ -17,12 +17,20 @@ class FieldsStore {
   }
 
   flattenFields(fields) {
-    return flattenFields(fields, (_, node) => isFormField(node));
+    return flattenFields(
+      fields,
+      (_, node) => isFormField(node),
+      'You must wrap field data with `createFormField`.'
+    );
   }
 
   flattenRegisteredFields(fields) {
     const validFieldsName = this.getValidFieldsName();
-    return flattenFields(fields, path => validFieldsName.indexOf(path) >= 0);
+    return flattenFields(
+      fields,
+      path => validFieldsName.indexOf(path) >= 0,
+      'You cannot set field before registering it.'
+    );
   }
 
   setFieldsInitialValue = (initialValues) => {

diff --git a/src/utils.js b/src/utils.js
@@ -19,7 +19,7 @@ export function flattenArray(arr) {
   return Array.prototype.concat.apply([], arr);
 }
 
-export function treeTraverse(path = '', tree, isLeafNode, callback) {
+export function treeTraverse(path = '', tree, isLeafNode, errorMessage, callback) {
   if (isLeafNode(path, tree)) {
     callback(path, tree);
   } else if (tree === undefined) {
@@ -29,11 +29,12 @@ export function treeTraverse(path = '', tree, isLeafNode, callback) {
       `${path}[${index}]`,
       subTree,
       isLeafNode,
+      errorMessage,
       callback
     ));
   } else { // It's object and not a leaf node
     if (typeof tree !== 'object') {
-      console.error('You must wrap field data with `createFormField`.');
+      console.error(errorMessage);
       return;
     }
     Object.keys(tree).forEach(subTreeKey => {
@@ -42,15 +43,16 @@ export function treeTraverse(path = '', tree, isLeafNode, callback) {
         `${path}${path ? '.' : ''}${subTreeKey}`,
         subTree,
         isLeafNode,
+        errorMessage,
         callback
       );
     });
   }
 }
 
-export function flattenFields(maybeNestedFields, isLeafNode) {
+export function flattenFields(maybeNestedFields, isLeafNode, errorMessage) {
   const fields = {};
-  treeTraverse(undefined, maybeNestedFields, isLeafNode, (path, node) => {
+  treeTraverse(undefined, maybeNestedFields, isLeafNode, errorMessage, (path, node) => {
     fields[path] = node;
   });
   return fields;