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

package/esm2015/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.js

@@ -11,7 +11,9 @@ import { Component, Input } from '@angular/core';
  * displaying errorMessage messages
  * */
 export class GovUkDateComponent {
-    constructor() { }
+    constructor() {
+        this.isOptional = false;
+    }
     /**
      * @return {?}
      */
@@ -27,21 +29,39 @@ export class GovUkDateComponent {
      * @private
      * @param {?} d
      * @param {?} month
+     * @param {?} year
      * @return {?}
      */
-    isValidDate(d, month) {
+    isValidDate(d, month, year) {
+        /** @type {?} */
+        const 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 {?} */
-        const dateCheck = d instanceof Date && !isNaN(d.getTime());
+        const monthMatch = d.getMonth() === month;
         /** @type {?} */
-        const leapYearCheck = d.getMonth() === month;
-        return dateCheck && leapYearCheck;
+        const yearMatch = d.getFullYear() === year;
+        return dateCheck && monthMatch && yearMatch;
+    }
+    /**
+     * @private
+     * @param {?} value
+     * @return {?}
+     */
+    isEmpty(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 {?}
      */
     DateValidator() {
-        /** @type {?} */
-        const res = (/**
+        return (/**
          * @return {?}
          */
         () => {
@@ -51,11 +71,13 @@ export class GovUkDateComponent {
             const month = this.formGroup.get(this.month).value - 1;
             /** @type {?} */
             const year = this.formGroup.get(this.year).value;
-            /** @type {?} */
-            const 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 = [
@@ -70,7 +92,8 @@ GovUkDateComponent.ctorParameters = () => [];
 GovUkDateComponent.propDecorators = {
     config: [{ type: Input }],
     errorMessage: [{ type: Input }],
-    formGroup: [{ type: Input }]
+    formGroup: [{ type: Input }],
+    isOptional: [{ type: Input }]
 };
 if (false) {
     /** @type {?} */
@@ -80,10 +103,12 @@ if (false) {
     /** @type {?} */
     GovUkDateComponent.prototype.formGroup;
     /** @type {?} */
+    GovUkDateComponent.prototype.isOptional;
+    /** @type {?} */
     GovUkDateComponent.prototype.month;
     /** @type {?} */
     GovUkDateComponent.prototype.day;
     /** @type {?} */
     GovUkDateComponent.prototype.year;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292LXVrLWRhdGUuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGhtY3RzL3JweC14dWktY29tbW9uLWxpYi8iLCJzb3VyY2VzIjpbImxpYi9nb3YtdWkvY29tcG9uZW50cy9nb3YtdWstZGF0ZS9nb3YtdWstZGF0ZS5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxPQUFPLEVBQ0wsU0FBUyxFQUNULEtBQUssRUFFTixNQUFNLGVBQWUsQ0FBQzs7Ozs7OztBQWV2QixNQUFNLE9BQU8sa0JBQWtCO0lBQzdCLGdCQUFlLENBQUM7Ozs7SUFTVCxRQUFRO1FBQ2IsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDbkMsSUFBSSxDQUFDLEtBQUssR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxRQUFRLENBQUM7UUFDdkMsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUM7O2NBQy9CLGFBQWEsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFO1FBQzFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxhQUFhLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDNUQsQ0FBQzs7Ozs7OztJQUVPLFdBQVcsQ0FBQyxDQUFNLEVBQUUsS0FBYTs7Y0FDakMsU0FBUyxHQUFHLENBQUMsWUFBWSxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDOztjQUNwRCxhQUFhLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxLQUFLLEtBQUs7UUFDNUMsT0FBTyxTQUFTLElBQUksYUFBYSxDQUFDO0lBQ3BDLENBQUM7Ozs7SUFFTSxhQUFhOztjQUNaLEdBQUc7OztRQUFHLEdBQTRCLEVBQUU7O2tCQUNsQyxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUs7O2tCQUN4QyxLQUFLLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDOztrQkFDaEQsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLOztrQkFDMUMsT0FBTyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRSxLQUFLLENBQUM7WUFDbkUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNuRCxDQUFDLENBQUE7UUFDRCxPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7OztZQXRDRixTQUFTLFNBQUM7Z0JBQ1QsUUFBUSxFQUFFLG9CQUFvQjtnQkFDOUIsbTJGQUEyQzs7YUFFNUM7Ozs7O3FCQUdFLEtBQUs7MkJBQ0wsS0FBSzt3QkFDTCxLQUFLOzs7O0lBRk4sb0NBQXlDOztJQUN6QywwQ0FBaUQ7O0lBQ2pELHVDQUErQjs7SUFFL0IsbUNBQWtCOztJQUNsQixpQ0FBZ0I7O0lBQ2hCLGtDQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIENvbXBvbmVudCxcbiAgSW5wdXQsXG4gIE9uSW5pdFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFZhbGlkYXRpb25FcnJvcnMsIFZhbGlkYXRvckZuIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgRXJyb3JNZXNzYWdlc01vZGVsIH0gZnJvbSAnLi4vLi4vbW9kZWxzL2Vycm9yLW1lc3NhZ2VzLW1vZGVsJztcbmltcG9ydCB7IEdvdlVpQ29uZmlnTW9kZWwgfSBmcm9tICcuLi8uLi9tb2RlbHMvZ292LXVpLWNvbmZpZy1tb2RlbCc7XG4vKlxuICogR292IFVLIERhdGUgQ29tcG9uZW50XG4gKiBSZXNwb25zaWJsZSBmb3IgZGlzcGxheWluZyAzIGlucHV0IGZpZWxkczpcbiAqIGRheSAvIG1vbnRoIC8geWVhclxuICogZGlzcGxheWluZyBlcnJvck1lc3NhZ2UgbWVzc2FnZXNcbiAqICovXG5AQ29tcG9uZW50KHtcbiAgc2VsZWN0b3I6ICd4dWlsaWItZ292LXVrLWRhdGUnLFxuICB0ZW1wbGF0ZVVybDogJy4vZ292LXVrLWRhdGUuY29tcG9uZW50Lmh0bWwnLFxuICBzdHlsZVVybHM6IFsnLi9nb3YtdWstZGF0ZS5jb21wb25lbnQuc2NzcyddXG59KVxuZXhwb3J0IGNsYXNzIEdvdlVrRGF0ZUNvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCB7XG4gIGNvbnN0cnVjdG9yKCkge31cbiAgQElucHV0KCkgcHVibGljIGNvbmZpZzogR292VWlDb25maWdNb2RlbDtcbiAgQElucHV0KCkgcHVibGljIGVycm9yTWVzc2FnZTogRXJyb3JNZXNzYWdlc01vZGVsO1xuICBASW5wdXQoKSBwdWJsaWMgZm9ybUdyb3VwOiBhbnk7XG5cbiAgcHVibGljIG1vbnRoOiBhbnk7XG4gIHB1YmxpYyBkYXk6IGFueTtcbiAgcHVibGljIHllYXI6IGFueTtcblxuICBwdWJsaWMgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgdGhpcy5kYXkgPSBgJHt0aGlzLmNvbmZpZy5pZH1fZGF5YDtcbiAgICB0aGlzLm1vbnRoID0gYCR7dGhpcy5jb25maWcuaWR9X21vbnRoYDtcbiAgICB0aGlzLnllYXIgPSBgJHt0aGlzLmNvbmZpZy5pZH1feWVhcmA7XG4gICAgY29uc3QgZGF0ZVZhbGlkYXRvciA9IHRoaXMuRGF0ZVZhbGlkYXRvcigpO1xuICAgIHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLmRheSkuc2V0VmFsaWRhdG9ycyhkYXRlVmFsaWRhdG9yKTtcbiAgfVxuXG4gIHByaXZhdGUgaXNWYWxpZERhdGUoZDogYW55LCBtb250aDogbnVtYmVyKTogYm9vbGVhbiB7XG4gICAgY29uc3QgZGF0ZUNoZWNrID0gZCBpbnN0YW5jZW9mIERhdGUgJiYgIWlzTmFOKGQuZ2V0VGltZSgpKTtcbiAgICBjb25zdCBsZWFwWWVhckNoZWNrID0gZC5nZXRNb250aCgpID09PSBtb250aDtcbiAgICByZXR1cm4gZGF0ZUNoZWNrICYmIGxlYXBZZWFyQ2hlY2s7XG4gIH1cblxuICBwdWJsaWMgRGF0ZVZhbGlkYXRvcigpOiBWYWxpZGF0b3JGbiB7XG4gICAgY29uc3QgcmVzID0gKCk6IFZhbGlkYXRpb25FcnJvcnMgfCBudWxsID0+IHtcbiAgICAgIGNvbnN0IGRheSA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLmRheSkudmFsdWU7XG4gICAgICBjb25zdCBtb250aCA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLm1vbnRoKS52YWx1ZSAtIDE7XG4gICAgICBjb25zdCB5ZWFyID0gdGhpcy5mb3JtR3JvdXAuZ2V0KHRoaXMueWVhcikudmFsdWU7XG4gICAgICBjb25zdCBpc1ZhbGlkID0gdGhpcy5pc1ZhbGlkRGF0ZShuZXcgRGF0ZSh5ZWFyLCBtb250aCwgZGF5KSwgbW9udGgpO1xuICAgICAgcmV0dXJuICFpc1ZhbGlkID8geyBkYXRlQ29tcG9uZW50OiB0cnVlIH0gOiBudWxsO1xuICAgIH07XG4gICAgcmV0dXJuIHJlcztcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292LXVrLWRhdGUuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGhtY3RzL3JweC14dWktY29tbW9uLWxpYi8iLCJzb3VyY2VzIjpbImxpYi9nb3YtdWkvY29tcG9uZW50cy9nb3YtdWstZGF0ZS9nb3YtdWstZGF0ZS5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxPQUFPLEVBQ0wsU0FBUyxFQUNULEtBQUssRUFFTixNQUFNLGVBQWUsQ0FBQzs7Ozs7OztBQWV2QixNQUFNLE9BQU8sa0JBQWtCO0lBQzdCO1FBSWdCLGVBQVUsR0FBWSxLQUFLLENBQUM7SUFKN0IsQ0FBQzs7OztJQVVULFFBQVE7UUFDYixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNuQyxJQUFJLENBQUMsS0FBSyxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFFBQVEsQ0FBQztRQUN2QyxJQUFJLENBQUMsSUFBSSxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQzs7Y0FDL0IsYUFBYSxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUU7UUFDMUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUM1RCxDQUFDOzs7Ozs7OztJQUVPLFdBQVcsQ0FBQyxDQUFPLEVBQUUsS0FBYSxFQUFFLElBQVk7O2NBQ2hELFNBQVMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7Ozs7Y0FHL0IsVUFBVSxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsS0FBSyxLQUFLOztjQUNuQyxTQUFTLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxLQUFLLElBQUk7UUFDMUMsT0FBTyxTQUFTLElBQUksVUFBVSxJQUFJLFNBQVMsQ0FBQztJQUM5QyxDQUFDOzs7Ozs7SUFFTyxPQUFPLENBQUMsS0FBVTtRQUN4Qiw2REFBNkQ7UUFDN0QsMkJBQTJCO1FBQzNCLGtDQUFrQztRQUNsQyw4Q0FBOEM7UUFDOUMsT0FBTyxLQUFLLElBQUksSUFBSSxJQUFJLEtBQUssS0FBSyxFQUFFLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLENBQUM7UUFDbEUsMEJBQTBCO1FBQzFCLGlDQUFpQztJQUNuQyxDQUFDOzs7O0lBRU0sYUFBYTtRQUNsQjs7O1FBQU8sR0FBNEIsRUFBRTs7a0JBQzdCLEdBQUcsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSzs7a0JBQ3hDLEtBQUssR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUM7O2tCQUNoRCxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUs7WUFDaEQsOEZBQThGO1lBQzlGLElBQUksSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDckYsT0FBTyxJQUFJLENBQUM7YUFDYjtZQUNELCtCQUErQjtZQUMvQixPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQ3RHLENBQUMsRUFBQztJQUNKLENBQUM7OztZQXZERixTQUFTLFNBQUM7Z0JBQ1QsUUFBUSxFQUFFLG9CQUFvQjtnQkFDOUIsbTJGQUEyQzs7YUFFNUM7Ozs7O3FCQUdFLEtBQUs7MkJBQ0wsS0FBSzt3QkFDTCxLQUFLO3lCQUNMLEtBQUs7Ozs7SUFITixvQ0FBeUM7O0lBQ3pDLDBDQUFpRDs7SUFDakQsdUNBQStCOztJQUMvQix3Q0FBNEM7O0lBRTVDLG1DQUFrQjs7SUFDbEIsaUNBQWdCOztJQUNoQixrQ0FBaUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBDb21wb25lbnQsXG4gIElucHV0LFxuICBPbkluaXRcbn0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBWYWxpZGF0aW9uRXJyb3JzLCBWYWxpZGF0b3JGbiB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IEVycm9yTWVzc2FnZXNNb2RlbCB9IGZyb20gJy4uLy4uL21vZGVscy9lcnJvci1tZXNzYWdlcy1tb2RlbCc7XG5pbXBvcnQgeyBHb3ZVaUNvbmZpZ01vZGVsIH0gZnJvbSAnLi4vLi4vbW9kZWxzL2dvdi11aS1jb25maWctbW9kZWwnO1xuLypcbiAqIEdvdiBVSyBEYXRlIENvbXBvbmVudFxuICogUmVzcG9uc2libGUgZm9yIGRpc3BsYXlpbmcgMyBpbnB1dCBmaWVsZHM6XG4gKiBkYXkgLyBtb250aCAvIHllYXJcbiAqIGRpc3BsYXlpbmcgZXJyb3JNZXNzYWdlIG1lc3NhZ2VzXG4gKiAqL1xuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAneHVpbGliLWdvdi11ay1kYXRlJyxcbiAgdGVtcGxhdGVVcmw6ICcuL2dvdi11ay1kYXRlLmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbJy4vZ292LXVrLWRhdGUuY29tcG9uZW50LnNjc3MnXVxufSlcbmV4cG9ydCBjbGFzcyBHb3ZVa0RhdGVDb21wb25lbnQgaW1wbGVtZW50cyBPbkluaXQge1xuICBjb25zdHJ1Y3RvcigpIHt9XG4gIEBJbnB1dCgpIHB1YmxpYyBjb25maWc6IEdvdlVpQ29uZmlnTW9kZWw7XG4gIEBJbnB1dCgpIHB1YmxpYyBlcnJvck1lc3NhZ2U6IEVycm9yTWVzc2FnZXNNb2RlbDtcbiAgQElucHV0KCkgcHVibGljIGZvcm1Hcm91cDogYW55O1xuICBASW5wdXQoKSBwdWJsaWMgaXNPcHRpb25hbDogYm9vbGVhbiA9IGZhbHNlO1xuXG4gIHB1YmxpYyBtb250aDogYW55O1xuICBwdWJsaWMgZGF5OiBhbnk7XG4gIHB1YmxpYyB5ZWFyOiBhbnk7XG5cbiAgcHVibGljIG5nT25Jbml0KCk6IHZvaWQge1xuICAgIHRoaXMuZGF5ID0gYCR7dGhpcy5jb25maWcuaWR9X2RheWA7XG4gICAgdGhpcy5tb250aCA9IGAke3RoaXMuY29uZmlnLmlkfV9tb250aGA7XG4gICAgdGhpcy55ZWFyID0gYCR7dGhpcy5jb25maWcuaWR9X3llYXJgO1xuICAgIGNvbnN0IGRhdGVWYWxpZGF0b3IgPSB0aGlzLkRhdGVWYWxpZGF0b3IoKTtcbiAgICB0aGlzLmZvcm1Hcm91cC5nZXQodGhpcy5kYXkpLnNldFZhbGlkYXRvcnMoZGF0ZVZhbGlkYXRvcik7XG4gIH1cblxuICBwcml2YXRlIGlzVmFsaWREYXRlKGQ6IERhdGUsIG1vbnRoOiBudW1iZXIsIHllYXI6IG51bWJlcik6IGJvb2xlYW4ge1xuICAgIGNvbnN0IGRhdGVDaGVjayA9ICFpc05hTihkLmdldFRpbWUoKSk7XG4gICAgLy8gTW9udGggbWlzbWF0Y2ggb2NjdXJzIGlmIHRoZSBwcm92aWRlZCBkYXkgb3IgbW9udGggYXJlIGludmFsaWQsIG9yIGVpdGhlciBpcyBvbWl0dGVkLiAqKk5vdGU6KiogVGhpcyBpcyBpbnN1ZmZpY2llbnQgZm9yXG4gICAgLy8gY2hlY2tpbmcgZGF0ZSB2YWxpZGl0eSB3aGVuIHRoZSB5ZWFyIGlzIG9taXR0ZWQgYmVjYXVzZSBpdCBkZWZhdWx0cyB0byAxOTAwIC0gYW4gZXh0cmEgY2hlY2sgaXMgcmVxdWlyZWRcbiAgICBjb25zdCBtb250aE1hdGNoID0gZC5nZXRNb250aCgpID09PSBtb250aDtcbiAgICBjb25zdCB5ZWFyTWF0Y2ggPSBkLmdldEZ1bGxZZWFyKCkgPT09IHllYXI7XG4gICAgcmV0dXJuIGRhdGVDaGVjayAmJiBtb250aE1hdGNoICYmIHllYXJNYXRjaDtcbiAgfVxuXG4gIHByaXZhdGUgaXNFbXB0eSh2YWx1ZTogYW55KSB7XG4gICAgLy8gTm90ZTogSW50ZW50aW9uYWwgdXNlIG9mID09IHRvIGNoZWNrIGZvciBudWxsIG9yIHVuZGVmaW5lZFxuICAgIC8qIGVzbGludC1kaXNhYmxlIGVxZXFlcSAqL1xuICAgIC8qIHRzbGludDpkaXNhYmxlOnRyaXBsZS1lcXVhbHMgKi9cbiAgICAvLyBOYU4gYW5kIDwgMCBjaGVja3MgcmVxdWlyZWQgZm9yIG1vbnRoIGZpZWxkXG4gICAgcmV0dXJuIHZhbHVlID09IG51bGwgfHwgdmFsdWUgPT09ICcnIHx8IGlzTmFOKHZhbHVlKSB8fCB2YWx1ZSA8IDA7XG4gICAgLyogZXNsaW50LWVuYWJsZSBlcWVxZXEgKi9cbiAgICAvKiB0c2xpbnQ6ZW5hYmxlOnRyaXBsZS1lcXVhbHMgKi9cbiAgfVxuXG4gIHB1YmxpYyBEYXRlVmFsaWRhdG9yKCk6IFZhbGlkYXRvckZuIHtcbiAgICByZXR1cm4gKCk6IFZhbGlkYXRpb25FcnJvcnMgfCBudWxsID0+IHtcbiAgICAgIGNvbnN0IGRheSA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLmRheSkudmFsdWU7XG4gICAgICBjb25zdCBtb250aCA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLm1vbnRoKS52YWx1ZSAtIDE7XG4gICAgICBjb25zdCB5ZWFyID0gdGhpcy5mb3JtR3JvdXAuZ2V0KHRoaXMueWVhcikudmFsdWU7XG4gICAgICAvLyBWYWxpZGF0aW9uIHNob3VsZCBwYXNzIGlmIHRoZSBkYXRlIGZpZWxkIGlzIG9wdGlvbmFsIGFuZCBkYXksIG1vbnRoLCBhbmQgeWVhciBhcmUgYWxsIGVtcHR5XG4gICAgICBpZiAodGhpcy5pc09wdGlvbmFsICYmIHRoaXMuaXNFbXB0eShkYXkpICYmIHRoaXMuaXNFbXB0eShtb250aCkgJiYgdGhpcy5pc0VtcHR5KHllYXIpKSB7XG4gICAgICAgIHJldHVybiBudWxsO1xuICAgICAgfVxuICAgICAgLy8gKyB0byBjb2VyY2UgeWVhciB0byBhIG51bWJlclxuICAgICAgcmV0dXJuICF0aGlzLmlzVmFsaWREYXRlKG5ldyBEYXRlKHllYXIsIG1vbnRoLCBkYXkpLCBtb250aCwgK3llYXIpID8geyBkYXRlQ29tcG9uZW50OiB0cnVlIH0gOiBudWxsO1xuICAgIH07XG4gIH1cbn1cbiJdfQ==

package/esm5/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.js

@@ -12,6 +12,7 @@ import { Component, Input } from '@angular/core';
  * */
 var GovUkDateComponent = /** @class */ (function () {
     function GovUkDateComponent() {
+        this.isOptional = false;
     }
     /**
      * @return {?}
@@ -31,20 +32,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 {?}
@@ -54,8 +80,7 @@ var GovUkDateComponent = /** @class */ (function () {
      */
     function () {
         var _this = this;
-        /** @type {?} */
-        var res = (/**
+        return (/**
          * @return {?}
          */
         function () {
@@ -65,11 +90,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: [{
@@ -83,7 +110,8 @@ var GovUkDateComponent = /** @class */ (function () {
     GovUkDateComponent.propDecorators = {
         config: [{ type: Input }],
         errorMessage: [{ type: Input }],
-        formGroup: [{ type: Input }]
+        formGroup: [{ type: Input }],
+        isOptional: [{ type: Input }]
     };
     return GovUkDateComponent;
 }());
@@ -96,10 +124,12 @@ if (false) {
     /** @type {?} */
     GovUkDateComponent.prototype.formGroup;
     /** @type {?} */
+    GovUkDateComponent.prototype.isOptional;
+    /** @type {?} */
     GovUkDateComponent.prototype.month;
     /** @type {?} */
     GovUkDateComponent.prototype.day;
     /** @type {?} */
     GovUkDateComponent.prototype.year;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292LXVrLWRhdGUuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGhtY3RzL3JweC14dWktY29tbW9uLWxpYi8iLCJzb3VyY2VzIjpbImxpYi9nb3YtdWkvY29tcG9uZW50cy9nb3YtdWstZGF0ZS9nb3YtdWstZGF0ZS5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxPQUFPLEVBQ0wsU0FBUyxFQUNULEtBQUssRUFFTixNQUFNLGVBQWUsQ0FBQzs7Ozs7OztBQVV2QjtJQU1FO0lBQWUsQ0FBQzs7OztJQVNULHFDQUFROzs7SUFBZjtRQUNFLElBQUksQ0FBQyxHQUFHLEdBQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQU0sQ0FBQztRQUNuQyxJQUFJLENBQUMsS0FBSyxHQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxXQUFRLENBQUM7UUFDdkMsSUFBSSxDQUFDLElBQUksR0FBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsVUFBTyxDQUFDOztZQUMvQixhQUFhLEdBQUcsSUFBSSxDQUFDLGFBQWEsRUFBRTtRQUMxQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzVELENBQUM7Ozs7Ozs7SUFFTyx3Q0FBVzs7Ozs7O0lBQW5CLFVBQW9CLENBQU0sRUFBRSxLQUFhOztZQUNqQyxTQUFTLEdBQUcsQ0FBQyxZQUFZLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7O1lBQ3BELGFBQWEsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEtBQUssS0FBSztRQUM1QyxPQUFPLFNBQVMsSUFBSSxhQUFhLENBQUM7SUFDcEMsQ0FBQzs7OztJQUVNLDBDQUFhOzs7SUFBcEI7UUFBQSxpQkFTQzs7WUFSTyxHQUFHOzs7UUFBRzs7Z0JBQ0osR0FBRyxHQUFHLEtBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLOztnQkFDeEMsS0FBSyxHQUFHLEtBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQzs7Z0JBQ2hELElBQUksR0FBRyxLQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSzs7Z0JBQzFDLE9BQU8sR0FBRyxLQUFJLENBQUMsV0FBVyxDQUFDLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUUsS0FBSyxDQUFDO1lBQ25FLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7UUFDbkQsQ0FBQyxDQUFBO1FBQ0QsT0FBTyxHQUFHLENBQUM7SUFDYixDQUFDOztnQkF0Q0YsU0FBUyxTQUFDO29CQUNULFFBQVEsRUFBRSxvQkFBb0I7b0JBQzlCLG0yRkFBMkM7O2lCQUU1Qzs7Ozs7eUJBR0UsS0FBSzsrQkFDTCxLQUFLOzRCQUNMLEtBQUs7O0lBOEJSLHlCQUFDO0NBQUEsQUF2Q0QsSUF1Q0M7U0FsQ1ksa0JBQWtCOzs7SUFFN0Isb0NBQXlDOztJQUN6QywwQ0FBaUQ7O0lBQ2pELHVDQUErQjs7SUFFL0IsbUNBQWtCOztJQUNsQixpQ0FBZ0I7O0lBQ2hCLGtDQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIENvbXBvbmVudCxcbiAgSW5wdXQsXG4gIE9uSW5pdFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFZhbGlkYXRpb25FcnJvcnMsIFZhbGlkYXRvckZuIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgRXJyb3JNZXNzYWdlc01vZGVsIH0gZnJvbSAnLi4vLi4vbW9kZWxzL2Vycm9yLW1lc3NhZ2VzLW1vZGVsJztcbmltcG9ydCB7IEdvdlVpQ29uZmlnTW9kZWwgfSBmcm9tICcuLi8uLi9tb2RlbHMvZ292LXVpLWNvbmZpZy1tb2RlbCc7XG4vKlxuICogR292IFVLIERhdGUgQ29tcG9uZW50XG4gKiBSZXNwb25zaWJsZSBmb3IgZGlzcGxheWluZyAzIGlucHV0IGZpZWxkczpcbiAqIGRheSAvIG1vbnRoIC8geWVhclxuICogZGlzcGxheWluZyBlcnJvck1lc3NhZ2UgbWVzc2FnZXNcbiAqICovXG5AQ29tcG9uZW50KHtcbiAgc2VsZWN0b3I6ICd4dWlsaWItZ292LXVrLWRhdGUnLFxuICB0ZW1wbGF0ZVVybDogJy4vZ292LXVrLWRhdGUuY29tcG9uZW50Lmh0bWwnLFxuICBzdHlsZVVybHM6IFsnLi9nb3YtdWstZGF0ZS5jb21wb25lbnQuc2NzcyddXG59KVxuZXhwb3J0IGNsYXNzIEdvdlVrRGF0ZUNvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCB7XG4gIGNvbnN0cnVjdG9yKCkge31cbiAgQElucHV0KCkgcHVibGljIGNvbmZpZzogR292VWlDb25maWdNb2RlbDtcbiAgQElucHV0KCkgcHVibGljIGVycm9yTWVzc2FnZTogRXJyb3JNZXNzYWdlc01vZGVsO1xuICBASW5wdXQoKSBwdWJsaWMgZm9ybUdyb3VwOiBhbnk7XG5cbiAgcHVibGljIG1vbnRoOiBhbnk7XG4gIHB1YmxpYyBkYXk6IGFueTtcbiAgcHVibGljIHllYXI6IGFueTtcblxuICBwdWJsaWMgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgdGhpcy5kYXkgPSBgJHt0aGlzLmNvbmZpZy5pZH1fZGF5YDtcbiAgICB0aGlzLm1vbnRoID0gYCR7dGhpcy5jb25maWcuaWR9X21vbnRoYDtcbiAgICB0aGlzLnllYXIgPSBgJHt0aGlzLmNvbmZpZy5pZH1feWVhcmA7XG4gICAgY29uc3QgZGF0ZVZhbGlkYXRvciA9IHRoaXMuRGF0ZVZhbGlkYXRvcigpO1xuICAgIHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLmRheSkuc2V0VmFsaWRhdG9ycyhkYXRlVmFsaWRhdG9yKTtcbiAgfVxuXG4gIHByaXZhdGUgaXNWYWxpZERhdGUoZDogYW55LCBtb250aDogbnVtYmVyKTogYm9vbGVhbiB7XG4gICAgY29uc3QgZGF0ZUNoZWNrID0gZCBpbnN0YW5jZW9mIERhdGUgJiYgIWlzTmFOKGQuZ2V0VGltZSgpKTtcbiAgICBjb25zdCBsZWFwWWVhckNoZWNrID0gZC5nZXRNb250aCgpID09PSBtb250aDtcbiAgICByZXR1cm4gZGF0ZUNoZWNrICYmIGxlYXBZZWFyQ2hlY2s7XG4gIH1cblxuICBwdWJsaWMgRGF0ZVZhbGlkYXRvcigpOiBWYWxpZGF0b3JGbiB7XG4gICAgY29uc3QgcmVzID0gKCk6IFZhbGlkYXRpb25FcnJvcnMgfCBudWxsID0+IHtcbiAgICAgIGNvbnN0IGRheSA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLmRheSkudmFsdWU7XG4gICAgICBjb25zdCBtb250aCA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLm1vbnRoKS52YWx1ZSAtIDE7XG4gICAgICBjb25zdCB5ZWFyID0gdGhpcy5mb3JtR3JvdXAuZ2V0KHRoaXMueWVhcikudmFsdWU7XG4gICAgICBjb25zdCBpc1ZhbGlkID0gdGhpcy5pc1ZhbGlkRGF0ZShuZXcgRGF0ZSh5ZWFyLCBtb250aCwgZGF5KSwgbW9udGgpO1xuICAgICAgcmV0dXJuICFpc1ZhbGlkID8geyBkYXRlQ29tcG9uZW50OiB0cnVlIH0gOiBudWxsO1xuICAgIH07XG4gICAgcmV0dXJuIHJlcztcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292LXVrLWRhdGUuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGhtY3RzL3JweC14dWktY29tbW9uLWxpYi8iLCJzb3VyY2VzIjpbImxpYi9nb3YtdWkvY29tcG9uZW50cy9nb3YtdWstZGF0ZS9nb3YtdWstZGF0ZS5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxPQUFPLEVBQ0wsU0FBUyxFQUNULEtBQUssRUFFTixNQUFNLGVBQWUsQ0FBQzs7Ozs7OztBQVV2QjtJQU1FO1FBSWdCLGVBQVUsR0FBWSxLQUFLLENBQUM7SUFKN0IsQ0FBQzs7OztJQVVULHFDQUFROzs7SUFBZjtRQUNFLElBQUksQ0FBQyxHQUFHLEdBQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQU0sQ0FBQztRQUNuQyxJQUFJLENBQUMsS0FBSyxHQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxXQUFRLENBQUM7UUFDdkMsSUFBSSxDQUFDLElBQUksR0FBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsVUFBTyxDQUFDOztZQUMvQixhQUFhLEdBQUcsSUFBSSxDQUFDLGFBQWEsRUFBRTtRQUMxQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzVELENBQUM7Ozs7Ozs7O0lBRU8sd0NBQVc7Ozs7Ozs7SUFBbkIsVUFBb0IsQ0FBTyxFQUFFLEtBQWEsRUFBRSxJQUFZOztZQUNoRCxTQUFTLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDOzs7O1lBRy9CLFVBQVUsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEtBQUssS0FBSzs7WUFDbkMsU0FBUyxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsS0FBSyxJQUFJO1FBQzFDLE9BQU8sU0FBUyxJQUFJLFVBQVUsSUFBSSxTQUFTLENBQUM7SUFDOUMsQ0FBQzs7Ozs7O0lBRU8sb0NBQU87Ozs7O0lBQWYsVUFBZ0IsS0FBVTtRQUN4Qiw2REFBNkQ7UUFDN0QsMkJBQTJCO1FBQzNCLGtDQUFrQztRQUNsQyw4Q0FBOEM7UUFDOUMsT0FBTyxLQUFLLElBQUksSUFBSSxJQUFJLEtBQUssS0FBSyxFQUFFLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLENBQUM7UUFDbEUsMEJBQTBCO1FBQzFCLGlDQUFpQztJQUNuQyxDQUFDOzs7O0lBRU0sMENBQWE7OztJQUFwQjtRQUFBLGlCQVlDO1FBWEM7OztRQUFPOztnQkFDQyxHQUFHLEdBQUcsS0FBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUs7O2dCQUN4QyxLQUFLLEdBQUcsS0FBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDOztnQkFDaEQsSUFBSSxHQUFHLEtBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLO1lBQ2hELDhGQUE4RjtZQUM5RixJQUFJLEtBQUksQ0FBQyxVQUFVLElBQUksS0FBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxLQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ3JGLE9BQU8sSUFBSSxDQUFDO2FBQ2I7WUFDRCwrQkFBK0I7WUFDL0IsT0FBTyxDQUFDLEtBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUN0RyxDQUFDLEVBQUM7SUFDSixDQUFDOztnQkF2REYsU0FBUyxTQUFDO29CQUNULFFBQVEsRUFBRSxvQkFBb0I7b0JBQzlCLG0yRkFBMkM7O2lCQUU1Qzs7Ozs7eUJBR0UsS0FBSzsrQkFDTCxLQUFLOzRCQUNMLEtBQUs7NkJBQ0wsS0FBSzs7SUE4Q1IseUJBQUM7Q0FBQSxBQXhERCxJQXdEQztTQW5EWSxrQkFBa0I7OztJQUU3QixvQ0FBeUM7O0lBQ3pDLDBDQUFpRDs7SUFDakQsdUNBQStCOztJQUMvQix3Q0FBNEM7O0lBRTVDLG1DQUFrQjs7SUFDbEIsaUNBQWdCOztJQUNoQixrQ0FBaUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBDb21wb25lbnQsXG4gIElucHV0LFxuICBPbkluaXRcbn0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBWYWxpZGF0aW9uRXJyb3JzLCBWYWxpZGF0b3JGbiB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IEVycm9yTWVzc2FnZXNNb2RlbCB9IGZyb20gJy4uLy4uL21vZGVscy9lcnJvci1tZXNzYWdlcy1tb2RlbCc7XG5pbXBvcnQgeyBHb3ZVaUNvbmZpZ01vZGVsIH0gZnJvbSAnLi4vLi4vbW9kZWxzL2dvdi11aS1jb25maWctbW9kZWwnO1xuLypcbiAqIEdvdiBVSyBEYXRlIENvbXBvbmVudFxuICogUmVzcG9uc2libGUgZm9yIGRpc3BsYXlpbmcgMyBpbnB1dCBmaWVsZHM6XG4gKiBkYXkgLyBtb250aCAvIHllYXJcbiAqIGRpc3BsYXlpbmcgZXJyb3JNZXNzYWdlIG1lc3NhZ2VzXG4gKiAqL1xuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAneHVpbGliLWdvdi11ay1kYXRlJyxcbiAgdGVtcGxhdGVVcmw6ICcuL2dvdi11ay1kYXRlLmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbJy4vZ292LXVrLWRhdGUuY29tcG9uZW50LnNjc3MnXVxufSlcbmV4cG9ydCBjbGFzcyBHb3ZVa0RhdGVDb21wb25lbnQgaW1wbGVtZW50cyBPbkluaXQge1xuICBjb25zdHJ1Y3RvcigpIHt9XG4gIEBJbnB1dCgpIHB1YmxpYyBjb25maWc6IEdvdlVpQ29uZmlnTW9kZWw7XG4gIEBJbnB1dCgpIHB1YmxpYyBlcnJvck1lc3NhZ2U6IEVycm9yTWVzc2FnZXNNb2RlbDtcbiAgQElucHV0KCkgcHVibGljIGZvcm1Hcm91cDogYW55O1xuICBASW5wdXQoKSBwdWJsaWMgaXNPcHRpb25hbDogYm9vbGVhbiA9IGZhbHNlO1xuXG4gIHB1YmxpYyBtb250aDogYW55O1xuICBwdWJsaWMgZGF5OiBhbnk7XG4gIHB1YmxpYyB5ZWFyOiBhbnk7XG5cbiAgcHVibGljIG5nT25Jbml0KCk6IHZvaWQge1xuICAgIHRoaXMuZGF5ID0gYCR7dGhpcy5jb25maWcuaWR9X2RheWA7XG4gICAgdGhpcy5tb250aCA9IGAke3RoaXMuY29uZmlnLmlkfV9tb250aGA7XG4gICAgdGhpcy55ZWFyID0gYCR7dGhpcy5jb25maWcuaWR9X3llYXJgO1xuICAgIGNvbnN0IGRhdGVWYWxpZGF0b3IgPSB0aGlzLkRhdGVWYWxpZGF0b3IoKTtcbiAgICB0aGlzLmZvcm1Hcm91cC5nZXQodGhpcy5kYXkpLnNldFZhbGlkYXRvcnMoZGF0ZVZhbGlkYXRvcik7XG4gIH1cblxuICBwcml2YXRlIGlzVmFsaWREYXRlKGQ6IERhdGUsIG1vbnRoOiBudW1iZXIsIHllYXI6IG51bWJlcik6IGJvb2xlYW4ge1xuICAgIGNvbnN0IGRhdGVDaGVjayA9ICFpc05hTihkLmdldFRpbWUoKSk7XG4gICAgLy8gTW9udGggbWlzbWF0Y2ggb2NjdXJzIGlmIHRoZSBwcm92aWRlZCBkYXkgb3IgbW9udGggYXJlIGludmFsaWQsIG9yIGVpdGhlciBpcyBvbWl0dGVkLiAqKk5vdGU6KiogVGhpcyBpcyBpbnN1ZmZpY2llbnQgZm9yXG4gICAgLy8gY2hlY2tpbmcgZGF0ZSB2YWxpZGl0eSB3aGVuIHRoZSB5ZWFyIGlzIG9taXR0ZWQgYmVjYXVzZSBpdCBkZWZhdWx0cyB0byAxOTAwIC0gYW4gZXh0cmEgY2hlY2sgaXMgcmVxdWlyZWRcbiAgICBjb25zdCBtb250aE1hdGNoID0gZC5nZXRNb250aCgpID09PSBtb250aDtcbiAgICBjb25zdCB5ZWFyTWF0Y2ggPSBkLmdldEZ1bGxZZWFyKCkgPT09IHllYXI7XG4gICAgcmV0dXJuIGRhdGVDaGVjayAmJiBtb250aE1hdGNoICYmIHllYXJNYXRjaDtcbiAgfVxuXG4gIHByaXZhdGUgaXNFbXB0eSh2YWx1ZTogYW55KSB7XG4gICAgLy8gTm90ZTogSW50ZW50aW9uYWwgdXNlIG9mID09IHRvIGNoZWNrIGZvciBudWxsIG9yIHVuZGVmaW5lZFxuICAgIC8qIGVzbGludC1kaXNhYmxlIGVxZXFlcSAqL1xuICAgIC8qIHRzbGludDpkaXNhYmxlOnRyaXBsZS1lcXVhbHMgKi9cbiAgICAvLyBOYU4gYW5kIDwgMCBjaGVja3MgcmVxdWlyZWQgZm9yIG1vbnRoIGZpZWxkXG4gICAgcmV0dXJuIHZhbHVlID09IG51bGwgfHwgdmFsdWUgPT09ICcnIHx8IGlzTmFOKHZhbHVlKSB8fCB2YWx1ZSA8IDA7XG4gICAgLyogZXNsaW50LWVuYWJsZSBlcWVxZXEgKi9cbiAgICAvKiB0c2xpbnQ6ZW5hYmxlOnRyaXBsZS1lcXVhbHMgKi9cbiAgfVxuXG4gIHB1YmxpYyBEYXRlVmFsaWRhdG9yKCk6IFZhbGlkYXRvckZuIHtcbiAgICByZXR1cm4gKCk6IFZhbGlkYXRpb25FcnJvcnMgfCBudWxsID0+IHtcbiAgICAgIGNvbnN0IGRheSA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLmRheSkudmFsdWU7XG4gICAgICBjb25zdCBtb250aCA9IHRoaXMuZm9ybUdyb3VwLmdldCh0aGlzLm1vbnRoKS52YWx1ZSAtIDE7XG4gICAgICBjb25zdCB5ZWFyID0gdGhpcy5mb3JtR3JvdXAuZ2V0KHRoaXMueWVhcikudmFsdWU7XG4gICAgICAvLyBWYWxpZGF0aW9uIHNob3VsZCBwYXNzIGlmIHRoZSBkYXRlIGZpZWxkIGlzIG9wdGlvbmFsIGFuZCBkYXksIG1vbnRoLCBhbmQgeWVhciBhcmUgYWxsIGVtcHR5XG4gICAgICBpZiAodGhpcy5pc09wdGlvbmFsICYmIHRoaXMuaXNFbXB0eShkYXkpICYmIHRoaXMuaXNFbXB0eShtb250aCkgJiYgdGhpcy5pc0VtcHR5KHllYXIpKSB7XG4gICAgICAgIHJldHVybiBudWxsO1xuICAgICAgfVxuICAgICAgLy8gKyB0byBjb2VyY2UgeWVhciB0byBhIG51bWJlclxuICAgICAgcmV0dXJuICF0aGlzLmlzVmFsaWREYXRlKG5ldyBEYXRlKHllYXIsIG1vbnRoLCBkYXkpLCBtb250aCwgK3llYXIpID8geyBkYXRlQ29tcG9uZW50OiB0cnVlIH0gOiBudWxsO1xuICAgIH07XG4gIH1cbn1cbiJdfQ==

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

@@ -3588,7 +3588,9 @@ GovUkCheckboxesComponent.propDecorators = {
  * displaying errorMessage messages
  * */
 class GovUkDateComponent {
-    constructor() { }
+    constructor() {
+        this.isOptional = false;
+    }
     /**
      * @return {?}
      */
@@ -3604,21 +3606,39 @@ class GovUkDateComponent {
      * @private
      * @param {?} d
      * @param {?} month
+     * @param {?} year
      * @return {?}
      */
-    isValidDate(d, month) {
+    isValidDate(d, month, year) {
+        /** @type {?} */
+        const 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 {?} */
-        const dateCheck = d instanceof Date && !isNaN(d.getTime());
+        const monthMatch = d.getMonth() === month;
         /** @type {?} */
-        const leapYearCheck = d.getMonth() === month;
-        return dateCheck && leapYearCheck;
+        const yearMatch = d.getFullYear() === year;
+        return dateCheck && monthMatch && yearMatch;
+    }
+    /**
+     * @private
+     * @param {?} value
+     * @return {?}
+     */
+    isEmpty(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 {?}
      */
     DateValidator() {
-        /** @type {?} */
-        const res = (/**
+        return (/**
          * @return {?}
          */
         () => {
@@ -3628,11 +3648,13 @@ class GovUkDateComponent {
             const month = this.formGroup.get(this.month).value - 1;
             /** @type {?} */
             const year = this.formGroup.get(this.year).value;
-            /** @type {?} */
-            const 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 = [
@@ -3647,7 +3669,8 @@ GovUkDateComponent.ctorParameters = () => [];
 GovUkDateComponent.propDecorators = {
     config: [{ type: Input }],
     errorMessage: [{ type: Input }],
-    formGroup: [{ type: Input }]
+    formGroup: [{ type: Input }],
+    isOptional: [{ type: Input }]
 };
 
 /**