@ukhomeoffice/cop-react-form-renderer 3.0.3 → 3.2.2

package/dist/utils/Component/getComponent.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getNestedComponent = exports.default = void 0;
+exports.getChildrenJsx = exports.default = void 0;
 
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 
@@ -17,6 +17,8 @@ var _cleanAttributes = _interopRequireDefault(require("./cleanAttributes"));
 
 var _isEditable = _interopRequireDefault(require("./isEditable"));
 
+var _FormComponent = _interopRequireDefault(require("../../components/FormComponent"));
+
 var _wrapInFormGroup = _interopRequireDefault(require("./wrapInFormGroup"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -85,11 +87,11 @@ var getRadios = function getRadios(config) {
   });
 
   options.forEach(function (option) {
-    if (!option.nested) {
+    if (!Array.isArray(option.nested)) {
       return;
     }
 
-    option.nestedJSX = getNestedComponent(config, option);
+    option.children = getChildrenJsx(config, option.nested);
   });
   var attrs = (0, _cleanAttributes.default)(config);
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.Radios, _extends({}, attrs, {
@@ -156,32 +158,49 @@ var getComponentByType = function getComponentByType(config) {
   }
 };
 /**
- * Get nested component with form data
- * @param {*} parentConfig 
- * @param {*} nestedConfig 
+ * Get single child component for a parent
+ * @param {*} parent the parent configuration
+ * @param {*} child the child configuration
  */
 
 
-var getNestedComponent = function getNestedComponent(parentConfig, nestedConfig) {
-  nestedConfig.nested.onChange = parentConfig.onChange;
-
-  if (parentConfig.formData) {
-    var _parentConfig$formDat;
+var getChildJsx = function getChildJsx(parent, child) {
+  if (parent.formData) {
+    var _parent$formData;
 
-    nestedConfig.nested.value = parentConfig !== null && parentConfig !== void 0 && (_parentConfig$formDat = parentConfig.formData) !== null && _parentConfig$formDat !== void 0 && _parentConfig$formDat[nestedConfig.nested.fieldId] ? parentConfig.formData[nestedConfig.nested.fieldId] : '';
+    child.value = parent !== null && parent !== void 0 && (_parent$formData = parent.formData) !== null && _parent$formData !== void 0 && _parent$formData[child.fieldId] ? parent.formData[child.fieldId] : '';
   }
 
-  if ('readonly' in nestedConfig.nested) delete nestedConfig.nested.readonly;
+  if ('readonly' in child) delete child.readonly;
 
-  if (parentConfig.readonly) {
-    nestedConfig.nested.readonly = parentConfig.readonly;
-    return getComponent(nestedConfig.nested, false);
+  if (parent.readonly) {
+    child.readonly = parent.readonly;
+    return /*#__PURE__*/_react.default.createElement("div", null, getComponent(child, false));
   }
 
-  return getComponent(nestedConfig.nested);
+  return /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+    component: child,
+    value: child.value,
+    onChange: parent.onChange,
+    key: child.key
+  });
+};
+/**
+ * Convert chidlrenConfigs into components
+ * @param {*} parentConfig parent component which the childrenConfigs will be under
+ * @param {*} childrenConfigs array of configurations for the child components
+ */
+
+
+var getChildrenJsx = function getChildrenJsx(parentConfig, childrenConfigs) {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, childrenConfigs.map(function (config) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
+      key: config.id
+    }, getChildJsx(parentConfig, config));
+  }));
 };
 
