From eed4059ca05483f7874f45bfbd876b6c2dfe4bb0 Mon Sep 17 00:00:00 2001
From: Teppo Kurki <teppo.kurki@vaadin.com>
Date: Tue, 2 Jun 2015 16:29:57 +0300
Subject: On progr. editor open, focus target cell if Grid had focus prior

Change-Id: I8ad9100356a309309e1f8964d6bc293981b2a827
---
 .../grid/basicfeatures/GridBasicFeatures.java       | 21 +++++++++++++++++++++
 .../grid/basicfeatures/server/GridEditorTest.java   | 14 ++++++++++++++
 2 files changed, 35 insertions(+)

(limited to 'uitest/src')

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index c98ee5c53b..a9cc528ac0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -127,6 +127,14 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
         }
     };
 
+    private ItemClickListener editorOpeningItemClickListener = new ItemClickListener() {
+
+        @Override
+        public void itemClick(ItemClickEvent event) {
+            grid.editItem(event.getItemId());
+        }
+    };
+
     private ColumnReorderListener columnReorderListener = new ColumnReorderListener() {
 
         @Override
@@ -642,6 +650,19 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         }
                     }
 
+                });
+        createBooleanAction("EditorOpeningItemClickListener", "State", false,
+                new Command<Grid, Boolean>() {
+
+                    @Override
+                    public void execute(Grid c, Boolean value, Object data) {
+                        if (!value) {
+                            c.removeItemClickListener(editorOpeningItemClickListener);
+                        } else {
+                            c.addItemClickListener(editorOpeningItemClickListener);
+                        }
+                    }
+
                 });
         createBooleanAction("ColumnReorderListener", "State", false,
                 new Command<Grid, Boolean>() {
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
index 0a6d884251..ba6c29522b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
@@ -161,6 +161,20 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest {
         assertEquals("", cell.getText(), focused.getAttribute("value"));
     }
 
+    @Test
+    public void testFocusOnProgrammaticOpenOnItemClick() {
+        selectMenuPath("Component", "State", "EditorOpeningItemClickListener");
+
+        GridCellElement cell = getGridElement().getCell(4, 2);
+
+        cell.click();
+
+        WebElement focused = getFocusedElement();
+
+        assertEquals("", "input", focused.getTagName());
+        assertEquals("", cell.getText(), focused.getAttribute("value"));
+    }
+
     @Test
     public void testNoFocusOnProgrammaticOpen() {
 
-- 
cgit v1.2.3