@ukhomeoffice/cop-react-form-renderer 5.89.0 → 5.90.1

package/dist/components/CheckYourAnswers/index.js

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

package/dist/components/CollectionPage/CollectionPage.js

@@ -1,78 +1,75 @@
 "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
 });
 exports.default = exports.DEFAULT_CLASS = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
+var _uuid = require("uuid");
 var _utils = _interopRequireDefault(require("../../utils"));
 var _FormPage = _interopRequireDefault(require("../FormPage"));
 var _FormPage2 = require("../FormPage/FormPage");
 require("../FormPage/FormPage.scss");
-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(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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 _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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Global imports
+
 // Local imports.
+
 // Styles
-var DEFAULT_CLASS = exports.DEFAULT_CLASS = _FormPage2.DEFAULT_CLASS;
-var CollectionPage = function CollectionPage(_ref) {
-  var _page$collection, _objectSpread5;
-  var page = _ref.page,
-    pages = _ref.pages,
-    onCollectionChange = _ref.onCollectionChange,
-    onAction = _ref.onAction,
-    hashLink = _ref.hashLink,
-    classBlock = _ref.classBlock,
-    classModifiers = _ref.classModifiers,
-    className = _ref.className,
-    submitting = _ref.submitting;
-  var _useState = (0, _react.useState)({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    patch = _useState2[0],
-    setPatch = _useState2[1];
-  var data = _utils.default.CollectionPage.getData(page.collection.name, page.formData) || [];
-  var currentCollectionName = page.collection.name.split('.').pop();
-  var activeIndex = _utils.default.CollectionPage.getActiveIndex(page.collection.name, page.formData);
+
+const DEFAULT_CLASS = exports.DEFAULT_CLASS = _FormPage2.DEFAULT_CLASS;
+const CollectionPage = _ref => {
+  let {
+    page,
+    pages,
+    onCollectionChange,
+    onAction,
+    hashLink,
+    classBlock,
+    classModifiers,
+    className,
+    submitting
+  } = _ref;
+  const [patch, setPatch] = (0, _react.useState)({});
+  let data = _utils.default.CollectionPage.getData(page.collection.name, page.formData) || [];
+  const currentCollectionName = page.collection.name.split('.').pop();
+  let activeIndex = _utils.default.CollectionPage.getActiveIndex(page.collection.name, page.formData);
 
   /**
    * Handle the state of the data directly within the page.
    * This is so that the overall form data isn't affected until such
    * time as the onAction handler is invoked.
   */
-  var currentPage = page;
-  var onPageChange = function onPageChange(_ref2) {
-    var target = _ref2.target;
+  const currentPage = page;
+  const onPageChange = _ref2 => {
+    let {
+      target
+    } = _ref2;
     _utils.default.CollectionPage.setData(currentPage.collection.name, target.value, page.formData);
     data = target.value;
-    var parentCollection = page.collection.name.split('.').shift();
+    const parentCollection = page.collection.name.split('.').shift();
     // Because of the way that patch is applied to the submission data
     // later (in onPageAction.js), we have to record the entire top-level
     // parent collection as being changed when we change a child.
-    setPatch(function (prev) {
-      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, parentCollection, _utils.default.CollectionPage.getData(parentCollection, page.formData)));
-    });
+    setPatch(prev => ({
+      ...prev,
+      [parentCollection]: _utils.default.CollectionPage.getData(parentCollection, page.formData)
+    }));
   };
-  var onTopLevelChange = function onTopLevelChange(_ref3) {
-    var target = _ref3.target;
+  const onTopLevelChange = _ref3 => {
+    let {
+      target
+    } = _ref3;
     currentPage.formData[target.name] = target.value;
-    setPatch(function (prev) {
-      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.name, target.value));
-    });
+    setPatch(prev => ({
+      ...prev,
+      [target.name]: target.value
+    }));
   };
-  var reportChange = function reportChange(newValue) {
+  const reportChange = newValue => {
     onPageChange({
       target: {
         name: currentCollectionName,
@@ -83,35 +80,41 @@ var CollectionPage = function CollectionPage(_ref) {
       onCollectionChange(page.formData);
     }
   };
-  var reportActiveIdChange = function reportActiveIdChange(newActiveId) {
+  const reportActiveIdChange = newActiveId => {
     // Manually set activeIndex here as if we receive rapid onChange events
     // from several components then it's possible activeIndex does not update
     // in time.
     activeIndex = data.length;
     onTopLevelChange({
       target: {
-        name: "".concat(currentCollectionName, "ActiveId"),
+        name: `${currentCollectionName}ActiveId`,
         value: newActiveId
       }
     });
   };
-  var onInnerPageAction = function onInnerPageAction(action) {
+  const onInnerPageAction = action => {
     onAction(action, patch, {});
   };
-  var onInnerPageChange = function onInnerPageChange(_ref4) {
-    var target = _ref4.target;
+  const onInnerPageChange = _ref4 => {
+    let {
+      target
+    } = _ref4;
     if (activeIndex === null) {
       // If there is no active entry in the collection, we create
       // a new entry and generate a new ID for it.
       // This ID becomes the active ID for the collection.
-      var newId = Date.now().toString();
+      const newId = (0, _uuid.v4)();
       reportActiveIdChange(newId);
-      reportChange([].concat(data, [_defineProperty({
-        id: newId
-      }, target.name, target.value)]));
+      reportChange([].concat(data, [{
+        id: newId,
+        [target.name]: target.value
+      }]));
     } else {
       // Update an existing entry.
-      reportChange([].concat(data.slice(0, activeIndex), [_objectSpread(_objectSpread({}, data[activeIndex]), {}, _defineProperty({}, target.name, target.value))], data.slice(activeIndex + 1)));
+      reportChange([].concat(data.slice(0, activeIndex), [{
+        ...data[activeIndex],
+        [target.name]: target.value
+      }], data.slice(activeIndex + 1)));
     }
   };
   // There is a bug where page.formData is not available on the first render.
@@ -119,18 +122,25 @@ var CollectionPage = function CollectionPage(_ref) {
   // of []. This is then used to create a new entry in the Page Collection in patch which 
   // on the next page action wipes out existing entries in the Page Collection.
   // We can fix it by waiting for page.formData to be defined and have keys. 
-  if ((_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.waitForFormData && page.formData && Object.keys(page.formData).length === 0) {
+  if (page.collection?.waitForFormData && page.formData && Object.keys(page.formData).length === 0) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_FormPage.default, {
-    page: _objectSpread(_objectSpread({}, page), {}, {
-      formData: _objectSpread(_objectSpread(_objectSpread({}, page.formData), data[activeIndex]), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, "".concat(currentCollectionName, "ActiveIndex"), activeIndex), _defineProperty(_objectSpread5, "".concat(currentCollectionName, "NumberedIndex"), typeof activeIndex === 'number' ? activeIndex + 1 : null), _objectSpread5)),
-      components: page.components.map(function (component) {
-        return _objectSpread(_objectSpread({}, component), {}, {
-          pageCollection: _objectSpread({}, page.collection)
-        });
-      })
-    }),
+    page: {
+      ...page,
+      formData: {
+        ...page.formData,
+        ...data[activeIndex],
+        [`${currentCollectionName}ActiveIndex`]: activeIndex,
+        [`${currentCollectionName}NumberedIndex`]: typeof activeIndex === 'number' ? activeIndex + 1 : null
+      },
+      components: page.components.map(component => ({
+        ...component,
+        pageCollection: {
+          ...page.collection
+        }
+      }))
+    },
     pages: pages,
     onAction: onInnerPageAction,
     onWrapperChange: onInnerPageChange,