Changeset 258730 in webkit

Timestamp:

Mar 19, 2020 2:41:33 PM (4 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: AXI: disabled buttons shouldn't be focusable
​https://bugs.webkit.org/show_bug.cgi?id=208283
<rdar://problem/59832150>

Reviewed by Devin Rousso.

Set tabIndex to "-1" when button becomes disabled.

• UserInterface/Views/ActivateButtonNavigationItem.js:

(WI.ActivateButtonNavigationItem):

• UserInterface/Views/ButtonNavigationItem.js:

_role is defined in the parent class now.

(WI.ButtonNavigationItem):
(WI.ButtonNavigationItem.prototype.set enabled):
(WI.ButtonNavigationItem.prototype.get tabbable):
(WI.ButtonNavigationItem.prototype._updateTabIndex):

• UserInterface/Views/RadioButtonNavigationItem.js:

(WI.RadioButtonNavigationItem.prototype.get tabbable):
(WI.RadioButtonNavigationItem):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ActivateButtonNavigationItem.js (modified) (1 diff)
• UserInterface/Views/ButtonNavigationItem.js (modified) (5 diffs)
• UserInterface/Views/RadioButtonNavigationItem.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-03-19  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: AXI: disabled buttons shouldn't be focusable
+        https://bugs.webkit.org/show_bug.cgi?id=208283
+        <rdar://problem/59832150>
+
+        Reviewed by Devin Rousso.
+
+        Set tabIndex to "-1" when button becomes disabled.
+
+        * UserInterface/Views/ActivateButtonNavigationItem.js:
+        (WI.ActivateButtonNavigationItem):
+        * UserInterface/Views/ButtonNavigationItem.js:
+        `_role` is defined in the parent class now.
+
+        (WI.ButtonNavigationItem):
+        (WI.ButtonNavigationItem.prototype.set enabled):
+        (WI.ButtonNavigationItem.prototype.get tabbable):
+        (WI.ButtonNavigationItem.prototype._updateTabIndex):
+        * UserInterface/Views/RadioButtonNavigationItem.js:
+        (WI.RadioButtonNavigationItem.prototype.get tabbable):
+        (WI.RadioButtonNavigationItem):
+
 2020-03-19  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/ActivateButtonNavigationItem.js

@@ -32 +32 @@
         this._defaultToolTip = defaultToolTip;
         this._activatedToolTip = activatedToolTip || defaultToolTip;
-        this._role = role;
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js

@@ -41 +41 @@
         this.element.addEventListener("mousedown", this._handleMouseDown.bind(this), true);
 
-        if (role === "button") {
-            this.element.tabIndex = 0;
+        this._role = role;
+        if (this._role === "button")
             this.element.addEventListener("keydown", this._handleKeyDown.bind(this));
-        }
 
         if (label)
@@ -56 +55 @@
         this._label = toolTipOrLabel;
 
+        this._updateTabIndex();
+
         this.buttonStyle = this._image ? WI.ButtonNavigationItem.Style.Image : WI.ButtonNavigationItem.Style.Text;
 
@@ -112 +113 @@
         this._enabled = flag;
         this.element.classList.toggle("disabled", !this._enabled);
+        this.element.ariaDisabled = !this._enabled;
+
+        this._updateTabIndex();
     }
 
@@ -169 +173 @@
     {
         return ["button"];
+    }
+
+    get tabbable()
+    {
+        return this._role === "button";
     }
 
@@ -229 +238 @@
         }
     }
+
+    _updateTabIndex()
+    {
+        if (!this._enabled) {
+            this.element.tabIndex = -1;
+            return;
+        }
+
+        this.element.tabIndex = this.tabbable ? 0 : -1;
+    }
 };
 

trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js

@@ -67 +67 @@
         return ["radio", "button"];
     }
+
+    get tabbable()
+    {
+        return this.selected ? 0 : -1;
+    }
 };