Made TabSheet tabs always become visible when focused (#12343)

Change-Id: I8f840bf4e45e257454d5e16c7b43f63858fd15d8

1 files changed, 16 insertions, 15 deletions

diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index 7d87650e24..172a25e3f3 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -243,6 +243,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
         }
 
         public void focus() {
+            getTabsheet().scrollIntoView(this);
             focusImpl.focus(td);
         }
 
@@ -1160,13 +1161,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
         } while (newTabIndex >= 0 && !newTab.isSelectable());
 
         if (newTabIndex >= 0) {
-            if (isScrolledTabs()) {
-                // Scroll until the new active tab is visible
-                while (!newTab.isVisible()) {
-                    scrollerIndex = tb.scrollLeft(scrollerIndex);
-                }
-                updateTabScroller();
-            }
             onTabSelected(newTabIndex);
             activeTabIndex = newTabIndex;
         }
@@ -1182,17 +1176,24 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
         } while (newTabIndex < getTabCount() && !newTab.isSelectable());
 
         if (newTabIndex < getTabCount()) {
-            if (isClippedTabs()) {
-                // Scroll until the new active tab is completely visible
-                int newScrollerIndex = scrollerIndex;
-                while (isClipped(newTab) && newScrollerIndex != -1) {
-                    newScrollerIndex = tb.scrollRight(newScrollerIndex);
+            onTabSelected(newTabIndex);
+            activeTabIndex = newTabIndex;
+        }
+    }
+
+    private void scrollIntoView(Tab tab) {
+        if (!tab.isHiddenOnServer()) {
+            if (isClipped(tab)) {
+                while (isClipped(tab) && scrollerIndex != -1) {
+                    scrollerIndex = tb.scrollRight(scrollerIndex);
+                }
+                updateTabScroller();
+            } else if (!tab.isVisible()) {
+                while (!tab.isVisible()) {
+                    scrollerIndex = tb.scrollLeft(scrollerIndex);
                 }
-                scrollerIndex = newScrollerIndex;
                 updateTabScroller();
             }
-            onTabSelected(newTabIndex);
-            activeTabIndex = newTabIndex;
         }
     }
 }