ソースを参照

Avoid selecting next match when opening search form with no selected text (#28261)

If a setSearchQuery effect is dispatched but the search query hasn't changed, avoid selecting the next match in the editor.

GitOrigin-RevId: 8b0dda2b6c9442796a030214a37da7e93f4901f4
Alf Eaton 1 年間 前
親
コミット
9ff0bc4ec4

+ 5 - 0
services/web/frontend/js/features/source-editor/extensions/search.ts

@@ -250,6 +250,11 @@ export const search = (initialSearchQuery: SearchQuery | null) => {
             const query = effect.value
             if (!query) return
 
+            const currentQuery = getSearchQuery(tr.startState)
+            if (currentQuery === query) {
+              return // avoiding selecting the next match when opening the search form with no selected text
+            }
+
             // The rest of this messes up searching in Vim, which is handled by
             // the Vim extension, so bail out here in Vim mode. Happily, the
             // Vim extension sticks an extra property on the query value that