Allow defining a focus delegate component for CustomField (#20336)

Change-Id: I1160e7a384b1816204eb7f4b0f52f83ed9e230c0

2 files changed, 18 insertions, 1 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
index b1c6ee57c1..978f582478 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
@@ -73,6 +73,8 @@ public class GridEditorCustomField extends AbstractTestUIWithLog {
             Button addCountryButton = new Button("New");
             fieldLayout.addComponent(addCountryButton);
 
+            setFocusDelegate(cityComboBox);
+
             return fieldLayout;
         }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
index 2acc554154..9e276f04b8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
@@ -17,13 +17,14 @@ package com.vaadin.tests.components.grid;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.openqa.selenium.Keys;
 
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
 import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.newelements.ComboBoxElement;
 
 @TestCategory("grid")
 public class GridEditorCustomFieldTest extends MultiBrowserTest {
@@ -43,4 +44,18 @@ public class GridEditorCustomFieldTest extends MultiBrowserTest {
         Assert.assertEquals("Oslo", grid.getCell(0, 2).getText());
 
     }
+
+    @Test
+    public void tabReachesCustomField() {
+        openTestURL();
+        GridElement grid = $(GridElement.class).first();
+        grid.getCell(0, 1).doubleClick();
+        GridEditorElement editor = grid.getEditor();
+        editor.getField(0).sendKeys(Keys.TAB, Keys.TAB);
+
+        ComboBoxElement comboBoxInCustomField = editor.getField(2)
+                .$(ComboBoxElement.class).first();
+        assertElementsEquals(comboBoxInCustomField.getInputField(),
+                getActiveElement());
+    }
 }