@ukhomeoffice/cop-react-form-renderer 4.59.0 → 4.61.0

package/dist/components/FormPage/FormPage.js

@@ -58,6 +58,7 @@ var FormPage = function FormPage(_ref) {
       onWrapperChange = _ref.onWrapperChange,
       onTopLevelChange = _ref.onTopLevelChange,
       onChange = _ref.onChange,
+      hashLink = _ref.hashLink,
       classBlock = _ref.classBlock,
       classModifiers = _ref.classModifiers,
       className = _ref.className;
@@ -115,7 +116,8 @@ var FormPage = function FormPage(_ref) {
     className: classes('page'),
     key: page.id
   }, (errors === null || errors === void 0 ? void 0 : errors.length) > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
-    errors: errors
+    errors: errors,
+    hashLink: hashLink
   }), page.title && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, _utils.default.interpolateString(page.title, page.formData)), page.components.filter(function (c) {
     return _utils.default.Component.show(c, page.formData);
   }).map(function (component, index) {

package/dist/components/FormRenderer/FormRenderer.js

@@ -69,6 +69,7 @@ var FormRenderer = function FormRenderer(_ref) {
       hub = _ref.hub,
       cya = _ref.cya,
       data = _ref.data,
+      hashLink = _ref.hashLink,
       hooks = _ref.hooks,
       classBlock = _ref.classBlock,
       classModifiers = _ref.classModifiers,
@@ -91,6 +92,7 @@ var FormRenderer = function FormRenderer(_ref) {
     classBlock: classBlock,
     classModifiers: classModifiers,
     className: className,
+    hashLink: hashLink,
     hide_title: hide_title,
     summaryListClassModifiers: summaryListClassModifiers,
     noChangeAction: noChangeAction,
@@ -115,6 +117,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       classBlock = _ref2.classBlock,
       classModifiers = _ref2.classModifiers,
       className = _ref2.className,
+      hashLink = _ref2.hashLink,
       hide_title = _ref2.hide_title,
       summaryListClassModifiers = _ref2.summaryListClassModifiers,
       noChangeAction = _ref2.noChangeAction,
@@ -254,8 +257,11 @@ 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 () {
-    setPagePoint(undefined);
-    hooks.onFormLoad();
+    setPagePoint(undefined); // In case of refresh the current task needs to be reset
+
+    hooks.onFormLoad(function (currentTask) {
+      return setCurrentTask(currentTask);
+    });
   }, [hooks]);
   (0, _react.useEffect)(function () {
     setHubDetails(_hub);
@@ -357,9 +363,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
             break;
 
           case _models.PageAction.TYPES.SAVE_AND_NAVIGATE:
-            var state = {
-              'fullPages': currentTask.fullPages
-            };
+            var state = _objectSpread({}, currentTask);
 
             pageUpdate = function pageUpdate() {
               return _handlers.default.navigate(action, pageId, onPageChange, state);
@@ -490,6 +494,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       });
       setCurrentTask(currentTask);
 
+      var state = _objectSpread({}, currentTask);
+
       if (currentTask.state === _models.TaskStates.TYPES.COMPLETE) {
         if (hubDetails !== null && hubDetails !== void 0 && hubDetails.noTaskCYAs) {
           var currentPage = data.formStatus.tasks[currentTask.name].currentPage;
@@ -497,19 +503,16 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         } else if (currentTask.customCYA) {
           onPageChange(currentTask.customCYA);
         } else {
-          onPageChange(_models.FormPages.CYA);
+          onPageChange(_models.FormPages.CYA, state);
         }
       } else if (currentTask.state === _models.TaskStates.TYPES.IN_PROGRESS) {
         var _currentPage = data.formStatus.tasks[currentTask.name].currentPage;
-        var state = {
-          'fullPages': currentTask.fullPages
-        };
         onPageChange(_currentPage || currentTask.pages[0], state);
       } else if (currentTask.firstPage) {
         var _currentPage2 = currentTask.firstPage;
-        onPageChange(_currentPage2 || currentTask.pages[0]);
+        onPageChange(_currentPage2 || currentTask.pages[0], state);
       } else {
-        onPageChange(currentTask.pages[0]);
+        onPageChange(currentTask.pages[0], state);
       }
     }
   }; // Handle actions from "Check your answers".
@@ -646,7 +649,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   })), formState.page && !formState.cya && !formState.page.collection && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: formState.page,
     onAction: onPageAction,
-    onChange: onChange
+    onChange: onChange,
+    hashLink: hashLink
   }), formState.page && !formState.cya && formState.page.collection && /*#__PURE__*/_react.default.createElement(_CollectionPage.default, {
     page: formState.page,
     onAction: onPageAction
@@ -660,6 +664,7 @@ FormRenderer.propTypes = InternalFormRenderer.propTypes = {
   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,
   components: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
   pages: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
+  hashLink: _propTypes.default.bool,
   hub: _propTypes.default.object,
   cya: _propTypes.default.object,
   data: _propTypes.default.object,
@@ -678,6 +683,7 @@ FormRenderer.defaultProps = InternalFormRenderer.defaultProps = {
   pages: [],
   classBlock: DEFAULT_CLASS,
   classModifiers: [],
+  hashLink: false,
   hide_title: false,
   summaryListClassModifiers: [],
   noChangeAction: false,

package/dist/context/HooksContext/HooksContext.js

@@ -32,11 +32,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var DEFAULT_HOOKS = {
-  onChange: function onChange(data) {
-    return data;
-  },
+  onChange: function onChange(data) {},
   onFormComplete: function onFormComplete() {},
-  onFormLoad: function onFormLoad() {},
+  onFormLoad: function onFormLoad(setCurrentTask) {},
   onGetComponent: function onGetComponent(config, wrap) {
     return null;
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.59.0",
+  "version": "4.61.0",
   "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.10.0",
+    "@ukhomeoffice/cop-react-components": "^2.11.0",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",
@@ -97,4 +97,4 @@
       "last 1 safari version"
     ]
   }
-}
+}