tweak handling of invalid dates.

Author: mmalerba

src/lib/core/datetime/date-adapter.ts

@@ -157,11 +157,26 @@ export abstract class DateAdapter<D> {
   abstract getISODateString(date: D): string;
 
   /**
-   * Checks whether the given value is a valid date object.
-   * @param value The value to check.
-   * @returns Whether the value is a valid date object.
+   * Checks whether the given object is considered a date instance by this DateAdapter.
+   * @param obj The object to check
+   * @returns Whether the object is a date instance.
    */
-  abstract isValidDate(value: any): boolean;
+  abstract isDateInstance(obj: any): boolean;
+
+  /**
+   * Checks whether the given date is valid.
+   * @param date The date to check.
+   * @returns Whether the date is valid.
+   */
+  abstract isValid(date: D): boolean;
+
+  /**
+   * @param {obj} The object to check.
+   * @returns The given object if it is both a date instance and valid, otherwise null.
+   */
+  getValidDateOrNull(obj: any): D | null {
+    return (this.isDateInstance(obj) && this.isValid(obj)) ? obj : null;
+  }
 
   /**
    * Sets the locale used for all dates.

src/lib/core/datetime/native-date-adapter.spec.ts

@@ -306,15 +306,15 @@ describe('NativeDateAdapter', () => {
   });
 
   it('should count a Date as a valid date object', () => {
-    expect(adapter.isValidDate(new Date())).toBe(true);
+    expect(adapter.isValid(new Date())).toBe(true);
   });
 
   it('should not count a string as a valid date object', () => {
-    expect(adapter.isValidDate('1/1/2017')).toBe(false);
+    expect(adapter.isValid('1/1/2017')).toBe(false);
   });
 
   it('should not count InvalidDate as a valid date object', () => {
-    expect(adapter.isValidDate(new Date(NaN))).toBe(false);
+    expect(adapter.isValid(new Date(NaN))).toBe(false);
   });
 });
 

src/lib/core/datetime/native-date-adapter.ts

@@ -164,7 +164,7 @@ export class NativeDateAdapter extends DateAdapter<Date> {
   }
 
   format(date: Date, displayFormat: Object): string {
-    if (!this.isValidDate(date)) {
+    if (!this.isValid(date)) {
       return 'INVALID DATE';
     }
     if (SUPPORTS_INTL_API) {
@@ -212,14 +212,12 @@ export class NativeDateAdapter extends DateAdapter<Date> {
     ].join('-');
   }
 
-  isValidDate(value: any) {
-    if (value == null) {
-      return true;
-    }
-    if (value instanceof Date) {
-      return !isNaN(value.getTime());
-    }
-    return false;
+  isDateInstance(obj: any) {
+    return obj instanceof Date;
+  }
+
+  isValid(date: Date) {
+    return !isNaN(date.getTime());
   }
 
   /** Creates a date but allows the month and date to overflow. */

src/lib/datepicker/datepicker-input.ts

@@ -112,10 +112,16 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   /** The value of the input. */
   @Input()
   get value(): D | null {
-    return this._dateAdapter.parse(this._elementRef.nativeElement.value,
-        this._dateFormats.parse.dateInput);
+    return this._dateAdapter.getValidDateOrNull(
+        this._dateAdapter.parse(
+            this._elementRef.nativeElement.value, this._dateFormats.parse.dateInput));
   }
   set value(value: D | null) {
+    if (value != null && !this._dateAdapter.isDateInstance(value)) {
+      throw Error('Datepicker: value not recognized as a date object by DateAdapter.');
+    }
+    value = this._dateAdapter.getValidDateOrNull(value);
+
     let oldDate = this.value;
     this._renderer.setProperty(this._elementRef.nativeElement, 'value',
         value ? this._dateAdapter.format(value, this._dateFormats.display.dateInput) : '');
@@ -126,21 +132,21 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
 
   /** The minimum valid date. */
   @Input()
-  get min(): D { return this._min; }
-  set min(value: D) {
-    this._min = value;
+  get min(): D | null { return this._min; }
+  set min(value: D | null) {
+    this._min = this._dateAdapter.getValidDateOrNull(value);
     this._validatorOnChange();
   }
-  private _min: D;
+  private _min: D | null;
 
   /** The maximum valid date. */
   @Input()
-  get max(): D { return this._max; }
-  set max(value: D) {
-    this._max = value;
+  get max(): D | null { return this._max; }
+  set max(value: D | null) {
+    this._max = this._dateAdapter.getValidDateOrNull(value);
     this._validatorOnChange();
   }
-  private _max: D;
+  private _max: D | null;
 
   /** Whether the datepicker-input is disabled. */
   @Input()
@@ -169,20 +175,20 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
 
   /** The form control validator for whether the input parses. */
   private _parseValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    return (!control.value || this._dateAdapter.isValidDate(control.value)) ?
+    return (!control.value || this._dateAdapter.isValid(control.value)) ?
         null : {'mdDatepickerParse': true};
   }
 
   /** The form control validator for the min date. */
   private _minValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    return (!this.min || !this._dateAdapter.isValidDate(this.min) || !control.value ||
+    return (!this.min || !control.value ||
         this._dateAdapter.compareDate(this.min, control.value) <= 0) ?
         null : {'mdDatepickerMin': {'min': this.min, 'actual': control.value}};
   }
 
   /** The form control validator for the max date. */
   private _maxValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    return (!this.max || !this._dateAdapter.isValidDate(this.max) || !control.value ||
+    return (!this.max || !control.value ||
         this._dateAdapter.compareDate(this.max, control.value) >= 0) ?
         null : {'mdDatepickerMax': {'max': this.max, 'actual': control.value}};
   }

src/lib/datepicker/datepicker.ts

@@ -124,15 +124,13 @@ export class MdDatepickerContent<D> implements AfterContentInit {
 export class MdDatepicker<D> implements OnDestroy {
   /** The date to open the calendar to initially. */
   @Input()
-  get startAt(): D {
+  get startAt(): D | null {
     // If an explicit startAt is set we start there, otherwise we start at whatever the currently
     // selected value is.
-    return this._startAt ||
-        (this._datepickerInput && this._dateAdapter.isValidDate(this._datepickerInput.value) ?
-            this._datepickerInput.value : null);
+    return this._startAt || (this._datepickerInput ? this._datepickerInput.value : null);
   }
-  set startAt(date: D) { this._startAt = date; }
-  private _startAt: D;
+  set startAt(date: D | null) { this._startAt = this._dateAdapter.getValidDateOrNull(date); }
+  private _startAt: D | null;
 
   /** The view that the calendar should start in. */
   @Input() startView: 'month' | 'year' = 'month';
@@ -166,12 +164,12 @@ export class MdDatepicker<D> implements OnDestroy {
   _selected: D | null = null;
 
   /** The minimum selectable date. */
-  get _minDate(): D {
+  get _minDate(): D | null {
     return this._datepickerInput && this._datepickerInput.min;
   }
 
   /** The maximum selectable date. */
-  get _maxDate(): D {
+  get _maxDate(): D | null {
     return this._datepickerInput && this._datepickerInput.max;
   }
 
@@ -239,8 +237,7 @@ export class MdDatepicker<D> implements OnDestroy {
     }
     this._datepickerInput = input;
     this._inputSubscription =
-        this._datepickerInput._valueChange.subscribe((value: D) =>
-            this._selected = this._dateAdapter.isValidDate(value) ? value : null);
+        this._datepickerInput._valueChange.subscribe((value: D | null) => this._selected = value);
   }
 
   /** Open the calendar. */