diff options
author | Anna Koskinen <Ansku@users.noreply.github.com> | 2020-12-03 08:10:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-03 08:10:30 +0200 |
commit | 7f69dc51dbf43edf42b9d74fa9771b424540512a (patch) | |
tree | 916651dc327b8631d7f5ee19b6a14de69f28f87a /client | |
parent | beff93ff44f09bc9e39f67720d4e3f31af933089 (diff) | |
download | vaadin-framework-7f69dc51dbf43edf42b9d74fa9771b424540512a.tar.gz vaadin-framework-7f69dc51dbf43edf42b9d74fa9771b424540512a.zip |
MenuBar: Don't set openRootOnHover when on Android or IOS. (#12135) (#12166)
Fixes #5873
Authored-by: Martin Vysny <martin@vysny.me>
Diffstat (limited to 'client')
-rw-r--r-- | client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java index f739d16fe4..43f6dcc52d 100644 --- a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java @@ -23,6 +23,7 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Timer; import com.vaadin.client.ApplicationConnection; +import com.vaadin.client.BrowserInfo; import com.vaadin.client.Paintable; import com.vaadin.client.TooltipInfo; import com.vaadin.client.UIDL; @@ -57,8 +58,14 @@ public class MenuBarConnector extends AbstractComponentConnector widget.htmlContentAllowed = uidl .hasAttribute(MenuBarConstants.HTML_CONTENT_ALLOWED); - widget.openRootOnHover = uidl - .getBooleanAttribute(MenuBarConstants.OPEN_ROOT_MENU_ON_HOWER); + if (BrowserInfo.get().isAndroid() || BrowserInfo.get().isIOS()) { + // disable the auto-open on hover on devices that don't support hover. + // fixes https://github.com/vaadin/framework/issues/5873 + widget.openRootOnHover = false; + } else { + widget.openRootOnHover = uidl + .getBooleanAttribute(MenuBarConstants.OPEN_ROOT_MENU_ON_HOWER); + } widget.enabled = isEnabled(); |