refactor(cdk/dialog): Remove use of focusInitialElementWhenReady

src/cdk/dialog/dialog-container.ts

@@ -37,6 +37,8 @@ import {
   ViewChild,
   ViewEncapsulation,
   inject,
+  afterNextRender,
+  Injector,
 } from '@angular/core';
 import {DialogConfig} from './dialog-config';
 
@@ -102,6 +104,8 @@ export class CdkDialogContainer<C extends DialogConfig = DialogConfig>
 
   protected readonly _changeDetectorRef = inject(ChangeDetectorRef);
 
+  private _injector = inject(Injector);
+
   constructor(
     protected _elementRef: ElementRef,
     protected _focusTrapFactory: FocusTrapFactory,
@@ -266,13 +270,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':
         this._focusByCssSelector('h1, h2, h3, h4, h5, h6, [role="heading"]');