@hmcts/rpx-xui-common-lib 1.4.30-date-component-common-validation → 1.4.31-date-component-validation-fixes

package/fesm5/hmcts-rpx-xui-common-lib.js

@@ -4513,6 +4513,7 @@ var GovUkCheckboxesComponent = /** @class */ (function () {
  * */
 var GovUkDateComponent = /** @class */ (function () {
     function GovUkDateComponent() {
+        this.isOptional = false;
     }
     /**
      * @return {?}
@@ -4532,20 +4533,45 @@ var GovUkDateComponent = /** @class */ (function () {
      * @private
      * @param {?} d
      * @param {?} month
+     * @param {?} year
      * @return {?}
      */
     GovUkDateComponent.prototype.isValidDate = /**
      * @private
      * @param {?} d
      * @param {?} month
+     * @param {?} year
      * @return {?}
      */
-    function (d, month) {
+    function (d, month, year) {
         /** @type {?} */
-        var dateCheck = d instanceof Date && !isNaN(d.getTime());
+        var dateCheck = !isNaN(d.getTime());
+        // Month mismatch occurs if the provided day or month are invalid, or either is omitted. **Note:** This is insufficient for
+        // checking date validity when the year is omitted because it defaults to 1900 - an extra check is required
         /** @type {?} */
-        var leapYearCheck = d.getMonth() === month;
-        return dateCheck && leapYearCheck;
+        var monthMatch = d.getMonth() === month;
+        /** @type {?} */
+        var yearMatch = d.getFullYear() === year;
+        return dateCheck && monthMatch && yearMatch;
+    };
+    /**
+     * @private
+     * @param {?} value
+     * @return {?}
+     */
+    GovUkDateComponent.prototype.isEmpty = /**
+     * @private
+     * @param {?} value
+     * @return {?}
+     */
+    function (value) {
+        // Note: Intentional use of == to check for null or undefined
+        /* eslint-disable eqeqeq */
+        /* tslint:disable:triple-equals */
+        // NaN and < 0 checks required for month field
+        return value == null || value === '' || isNaN(value) || value < 0;
+        /* eslint-enable eqeqeq */
+        /* tslint:enable:triple-equals */
     };
     /**
      * @return {?}
@@ -4555,8 +4581,7 @@ var GovUkDateComponent = /** @class */ (function () {
      */
     function () {
         var _this = this;
-        /** @type {?} */
-        var res = (/**
+        return (/**
          * @return {?}
          */
         function () {
@@ -4566,11 +4591,13 @@ var GovUkDateComponent = /** @class */ (function () {
             var month = _this.formGroup.get(_this.month).value - 1;
             /** @type {?} */
             var year = _this.formGroup.get(_this.year).value;
-            /** @type {?} */
-            var isValid = _this.isValidDate(new Date(year, month, day), month);
-            return !isValid ? { dateComponent: true } : null;
+            // Validation should pass if the date field is optional and day, month, and year are all empty
+            if (_this.isOptional && _this.isEmpty(day) && _this.isEmpty(month) && _this.isEmpty(year)) {
+                return null;
+            }
+            // + to coerce year to a number
+            return !_this.isValidDate(new Date(year, month, day), month, +year) ? { dateComponent: true } : null;
         });
-        return res;
     };
     GovUkDateComponent.decorators = [
         { type: Component, args: [{
@@ -4584,7 +4611,8 @@ var GovUkDateComponent = /** @class */ (function () {
     GovUkDateComponent.propDecorators = {
         config: [{ type: Input }],
         errorMessage: [{ type: Input }],
-        formGroup: [{ type: Input }]
+        formGroup: [{ type: Input }],
+        isOptional: [{ type: Input }]
     };
     return GovUkDateComponent;
 }());