-exports.getNestedComponent = getNestedComponent;
+exports.getChildrenJsx = getChildrenJsx;
 
 /**
  * Get a renderable component, based on a configuration object.
@@ -205,8 +224,7 @@ var getComponent = function getComponent(config) {
   var component = getComponentByType(config);
 
   if (component && wrap && (0, _isEditable.default)(config)) {
-    var attrs = (0, _cleanAttributes.default)(config, ['fieldId', 'displayMenu']);
-    return (0, _wrapInFormGroup.default)(attrs, component);
+    return (0, _wrapInFormGroup.default)(config, component);
   }
 
   return component;

package/dist/utils/Component/getComponentTests/getComponent.nested.test.js

@@ -4,6 +4,8 @@ var _react = require("@testing-library/react");
 
 var _getComponent = require("../getComponent");
 
+var _setupTests = require("../../../setupTests");
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -11,8 +13,10 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 describe('utils.Component.get', function () {
-  it('should return a component that is nested within another component', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var ID, FIELD_ID, LABEL, VALUE, PARENT_CONFIG, NESTED_CONFIG, _render, container, child, label, input;
+  it('should return components that are nested within another component', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _formData;
+
+    var ID, FIELD_ID, LABEL, ID2, FIELD_ID2, LABEL2, VALUE, VALUE2, PARENT_CONFIG, NESTED_CONFIG, _renderWithValidation, container, child, label, input, child2, label2, input2;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -21,32 +25,53 @@ describe('utils.Component.get', function () {
             ID = 'testId';
             FIELD_ID = 'fieldId';
             LABEL = 'Test label';
+            ID2 = 'testId2';
+            FIELD_ID2 = 'fieldId2';
+            LABEL2 = 'Test label 2';
             VALUE = 'nestedValue';
+            VALUE2 = '1-2-2022';
             PARENT_CONFIG = {
               onChange: function onChange() {},
-              formData: _defineProperty({}, FIELD_ID, VALUE)
-            };
-            NESTED_CONFIG = {
-              nested: {
-                id: ID,
-                fieldId: FIELD_ID,
-                label: LABEL,
-                type: 'text'
-              }
+              formData: (_formData = {}, _defineProperty(_formData, FIELD_ID, VALUE), _defineProperty(_formData, FIELD_ID2, VALUE2), _formData)
             };
-            _render = (0, _react.render)((0, _getComponent.getNestedComponent)(PARENT_CONFIG, NESTED_CONFIG)), container = _render.container;
+            NESTED_CONFIG = [{
+              id: ID,
+              fieldId: FIELD_ID,
+              label: LABEL,
+              type: 'text'
+            }, {
+              id: ID2,
+              fieldId: FIELD_ID2,
+              label: LABEL2,
+              type: 'date'
+            }];
+            _renderWithValidation = (0, _setupTests.renderWithValidation)((0, _getComponent.getChildrenJsx)(PARENT_CONFIG, NESTED_CONFIG)), container = _renderWithValidation.container;
             child = container.childNodes[0];
+            expect(child.childNodes.length).toEqual(3);
             expect(child.classList).toContain('govuk-form-group');
             label = child.childNodes[0];
             expect(label).toBeDefined();
             expect(label.innerHTML).toContain(LABEL);
-            input = child.childNodes[1];
+            input = child.childNodes[2];
             expect(input.tagName).toEqual('INPUT');
             expect(input.classList).toContain('govuk-input');
             expect(input.id).toEqual(ID);
             expect(input.value).toEqual(VALUE);
+            child2 = container.childNodes[1];
+            expect(child2.childNodes.length).toEqual(3);
+            expect(child2.classList).toContain('govuk-form-group');
+            label2 = child2.childNodes[0];
+            expect(label2).toBeDefined();
+            expect(label2.innerHTML).toContain(LABEL2);
+            input2 = child2.childNodes[2];
+            expect(input2.tagName).toEqual('DIV');
+            expect(input2.classList).toContain('govuk-date-input');
+            expect(input2.id).toEqual(ID2);
+            expect(input2.childNodes[0].childNodes[1].value).toEqual('1');
+            expect(input2.childNodes[1].childNodes[1].value).toEqual('2');
+            expect(input2.childNodes[2].childNodes[1].value).toEqual('2022');
 
-          case 17:
+          case 35:
           case "end":
             return _context.stop();
         }
@@ -54,7 +79,7 @@ describe('utils.Component.get', function () {
     }, _callee);
   })));
   it('should return a read only component that is nested within another readonly component', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-    var ID, FIELD_ID, LABEL, VALUE, PARENT_CONFIG, NESTED_CONFIG, _render2, container, child;
+    var ID, FIELD_ID, LABEL, VALUE, PARENT_CONFIG, NESTED_CONFIG, _render, container, child;
 
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -69,17 +94,15 @@ describe('utils.Component.get', function () {
               formData: _defineProperty({}, FIELD_ID, VALUE),
               readonly: true
             };
-            NESTED_CONFIG = {
-              nested: {
-                id: ID,
-                fieldId: FIELD_ID,
-                label: LABEL,
-                type: 'text',
-                readonly: true
-              }
-            };
-            _render2 = (0, _react.render)((0, _getComponent.getNestedComponent)(PARENT_CONFIG, NESTED_CONFIG)), container = _render2.container;
-            child = container.childNodes[0];
+            NESTED_CONFIG = [{
+              id: ID,
+              fieldId: FIELD_ID,
+              label: LABEL,
+              type: 'text',
+              readonly: true
+            }];
+            _render = (0, _react.render)((0, _getComponent.getChildrenJsx)(PARENT_CONFIG, NESTED_CONFIG)), container = _render.container;
+            child = container.childNodes[0].childNodes[0];
             expect(child.classList).toContain('hods-readonly');
 
           case 9:

package/dist/utils/Component/getComponentTests/getComponent.time.test.js

@@ -0,0 +1,106 @@
+"use strict";
+
+var _react = require("@testing-library/react");
+
+var _models = require("../../../models");
+
+var _getComponent = _interopRequireDefault(require("../getComponent"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+describe('utils.Component.get', function () {
+  it('should return an appropriately rendered time component', function () {
+    var ID = 'test-id';
+    var FIELD_ID = 'field-id';
+    var LABEL = 'label';
+    var ON_CHANGE_CALLS = [];
+
+    var ON_CHANGE = function ON_CHANGE(e) {
+      ON_CHANGE_CALLS.push(e.target);
+    };
+
+    var COMPONENT = {
+      type: _models.ComponentTypes.TIME,
+      id: ID,
+      fieldId: FIELD_ID,
+      label: LABEL,
+      onChange: ON_CHANGE,
+      'data-testid': ID
+    };
+
+    var _render = (0, _react.render)((0, _getComponent.default)(COMPONENT)),
+        container = _render.container;
+
+    var _getAllByTestId = (0, _react.getAllByTestId)(container, ID),
+        _getAllByTestId2 = _slicedToArray(_getAllByTestId, 2),
+        formGroup = _getAllByTestId2[0],
+        timeInput = _getAllByTestId2[1];
+
+    expect(formGroup.tagName).toEqual('DIV');
+    expect(formGroup.classList).toContain('govuk-form-group');
+    var label = formGroup.childNodes[0];
+    expect(label.innerHTML).toContain(LABEL);
+    expect(label.getAttribute('for')).toEqual(ID);
+    expect(timeInput.tagName).toEqual('DIV');
+    expect(timeInput.classList).toContain('govuk-date-input');
+    expect(timeInput.id).toEqual(ID);
+    var onChangeCalls = ON_CHANGE_CALLS.length;
+
+    var _timeInput$childNodes = _slicedToArray(timeInput.childNodes, 2),
+        hourItem = _timeInput$childNodes[0],
+        minuteItem = _timeInput$childNodes[1];
+
+    [{
+      id: 'hour',
+      label: 'Hour',
+      item: hourItem,
+      value: '5',
+      expectedValue: '5:'
+    }, {
+      id: 'minute',
+      label: 'Minute',
+      item: minuteItem,
+      value: '11',
+      expectedValue: '5:11'
+    }].forEach(function (part) {
+      expect(part.item.tagName).toEqual('DIV');
+      expect(part.item.classList).toContain('govuk-date-input__item');
+
+      var _part$item$childNodes = _slicedToArray(part.item.childNodes, 2),
+          label = _part$item$childNodes[0],
+          input = _part$item$childNodes[1];
+
+      expect(label.tagName).toEqual('LABEL');
+      expect(label.classList).toContain('govuk-label');
+      expect(label.textContent).toEqual(part.label);
+      expect(input.tagName).toEqual('INPUT');
+      expect(input.id).toEqual("".concat(ID, "-").concat(part.id)); // Put something in the input and make sure it fires.
+
+      _react.fireEvent.change(input, {
+        target: {
+          name: "".concat(FIELD_ID, "-").concat(part.id),
+          value: part.value
+        }
+      });
+
+      onChangeCalls++;
+      expect(ON_CHANGE_CALLS.length).toEqual(onChangeCalls);
+      expect(ON_CHANGE_CALLS[onChangeCalls - 1]).toMatchObject({
+        name: FIELD_ID,
+        value: part.expectedValue
+      });
+    });
+  });
+});

package/dist/utils/Component/showComponent.js

@@ -11,6 +11,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // Local imports
 var showComponent = function showComponent(component, data) {
+  var _component$show_when;
+
   if (!component) {
     return false;
   }
@@ -19,6 +21,10 @@ var showComponent = function showComponent(component, data) {
     return false;
   }
 
+  if (((_component$show_when = component.show_when) === null || _component$show_when === void 0 ? void 0 : _component$show_when.type) === "or") {
+    return _Condition.default.meetsOne(component, data);
+  }
+
   return _Condition.default.meetsAll(component, data);
 };
 

package/dist/utils/Component/showComponent.test.js

@@ -89,6 +89,69 @@ describe('utils', function () {
         };
         expect((0, _showComponent.default)(COMPONENT, DATA)).toBeFalsy();
       });
+      it('SHOULD be shown when the component has multiple show_when conditions, with type "or" provided and ALL are matched', function () {
+        var COMPONENT = {
+          show_when: {
+            "type": "or",
+            "conditions": [{
+              field: 'alpha',
+              op: '=',
+              value: 'Alpha'
+            }, {
+              field: 'bravo',
+              op: '=',
+              value: 'Bravo'
+            }]
+          }
+        };
+        var DATA = {
+          alpha: 'Alpha',
+          bravo: 'Bravo'
+        };
+        expect((0, _showComponent.default)(COMPONENT, DATA)).toBeTruthy();
+      });
+      it('SHOULD be shown when the component has multiple show_when conditions, with type "or" provided and at least ONE is matched', function () {
+        var COMPONENT = {
+          show_when: {
+            "type": "or",
+            "conditions": [{
+              field: 'alpha',
+              op: '=',
+              value: 'Alpha'
+            }, {
+              field: 'charlie',
+              op: '=',
+              value: 'Charlie'
+            }]
+          }
+        };
+        var DATA = {
+          alpha: 'Alpha',
+          bravo: 'Bravo'
+        };
+        expect((0, _showComponent.default)(COMPONENT, DATA)).toBeTruthy();
+      });
+      it('should NOT be shown when the component has multiple show_when conditions, with type "or" provided and NONE are matched', function () {
+        var COMPONENT = {
+          show_when: {
+            "type": "or",
+            "conditions": [{
+              field: 'alpha',
+              op: '!=',
+              value: 'Alpha'
+            }, {
+              field: 'charlie',
+              op: '=',
+              value: 'Charlie'
+            }]
+          }
+        };
+        var DATA = {
+          alpha: 'Alpha',
+          bravo: 'Bravo'
+        };
+        expect((0, _showComponent.default)(COMPONENT, DATA)).toBeFalsy();
+      });
     });
   });
 });

package/dist/utils/Component/wrapInFormGroup.js

@@ -5,16 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
+
 var _react = _interopRequireDefault(require("react"));
 
-var _copReactComponents = require("@ukhomeoffice/cop-react-components");
+var _cleanAttributes = _interopRequireDefault(require("./cleanAttributes"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 var wrapInFormGroup = function wrapInFormGroup(config, children) {
-  return /*#__PURE__*/_react.default.createElement(_copReactComponents.FormGroup, _extends({}, config, {
+  var attrs = (0, _cleanAttributes.default)(config, ['fieldId', 'displayMenu']);
+  return /*#__PURE__*/_react.default.createElement(_copReactComponents.FormGroup, _extends({}, attrs, {
     onChange: null
   }), children);
 };

package/dist/utils/Condition/index.js

@@ -9,9 +9,12 @@ var _meetsAllConditions = _interopRequireDefault(require("./meetsAllConditions")
 
 var _meetsCondition = _interopRequireDefault(require("./meetsCondition"));
 
+var _meetsOneCondition = _interopRequireDefault(require("./meetsOneCondition"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var Condition = {
+  meetsOne: _meetsOneCondition.default,
   meetsAll: _meetsAllConditions.default,
   met: _meetsCondition.default
 };

package/dist/utils/Condition/meetsOneCondition.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _Data = _interopRequireDefault(require("../Data"));
+
+var _meetsCondition = _interopRequireDefault(require("./meetsCondition"));
+
+var _setupConditions = _interopRequireDefault(require("./setupConditions"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Local imports
+
+/**
+ * Evaluates all condition(s) on a page, container, or component.
+ * @param {object} options The container to consider.
+ * @param {object} data The top-level form data.
+ * @returns Boolean true if at least one conditions is met; false otherwise.
+ */
+var meetsOneCondition = function meetsOneCondition(options, data) {
+  var conditions = (0, _setupConditions.default)(options);
+
+  if (conditions) {
+    var arr = Array.isArray(conditions) ? conditions : [conditions];
+    return arr.some(function (condition) {
+      var sourceDataValue = _Data.default.getSource(data, condition.field);
+
+      return (0, _meetsCondition.default)(condition, sourceDataValue);
+    });
+  }
+
+  return true;
+};
+
+var _default = meetsOneCondition;
+exports.default = _default;

package/dist/utils/Condition/meetsOneCondition.test.js

@@ -0,0 +1,101 @@
+"use strict";
+
+var _meetsOneCondition = _interopRequireDefault(require("./meetsOneCondition"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Local imports
+describe('utils.Condition.meetsOneCondition', function () {
+  var DATA = {
+    alpha: 'bravo',
+    charlie: 'delta'
+  };
+  it('should evaluate to true when conditions are null', function () {
+    expect((0, _meetsOneCondition.default)(null, DATA)).toBeTruthy();
+  });
+  it('should evaluate to true when conditions are undefined', function () {
+    expect((0, _meetsOneCondition.default)(undefined, DATA)).toBeTruthy();
+  });
+  it('should evaluate to true when conditions is an empty array', function () {
+    var CONDITION = {
+      "type": "or",
+      "conditions": []
+    };
+    expect((0, _meetsOneCondition.default)(CONDITION, DATA)).toBeTruthy();
+  });
+  it('should evaluate to true when one condition is provided and one condition is met', function () {
+    var CONDITION = {
+      "type": "or",
+      "conditions": [{
+        field: 'alpha',
+        op: 'eq',
+        value: 'bravo'
+      }]
+    };
+    expect((0, _meetsOneCondition.default)(CONDITION, DATA)).toBeTruthy();
+  });
+  it('should evaluate to true when two conditions are provided and one condition is met', function () {
+    var CONDITION = {
+      "type": "or",
+      "conditions": [{
+        field: 'alpha',
+        op: 'eq',
+        value: 'bravo'
+      }, {
+        field: 'alpha',
+        op: 'eq',
+        value: "charlie"
+      }]
+    };
+    expect((0, _meetsOneCondition.default)(CONDITION, DATA)).toBeTruthy();
+  });
+  it('should evaluate to true when three conditions are provided and two conditions are met', function () {
+    var CONDITION = {
+      "type": "or",
+      "conditions": [{
+        field: 'alpha',
+        op: 'eq',
+        value: 'bravo'
+      }, {
+        field: 'charlie',
+        op: 'eq',
+        value: 'delta'
+      }, {
+        field: 'alpha',
+        op: 'eq',
+        value: "charlie"
+      }]
+    };
+    expect((0, _meetsOneCondition.default)(CONDITION, DATA)).toBeTruthy();
+  });
+  it('should evaluate to true when all conditions are met', function () {
+    var CONDITION = {
+      "type": "or",
+      "conditions": [{
+        field: 'alpha',
+        op: 'eq',
+        value: 'bravo'
+      }, {
+        field: 'charlie',
+        op: 'eq',
+        value: 'delta'
+      }]
+    };
+    expect((0, _meetsOneCondition.default)(CONDITION, DATA)).toBeTruthy();
+  });
+  it('should evaluate to false when no conditions are met', function () {
+    var CONDITION = {
+      "type": "or",
+      "conditions": [{
+        field: 'alpha',
+        op: 'eq',
+        value: 'delta'
+      }, {
+        field: 'charlie',
+        op: 'eq',
+        value: 'bravo'
+      }]
+    };
+    expect((0, _meetsOneCondition.default)(CONDITION, DATA)).toBeTruthy();
+  });
+});

package/dist/utils/Condition/setupConditions.js

@@ -17,12 +17,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var makeComponentFieldsAbsolute = function makeComponentFieldsAbsolute(component) {
   if (component.show_when) {
+    var conditions = component.show_when.type ? component.show_when.conditions : component.show_when;
     var full_path = component.full_path;
-    var show_when = Array.isArray(component.show_when) ? component.show_when : [component.show_when];
-    return show_when.map(function (sw) {
-      var field = _Data.default.getDataPath(sw.field, full_path);
+    conditions = Array.isArray(conditions) ? conditions : [conditions];
+    return conditions.map(function (condition) {
+      var field = _Data.default.getDataPath(condition.field, full_path);
 
-      return _objectSpread(_objectSpread({}, sw), {}, {
+      return _objectSpread(_objectSpread({}, condition), {}, {
         field: field
       });
     });

package/dist/utils/Container/showContainer.js

@@ -41,6 +41,10 @@ var showContainer = function showContainer(container, data) {
 
 
   if (container.show_when) {
+    if (container.show_when.type === "or") {
+      return _Condition.default.meetsOne(container, data);
+    }
+
     return _Condition.default.meetsAll(container, data);
   } // If the container itself doesn't have a show_when, we need to make sure that if it
   // contains ANY editable components, at least one of them is shown.