@ukhomeoffice/cop-react-form-renderer 6.14.0 → 6.14.1

package/dist/components/FormComponent/helpers/addLabel.js

@@ -4,20 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 /**
  * Adds label to target for given value.
  * @param {object} target The target to be updated.
  * @returns The updated target.
  */
-var addLabel = function addLabel(paramTarget, component, data) {
-  var target = paramTarget;
+const addLabel = (paramTarget, component, data) => {
+  const target = paramTarget;
   // target.value can be an object in which case use value in object attribute
-  var value = _typeof(target.value) === 'object' ? target.value.value : target.value;
+  const value = typeof target.value === 'object' ? target.value.value : target.value;
   // find the reference data item using the value
-  var item = data.find(function (e) {
-    return String(e.id) === value;
-  });
+  const item = data.find(e => String(e.id) === value);
   // if item is null it means that the target.value can be used as a label otherwise use item.label
   target.label = item === undefined ? target.value : item.label;
   target.component = component.cya_label;

package/dist/components/FormComponent/helpers/getComponentDisabled.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
-var getComponentDisabled = function getComponentDisabled(disabled, formData) {
+const getComponentDisabled = (disabled, formData) => {
   if (typeof disabled === 'string') {
     return !!_copReactComponents.Utils.interpolateString(disabled, formData);
   }

package/dist/components/FormComponent/helpers/getComponentDisabled.test.js

@@ -1,25 +1,25 @@
 "use strict";
 
 var _getComponentDisabled = _interopRequireDefault(require("./getComponentDisabled"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('components.FormComponent.helpers.getComponentDisabled', function () {
-  var DATA = {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('components.FormComponent.helpers.getComponentDisabled', () => {
+  const DATA = {
     shouldDisable: true
   };
-  it('should return false if disabled is undefined', function () {
+  it('should return false if disabled is undefined', () => {
     expect((0, _getComponentDisabled.default)(undefined, DATA)).toEqual(false);
   });
-  it('should return false if disabled is boolean false', function () {
+  it('should return false if disabled is boolean false', () => {
     expect((0, _getComponentDisabled.default)(false, DATA)).toEqual(false);
   });
-  it('should return true if disabled is boolean true', function () {
+  it('should return true if disabled is boolean true', () => {
     expect((0, _getComponentDisabled.default)(true, DATA)).toEqual(true);
   });
-  it('should interpolate correctly if disabled is a field path', function () {
+  it('should interpolate correctly if disabled is a field path', () => {
     // eslint-disable-next-line no-template-curly-in-string
     expect((0, _getComponentDisabled.default)('${shouldDisable}', DATA)).toEqual(true);
   });
-  it('should return false if interpolating a field that does not exist', function () {
+  it('should return false if interpolating a field that does not exist', () => {
     // eslint-disable-next-line no-template-curly-in-string
     expect((0, _getComponentDisabled.default)('${notARealField}', DATA)).toEqual(false);
   });

package/dist/components/FormComponent/helpers/getComponentError.js

@@ -4,13 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var getComponentError = function getComponentError(component, errors) {
+const getComponentError = (component, errors) => {
   if (Array.isArray(errors)) {
-    var error = errors.find(function (err) {
-      return err.id === (component.full_path || component.id);
-    });
+    const error = errors.find(err => err.id === (component.full_path || component.id));
     if (error) {
-      var props = {
+      const props = {
         error: error.error
       };
       if (error.properties) {

package/dist/components/FormComponent/helpers/getComponentError.test.js

@@ -1,47 +1,47 @@
 "use strict";
 
 var _getComponentError = _interopRequireDefault(require("./getComponentError"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('components.FormComponent.helpers.getComponentError', function () {
-  var ALPHA = {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('components.FormComponent.helpers.getComponentError', () => {
+  const ALPHA = {
     id: 'alpha'
   };
-  var BETA = {
+  const BETA = {
     id: 'beta',
     full_path: 'beta'
   };
-  var ALPHA_ERROR = {
+  const ALPHA_ERROR = {
     id: ALPHA.id,
     error: 'Alpha is required'
   };
-  var BETA_ERROR = {
+  const BETA_ERROR = {
     id: BETA.id,
     error: 'Year is required',
     properties: {
       year: true
     }
   };
-  it('should return undefined if the errors array is undefined', function () {
+  it('should return undefined if the errors array is undefined', () => {
     expect((0, _getComponentError.default)(ALPHA, undefined)).toBeUndefined();
   });
-  it('should return undefined if the errors array is null', function () {
+  it('should return undefined if the errors array is null', () => {
     expect((0, _getComponentError.default)(ALPHA, null)).toBeUndefined();
   });
-  it('should return undefined if the errors array is empty', function () {
+  it('should return undefined if the errors array is empty', () => {
     expect((0, _getComponentError.default)(ALPHA, [])).toBeUndefined();
   });
-  it('should return undefined if the errors array does not contain an error for the component', function () {
-    var ERRORS = [BETA_ERROR];
+  it('should return undefined if the errors array does not contain an error for the component', () => {
+    const ERRORS = [BETA_ERROR];
     expect((0, _getComponentError.default)(ALPHA, ERRORS)).toBeUndefined();
   });
-  it('should return an appropriate response if the errors array contains an error for the component', function () {
-    var ERRORS = [ALPHA_ERROR];
+  it('should return an appropriate response if the errors array contains an error for the component', () => {
+    const ERRORS = [ALPHA_ERROR];
     expect((0, _getComponentError.default)(ALPHA, ERRORS)).toEqual({
       error: ALPHA_ERROR.error
     });
   });
-  it('should return an appropriate response if the errors array contains an error with properties for the component', function () {
-    var ERRORS = [BETA_ERROR];
+  it('should return an appropriate response if the errors array contains an error with properties for the component', () => {
+    const ERRORS = [BETA_ERROR];
     expect((0, _getComponentError.default)(BETA, ERRORS)).toEqual({
       error: BETA_ERROR.error,
       propsInError: BETA_ERROR.properties

package/dist/components/FormComponent/helpers/getComponentFieldSet.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _models = require("../../../models");
-var SHOULD_HAVE_FIELDSET = [_models.ComponentTypes.RADIOS, _models.ComponentTypes.CHECKBOXES, _models.ComponentTypes.DATE, _models.ComponentTypes.TIME];
-var _default = exports.default = function _default(component) {
-  return component.fieldset || SHOULD_HAVE_FIELDSET.includes(component.type);
-};
+const SHOULD_HAVE_FIELDSET = [_models.ComponentTypes.RADIOS, _models.ComponentTypes.CHECKBOXES, _models.ComponentTypes.DATE, _models.ComponentTypes.TIME];
+var _default = component => component.fieldset || SHOULD_HAVE_FIELDSET.includes(component.type);
+exports.default = _default;

package/dist/components/FormComponent/helpers/getComponentFieldSet.test.js

@@ -1,29 +1,29 @@
 "use strict";
 
 var _getComponentFieldSet = _interopRequireDefault(require("./getComponentFieldSet"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('components.FormComponent.helpers.getComponentFieldSet', function () {
-  it('should return true for component type radios', function () {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('components.FormComponent.helpers.getComponentFieldSet', () => {
+  it('should return true for component type radios', () => {
     expect((0, _getComponentFieldSet.default)({
       type: 'radios'
     })).toEqual(true);
   });
-  it('should return true for component type checkboxes', function () {
+  it('should return true for component type checkboxes', () => {
     expect((0, _getComponentFieldSet.default)({
       type: 'checkboxes'
     })).toEqual(true);
   });
-  it('should return true for component type date', function () {
+  it('should return true for component type date', () => {
     expect((0, _getComponentFieldSet.default)({
       type: 'date'
     })).toEqual(true);
   });
-  it('should return false for component type text', function () {
+  it('should return false for component type text', () => {
     expect((0, _getComponentFieldSet.default)({
       type: 'text'
     })).toEqual(false);
   });
-  it('should return false when component type missing', function () {
+  it('should return false when component type missing', () => {
     expect((0, _getComponentFieldSet.default)({})).toEqual(false);
   });
 });

package/dist/components/FormComponent/helpers/index.js

@@ -5,25 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "addLabel", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _addLabel.default;
   }
 });
 Object.defineProperty(exports, "getComponentDisabled", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _getComponentDisabled.default;
   }
 });
 Object.defineProperty(exports, "getComponentError", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _getComponentError.default;
   }
 });
 Object.defineProperty(exports, "getComponentFieldSet", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _getComponentFieldSet.default;
   }
 });
@@ -31,4 +31,4 @@ var _addLabel = _interopRequireDefault(require("./addLabel"));
 var _getComponentDisabled = _interopRequireDefault(require("./getComponentDisabled"));
 var _getComponentError = _interopRequireDefault(require("./getComponentError"));
 var _getComponentFieldSet = _interopRequireDefault(require("./getComponentFieldSet"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/dist/components/FormComponent/index.js

@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _FormComponent = _interopRequireDefault(require("./FormComponent"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var _default = exports.default = _FormComponent.default;

package/dist/components/FormPage/FormPage.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,58 +12,46 @@ var _utils = _interopRequireDefault(require("../../utils"));
 var _FormComponent = _interopRequireDefault(require("../FormComponent"));
 var _PageActions = _interopRequireDefault(require("../PageActions"));
 require("./FormPage.scss");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // Global imports
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // Global imports
 // Local imports.
 // Styles
-var DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form__page';
-var FormPage = function FormPage(_ref) {
+const DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form__page';
+const FormPage = _ref => {
   var _page$customValidatio, _formPage$actions, _page$actions;
-  var page = _ref.page,
-    pages = _ref.pages,
-    _onAction = _ref.onAction,
-    onWrapperChange = _ref.onWrapperChange,
-    onTopLevelChange = _ref.onTopLevelChange,
-    onChange = _ref.onChange,
-    hashLink = _ref.hashLink,
-    classBlock = _ref.classBlock,
-    classModifiers = _ref.classModifiers,
-    className = _ref.className,
-    submitting = _ref.submitting,
-    pageId = _ref.pageId,
-    fromTarget = _ref.fromTarget;
-  var _useState = (0, _react.useState)({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    patch = _useState2[0],
-    setPatch = _useState2[1];
-  var _useValidation = (0, _hooks.useValidation)(),
-    errors = _useValidation.errors,
-    validate = _useValidation.validate;
-  var _useState3 = (0, _react.useState)({}),
-    _useState4 = _slicedToArray(_useState3, 2),
-    patchLabel = _useState4[0],
-    setPatchLabel = _useState4[1];
-  var _useState5 = (0, _react.useState)(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isPageRendered = _useState6[0],
-    setIsPageRendered = _useState6[1];
-  var runOnLoad = Array.isArray(page === null || page === void 0 ? void 0 : page.customValidation) && page.customValidation.length > 0 ? ((_page$customValidatio = page.customValidation[0]) === null || _page$customValidatio === void 0 || (_page$customValidatio = _page$customValidatio.runWhen) === null || _page$customValidatio === void 0 ? void 0 : _page$customValidatio.onLoad) === true : false;
-  (0, _react.useEffect)(function () {
+  let {
+    page,
+    pages,
+    onAction,
+    onWrapperChange,
+    onTopLevelChange,
+    onChange,
+    hashLink,
+    classBlock,
+    classModifiers,
+    className,
+    submitting,
+    pageId,
+    fromTarget
+  } = _ref;
+  const [patch, setPatch] = (0, _react.useState)({});
+  const {
+    errors,
+    validate
+  } = (0, _hooks.useValidation)();
+  const [patchLabel, setPatchLabel] = (0, _react.useState)({});
+  const [isPageRendered, setIsPageRendered] = (0, _react.useState)(false);
+  const runOnLoad = Array.isArray(page === null || page === void 0 ? void 0 : page.customValidation) && page.customValidation.length > 0 ? ((_page$customValidatio = page.customValidation[0]) === null || _page$customValidatio === void 0 || (_page$customValidatio = _page$customValidatio.runWhen) === null || _page$customValidatio === void 0 ? void 0 : _page$customValidatio.onLoad) === true : false;
+  (0, _react.useEffect)(() => {
     setIsPageRendered(true);
   }, []);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (isPageRendered && fromTarget && runOnLoad) {
       validate.page(page);
     }
@@ -75,69 +62,63 @@ var FormPage = function FormPage(_ref) {
    * This is so that the overall form data isn't affected until such
    * time as the onAction handler is invoked.
   */
-  var onPageChange = function onPageChange(_ref2) {
-    var target = _ref2.target;
-    var formPage = page;
+  const onPageChange = _ref2 => {
+    let {
+      target
+    } = _ref2;
+    const formPage = page;
     if (target.value == null) {
       delete formPage.formData[target.name];
-      setPatch(function (prev) {
-        var data = prev;
+      setPatch(prev => {
+        const data = prev;
         return delete data[target.name];
       });
-      setPatchLabel(function (prev) {
-        var data = prev;
+      setPatchLabel(prev => {
+        const data = prev;
         return delete data[target.component];
       });
     } else {
       formPage.formData[target.name] = target.value;
-      setPatch(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.name, target.value));
-      });
-      setPatchLabel(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.component, target.label));
-      });
+      setPatch(prev => _objectSpread(_objectSpread({}, prev), {}, {
+        [target.name]: target.value
+      }));
+      setPatchLabel(prev => _objectSpread(_objectSpread({}, prev), {}, {
+        [target.component]: target.label
+      }));
     }
     if (typeof onChange === 'function') {
       onChange(page.formData);
     }
   };
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     // eslint-disable-next-line no-useless-concat
-    var coreDocTitle = document.title.replace('Error: ', '');
+    const coreDocTitle = document.title.replace('Error: ', '');
     // eslint-disable-next-line prefer-template
     document.title = errors.length > 0 ? 'Error: ' + coreDocTitle : coreDocTitle;
   }, [errors]);
-  var classes = _utils.default.classBuilder(classBlock, classModifiers, className);
-  var formPage = page;
-  formPage.actions = (_formPage$actions = formPage.actions) === null || _formPage$actions === void 0 ? void 0 : _formPage$actions.map(function (action) {
-    return action.label ? _objectSpread(_objectSpread({}, action), {}, {
-      label: _utils.default.interpolateString(action.label, formPage.formData)
-    }) : action;
-  });
+  const classes = _utils.default.classBuilder(classBlock, classModifiers, className);
+  const formPage = page;
+  formPage.actions = (_formPage$actions = formPage.actions) === null || _formPage$actions === void 0 ? void 0 : _formPage$actions.map(action => action.label ? _objectSpread(_objectSpread({}, action), {}, {
+    label: _utils.default.interpolateString(action.label, formPage.formData)
+  }) : action);
   formPage.formData = _utils.default.Operate.runPageOperations(formPage, _objectSpread(_objectSpread({}, formPage.formData), patch), onWrapperChange || onPageChange);
-  var headingContent = page.title ? /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, _utils.default.FormPage.getTitle(page.title, page.formData)) : /*#__PURE__*/_react.default.createElement(_copReactComponents.Label, {
+  const headingContent = page.title ? /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, _utils.default.FormPage.getTitle(page.title, page.formData)) : /*#__PURE__*/_react.default.createElement(_copReactComponents.Label, {
     id: page.id,
     required: page.required,
     hideOptionalSuffix: page.hideOptionalSuffix
   }, page.label);
-  var formComponentContent = page.components.filter(function (c) {
-    return _utils.default.Component.show(c, page.formData);
-  }).map(function (component, index) {
-    return /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
-      key: index,
-      component: component,
-      onAction: function onAction(action) {
-        return _onAction(action, patch, patchLabel);
-      },
-      onChange: onWrapperChange || onPageChange,
-      onTopLevelChange: onTopLevelChange || onPageChange,
-      value: page.formData[component.fieldId] || patch[component.fieldId],
-      formData: page.formData,
-      pages: pages,
-      submitting: submitting
-    });
-  });
-  var errorMessages = null;
+  const formComponentContent = page.components.filter(c => _utils.default.Component.show(c, page.formData)).map((component, index) => /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+    key: index,
+    component: component,
+    onAction: action => onAction(action, patch, patchLabel),
+    onChange: onWrapperChange || onPageChange,
+    onTopLevelChange: onTopLevelChange || onPageChange,
+    value: page.formData[component.fieldId] || patch[component.fieldId],
+    formData: page.formData,
+    pages: pages,
+    submitting: submitting
+  }));
+  let errorMessages = null;
   if (runOnLoad && (errors === null || errors === void 0 ? void 0 : errors.length) > 0) {
     var _page$customValidatio2;
     errorMessages = [{
@@ -157,12 +138,8 @@ var FormPage = function FormPage(_ref) {
   }, /*#__PURE__*/_react.default.createElement("legend", {
     className: "govuk-fieldset__legend"
   }, headingContent), formComponentContent), !page.fieldset && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, headingContent, formComponentContent), /*#__PURE__*/_react.default.createElement(_PageActions.default, {
-    actions: (_page$actions = page.actions) === null || _page$actions === void 0 ? void 0 : _page$actions.filter(function (action) {
-      return _utils.default.Component.show(action, page.formData);
-    }),
-    onAction: function onAction(action) {
-      return _onAction(action, patch, patchLabel);
-    }
+    actions: (_page$actions = page.actions) === null || _page$actions === void 0 ? void 0 : _page$actions.filter(action => _utils.default.Component.show(action, page.formData)),
+    onAction: action => onAction(action, patch, patchLabel)
   }));
 };
 FormPage.propTypes = {