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

package/dist/components/FormRenderer/FormRenderer.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
 });
@@ -20,47 +19,44 @@ var _handlers = _interopRequireDefault(require("./handlers"));
 var _helpers = _interopRequireDefault(require("./helpers"));
 var _onCYAAction = _interopRequireDefault(require("./onCYAAction"));
 var _onPageAction = _interopRequireDefault(require("./onPageAction"));
-var _onTaskAction2 = _interopRequireDefault(require("./onTaskAction"));
+var _onTaskAction = _interopRequireDefault(require("./onTaskAction"));
 require("./FormRenderer.scss");
-var _excluded = ["noTaskCYAs", "nonSequential"];
-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 _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); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+const _excluded = ["noTaskCYAs", "nonSequential"];
+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 _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 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; } /* eslint-disable no-shadow */ // 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); } /* eslint-disable no-shadow */ // Global imports
 // Local imports
 // Styles
-var FormRenderer = function FormRenderer(_ref) {
-  var title = _ref.title,
-    type = _ref.type,
-    components = _ref.components,
-    pages = _ref.pages,
-    hub = _ref.hub,
-    cya = _ref.cya,
-    data = _ref.data,
-    hashLink = _ref.hashLink,
-    hooks = _ref.hooks,
-    classBlock = _ref.classBlock,
-    classModifiers = _ref.classModifiers,
-    className = _ref.className,
-    hideTitle = _ref.hide_title,
-    summaryListClassModifiers = _ref.summaryListClassModifiers,
-    noChangeAction = _ref.noChangeAction,
-    newPageId = _ref.newPageId,
-    viewOnly = _ref.viewOnly,
-    hideBlankRows = _ref.hideBlankRows;
+const FormRenderer = _ref => {
+  let {
+    title,
+    type,
+    components,
+    pages,
+    hub,
+    cya,
+    data,
+    hashLink,
+    hooks,
+    classBlock,
+    classModifiers,
+    className,
+    hide_title: hideTitle,
+    summaryListClassModifiers,
+    noChangeAction,
+    newPageId,
+    viewOnly,
+    hideBlankRows,
+    fromTarget
+  } = _ref;
   return /*#__PURE__*/_react.default.createElement(_context.HooksContextProvider, {
     overrides: hooks
   }, /*#__PURE__*/_react.default.createElement(_context.ValidationContextProvider, null, /*#__PURE__*/_react.default.createElement(InternalFormRenderer, {
@@ -80,94 +76,67 @@ var FormRenderer = function FormRenderer(_ref) {
     noChangeAction: noChangeAction,
     newPageId: newPageId,
     viewOnly: viewOnly,
-    hideBlankRows: hideBlankRows
+    hideBlankRows: hideBlankRows,
+    fromTarget: fromTarget
   })));
 };
-var DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form';
-var InternalFormRenderer = function InternalFormRenderer(_ref2) {
+const DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form';
+const InternalFormRenderer = _ref2 => {
   var _formState$page4, _formState$page$actio, _formState$cya$hideCh, _formState$cya$hideGr;
-  var title = _ref2.title,
-    type = _ref2.type,
-    components = _ref2.components,
-    _pages = _ref2.pages,
-    _hub = _ref2.hub,
-    cya = _ref2.cya,
-    _data = _ref2.data,
-    classBlock = _ref2.classBlock,
-    classModifiers = _ref2.classModifiers,
-    className = _ref2.className,
-    hashLink = _ref2.hashLink,
-    hideTitle = _ref2.hide_title,
-    summaryListClassModifiers = _ref2.summaryListClassModifiers,
-    noChangeAction = _ref2.noChangeAction,
-    newPageId = _ref2.newPageId,
-    viewOnly = _ref2.viewOnly,
-    hideBlankRows = _ref2.hideBlankRows;
+  let {
+    title,
+    type,
+    components,
+    pages: _pages,
+    hub: _hub,
+    cya,
+    data: _data,
+    classBlock,
+    classModifiers,
+    className,
+    hashLink,
+    hide_title: hideTitle,
+    summaryListClassModifiers,
+    noChangeAction,
+    newPageId,
+    viewOnly,
+    hideBlankRows,
+    fromTarget
+  } = _ref2;
   // Set up the initial states.
-  var _useState = (0, _react.useState)({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    data = _useState2[0],
-    setData = _useState2[1];
-  var _useState3 = (0, _react.useState)(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    submitted = _useState4[0],
-    setSubmitted = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    pages = _useState6[0],
-    setPages = _useState6[1];
-  var _useState7 = (0, _react.useState)(undefined),
-    _useState8 = _slicedToArray(_useState7, 2),
-    hub = _useState8[0],
-    setHub = _useState8[1];
-  var _useState9 = (0, _react.useState)(_helpers.default.getNextPageId(type, _pages, null, null, _data)),
-    _useState10 = _slicedToArray(_useState9, 2),
-    pageId = _useState10[0],
-    setPageId = _useState10[1];
-  var _useState11 = (0, _react.useState)(_helpers.default.getFormState(pageId, pages, hub)),
-    _useState12 = _slicedToArray(_useState11, 2),
-    formState = _useState12[0],
-    setFormState = _useState12[1];
-  var _useState13 = (0, _react.useState)({}),
-    _useState14 = _slicedToArray(_useState13, 2),
-    currentTask = _useState14[0],
-    setCurrentTask = _useState14[1];
-  var _useState15 = (0, _react.useState)({}),
-    _useState16 = _slicedToArray(_useState15, 2),
-    hubDetails = _useState16[0],
-    setHubDetails = _useState16[1];
-  var _useState17 = (0, _react.useState)('load'),
-    _useState18 = _slicedToArray(_useState17, 2),
-    pagePoint = _useState18[0],
-    setPagePoint = _useState18[1];
-  var _useState19 = (0, _react.useState)(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    goingBack = _useState20[0],
-    setGoingBack = _useState20[1];
-  var _useState21 = (0, _react.useState)(false),
-    _useState22 = _slicedToArray(_useState21, 2),
-    submitting = _useState22[0],
-    setSubmitting = _useState22[1];
+  const [data, setData] = (0, _react.useState)({});
+  const [submitted, setSubmitted] = (0, _react.useState)();
+  const [pages, setPages] = (0, _react.useState)([]);
+  const [hub, setHub] = (0, _react.useState)(undefined);
+  const [pageId, setPageId] = (0, _react.useState)(_helpers.default.getNextPageId(type, _pages, null, null, _data));
+  const [formState, setFormState] = (0, _react.useState)(_helpers.default.getFormState(pageId, pages, hub));
+  const [currentTask, setCurrentTask] = (0, _react.useState)({});
+  const [hubDetails, setHubDetails] = (0, _react.useState)({});
+  const [pagePoint, setPagePoint] = (0, _react.useState)('load');
+  const [goingBack, setGoingBack] = (0, _react.useState)(false);
+  const [submitting, setSubmitting] = (0, _react.useState)(false);
 
   // Set up hooks.
-  var _useHooks = (0, _hooks.useHooks)(),
-    hooks = _useHooks.hooks;
+  const {
+    hooks
+  } = (0, _hooks.useHooks)();
 
   // Set up the useValidation hook.
-  var _useValidation = (0, _hooks.useValidation)(),
-    addErrors = _useValidation.addErrors,
-    clearErrors = _useValidation.clearErrors,
-    errors = _useValidation.errors,
-    validate = _useValidation.validate;
+  const {
+    addErrors,
+    clearErrors,
+    errors,
+    validate
+  } = (0, _hooks.useValidation)();
 
   // Need to set submission data when going back
-  window.onpopstate = function (e) {
+  window.onpopstate = e => {
     var _formState$page;
     if (document.location.hash) {
       return;
     }
     if (e.state && e.state.fullPages !== undefined) {
-      setCurrentTask(function (prev) {
+      setCurrentTask(prev => {
         var _e$state;
         return _objectSpread(_objectSpread({}, prev), {}, {
           fullPages: (_e$state = e.state) === null || _e$state === void 0 ? void 0 : _e$state.fullPages
@@ -178,16 +147,16 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     setGoingBack(true);
     hooks.onGoingBack(e.state ? e.state : null);
     if (components && pages && data && (_formState$page = formState.page) !== null && _formState$page !== void 0 && _formState$page.formData && pagePoint === undefined) {
-      var submissionData = _utils.default.Format.form({
-        pages: pages,
-        components: components
+      const submissionData = _utils.default.Format.form({
+        pages,
+        components
       }, _objectSpread(_objectSpread({}, data), formState.page.formData), _models.EventTypes.SUBMIT);
       setData(submissionData);
     }
   };
 
   // Setup data.
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (components && _pages && _data && (pagePoint === 'load' || viewOnly)) {
       var _data$formStatus;
       setData(_utils.default.Data.setupForm(_pages, components, _data));
@@ -198,24 +167,22 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, [components, _pages, _data, setData, pagePoint, viewOnly]);
 
   // Setup pages.
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     setPages(_utils.default.FormPage.getAll(_pages, components, _objectSpread({}, data)));
   }, [components, _pages, data, setPages]);
 
   // Setup initial pageId.
-  (0, _react.useEffect)(function () {
-    setPageId(function (prev) {
-      return prev || _helpers.default.getNextPageId(type, pages);
-    });
+  (0, _react.useEffect)(() => {
+    setPageId(prev => prev || _helpers.default.getNextPageId(type, pages));
   }, [type, pages, setPageId]);
 
   // Setup hub.
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     setHub(_utils.default.Hub.get(type, _hub, components, _objectSpread({}, data)));
   }, [type, _hub, data, components, setHub]);
 
   // Form state.
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     var _formState$page2;
     // revert formData changes if going back in hub-and-spoke
     if (type === _models.FormTypes.HUB && goingBack && data && (_formState$page2 = formState.page) !== null && _formState$page2 !== void 0 && _formState$page2.formData) {
@@ -226,67 +193,63 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, [pages, hub, pageId, setFormState, type, goingBack, data, formState.page]);
 
   // Call the onFormLoad hook just when this component first renders.
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     setPagePoint(undefined);
     // In case of refresh the current task needs to be reset
-    hooks.onFormLoad(function (currentTask) {
+    hooks.onFormLoad(currentTask => {
       setCurrentTask(currentTask);
     });
   }, [hooks]);
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     setHubDetails(_hub);
   }, [_hub]);
 
   // Calling setData directly within the hooks.onSubmit success handler
   // resulted in a synchronisation error. Handling it in a useEffect appears
   // to be the way to deal with this... and it certainly seems to work.
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (submitted !== null && submitted !== void 0 && submitted.data) {
       setData(submitted.data);
       setSubmitted(undefined);
     }
   }, [submitted, setData, setSubmitted]);
-  var theSections = _hub === null || _hub === void 0 ? void 0 : _hub.sections;
-  var nonSequential = _hub === null || _hub === void 0 ? void 0 : _hub.nonSequential;
+  const theSections = _hub === null || _hub === void 0 ? void 0 : _hub.sections;
+  const nonSequential = _hub === null || _hub === void 0 ? void 0 : _hub.nonSequential;
   // Update task list pages with form data and update states
-  (0, _react.useEffect)(function () {
-    var pages = currentTask.fullPages;
+  (0, _react.useEffect)(() => {
+    const pages = currentTask.fullPages;
     if (pages) {
-      pages.forEach(function (page) {
-        var p = page;
+      pages.forEach(page => {
+        const p = page;
         if (p) {
           p.formData = data;
         }
       });
-      setCurrentTask(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), {}, {
-          fullPages: pages
-        });
-      });
+      setCurrentTask(prev => _objectSpread(_objectSpread({}, prev), {}, {
+        fullPages: pages
+      }));
     }
     if (theSections) {
       var _data$formStatus2;
-      var tasks = (data === null || data === void 0 || (_data$formStatus2 = data.formStatus) === null || _data$formStatus2 === void 0 ? void 0 : _data$formStatus2.tasks) || {};
-      var updatedSections = _helpers.default.getUpdatedSectionStates(theSections, tasks, nonSequential, data);
-      setHubDetails(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), {}, {
-          sections: [].concat(updatedSections)
-        });
-      });
+      const tasks = (data === null || data === void 0 || (_data$formStatus2 = data.formStatus) === null || _data$formStatus2 === void 0 ? void 0 : _data$formStatus2.tasks) || {};
+      const updatedSections = _helpers.default.getUpdatedSectionStates(theSections, tasks, nonSequential, data);
+      setHubDetails(prev => _objectSpread(_objectSpread({}, prev), {}, {
+        sections: [].concat(updatedSections)
+      }));
     }
   }, [currentTask.fullPages, data, theSections, nonSequential]);
-  var onPageChange = function onPageChange(newPageId) {
-    var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const onPageChange = function (newPageId) {
+    let state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     clearErrors();
     setPageId(newPageId);
     hooks.onPageChange(newPageId, state);
   };
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (newPageId !== undefined) setPageId(newPageId);
   }, [newPageId]);
 
   // Handle change to form data in pages.
-  var onChange = function onChange(data) {
+  const onChange = data => {
     hooks.onChange(data);
   };
 
@@ -294,49 +257,47 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   // Passing a dataCallback allows changes to formData from the
   // CYA screen. This is necessary to allow changing the active
   // entry in page collections.
-  var onCYARowAction = function onCYARowAction(page, dataCallback) {
+  const onCYARowAction = (page, dataCallback) => {
     var _formState$page3;
     if (typeof dataCallback === 'function') {
-      var newData = dataCallback(_objectSpread({}, data));
+      const newData = dataCallback(_objectSpread({}, data));
       if (newData) {
         setData(newData);
       }
     }
     if (((_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.type) === _models.FormPages.PARTIAL_CYA && !cya.disableTaskSwitch) {
-      hubDetails.sections.every(function (section) {
-        return section.tasks.every(function (task) {
-          if (task.pages.includes(page.pageId) && task.name !== currentTask.name) {
-            (0, _onTaskAction2.default)(task, pages, setCurrentTask, hubDetails, data, onPageChange);
-            return false;
-          }
-          return true;
-        });
-      });
+      hubDetails.sections.every(section => section.tasks.every(task => {
+        if (task.pages.includes(page.pageId) && task.name !== currentTask.name) {
+          (0, _onTaskAction.default)(task, pages, setCurrentTask, hubDetails, data, onPageChange);
+          return false;
+        }
+        return true;
+      }));
     }
     if (page) {
       _handlers.default.cyaAction(page, pageId, onPageChange);
     }
   };
-  var classes = _utils.default.classBuilder(classBlock, classModifiers, className);
+  const classes = _utils.default.classBuilder(classBlock, classModifiers, className);
   if (hub === _models.HubFormats.TASK) {
-    var currentCYA = cya;
+    const currentCYA = cya;
     currentCYA.actions = [_models.PageAction.TYPES.SAVE_AND_CONTINUE, _models.PageAction.TYPES.SAVE_AND_RETURN];
   }
 
   // filter out invalid attribs
-  var _noCYA = hubDetails.noTaskCYAs,
-    _nonSeq = hubDetails.nonSequential,
+  const {
+      noTaskCYAs: _noCYA,
+      nonSequential: _nonSeq
+    } = hubDetails,
     taskDetails = _objectWithoutProperties(hubDetails, _excluded);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: classes()
   }, title && !hideTitle && pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, title), formState.cya && /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, _extends({
     pages: _helpers.default.getRelevantPages(formState, pages, currentTask.fullPages)
   }, cya, ((_formState$page4 = formState.page) === null || _formState$page4 === void 0 ? void 0 : _formState$page4.type) === _models.FormPages.PARTIAL_CYA && {
-    actions: (_formState$page$actio = formState.page.actions) === null || _formState$page$actio === void 0 ? void 0 : _formState$page$actio.filter(function (action) {
-      return _utils.default.Component.show(action, data);
-    })
+    actions: (_formState$page$actio = formState.page.actions) === null || _formState$page$actio === void 0 ? void 0 : _formState$page$actio.filter(action => _utils.default.Component.show(action, data))
   }, formState.cya, {
-    onAction: function onAction(action) {
+    onAction: action => {
       (0, _onCYAAction.default)(setPagePoint, action, pages, validate, components, data, setData, type, pageId, currentTask, hooks, addErrors, hub, onPageChange, formState, submitting, setSubmitting);
     },
     onRowAction: onCYARowAction,
@@ -349,27 +310,29 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     hideBlankRows: hideBlankRows
   })), hub === _models.HubFormats.TASK && formState.pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_TaskList.default, _extends({}, taskDetails, {
     refNumber: data.businessKey,
-    onTaskAction: function onTaskAction(task) {
-      (0, _onTaskAction2.default)(task, pages, setCurrentTask, hubDetails, data, onPageChange);
+    onTaskAction: task => {
+      (0, _onTaskAction.default)(task, pages, setCurrentTask, hubDetails, data, onPageChange);
     },
     annotations: (hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.taskListAnnotations) || [],
     formData: data
   })), formState.page && !formState.cya && !formState.page.collection && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: formState.page,
     pages: [].concat(pages),
-    onAction: function onAction(action, patch, patchLabel) {
+    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, submitting, setSubmitting, errors);
     },
     onChange: onChange,
     hashLink: hashLink,
     classModifiers: formState.page.classModifiers,
     className: formState.page.className,
-    submitting: submitting
+    submitting: submitting,
+    pageId: pageId,
+    fromTarget: fromTarget
   }), formState.page && !formState.cya && formState.page.collection && /*#__PURE__*/_react.default.createElement(_CollectionPage.default, {
     page: formState.page,
     pages: pages,
     onCollectionChange: onChange,
-    onAction: function onAction(action, patch, patchLabel) {
+    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, submitting, setSubmitting, errors);
     },
     hashLink: hashLink,
@@ -378,7 +341,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     submitting: submitting
   }));
 };
-var propTypes = {
+const propTypes = {
   classBlock: _propTypes.default.string,
   classModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
   className: _propTypes.default.string,
@@ -407,9 +370,10 @@ var propTypes = {
   /** See <a href="/?path=/docs/f-json--page#formtypes">FormTypes</a>. */
   type: _propTypes.default.oneOf([_models.FormTypes.CYA, _models.FormTypes.FORM, _models.FormTypes.HUB, _models.FormTypes.TASK, _models.FormTypes.WIZARD, _models.FormTypes.TASK_CYA, _models.FormTypes.FORM_WITH_TASK]).isRequired,
   viewOnly: _propTypes.default.bool,
-  hideBlankRows: _propTypes.default.bool
+  hideBlankRows: _propTypes.default.bool,
+  fromTarget: _propTypes.default.bool.isRequired
 };
-var defaultProps = {
+const defaultProps = {
   classBlock: DEFAULT_CLASS,
   className: '',
   classModifiers: [],