fix(menuBar): close just nested menu when escape key is pressedfocus stays with the parent menu when nested one is closed instead of closing all the menusFixes #11678

Author: marosoft

src/components/menu/js/menuServiceProvider.js

@@ -289,7 +289,11 @@ function MenuProvider($$interimElementProvider) {
           var handled;
           switch (ev.keyCode) {
             case $mdConstant.KEY_CODE.ESCAPE:
-              opts.mdMenuCtrl.close(false, { closeAll: true });
+              if (opts.nestLevel) {
+                opts.mdMenuCtrl.close();
+              } else {
+                opts.mdMenuCtrl.close(false, { closeAll: true });
+              }
               handled = true;
               break;
             case $mdConstant.KEY_CODE.TAB:

src/components/menuBar/menu-bar.spec.js

@@ -226,6 +226,39 @@ describe('material.components.menuBar', function() {
           menuBar.remove();
         });
 
+        it('closes only current sub-menu with escape key', inject(function($mdConstant) {
+          menuBar = setup();
+          ctrl = menuBar.controller('mdMenuBar');
+          menus = menuBar[0].querySelectorAll('md-menu md-menu');
+
+          angular.element(document.body).append(menuBar);
+
+          expect(getNumberOfOpenMenus()).toBe(0);
+
+          // Open the menu-bar menu
+          ctrl.focusMenu(1);
+          ctrl.openFocusedMenu();
+          waitForMenuOpen();
+
+          expect(getNumberOfOpenMenus()).toBe(1);
+
+          // Open the first nested menu
+          openSubMenu(0);
+          waitForMenuOpen();
+          expect(getOpenSubMenu().text().trim()).toBe('Sub 1 - Content');
+
+          expect(getNumberOfOpenMenus()).toBe(2);
+
+          // Close the first nested menu with escape key
+          pressKey(getOpenSubMenu(), $mdConstant.KEY_CODE.ESCAPE);
+          waitForMenuClose();
+
+          // Just main menu should be visible
+          expect(getNumberOfOpenMenus()).toBe(1);
+
+          menuBar.remove();
+        }));
+
         function openSubMenu(index) {
           // If a menu is already open, trigger the mouse leave to close it
           if (subMenuOpen) {
@@ -252,7 +285,19 @@ describe('material.components.menuBar', function() {
           return angular.element(lastContainer.querySelector('md-menu-content'));
         }
 
-        function setup(){
+        function getNumberOfOpenMenus() {
+          var containers = document.body.querySelectorAll('.md-open-menu-container.md-active');
+          return containers.length;
+        }
+
+        function pressKey(el, code) {
+          el.triggerHandler({
+            type: 'keydown',
+            keyCode: code
+          });
+        }
+
+        function setup() {
           var el;
           inject(function($compile, $rootScope) {
             el = $compile([