Merge "Merged TabSheet keyboard focus fixes into master"

2 files changed, 63 insertions, 0 deletions

diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index 81786f2647..c8b084778f 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -715,6 +715,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
             client.updateVariable(id, "selected", tabKeys.get(tabIndex)
                     .toString(), true);
             waitingForResponse = true;
+
+            tb.getTab(tabIndex).focus(); // move keyboard focus to active tab
         }
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
new file mode 100644
index 0000000000..b55f1057b5
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.tabsheet;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TabsheetScrollingTest extends MultiBrowserTest {
+
+    @Test
+    public void keyboardScrolling() {
+        openTestURL();
+        getTab(1).click();
+        for (int i = 0; i < 10; i++) {
+            sendKey(Keys.ARROW_RIGHT);
+        }
+        sendKey(Keys.SPACE);
+        Assert.assertEquals("Hide this tab (21)", getHideButtonText());
+    }
+
+    private WebElement getTab(int index) {
+        return getDriver().findElement(
+                By.vaadin("/VVerticalLayout[0]/Slot[1]"
+                        + "/VVerticalLayout[0]/Slot[0]/VTabsheet[0]"
+                        + "/domChild[0]/domChild[0]/domChild[0]"
+                        + "/domChild[0]/domChild[" + index + "]"));
+
+    }
+
+    private String getHideButtonText() {
+        WebElement buttonCaption = getDriver().findElement(
+                By.vaadin("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]"
+                        + "/Slot[0]/VTabsheet[0]/VTabsheetPanel[0]"
+                        + "/VButton[0]/domChild[0]/domChild[0]"));
+        return buttonCaption.getText();
+    }
+
+    private void sendKey(Keys key) {
+        new Actions(getDriver()).sendKeys(key).perform();
+    }
+
+}