Merge pull request #19 from mrclay/18_array_of_string

Fixes #18
RXNT · Feb 16, 2018 · c321295 · c321295
2 parents c271482 + 5f2b777
commit c321295
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/conditionsMeet.js b/src/conditionsMeet.js
@@ -35,8 +35,8 @@ export default function conditionsMeet(condition, formData) {
     } else {
       let refVal = selectRef(ref, formData);
       if (Array.isArray(refVal)) {
-        let condMeatOnce = refVal.some(val =>
-          conditionsMeet(refCondition, val)
+        let condMeatOnce = refVal.some(
+          val => (isObject(val) ? conditionsMeet(refCondition, val) : false)
         );
         // It's either true for an element in an array or for the whole array
         return (

diff --git a/test/conditionsMeet.test.js b/test/conditionsMeet.test.js
@@ -14,6 +14,17 @@ test("run predicate against array and elements", () => {
   expect(conditionsMeet(condition, [])).toBeTruthy();
 });
 
+test("handles array of non-objects", () => {
+  let condition = {
+    options: {
+      contains: "foo",
+    },
+  };
+  expect(conditionsMeet(condition, { options: ["bar"] })).toBeFalsy();
+  expect(conditionsMeet(condition, { options: [] })).toBeFalsy();
+  expect(conditionsMeet(condition, { options: ["foo", "bar"] })).toBeTruthy();
+});
+
 test("single line", () => {
   let condition = {
     firstName: "empty",