fix(datetime): set default to max if max before current only #9846

Author: mlynch

src/components/datetime/datetime.ts

@@ -12,6 +12,7 @@ import { assert, clamp, deepCopy, isArray, isBlank, isObject, isPresent, isStrin
 import {
   DateTimeData,
   LocaleData,
+  compareDates,
   convertDataToISO,
   convertFormatToKey,
   dateDataSortValue,
@@ -850,10 +851,17 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterContentIni
    * @private
    */
   getDefaultValue() {
+    const now = parseDate((new Date).toISOString());
     if (this.max) {
-      return parseDate(this.max);
+      const max = parseDate(this.max);
+      const diff = compareDates(now, max);
+
+      // If max is before current time, return max
+      if (diff > 0) {
+        return max;
+      }
     }
-    return parseDate((new Date).toISOString());
+    return now;
   }
 }
 

src/components/datetime/test/datetime.spec.ts

@@ -25,7 +25,7 @@ describe('DateTime', () => {
       expect(val.minute).toEqual(now.minute);
     });
 
-    fit('should default to max if no initial value supplied but max specified', () => {
+    fit('should default to max if no initial value supplied but max specified and max before current', () => {
       datetime.max = '1987-10-19';
       datetime.generate();
       const val = datetime.getValue();
@@ -34,6 +34,16 @@ describe('DateTime', () => {
       expect(val.day).toEqual(19);
     });
 
+    fit('should default to current if no initial value supplied but max specified and max after current', () => {
+      const now = datetimeUtil.parseDate(new Date().toISOString());
+      datetime.max = '2100-10-19';
+      datetime.generate();
+      const val = datetime.getValue();
+      expect(val.year).toEqual(now.year);
+      expect(val.month).toEqual(now.month);
+      expect(val.day).toEqual(now.day);
+    });
+
     it('should restrict January 1-14, 2000 from selection, then allow it, and restrict December 15-31, 2001', () => {
       datetime.max = '2001-12-15';
       datetime.min = '2000-01-15';

src/util/datetime-util.ts

@@ -228,6 +228,12 @@ export function parseDate(val: any): DateTimeData {
   };
 }
 
+export function compareDates(d1: DateTimeData, d2: DateTimeData) : number {
+  const date1 = new Date(d1.year, d1.month, d1.day, d1.hour, d1.minute, d1.second);
+  const date2 = new Date(d2.year, d2.month, d2.day, d2.hour, d2.minute, d2.second);
+
+  return date1.getTime() - date2.getTime();
+}
 
 export function updateDate(existingData: DateTimeData, newData: any): boolean {
   if (isPresent(newData) && newData !== '') {