Scrolling down submenus via scrollbar (MenuBar.isAutoOpen()) (#10456)

full name of defect: Can't scroll down submenus using the scrollbar when
MenuBar.isAutoOpen() == true
Tests.

Change-Id: I2cbe797c96dc6a780df147e165babb23f7fbdef3

1 files changed, 17 insertions, 1 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
index d08301ec93..2f1b93994b 100644
--- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
@@ -33,6 +33,10 @@ import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.event.dom.client.KeyDownHandler;
 import com.google.gwt.event.dom.client.KeyPressEvent;
 import com.google.gwt.event.dom.client.KeyPressHandler;
+import com.google.gwt.event.dom.client.MouseOutEvent;
+import com.google.gwt.event.dom.client.MouseOutHandler;
+import com.google.gwt.event.dom.client.MouseOverEvent;
+import com.google.gwt.event.dom.client.MouseOverHandler;
 import com.google.gwt.event.logical.shared.CloseEvent;
 import com.google.gwt.event.logical.shared.CloseHandler;
 import com.google.gwt.user.client.Command;
@@ -54,7 +58,7 @@ import com.vaadin.shared.ui.menubar.MenuBarConstants;
 
 public class VMenuBar extends SimpleFocusablePanel
         implements CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler,
-        FocusHandler, SubPartAware {
+        FocusHandler, SubPartAware, MouseOutHandler, MouseOverHandler {
 
     // The hierarchy of VMenuBar is a bit weird as VMenuBar is the Paintable,
     // used for the root menu but also used for the sub menus.
@@ -605,6 +609,8 @@ public class VMenuBar extends SimpleFocusablePanel
         popup.setWidget(item.getSubMenu());
         popup.addCloseHandler(this);
         popup.addAutoHidePartner(item.getElement());
+        popup.addDomHandler(this, MouseOutEvent.getType());
+        popup.addDomHandler(this, MouseOverEvent.getType());
 
         // at 0,0 because otherwise IE7 add extra scrollbars (#5547)
         popup.setPopupPosition(0, 0);
@@ -1718,4 +1724,14 @@ public class VMenuBar extends SimpleFocusablePanel
     public CustomMenuItem getMenuItemWithElement(Element element) {
         return getMenuItemWithElement(DOM.asOld(element));
     }
+
+    @Override
+    public void onMouseOver(MouseOverEvent event) {
+        LazyCloser.cancelClosing();
+    }
+
+    @Override
+    public void onMouseOut(MouseOutEvent event) {
+        LazyCloser.schedule();
+    }
 }