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

package/bundles/hmcts-rpx-xui-common-lib.umd.js

@@ -4556,6 +4556,7 @@
      * */
     var GovUkDateComponent = /** @class */ (function () {
         function GovUkDateComponent() {
+            this.isOptional = false;
         }
         /**
          * @return {?}
@@ -4575,20 +4576,45 @@
          * @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 {?}
@@ -4598,8 +4624,7 @@
          */
             function () {
                 var _this = this;
-                /** @type {?} */
-                var res = ( /**
+                return ( /**
                  * @return {?}
                  */function () {
                     /** @type {?} */
@@ -4608,11 +4633,13 @@
                     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: i0.Component, args: [{
@@ -4626,7 +4653,8 @@
         GovUkDateComponent.propDecorators = {
             config: [{ type: i0.Input }],
             errorMessage: [{ type: i0.Input }],
-            formGroup: [{ type: i0.Input }]
+            formGroup: [{ type: i0.Input }],
+            isOptional: [{ type: i0.Input }]
         };
         return GovUkDateComponent;
     }());