fix: move to first match on search term change (#1416)

* fix: update highlight/focus to first match on search term change * pr comments
pinterest · Apr 6, 2024 · 3507385 · 3507385
1 parent 357132a
commit 3507385
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/querybook/webapp/components/SearchAndReplace/CodeMirrorSearchHighlighter.tsx b/querybook/webapp/components/SearchAndReplace/CodeMirrorSearchHighlighter.tsx
@@ -61,7 +61,7 @@ export const CodeMirrorSearchHighlighter: React.FC<{
                 }
             );
         }
-    }, [currentSearchResultIndex]);
+    }, [currentSearchItem]);
 
     return null;
 };
diff --git a/querybook/webapp/components/SearchAndReplace/SearchAndReplaceBar.tsx b/querybook/webapp/components/SearchAndReplace/SearchAndReplaceBar.tsx
@@ -142,16 +142,12 @@ export const SearchAndReplaceBar = React.forwardRef<
         }));
 
         const noPrevRes = React.useMemo(
-            () =>
-                searchResults.length === 0 ||
-                currentSearchResultIndex <= searchResults.length,
-            [searchResults.length, currentSearchResultIndex]
+            () => searchResults.length <= 1,
+            [searchResults.length]
         );
         const noNextRes = React.useMemo(
-            () =>
-                searchResults.length === 0 ||
-                currentSearchResultIndex >= searchResults.length,
-            [searchResults.length, currentSearchResultIndex]
+            () => searchResults.length <= 1,
+            [searchResults.length]
         );
 
         const searchRow = (