fix(material/datepicker) call detectChanges before focusing active cell

angular · Jan 10, 2022 · c0f8ecf · c0f8ecf
1 parent 906db9e
commit c0f8ecf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/material/datepicker/month-view.ts b/src/material/datepicker/month-view.ts
@@ -342,6 +342,9 @@ export class MatMonthView<D> implements AfterContentInit, OnChanges, OnDestroy {
       this.activeDateChange.emit(this.activeDate);
     }
 
+    // Ensure the calendar body has the correct active cell.
+    this._changeDetectorRef.detectChanges();
+
     this._focusActiveCell();
     // Prevent unexpected default actions such as form submission.
     event.preventDefault();

diff --git a/src/material/datepicker/multi-year-view.ts b/src/material/datepicker/multi-year-view.ts
@@ -293,6 +293,9 @@ export class MatMultiYearView<D> implements AfterContentInit, OnDestroy {
       this.activeDateChange.emit(this.activeDate);
     }
 
+    // Ensure the calendar body has the correct active cell.
+    this._changeDetectorRef.detectChanges();
+
     this._focusActiveCell();
     // Prevent unexpected default actions such as form submission.
     event.preventDefault();

diff --git a/src/material/datepicker/year-view.ts b/src/material/datepicker/year-view.ts
@@ -280,6 +280,9 @@ export class MatYearView<D> implements AfterContentInit, OnDestroy {
       this.activeDateChange.emit(this.activeDate);
     }
 
+    // Ensure the calendar body has the correct active cell.
+    this._changeDetectorRef.detectChanges();
+
     this._focusActiveCell();
     // Prevent unexpected default actions such as form submission.
     event.preventDefault();