feat(datepicker): infer startDate from model value

Closes #843 Closes #844
ng-bootstrap · Oct 6, 2016 · 4fc52c1 · 4fc52c1
1 parent 91c6054
commit 4fc52c1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/datepicker/datepicker-input.spec.ts b/src/datepicker/datepicker-input.spec.ts
@@ -9,6 +9,7 @@ import {NgbDatepickerModule} from './datepicker.module';
 import {NgbInputDatepicker} from './datepicker-input';
 import {NgbDatepicker} from './datepicker';
 import {NgbDateStruct} from './ngb-date-struct';
+import {NgbDate} from './ngb-date';
 
 const createTestCmpt = (html: string) =>
     createGenericTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
@@ -212,6 +213,19 @@ describe('NgbInputDatepicker', () => {
       const dp = fixture.debugElement.query(By.css('ngb-datepicker')).injector.get(NgbDatepicker);
       expect(dp.startDate).toEqual({year: 2016, month: 9, day: 13});
     });
+
+    it('should propagate model as "startDate" option when "startDate" not provided', fakeAsync(() => {
+         const fixture = createTestCmpt(`<input ngbDatepicker [ngModel]="{year: 2016, month: 9, day: 13}">`);
+         const dpInput = fixture.debugElement.query(By.directive(NgbInputDatepicker)).injector.get(NgbInputDatepicker);
+
+         tick();
+         fixture.detectChanges();
+         dpInput.open();
+         fixture.detectChanges();
+
+         const dp = fixture.debugElement.query(By.css('ngb-datepicker')).injector.get(NgbDatepicker);
+         expect(dp.startDate).toEqual(NgbDate.from({year: 2016, month: 9, day: 13}));
+       }));
   });
 });
 

diff --git a/src/datepicker/datepicker-input.ts b/src/datepicker/datepicker-input.ts
@@ -187,12 +187,13 @@ export class NgbInputDatepicker implements ControlValueAccessor {
 
   private _applyDatepickerInputs(datepickerInstance: NgbDatepicker): void {
     ['dayTemplate', 'firstDayOfWeek', 'markDisabled', 'minDate', 'maxDate', 'showNavigation', 'showWeekdays',
-     'showWeekNumbers', 'startDate']
+     'showWeekNumbers']
         .forEach((optionName: string) => {
           if (this[optionName] !== undefined) {
             datepickerInstance[optionName] = this[optionName];
           }
         });
+    datepickerInstance.startDate = this.startDate || this._model;
   }
 
   private _applyPopupStyling(nativeElement: any) {