Fixed tab index for Button and NativeButton (#9022)

2 files changed, 37 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java
index fdc053b3ae..2daceea0e8 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java
@@ -5,6 +5,7 @@
 package com.vaadin.terminal.gwt.client.ui.button;
 
 import com.vaadin.terminal.gwt.client.ComponentState;
+import com.vaadin.terminal.gwt.client.ui.TabIndexState;
 import com.vaadin.ui.Button;
 
 /**
@@ -14,10 +15,14 @@ import com.vaadin.ui.Button;
  * 
  * @since 7.0
  */
-public class ButtonState extends ComponentState {
+public class ButtonState extends ComponentState implements TabIndexState {
     private boolean disableOnClick = false;
     private int clickShortcutKeyCode = 0;
     /**
+     * The tab order number of this field.
+     */
+    private int tabIndex = 0;
+    /**
      * If caption should be rendered in HTML
      */
     private boolean htmlContentAllowed = false;
@@ -92,4 +97,22 @@ public class ButtonState extends ComponentState {
         return htmlContentAllowed;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#getTabIndex()
+     */
+    public int getTabIndex() {
+        return tabIndex;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#setTabIndex(int)
+     */
+    public void setTabIndex(int tabIndex) {
+        this.tabIndex = tabIndex;
+    }
+
 }
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 8e504d828b..0abc50f26f 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -357,8 +357,6 @@ public class Button extends AbstractComponent implements
 
     protected ClickShortcut clickShortcut;
 
-    private int tabIndex = 0;
-
     /**
      * Makes it possible to invoke a click on this button by pressing the given
      * {@link KeyCode} and (optional) {@link ModifierKey}s.<br/>
@@ -471,13 +469,23 @@ public class Button extends AbstractComponent implements
         requestRepaint();
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.ui.Component.Focusable#getTabIndex()
+     */
     public int getTabIndex() {
-        return tabIndex;
+        return getState().getTabIndex();
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.ui.Component.Focusable#setTabIndex(int)
+     */
     public void setTabIndex(int tabIndex) {
-        this.tabIndex = tabIndex;
-
+        getState().setTabIndex(tabIndex);
+        requestRepaint();
     }
 
     @Override