Merge pull request #387 from vaadin/fix/input-focus

Prevent focus from being stolen for focusable elements inside cells
vaadin · Jun 14, 2016 · 107c0d4 · 107c0d4
2 parents 3c37785 + 4e612c5
commit 107c0d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/java/src/main/java/com/vaadin/elements/grid/ViolatedGrid.java b/java/src/main/java/com/vaadin/elements/grid/ViolatedGrid.java
@@ -161,11 +161,24 @@ public void onBrowserEvent(Event event) {
         focusGridIfSelectAllClicked(event);
 
         Element targetElement = (Element)event.getEventTarget().cast();
-        if (targetElement != WidgetUtil.getFocusedElement() || isElementOutsideStaticSection(targetElement)) {
+
+        // by default Grid steals focus from focusable elements inside cells,
+        // so we need to prevent that.
+        Element focusedElement = WidgetUtil.getFocusedElement();
+        if (elementContains(targetElement, focusedElement)) {
+          return;
+        }
+
+        if (targetElement != focusedElement || isElementOutsideStaticSection(targetElement)) {
             super.onBrowserEvent(event);
         }
     }
 
+    private native Boolean elementContains(Element parent, Element child)
+        /*-{
+          return parent.contains(child);
+        }-*/;
+
     private boolean isElementOutsideStaticSection(Element element) {
         TableSectionElement headerElement = getEscalator().getHeader().getElement();
         TableSectionElement footerElement = getEscalator().getFooter().getElement();

diff --git a/vaadin-grid.min.js b/vaadin-grid.min.js