Fix setting custom tab index for TabSheet or Accordion (#9574) (#10278)

2 files changed, 32 insertions, 0 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VAccordion.java b/client/src/main/java/com/vaadin/client/ui/VAccordion.java
index 9ad4ef4e96..c103f9e726 100644
--- a/client/src/main/java/com/vaadin/client/ui/VAccordion.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAccordion.java
@@ -51,6 +51,8 @@ public class VAccordion extends VTabsheetBase {
 
     private final TouchScrollHandler touchScrollHandler;
 
+    private int tabulatorIndex;
+
     public VAccordion() {
         super(CLASSNAME);
 
@@ -110,6 +112,20 @@ public class VAccordion extends VTabsheetBase {
         }
     }
 
+    /**
+     * For internal use only. May be renamed or removed in a future release.
+     *
+     * @param tabIndex
+     *            tabulator index for the open stack item
+     */
+    public void setTabIndex(int tabIndex) {
+        tabulatorIndex = tabIndex;
+        StackItem openStackItem = getOpenStackItem();
+        if (openStackItem != null) {
+            openStackItem.getElement().setTabIndex(tabIndex);
+        }
+    }
+
     /** For internal use only. May be removed or replaced in the future. */
     public void open(int itemIndex) {
         StackItem item = (StackItem) getWidget(itemIndex);
@@ -308,6 +324,7 @@ public class VAccordion extends VTabsheetBase {
             content.getStyle().setLeft(0, Unit.PX);
             content.getStyle().clearVisibility();
             addStyleDependentName("open");
+            getElement().setTabIndex(tabulatorIndex);
         }
 
         public void hide() {
@@ -325,6 +342,7 @@ public class VAccordion extends VTabsheetBase {
             setHeight(-1);
             setWidth("");
             open = false;
+            getElement().setTabIndex(-1);
         }
 
         public boolean isOpen() {
diff --git a/client/src/main/java/com/vaadin/client/ui/VTabsheet.java b/client/src/main/java/com/vaadin/client/ui/VTabsheet.java
index e3e55f97ef..c9c721bbe9 100644
--- a/client/src/main/java/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTabsheet.java
@@ -787,6 +787,20 @@ public class VTabsheet extends VTabsheetBase
     private String currentStyle;
 
     /**
+     * For internal use only. May be renamed or removed in a future release.
+     *
+     * @param tabIndex
+     *            tabulator index for the active tab of the tab sheet
+     */
+    public void setTabIndex(int tabIndex) {
+        tabulatorIndex = tabIndex;
+        Tab activeTab = getActiveTab();
+        if (activeTab != null) {
+            activeTab.setTabulatorIndex(tabIndex);
+        }
+    }
+
+    /**
      * @return Whether the tab could be selected or not.
      */
     private boolean canSelectTab(final int tabIndex) {