fix(material/dialog): Make focus behavior consistent across zoneful/zoneless apps

Author: mmalerba

src/cdk/dialog/dialog-container.ts

@@ -283,13 +283,17 @@ export class CdkDialogContainer<C extends DialogConfig = DialogConfig>
         break;
       case true:
       case 'first-tabbable':
-        this._focusTrap?.focusInitialElementWhenReady().then(focusedSuccessfully => {
-          // If we weren't able to find a focusable element in the dialog, then focus the dialog
-          // container instead.
-          if (!focusedSuccessfully) {
-            this._focusDialogContainer();
-          }
-        });
+        afterNextRender(
+          () => {
+            const focusedSuccessfully = this._focusTrap?.focusInitialElement();
+            // If we weren't able to find a focusable element in the dialog, then focus the dialog
+            // container instead.
+            if (!focusedSuccessfully) {
+              this._focusDialogContainer();
+            }
+          },
+          {injector: this._injector},
+        );
         break;
       case 'first-heading':
         afterNextRender(

src/material/bottom-sheet/bottom-sheet.spec.ts

@@ -725,7 +725,6 @@ describe('MatBottomSheet', () => {
 
       const bottomSheetRef = bottomSheet.open(PizzaMsg, {viewContainerRef: testViewContainerRef});
 
-      flush();
       viewContainerFixture.detectChanges();
       flush();
       viewContainerFixture.detectChanges();
@@ -763,7 +762,6 @@ describe('MatBottomSheet', () => {
         restoreFocus: false,
       });
 
-      flush();
       viewContainerFixture.detectChanges();
       flush();
       viewContainerFixture.detectChanges();
@@ -804,7 +802,6 @@ describe('MatBottomSheet', () => {
 
       const bottomSheetRef = bottomSheet.open(PizzaMsg, {viewContainerRef: testViewContainerRef});
 
-      flush();
       viewContainerFixture.detectChanges();
       flush();
       viewContainerFixture.detectChanges();
@@ -822,9 +819,9 @@ describe('MatBottomSheet', () => {
         .withContext('Expected focus to be on the alternate button.')
         .toBe('other-button');
 
-      flushMicrotasks();
       viewContainerFixture.detectChanges();
       flush();
+      viewContainerFixture.detectChanges();
 
       expect(document.activeElement!.id)
         .withContext('Expected focus to stay on the alternate button.')