Fix/focus inside window chrome (#11142)

Fixes #11087

2 files changed, 128 insertions, 0 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/InitialFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/InitialFocus.java
new file mode 100644
index 0000000000..52dc916824
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/InitialFocus.java
@@ -0,0 +1,74 @@
+package com.vaadin.tests.components.window;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+
+public class InitialFocus extends AbstractTestUI {
+
+    public static final String FOCUS_NAME_BUTTON_ID = "focusNameButton";
+    public static final String FOCUS_GENDER_BUTTON_ID = "focusGenderButton";
+    public static final String NAME_FIELD_ID = "nameField";
+    public static final String GENDER_FIELD_ID = "genderField";
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Button focusNameButton = new Button("Open Window and focus Name");
+        focusNameButton.setId(FOCUS_NAME_BUTTON_ID);
+        focusNameButton.addClickListener(event -> {
+            MyDialog myDialog = new MyDialog();
+            myDialog.setClosable(true);
+            myDialog.center();
+            getUI().addWindow(myDialog);
+            myDialog.bringToFront();
+            myDialog.focusNameField();
+        });
+        addComponent(focusNameButton);
+
+        Button focusGenderButton = new Button("Open Window and focus Gender");
+        focusGenderButton.setId(FOCUS_GENDER_BUTTON_ID);
+        focusGenderButton.addClickListener(event -> {
+            MyDialog myDialog = new MyDialog();
+            myDialog.setClosable(true);
+            myDialog.center();
+            getUI().addWindow(myDialog);
+            myDialog.bringToFront();
+            myDialog.focusGenderField();
+        });
+        addComponent(focusGenderButton);
+    }
+
+    private static class MyDialog extends Window {
+        private TextField nameField;
+        private ComboBox genderField;
+
+        private MyDialog() {
+            super("MyDialog");
+            setWidth("400px");
+            setHeight("300px");
+            VerticalLayout hl = new VerticalLayout();
+            hl.setSizeFull();
+            nameField = new TextField("Name");
+            nameField.setId(NAME_FIELD_ID);
+            hl.addComponent(this.nameField);
+
+            genderField = new ComboBox("Gender");
+            genderField.setId(GENDER_FIELD_ID);
+            hl.addComponentsAndExpand(genderField);
+
+            this.setContent(hl);
+        }
+
+        private void focusNameField() {
+            nameField.focus();
+        }
+
+        private void focusGenderField() {
+            genderField.focus();
+        }
+    }
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/InitialFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/InitialFocusTest.java
new file mode 100644
index 0000000000..a6ab48803c
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/InitialFocusTest.java
@@ -0,0 +1,54 @@
+package com.vaadin.tests.components.window;
+
+import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+public class InitialFocusTest extends MultiBrowserTest {
+    /**
+     * To test an implementation of
+     * {@code com.google.gwt.user.client.ui.Focusable} which is nameField of
+     * TextField type
+     */
+    @Test
+    public void window_callingFocusNameField_nameFieldShouldGetFocused() {
+        openTestURL();
+        WebElement openWindowButton = findElement(
+                By.id(InitialFocus.FOCUS_NAME_BUTTON_ID));
+        openWindowButton.click();
+        waitForElementPresent(By.id(InitialFocus.NAME_FIELD_ID));
+        WebElement focusedElement = getFocusedElement();
+        Assert.assertNotNull(
+                "Name TextField should have focus while focusedElement is null.",
+                focusedElement);
+        String focusedElementId = focusedElement.getAttribute("id");
+        Assert.assertEquals(
+                "Name TextField should have focus while " + focusedElementId
+                        + " has focus.",
+                InitialFocus.NAME_FIELD_ID, focusedElementId);
+    }
+
+    /**
+     * To test an implementation of {@code com.vaadin.client.Focusable} which is
+     * genderField of ComboBox type
+     */
+    @Test
+    public void window_callingFocusGenderField_genderFieldShouldGetFocused() {
+        openTestURL();
+        WebElement openWindowButton = findElement(
+                By.id(InitialFocus.FOCUS_GENDER_BUTTON_ID));
+        openWindowButton.click();
+        waitForElementPresent(By.id(InitialFocus.GENDER_FIELD_ID));
+        WebElement focusedElement = getFocusedElement();
+        Assert.assertNotNull(
+                "Gender ComboBox should have focus while focusedElement is null.",
+                focusedElement);
+        ComboBoxElement genderField = $(ComboBoxElement.class).first();
+        Assert.assertEquals(
+                "Gender ComboBox should have focus while another element has focus.",
+                genderField.getInputField(), focusedElement);
+    }
+}