fix(cdk-experimental/menu): refocus trigger after closeAll

Author: mmalerba

src/cdk-experimental/menu/menu-item-trigger.ts

@@ -95,6 +95,7 @@ export class CdkMenuItemTrigger extends MenuTrigger implements OnDestroy {
   ) {
     super(injector, menuStack);
     this._registerCloseHandler();
+    this._subscribeToMenuStackClosed();
     this._subscribeToMouseEnter();
     this._subscribeToHasFocus();
   }
@@ -321,4 +322,14 @@ export class CdkMenuItemTrigger extends MenuTrigger implements OnDestroy {
       this.menuStack.setHasFocus(hasFocus);
     }
   }
+
+  private _subscribeToMenuStackClosed() {
+    if (!this._parentMenu) {
+      this.menuStack.closed.subscribe(({focusParentMenu}) => {
+        if (focusParentMenu && !this.menuStack.length()) {
+          this._elementRef.nativeElement.focus();
+        }
+      });
+    }
+  }
 }

src/cdk-experimental/menu/menu-item.ts

@@ -140,7 +140,7 @@ export class CdkMenuItem implements FocusableOption, FocusableElement, Toggler,
   trigger() {
     if (!this.disabled && !this.hasMenu()) {
       this.triggered.next();
-      this._menuStack.closeAll();
+      this._menuStack.closeAll(undefined, true);
     }
   }
 
@@ -219,7 +219,7 @@ export class CdkMenuItem implements FocusableOption, FocusableElement, Toggler,
   private _forwardArrowPressed(event: KeyboardEvent) {
     if (!this.hasMenu() && this._menuStack.hasInlineMenu()) {
       event.preventDefault();
-      this._menuStack.closeAll(FocusNext.nextItem);
+      this._menuStack.closeAll(FocusNext.nextItem, true);
     }
   }
 

src/cdk-experimental/menu/menu-stack.ts

@@ -148,7 +148,6 @@ export class MenuStack {
           this._close.next({item: menuStackItem, focusParentMenu});
         }
       }
-
       this._empty.next(focusNext);
     }
   }