fix(datepicker): Fix button label initialization.

Closes APM-346025.
dynatrace-oss · Jan 13, 2022 · 067c1c8 · 067c1c8
1 parent 990c0b5
commit 067c1c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git 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
@@ -322,6 +322,16 @@ export class DtDatePicker<T>
     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<T>
           month: 'numeric',
           day: 'numeric',
         })
-      : '';
+      : 'Select date';
     this._changeDetectorRef.markForCheck();
   }