@skyux/datetime 6.4.0 → 6.7.0

package/fesm2020/skyux-datetime.mjs

@@ -2882,6 +2882,10 @@ class SkyDatepickerInputDirective {
     validate(control) {
         if (!this.control) {
             this.control = control;
+            // Account for any date conversion that may have occurred prior to validation.
+            if (this.control.value !== this.value) {
+                this.control.patchValue(this.value, { emitEvent: false });
+            }
         }
         if (this.skyDatepickerNoValidate) {
             return;
@@ -2989,6 +2993,20 @@ class SkyDatepickerInputDirective {
     getShortcutOrDateValue(value) {
         const num = Number(value);
         if (Number.isInteger(num)) {
+            // We require 8 digits in order to know that we have all information needed to determine what part of the number is the month (2), day (2), and year (4).
+            if (value.length === 8) {
+                const regex = new RegExp(/\b(MM)\b|\b(DD)\b|\b(YY)\b|\b(YYYY)\b/, 'g');
+                const formatTokensOnly = this.dateFormat
+                    .match(regex)
+                    .join('')
+                    .replace(new RegExp(/Y+/), 'YYYY');
+                if (formatTokensOnly.length === 8) {
+                    const date = this.dateFormatter.getDateFromString(value, formatTokensOnly, true);
+                    if (this.dateFormatter.dateIsValid(date)) {
+                        return date;
+                    }
+                }
+            }
             const now = new Date();
             const shortcutDate = new Date(now.getFullYear(), now.getMonth(), num);
             const daysInMonth = shortcutDate.getDate();
@@ -4576,7 +4594,10 @@ class SkyTimepickerInputDirective {
         }
     }
     ngOnDestroy() {
-        this.pickerChangedSubscription.unsubscribe();
+        /* istanbul ignore else */
+        if (this.pickerChangedSubscription) {
+            this.pickerChangedSubscription.unsubscribe();
+        }
     }
     ngOnChanges() {
         this.skyTimepickerInput.setFormat(this.timeFormat);