Add tests for condition

Author: rvsia

packages/react-form-renderer/demo/index.js

@@ -30,6 +30,7 @@ const validatorMapper = {
     )
 };
 
+// eslint-disable-next-line no-unused-vars
 const asyncValidatorSchema = {
   fields: [
     {

packages/react-form-renderer/src/form-renderer/condition.js

@@ -31,20 +31,24 @@ const fieldCondition = (value, { is, isNotEmpty, isEmpty, pattern, notMatch, fla
 export const parseCondition = (condition, values) => {
   let positiveResult = {
     visible: true,
-    ...condition.then
+    ...condition.then,
+    result: true
   };
 
   let negativeResult = {
     visible: false,
-    ...condition.else
+    ...condition.else,
+    result: false
   };
 
   if (Array.isArray(condition)) {
-    return !condition.map((condition) => parseCondition(condition, values)).some((result) => result === false) ? positiveResult : negativeResult;
+    return !condition.map((condition) => parseCondition(condition, values)).some(({ result }) => result === false) ? positiveResult : negativeResult;
   }
 
   if (condition.and) {
-    return !condition.and.map((condition) => parseCondition(condition, values)).some((result) => result === false) ? positiveResult : negativeResult;
+    return !condition.and.map((condition) => parseCondition(condition, values)).some(({ result }) => result === false)
+      ? positiveResult
+      : negativeResult;
   }
 
   if (condition.sequence) {
@@ -53,20 +57,21 @@ export const parseCondition = (condition, values) => {
         const result = parseCondition(curr, values);
 
         return {
-          sets: [...acc.sets, ...[result.set ? result.set : []]],
-          visible: acc.visible || result.visible
+          sets: [...acc.sets, ...(result.set ? [result.set] : [])],
+          visible: acc.visible || result.visible,
+          result: acc.result || result.result
         };
       },
       { ...negativeResult, sets: [] }
     );
   }
 
   if (condition.or) {
-    return condition.or.map((condition) => parseCondition(condition, values)).some((result) => result === true) ? positiveResult : negativeResult;
+    return condition.or.map((condition) => parseCondition(condition, values)).some(({ result }) => result === true) ? positiveResult : negativeResult;
   }
 
   if (condition.not) {
-    return !parseCondition(condition.not, values) ? positiveResult : negativeResult;
+    return !parseCondition(condition.not, values).result ? positiveResult : negativeResult;
   }
 
   if (typeof condition.when === 'string') {

packages/react-form-renderer/src/form-renderer/render-form.js

@@ -37,7 +37,7 @@ const FormConditionWrapper = ({ condition, children }) =>
   );
 
 FormConditionWrapper.propTypes = {
-  condition: PropTypes.object,
+  condition: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   children: childrenPropTypes.isRequired
 };
 
@@ -93,7 +93,7 @@ const SingleField = ({ component, condition, hideField, validate, ...rest }) =>
 
 SingleField.propTypes = {
   component: PropTypes.string.isRequired,
-  condition: PropTypes.object,
+  condition: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   hideField: PropTypes.bool,
   dataType: PropTypes.string,
   validate: PropTypes.arrayOf(PropTypes.func),

packages/react-form-renderer/src/tests/form-renderer/__snapshots__/render-form.test.js.snap

@@ -191,25 +191,26 @@ exports[`renderForm function #condition should render condition field only if co
           ]
         }
       >
-        <Condition
-          condition={
-            Array [
-              Object {
-                "is": "x",
-                "when": Array [
-                  "a",
-                  "b",
-                ],
-              },
-              Object {
-                "pattern": /fuzz/,
-                "when": "c",
-              },
-            ]
-          }
-        >
-          <FormSpy />
-        </Condition>
+        <FormSpy>
+          <Component
+            condition={
+              Array [
+                Object {
+                  "is": "x",
+                  "when": Array [
+                    "a",
+                    "b",
+                  ],
+                },
+                Object {
+                  "pattern": /fuzz/,
+                  "when": "c",
+                },
+              ]
+            }
+            values={Object {}}
+          />
+        </FormSpy>
       </FormConditionWrapper>
     </SingleField>
   </ReactFinalForm>
@@ -395,19 +396,20 @@ exports[`renderForm function #condition should render condition field only if on
           }
         }
       >
-        <Condition
-          condition={
-            Object {
-              "is": "x",
-              "when": Array [
-                "a",
-                "b",
-              ],
+        <FormSpy>
+          <Component
+            condition={
+              Object {
+                "is": "x",
+                "when": Array [
+                  "a",
+                  "b",
+                ],
+              }
             }
-          }
-        >
-          <FormSpy />
-        </Condition>
+            values={Object {}}
+          />
+        </FormSpy>
       </FormConditionWrapper>
     </SingleField>
   </ReactFinalForm>