@ukhomeoffice/cop-react-form-renderer 4.13.0 → 4.13.1-alpha

package/dist/utils/Component/getComponent.js

@@ -25,12 +25,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 setupChildrenJSX = function setupChildrenJSX(options, config) {
+  options.forEach(function (option) {
+    if (!Array.isArray(option.nested)) {
+      return;
+    }
+
+    option.children = getChildrenJsx(config, option.nested);
+  });
+};
 /** 
  * Separate function for each component type for the sake of
  * code clarity - having the additional bits and pieces in the
  * switch statement increases the cyclomatic complexity and
  * makes it much harder to follow what's going on.
  */
+
+
 var getAutocomplete = function getAutocomplete(config) {
   var attrs = (0, _cleanAttributes.default)(config);
 
@@ -48,6 +59,7 @@ var getCheckboxes = function getCheckboxes(config) {
     options = val;
   });
 
+  setupChildrenJSX(options, config);
   var attrs = (0, _cleanAttributes.default)(config);
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.Checkboxes, _extends({}, attrs, {
     options: options
@@ -106,13 +118,7 @@ var getRadios = function getRadios(config) {
     options = val;
   });
 
-  options.forEach(function (option) {
-    if (!Array.isArray(option.nested)) {
-      return;
-    }
-
-    option.children = getChildrenJsx(config, option.nested);
-  });
+  setupChildrenJSX(options, config);
   var attrs = (0, _cleanAttributes.default)(config);
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.Radios, _extends({}, attrs, {
     options: options

package/dist/utils/Validate/validateComponent.js

@@ -79,6 +79,7 @@ var validateComponent = function validateComponent(component, outerData, formDat
         error = message;
         break;
 
+      case _models.ComponentTypes.CHECKBOXES:
       case _models.ComponentTypes.RADIOS:
         var nestedErrors = [];
         (_component$data$optio = component.data.options) === null || _component$data$optio === void 0 ? void 0 : _component$data$optio.forEach(function (option) {

package/dist/utils/Validate/validateComponent.test.js

@@ -200,19 +200,19 @@ describe('utils.Validate.Component', function () {
     });
   });
   describe('when the component has a nested component', function () {
-    it('should return no error when the radio component contains nested components without errors', function () {
+    it.each([['radios', 'text'], ['checkboxes', 'text']])('should return no error when the radio component contains nested components without errors', function (parentType, nestedType) {
       var NESTED_ID = 'nestedId';
       var NESTED_VALUE = 'nestedValue';
 
       var FORMDATA = _defineProperty({}, NESTED_ID, NESTED_VALUE);
 
       var COMPONENT = {
-        type: 'radios',
+        type: parentType,
         id: 'a',
         data: {
           options: [{
             nested: [{
-              type: 'text',
+              type: nestedType,
               fieldId: NESTED_ID,
               id: NESTED_ID,
               required: true
@@ -222,16 +222,16 @@ describe('utils.Validate.Component', function () {
       };
       expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toBeUndefined();
     });
-    it('should return an error when the radio component contains nested components with errors', function () {
+    it.each([['radios', 'text'], ['checkboxes', 'text']])('should return an error when the radio component contains nested components with errors', function (parentType, nestedType) {
       var NESTED_ID = 'nestedId';
       var FORMDATA = {};
       var COMPONENT = {
-        type: 'radios',
+        type: parentType,
         id: 'a',
         data: {
           options: [{
             nested: [{
-              type: 'text',
+              type: nestedType,
               fieldId: NESTED_ID,
               id: NESTED_ID,
               required: true
@@ -244,10 +244,10 @@ describe('utils.Validate.Component', function () {
         error: "Field is required"
       }]);
     });
-    it('should return no error when a non selected radio component contains nested components with errors', function () {
+    it.each([['radios'], ['checkboxes']])('should return no error when a non selected radio component contains nested components with errors', function (type) {
       var NESTED_ID = 'nestedId';
       var COMPONENT = {
-        type: 'radios',
+        type: type,
         id: 'a',
         data: {
           options: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.13.0",
+  "version": "4.13.1-alpha",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "2.2.2",
+    "@ukhomeoffice/cop-react-components": "2.2.3-alpha",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",