Close all menus on esc

vaadin · Jan 28, 2019 · e5de5d8 · e5de5d8
1 parent 97b7a8b
commit e5de5d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/vaadin-contextmenu-items-mixin.html b/src/vaadin-contextmenu-items-mixin.html
@@ -208,13 +208,19 @@
           menu.dispatchEvent(new CustomEvent('item-selected', {detail: e.detail}));
         });
 
+        subMenu.addEventListener('close-all-menus', () => {
+          menu.dispatchEvent(new CustomEvent('close-all-menus'));
+        });
+        menu.addEventListener('close-all-menus', menu.close);
         menu.addEventListener('item-selected', menu.close);
         menu.$.overlay.$.backdrop.addEventListener('click', () => menu.close());
 
         menu.$.overlay.addEventListener('keydown', e => {
-          if (e.keyCode === 37 || e.keyCode === 27) {
+          if (e.keyCode === 37) {
             menu.close();
             menu.listenOn.focus();
+          } else if (e.keyCode === 27) {
+            menu.dispatchEvent(new CustomEvent('close-all-menus'));
           }
         });
 

diff --git a/test/items.html b/test/items.html
@@ -181,11 +181,9 @@
           expect(focusSpy).to.have.been.called;
         });
 
-        it('should close the submenu on esc', () => {
-          const focusSpy = sinon.spy(menuComponents()[0], 'focus');
+        it('should close all menus on esc', () => {
           fire(menuComponents(subMenu)[0], 'keydown', {}, {keyCode: 27, key: 'Esc'});
-          expect(subMenu.opened).to.be.false;
-          expect(focusSpy).to.have.been.called;
+          expect(rootMenu.opened).to.be.false;
         });
 
         it('should not close on disabled item click', () => {