Changeset 269074 in webkit

Timestamp:

Oct 27, 2020 2:48:35 PM (21 months ago)

Author:

Devin Rousso

Message:

Web Inspector: Search: don't steal focus from the search field when shown
​https://bugs.webkit.org/show_bug.cgi?id=218260

Reviewed by Brian Burg.

• UserInterface/Views/SearchSidebarPanel.js:

(WI.SearchSidebarPanel.prototype.focusSearchField):
(WI.SearchSidebarPanel.prototype.performSearch.createTreeElementForMatchObject):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/SearchSidebarPanel.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-10-27  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Search: don't steal focus from the search field when shown
+        https://bugs.webkit.org/show_bug.cgi?id=218260
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/SearchSidebarPanel.js:
+        (WI.SearchSidebarPanel.prototype.focusSearchField):
+        (WI.SearchSidebarPanel.prototype.performSearch.createTreeElementForMatchObject):
+
 2020-10-27  Devin Rousso  <drousso@apple.com>
 

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

@@ -94 +94 @@
 
         if (performSearch)
-            this.performSearch(this._inputElement.value);
-    }
-
-    performSearch(searchQuery)
+            this.performSearch(this._inputElement.value, {omitFocus: true});
+    }
+
+    performSearch(searchQuery, {omitFocus} = {})
     {
         this._inputElement.value = searchQuery;
@@ -142 +142 @@
             WI.whenTargetsAvailable().then(() => {
                 if (this._searchQuerySetting.value === searchQuery)
-                    this.performSearch(searchQuery);
+                    this.performSearch(searchQuery, {omitFocus});
             });
             return;
@@ -177 +177 @@
             parentTreeElement.appendChild(matchTreeElement);
 
-            if (!this.contentTreeOutline.selectedTreeElement)
-                matchTreeElement.revealAndSelect(false, true);
+            if (!this.contentTreeOutline.selectedTreeElement) {
+                const selectedByUser = true;
+                matchTreeElement.revealAndSelect(omitFocus ?? false, selectedByUser);
+            }
         }