diff --git a/libs/barista-components/experimental/datepicker/src/datepicker.spec.ts b/libs/barista-components/experimental/datepicker/src/datepicker.spec.ts index 7ded7ee602..868ed72567 100644 --- a/libs/barista-components/experimental/datepicker/src/datepicker.spec.ts +++ b/libs/barista-components/experimental/datepicker/src/datepicker.spec.ts @@ -505,6 +505,13 @@ describe('DtDatePicker', () => { fixture.detectChanges(); })); + it('should correctly initialize the value label if a value is set', fakeAsync(() => { + expect(component.datePicker.value).toEqual(new Date(2020, 2, 25)); + const label = + fixture.debugElement.nativeElement.querySelector('.dt-button-label'); + expect(label.textContent).toContain('3/25/2020'); + })); + it('should correctly set a value if it is passed to the datepicker', fakeAsync(() => { component.datePicker.open(); tick(); diff --git a/libs/barista-components/experimental/datepicker/src/datepicker.ts b/libs/barista-components/experimental/datepicker/src/datepicker.ts index 206f3ccf6a..d49bacb11f 100644 --- a/libs/barista-components/experimental/datepicker/src/datepicker.ts +++ b/libs/barista-components/experimental/datepicker/src/datepicker.ts @@ -322,6 +322,16 @@ export class DtDatePicker this.id = this.id; } + ngOnInit(): void { + this._valueLabel = this.value + ? this._dateAdapter.format(this.value, { + year: 'numeric', + month: 'numeric', + day: 'numeric', + }) + : 'Select date'; + } + ngOnDestroy(): void { this._destroy$.next(); this._destroy$.complete(); @@ -451,7 +461,7 @@ export class DtDatePicker month: 'numeric', day: 'numeric', }) - : ''; + : 'Select date'; this._changeDetectorRef.markForCheck(); }