fix(datepicker): set min/max dates correctly with custom adapters (#3686

) Fixes #3598
ng-bootstrap · Apr 17, 2020 · 644f71f · 644f71f
1 parent 145259d
commit 644f71f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/datepicker/datepicker-input.spec.ts b/src/datepicker/datepicker-input.spec.ts
@@ -675,7 +675,6 @@ describe('NgbInputDatepicker', () => {
       fixture.componentRef.instance.minDate = {year: 2019, month: 11, day: 14};
       fixture.detectChanges();
       expect(dp.minDate).toEqual({year: 2019, month: 11, day: 14});
-
     });
 
     it('should dynamically propagate the "maxDate" option', () => {
@@ -692,7 +691,6 @@ describe('NgbInputDatepicker', () => {
       fixture.componentRef.instance.maxDate = {year: 2019, month: 12, day: 14};
       fixture.detectChanges();
       expect(dp.maxDate).toEqual({year: 2019, month: 12, day: 14});
-
     });
 
     it('should dynamically propagate the "maxDate" and "minDate" option', () => {
@@ -714,7 +712,6 @@ describe('NgbInputDatepicker', () => {
 
       expect(dp.minDate).toEqual({year: 2019, month: 10, day: 14});
       expect(dp.maxDate).toEqual({year: 2019, month: 12, day: 14});
-
     });
 
     it('should propagate the "outsideDays" option', () => {
@@ -1133,6 +1130,27 @@ describe('NgbInputDatepicker', () => {
       inputDebugEl.triggerEventHandler('input', {target: {value: '2018-01-03'}});
       expect(fixture.componentInstance.date).toEqual(new Date(2018, 0, 3));
     });
+
+    it('should dynamically propagate the "maxDate" and "minDate" option', () => {
+      const fixture = createTestCmpt(`<input ngbDatepicker [minDate]="minDate" [maxDate]="maxDate">`);
+      const dpInput = fixture.debugElement.query(By.directive(NgbInputDatepicker)).injector.get(NgbInputDatepicker);
+      fixture.componentRef.instance.minDate = {year: 2019, month: 11, day: 14};
+      fixture.componentRef.instance.maxDate = {year: 2019, month: 12, day: 31};
+
+      dpInput.open();
+      fixture.detectChanges();
+
+      const dp = fixture.debugElement.query(By.css('ngb-datepicker')).injector.get(NgbDatepicker);
+      expect(dp.minDate).toEqual({year: 2019, month: 11, day: 14});
+      expect(dp.maxDate).toEqual({year: 2019, month: 12, day: 31});
+
+      fixture.componentRef.instance.minDate = {year: 2019, month: 10, day: 14};
+      fixture.componentRef.instance.maxDate = {year: 2019, month: 12, day: 14};
+      fixture.detectChanges();
+
+      expect(dp.minDate).toEqual({year: 2019, month: 10, day: 14});
+      expect(dp.maxDate).toEqual({year: 2019, month: 12, day: 14});
+    });
   });
 });
 

diff --git a/src/datepicker/datepicker-input.ts b/src/datepicker/datepicker-input.ts
@@ -447,10 +447,10 @@ export class NgbInputDatepicker implements OnChanges,
 
       if (this.isOpen()) {
         if (changes['minDate']) {
-          this._cRef !.instance.minDate = this._dateAdapter.toModel(changes.minDate.currentValue);
+          this._cRef !.instance.minDate = this.minDate;
         }
         if (changes['maxDate']) {
-          this._cRef !.instance.maxDate = this._dateAdapter.toModel(changes.maxDate.currentValue);
+          this._cRef !.instance.maxDate = this.maxDate;
         }
         this._cRef !.instance.ngOnChanges(changes);
       }