@ukhomeoffice/cop-react-form-renderer 5.13.1 → 5.13.3-bravo

package/dist/components/CheckYourAnswers/Answer.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _VisuallyHidden = _interopRequireDefault(require("@ukhomeoffice/cop-react-components/dist/VisuallyHidden"));
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _FormComponent = _interopRequireDefault(require("../FormComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -20,7 +20,7 @@ var Answer = function Answer(_ref) {
     component = _ref.component,
     formData = _ref.formData;
   if (!value) {
-    return /*#__PURE__*/_react.default.createElement(_VisuallyHidden.default, null, "No answer");
+    return /*#__PURE__*/_react.default.createElement(_copReactComponents.VisuallyHidden, null, "No answer");
   }
   if (!component) {
     return Object.prototype.hasOwnProperty.call(value, 'label') ? value.label : value;

package/dist/components/CheckYourAnswers/Answer.test.js

@@ -1,7 +1,6 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _Readonly = require("@ukhomeoffice/cop-react-components/dist/Readonly");
 var _react = _interopRequireDefault(require("react"));
 var _setupTests = require("../../setupTests");
 var _Answer = _interopRequireDefault(require("./Answer"));
@@ -66,7 +65,7 @@ describe('components', function () {
             })), container = _renderWithValidation3.container;
             answer = container.childNodes[0];
             expect(answer.tagName).toEqual('DIV');
-            expect(answer.classList).toContain(_Readonly.DEFAULT_CLASS);
+            expect(answer.classList).toContain(DEFAULT_READONLY_CLASS);
             expect(answer.textContent).toEqual(VALUE);
           case 7:
           case "end":
@@ -125,7 +124,7 @@ describe('components', function () {
             })), container = _renderWithValidation5.container;
             answer = container.childNodes[0];
             expect(answer.tagName).toEqual('DIV');
-            expect(answer.classList).toContain(_Readonly.DEFAULT_CLASS);
+            expect(answer.classList).toContain(DEFAULT_READONLY_CLASS);
             expect(answer.textContent).toEqual('hardcoded delta');
           case 8:
           case "end":

package/dist/components/CollectionPage/CollectionPage.js

@@ -29,7 +29,6 @@ var DEFAULT_CLASS = _FormPage2.DEFAULT_CLASS;
 exports.DEFAULT_CLASS = DEFAULT_CLASS;
 var CollectionPage = function CollectionPage(_ref) {
   var page = _ref.page,
-    onCollectionChange = _ref.onCollectionChange,
     onAction = _ref.onAction,
     hashLink = _ref.hashLink,
     classBlock = _ref.classBlock,
@@ -63,9 +62,6 @@ var CollectionPage = function CollectionPage(_ref) {
         value: newValue
       }
     });
-    if (typeof onCollectionChange === 'function') {
-      onCollectionChange(page.formData);
-    }
   };
   var reportActiveIdChange = function reportActiveIdChange(newActiveId) {
     onPageChange({
@@ -123,7 +119,6 @@ CollectionPage.propTypes = {
     actions: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.shape({}), _propTypes.default.string])),
     formData: _propTypes.default.shape({}).isRequired
   }).isRequired,
-  onCollectionChange: _propTypes.default.func,
   onAction: _propTypes.default.func.isRequired,
   hashLink: _propTypes.default.bool,
   classBlock: _propTypes.default.string,
@@ -131,7 +126,6 @@ CollectionPage.propTypes = {
   className: _propTypes.default.string
 };
 CollectionPage.defaultProps = {
-  onCollectionChange: undefined,
   hashLink: false,
   classBlock: DEFAULT_CLASS,
   classModifiers: [],

package/dist/components/FormComponent/Container.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.DEFAULT_CLASS = void 0;
-var _Utils = require("@ukhomeoffice/cop-react-components/dist/utils/Utils");
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _models = require("../../models");
 var _utils = _interopRequireDefault(require("../../utils"));
+var _cleanAttributes = _interopRequireDefault(require("../../utils/Component/cleanAttributes"));
 var _FormComponent = _interopRequireDefault(require("./FormComponent"));
 var _excluded = ["container", "value", "formData", "onChange", "wrap", "onTopLevelChange"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -61,8 +61,8 @@ var Container = function Container(_ref) {
     }), formData);
   };
   var classes = _utils.default.classBuilder(DEFAULT_CLASS, [], container.className);
