Changeset 259277 in webkit

Timestamp:

Mar 30, 2020, 8:32:05 PM (5 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: the Dock Side navigation item is automatically focused when Web Inspector is opened detached, preventing any global spacebar shortcuts from working
​https://bugs.webkit.org/show_bug.cgi?id=209760

Reviewed by Devin Rousso.

When undocking, Web Inspector focuses on the first visible focusable element. I don't know why.
This patch restores the focus to the previously focused element.

• UserInterface/Base/Main.js:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-03-30  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: the Dock Side navigation item is automatically focused when Web Inspector is opened detached, preventing any global spacebar shortcuts from working
+        https://bugs.webkit.org/show_bug.cgi?id=209760
+
+        Reviewed by Devin Rousso.
+
+        When undocking, Web Inspector focuses on the first visible focusable element. I don't know why.
+        This patch restores the focus to the previously focused element.
+
+        * UserInterface/Base/Main.js:
+
 2020-03-30  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -902 +902 @@
     if (!WI.dockedConfigurationSupportsSplitContentBrowser() && !WI.doesCurrentTabSupportSplitContentBrowser())
         WI.hideSplitConsole();
+
+    if (side === WI.DockConfiguration.Undocked && WI.Platform.name === "mac") {
+        // When undocking, the first visible focusable element steals focus. Undo this.
+        document.body.addEventListener("focusin", function(event) {
+            let firstFocusableElement = document.querySelector("[tabindex='0']:not(.hidden)");
+            if (firstFocusableElement === event.target) {
+                if (WI.previousFocusElement)
+                    WI.previousFocusElement.focus();
+                else
+                    event.target.blur();
+            }
+        }, {once: true, capture: true});
+    }
 };