@ukhomeoffice/cop-react-form-renderer 6.16.0-charlie → 6.16.0

package/dist/components/CheckYourAnswers/CheckYourAnswers.js

@@ -127,12 +127,16 @@ const CheckYourAnswers = _ref => {
       }
     })));
   };
+  const getDedupedErrors = () => {
+    const dedupedErrors = Array.from(new Set(errors.map(a => a.id))).map(id => errors.find(b => b.id === id));
+    return dedupedErrors;
+  };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: DEFAULT_CLASS
   }, title && !hide_title && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, {
     key: "heading"
   }, title), errors && errors.length > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
-    errors: errors
+    errors: getDedupedErrors()
   }), type === _models.FormTypes.TASK_CYA && pages.length > 0 && sections && sections.map(section => section.tasks.filter(task => task.state !== _models.TaskStates.TYPES.SKIPPED).map((task, taskIndex) => {
     const filterPages = pages.filter(page => task.pages.some(p => p === page.name));
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, {

package/dist/components/FormRenderer/FormRenderer.js

@@ -129,17 +129,6 @@ const InternalFormRenderer = _ref2 => {
     validate
   } = (0, _hooks.useValidation)();
 
-  // Set focus to header for accessibility, Screen reader to anounce the page heading
-  const setFocusToHeading = () => {
-    if (document) {
-      const header = Array.from(document.getElementsByTagName('h1')).pop();
-      if (header && document.activeElement !== header) {
-        header.setAttribute('tabIndex', '-1');
-        header.focus();
-      }
-    }
-  };
-
   // Need to set submission data when going back
   window.onpopstate = e => {
     var _formState$page;
@@ -203,11 +192,6 @@ const InternalFormRenderer = _ref2 => {
     setHub(_utils.default.Hub.get(type, _hub, components, _objectSpread({}, data)));
   }, [type, _hub, data, components, setHub]);
 
-  // Set focus to heading for accessibility
-  (0, _react.useEffect)(() => {
-    setFocusToHeading();
-  }, [formState]);
-
   // Form state.
   (0, _react.useEffect)(() => {
     var _formState$page2;

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-hidden-component-with-nested-questions-visible-elsewhere.json

@@ -0,0 +1,118 @@
+{
+  "id": "example-form",
+  "cleanseHiddenData": true,
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text"
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text"
+    },
+    {
+      "id": "person",
+      "fieldId": "person",
+      "type": "container",
+      "components": [
+        {
+          "id": "telephone_visible",
+          "fieldId": "telephone",
+          "label": "telephone_visible",
+          "type": "text"
+        },        
+        {
+          "id": "telephoneKnown",
+          "fieldId": "telephoneKnown",
+          "type": "radios",
+          "data": {
+            "options": [
+              {
+                "value": "yes",
+                "label": "Yes",
+                "nested": [
+                  {
+                    "id": "telephone",
+                    "fieldId": "telephone",
+                    "type": "text",
+                    "label": "Telephone",
+                    "required": true
+                  }
+                ]
+              },
+              {
+                "value": "no",
+                "label": "No"
+              }
+            ]
+          },
+          "show_when": {
+            "op": "=",
+            "field": "bravo",
+            "value": "NOT-bravo-value"
+          }
+        },
+        {
+          "id": "name",
+          "fieldId": "name",
+          "label": "Name",
+          "type": "text"
+        }
+      ]
+    },    
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "general",
+      "name": "general",
+      "title": "General information",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "person"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ],
+      "actions": [
+        "submit",
+        {
+          "type": "cancel",
+          "page": "",
+          "validate": false,
+          "classModifiers": "secondary",
+          "label": "Cancel"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-nested-answers-hidden-by-option-visible-elsewhere.json

@@ -0,0 +1,113 @@
+{
+  "id": "example-form",
+  "cleanseHiddenData": true,
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text"
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text"
+    },
+    {
+      "id": "person",
+      "fieldId": "person",
+      "type": "container",
+      "components": [
+        {
+          "id": "telephone_visible",
+          "fieldId": "telephone",
+          "label": "telephone_visible",
+          "type": "text"
+        }, 
+        {          
+          "id": "telephoneKnown",
+          "fieldId": "telephoneKnown",
+          "type": "radios",
+          "data": {
+            "options": [
+              {
+                "value": "yes",
+                "label": "Yes",
+                "nested": [
+                  {
+                    "id": "telephone",
+                    "fieldId": "telephone",
+                    "type": "text",
+                    "label": "Telephone",
+                    "required": true
+                  }
+                ]
+              },
+              {
+                "value": "no",
+                "label": "No"
+              }
+            ]
+          }
+        },
+        {
+          "id": "name",
+          "fieldId": "name",
+          "label": "Name",
+          "type": "text"
+        }
+      ]
+    },    
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "general",
+      "name": "general",
+      "title": "General information",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "person"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ],
+      "actions": [
+        "submit",
+        {
+          "type": "cancel",
+          "page": "",
+          "validate": false,
+          "classModifiers": "secondary",
+          "label": "Cancel"
+        }
+      ]
+    }
+  ]
+}