Address feedback

Author: devversion

src/lib/dialog/dialog-container.ts

@@ -79,8 +79,8 @@ export class MatDialogContainer extends BasePortalOutlet {
   /** Element that was focused before the dialog was opened. Save this to restore upon close. */
   private _elementFocusedBeforeDialogWasOpened: HTMLElement | null = null;
 
-  /** Focus origin type that describes how the dialog got closed. */
-  _closeFocusOrigin: FocusOrigin = 'program';
+  /** Type of interaction that closed the dialog. */
+  private _closeFocusOrigin: FocusOrigin = 'program';
 
   /** The dialog configuration. */
   _config: MatDialogConfig;
@@ -187,8 +187,9 @@ export class MatDialogContainer extends BasePortalOutlet {
   }
 
   /** Starts the dialog exit animation. */
-  _startExitAnimation(): void {
+  _startExitAnimation(focusOrigin: FocusOrigin): void {
     this._state = 'exit';
+    this._closeFocusOrigin = focusOrigin;
 
     // Mark the container for check so it can react if the
     // view container is using OnPush change detection.

src/lib/dialog/dialog-ref.ts

@@ -78,10 +78,10 @@ export class MatDialogRef<T, R = any> {
 
   /**
    * Close the dialog.
-   * @param dialogResult Optional result to return to the dialog opener.
-   * @param closeFocusOrigin Focus origin that describes how the dialog got closed
+   * @param dialogResult Optional result to return to the dialog opener
+   * @param focusOrigin Type of interaction that closed the dialog
    */
-  close(dialogResult?: R, closeFocusOrigin: FocusOrigin = 'program'): void {
+  close(dialogResult?: R, focusOrigin: FocusOrigin = 'program'): void {
     this._result = dialogResult;
 
     // Transition the backdrop in parallel to the dialog.
@@ -95,8 +95,7 @@ export class MatDialogRef<T, R = any> {
       this._overlayRef.detachBackdrop();
     });
 
-    this._containerInstance._closeFocusOrigin = closeFocusOrigin;
-    this._containerInstance._startExitAnimation();
+    this._containerInstance._startExitAnimation(focusOrigin);
   }
 
   /**

src/lib/dialog/dialog.spec.ts

@@ -25,7 +25,7 @@ import {SpyLocation} from '@angular/common/testing';
 import {Directionality} from '@angular/cdk/bidi';
 import {MatDialogContainer} from './dialog-container';
 import {OverlayContainer, ScrollStrategy} from '@angular/cdk/overlay';
-import {A11yModule, FocusOrigin, FocusMonitor} from '@angular/cdk/a11y';
+import {FocusOrigin, FocusMonitor} from '@angular/cdk/a11y';
 import {A, ESCAPE} from '@angular/cdk/keycodes';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {
@@ -49,7 +49,7 @@ describe('MatDialog', () => {
 
   beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
-      imports: [MatDialogModule, DialogTestModule, A11yModule],
+      imports: [MatDialogModule, DialogTestModule],
       providers: [
         {provide: Location, useClass: SpyLocation}
       ],
@@ -903,7 +903,7 @@ describe('MatDialog', () => {
       document.body.removeChild(button);
     }));
 
-    it('should re-focus the trigger via mouse when dialog closes through escape', fakeAsync(() => {
+    it('should re-focus the trigger via keyboard when closed via escape key', fakeAsync(() => {
       const button = document.createElement('button');
       let lastFocusOrigin: FocusOrigin = null;
 
@@ -932,7 +932,7 @@ describe('MatDialog', () => {
       document.body.removeChild(button);
     }));
 
-    it('should re-focus the trigger via keyboard when backdrop has been clicked', fakeAsync(() => {
+    it('should re-focus the trigger via mouse when backdrop has been clicked', fakeAsync(() => {
       const button = document.createElement('button');
       let lastFocusOrigin: FocusOrigin = null;