-  var cleanedAttrs = (0, _Utils.cleanHtmlAttributes)(attrs);
-  return /*#__PURE__*/_react.default.createElement("div", _extends({}, cleanedAttrs, {
+  var htmlAttrs = (0, _cleanAttributes.default)(attrs);
+  return /*#__PURE__*/_react.default.createElement("div", _extends({}, htmlAttrs, {
     className: classes(),
     id: container.id
   }), container.components && container.components.filter(shouldShow).map(function (component, index) {

package/dist/components/FormRenderer/FormRenderer.js

@@ -354,7 +354,6 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     className: formState.page.className
   }), formState.page && !formState.cya && formState.page.collection && /*#__PURE__*/_react.default.createElement(_CollectionPage.default, {
     page: formState.page,
-    onCollectionChange: onChange,
     onAction: function onAction(action, patch, patchLabel) {
       (0, _onPageAction.default)(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors);
     },

package/dist/components/FormRenderer/onCYAAction.js

@@ -101,11 +101,7 @@ var onCYAAction = function onCYAAction(setPagePoint, action, pages, validate, co
     onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, (_formState$page = formState.page) === null || _formState$page === void 0 ? void 0 : _formState$page.formData));
   }
   if (action.type === _models.PageAction.TYPES.CANCEL) {
-    var formData = _utils.default.Format.form({
-      pages: pages,
-      components: components
-    }, _objectSpread({}, data), _models.EventTypes.CANCEL);
-    hooks.onCancel(formData);
+    hooks.onCancel();
   }
 };
 var _default = onCYAAction;

package/dist/components/FormRenderer/onCYAAction.test.js

@@ -102,15 +102,15 @@ describe('components.FormRenderer.onCYAAction', function () {
     onFormComplete: function onFormComplete() {
       this.onFormCompleteCalls += 1;
     },
-    onCancelArgs: [],
-    onCancel: function onCancel(data) {
-      this.onCancelArgs.push(data);
+    onCancelCalls: 0,
+    onCancel: function onCancel() {
+      this.onCancelCalls += 1;
     },
     reset: function reset() {
       this.onSubmitCalls = 0;
       this.onSubmitArgs = [];
       this.onFormCompleteCalls = 0;
-      this.onCancelArgs = [];
+      this.onCancelCalls = 0;
     }
   };
   var setPagePointCalls = 0;
@@ -578,9 +578,6 @@ describe('components.FormRenderer.onCYAAction', function () {
       }
     });
     _onCYAAction.default.apply(void 0, Object.values(CUSTOM_ARGS));
-    expect(MOCK_HOOKS.onCancelArgs.length).toEqual(1);
-    expect(MOCK_HOOKS.onCancelArgs[0]).toMatchObject({
-      id: 'formId'
-    });
+    expect(MOCK_HOOKS.onCancelCalls).toEqual(1);
   });
 });

package/dist/components/FormRenderer/onPageAction.js

