@4site/engrid-scripts 0.22.0 → 0.22.2

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const AppVersion = "0.22.0";
+export declare const AppVersion = "0.22.2";

package/dist/version.js

@@ -1 +1 @@
-export const AppVersion = "0.22.0";
+export const AppVersion = "0.22.2";

package/dist/welcome-back.d.ts

@@ -12,4 +12,5 @@ export declare class WelcomeBack {
     private addPersonalDetailsSummary;
     private addEventListeners;
     enOnValidate(): void;
+    doubleCheckValidation(): void;
 }

package/dist/welcome-back.js

@@ -129,16 +129,39 @@ export class WelcomeBack {
             });
         });
         this._form.onValidate.subscribe(this.enOnValidate.bind(this));
+        this._form.onValidate.subscribe(() => {
+            window.setTimeout(this.doubleCheckValidation.bind(this), 150);
+        });
     }
     enOnValidate() {
-        if (!this._form.validate)
+        if (!this._form.validate) {
+            // Disable the fast personal details if the form is invalidated by other components running before
+            ENGrid.setBodyData("hide-fast-personal-details", false);
             return;
-        const regionFieldValue = ENGrid.getFieldValue("supporter.region");
+        }
+        const regionField = ENGrid.getField("supporter.region");
+        const regionFieldValue = regionField ? regionField.value : "";
+        const regionFieldType = regionField === null || regionField === void 0 ? void 0 : regionField.tagName.toLowerCase();
         const regionFieldLabel = document.querySelector(".en__field--region label");
-        if (regionFieldLabel && regionFieldValue === "") {
+        if (regionFieldType === "select" &&
+            regionFieldLabel &&
+            regionFieldValue === "") {
             ENGrid.setError(".en__field--region", `${regionFieldLabel.innerText} is required`);
             ENGrid.setBodyData("hide-fast-personal-details", false);
             this._form.validate = false;
         }
     }
+    doubleCheckValidation() {
+        // Disable the fast personal details if the form is invalidated by other components running AFTER
+        // the fast personal details component
+        const validationError = document.querySelector(".fast-personal-details .en__field--validationFailed");
+        if (validationError) {
+            ENGrid.setBodyData("hide-fast-personal-details", false);
+            validationError.scrollIntoView({
+                behavior: "smooth",
+                block: "center",
+            });
+        }
+        return;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4site/engrid-scripts",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "Scripts for the ENGRID Project",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -25,7 +25,7 @@
     "strongly-typed-events": "^2.0.9"
   },
   "homepage": "https://github.com/4site-interactive-studios/engrid#readme",
-  "gitHead": "e5d7823be14fd1c1116bd43d80be85da4c1e69fd",
+  "gitHead": "fab50c9fa377f36deec8f098075591d55a7c5e2f",
   "devDependencies": {
     "nodemon": "^2.0.20"
   }