@@ -20,6 +20,11 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 // patchLabel captures non-ID values 
 // for display purposes after submission.)
 var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors) {
+  if (action.type === _models.PageAction.TYPES.CANCEL) {
+    hooks.onCancel();
+    return;
+  }
+  ;
   // Save a copy of data in case submit errors and we need to revert
   var preSubmitData = _objectSpread({}, data);
   var form = formState;
@@ -31,14 +36,6 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
   // This should normally have no effect but will prevent issues 
   // with validation if formData happens to have been wiped.
   form.page.formData = _objectSpread(_objectSpread({}, form.page.formData), _patch);
-
-  // Exposes form data to consuming application.
-  if (action.type === _models.PageAction.TYPES.CANCEL) {
-    hooks.onCancel(form.page.formData);
-    return;
-  }
-  ;
-
   // Check to see whether the action is able to proceed, which in
   // in the case of a submission will validate the fields in the page.
   if (_helpers.default.canActionProceed(action, form.page, validate.page)) {

package/dist/components/FormRenderer/onPageAction.test.js

@@ -121,15 +121,15 @@ describe('components.FormRenderer.onPageAction', function () {
     onFormComplete: function onFormComplete() {
       this.onFormCompleteCalls += 1;
     },
-    onCancelArgs: [],
-    onCancel: function onCancel(data) {
-      this.onCancelArgs.push(data);
+    onCancelCalls: 0,
+    onCancel: function onCancel() {
+      this.onCancelCalls += 1;
     },
     reset: function reset() {
       this.onSubmitCalls = 0;
       this.onSubmitArgs = [];
       this.onFormCompleteCalls = 0;
-      this.onCancelArgs = [];
+      this.onCancelCalls = 0;
       this.onActionCalls = 0;
     },
     onActionCalls: 0,
@@ -290,8 +290,7 @@ describe('components.FormRenderer.onPageAction', function () {
       action: ACTION
     });
     _onPageAction.default.apply(void 0, Object.values(CUSTOM_ARGS));
-    expect(MOCK_HOOKS.onCancelArgs.length).toEqual(1);
-    expect(MOCK_HOOKS.onCancelArgs[0]).toMatchObject({});
+    expect(MOCK_HOOKS.onCancelCalls).toEqual(1);
     // Shouldn't get to the point of validation if
     // action is a cancel action.
     expect(_helpers.default.canActionProceedCalls).toEqual(0);

package/dist/components/SummaryList/SummaryList.js

@@ -29,7 +29,6 @@ var SummaryList = function SummaryList(_ref) {
     className = _ref.className,
     attrs = _objectWithoutProperties(_ref, _excluded);
   var classes = _copReactComponents.Utils.classBuilder(classBlock, classModifiers, className);
-  var cleanedHtmlAttrs = _copReactComponents.Utils.cleanHtmlAttributes(attrs);
   var groupActionRow = null;
   if (isGroup) {
     var rowActions = rows.filter(function (r) {
@@ -39,7 +38,7 @@ var SummaryList = function SummaryList(_ref) {
   }
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "group-of-rows"
-  }, /*#__PURE__*/_react.default.createElement("dl", _extends({}, cleanedHtmlAttrs, {
+  }, /*#__PURE__*/_react.default.createElement("dl", _extends({}, attrs, {
     className: classes()
   }), rows.map(function (row) {
     var key = "".concat(row.pageId, "_").concat(row.full_path || row.fieldId);

package/dist/components/TaskList/TaskList.js

@@ -8,7 +8,6 @@ exports.default = exports.DEFAULT_INCOMPLETE_TITLE = exports.DEFAULT_CLASS = voi
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
-var _dist = require("@ukhomeoffice/cop-react-components/dist");
 var _models = require("../../models");
 var _Task = _interopRequireDefault(require("./Task"));
 var _showComponent = _interopRequireDefault(require("../../utils/Component/showComponent"));
@@ -45,7 +44,7 @@ var TaskList = function TaskList(_ref) {
     formData = _ref.formData,
     attrs = _objectWithoutProperties(_ref, _excluded);
   var classes = _copReactComponents.Utils.classBuilder(classBlock, classModifiers, className);
-  var cleanedHtmlAttrs = _copReactComponents.Utils.cleanHtmlAttributes(attrs);
+
   // TODO state will be retrieved from a document in S3 rather than given in the component definition, covered under COP-9885
   var _sections$filter$redu = sections.filter(function (section) {
       return !section.skipped;
@@ -71,7 +70,7 @@ var TaskList = function TaskList(_ref) {
   };
   return /*#__PURE__*/_react.default.createElement("div", _extends({
     id: id
-  }, cleanedHtmlAttrs, {
+  }, attrs, {
     className: classes()
   }), refNumber && refTitle && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-0"
@@ -103,7 +102,7 @@ var TaskList = function TaskList(_ref) {
       className: classes('section')
     }, sections.length > 1 ? "".concat(index + 1, ". ") : '', section.name), /*#__PURE__*/_react.default.createElement("ol", {
       className: classes('items')
-    }, /*#__PURE__*/_react.default.createElement("li", null, /*#__PURE__*/_react.default.createElement(_dist.Hint, null, section.label ? section.label : '')), section.tasks.filter(function (task) {
+    }, /*#__PURE__*/_react.default.createElement(_copReactComponents.Hint, null, section.label ? section.label : ''), section.tasks.filter(function (task) {
       return task.state !== _models.TaskStates.TYPES.SKIPPED;
     }).map(function (task) {
       return /*#__PURE__*/_react.default.createElement(_Task.default, {

package/dist/context/HooksContext/HooksContext.js

@@ -56,7 +56,7 @@ var DEFAULT_HOOKS = {
     return errors;
   },
   // Returns the list of errors already found in FR by default.
-  onCancel: function onCancel(data) {} // Consuming application must provide function to action, else this does nothing.
+  onCancel: function onCancel() {} // Consuming application must provide function to action, else this does nothing.
 };
 
 var ALLOWED_HOOKS = Object.keys(DEFAULT_HOOKS);

package/dist/hooks/useRefData.js

@@ -52,7 +52,8 @@ var useRefData = function useRefData(component, formData) {
     setStatus = _useState4[1];
   (0, _react.useEffect)(function () {
     if (!url) {
-      if (component.data && component.data.options) {
+      var _component$data;
+      if ((_component$data = component.data) !== null && _component$data !== void 0 && _component$data.options) {
         setData(_Data.default.refData.toOptions(component.data.options, component.item));
       }
       setStatus(STATUS_COMPLETE);

package/dist/models/ComponentTypes.js

@@ -10,6 +10,7 @@ var TYPE_CALCULATION = 'calculation';
 var TYPE_CHECKBOXES = 'checkboxes';
 var TYPE_COLLECTION = 'collection';
 var TYPE_CONTAINER = 'container';
+var TYPE_DATA = 'data';
 var TYPE_DATE = 'date';
 var TYPE_DETAILS = 'details';
 var TYPE_EMAIL = 'email';
@@ -34,6 +35,7 @@ var ComponentTypes = {
   CHECKBOXES: TYPE_CHECKBOXES,
   COLLECTION: TYPE_COLLECTION,
   CONTAINER: TYPE_CONTAINER,
+  DATA: TYPE_DATA,
   DATE: TYPE_DATE,
   DETAILS: TYPE_DETAILS,
   EMAIL: TYPE_EMAIL,

package/dist/models/EventTypes.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var TYPE_BLUR = 'blur';
 var TYPE_SUBMIT = 'submit';
-var TYPE_CANCEL = 'cancel';
 var EventTypes = {
   BLUR: TYPE_BLUR,
-  SUBMIT: TYPE_SUBMIT,
-  CANCEL: TYPE_CANCEL
+  SUBMIT: TYPE_SUBMIT
 };
 var _default = EventTypes;
 exports.default = _default;

package/dist/utils/Component/getComponent.js

@@ -80,6 +80,17 @@ var getCalculation = function getCalculation(config) {
     readonly: true
   }));
 };
+var getData = function getData(config) {
+  var options = [];
+  _Data.default.getOptions(config, function (val) {
+    options = val;
+  });
+  var attrs = (0, _cleanAttributes.default)(config);
+  var text = JSON.stringify(options, null, 2);
+  return /*#__PURE__*/_react.default.createElement(_copReactComponents.TextArea, _extends({}, attrs, {
+    value: text
+  }));
+};
 var getDate = function getDate(config) {
   var attrs = (0, _cleanAttributes.default)(config);
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.DateInput, attrs);
@@ -220,6 +231,8 @@ var getComponentByType = function getComponentByType(config) {
       return getParagraph(config);
     case _models.ComponentTypes.LIST:
       return getList(config);
+    case _models.ComponentTypes.DATA:
+      return getData(config);
     default:
       {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.13.1",
+  "version": "5.13.3-bravo",
   "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": "^3.4.1",
+    "@ukhomeoffice/cop-react-components": "^3.4.2",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",