PR feedback

app/editor/components/FindAndReplace.tsx

@@ -213,8 +213,7 @@ export default function FindAndReplace({
   }, [caseSensitive, editor.commands, searchTerm]);
 
   // Searching the document on every keystroke is expensive in long documents –
-  // it traverses the entire doc and rebuilds highlights – so debounce it to keep
-  // typing in the input responsive. The input value itself updates immediately.
+  // it traverses the entire doc and rebuilds highlights – so debounce.
   const debouncedFind = React.useMemo(
     () =>
       debounce(
@@ -225,7 +224,7 @@ export default function FindAndReplace({
         }) => {
           editor.commands.find(attrs);
         },
-        100
+        250
       ),
     [editor.commands]
   );
@@ -355,6 +354,9 @@ export default function FindAndReplace({
     } else {
       onClose();
       setShowReplace(false);
+      // Cancel any pending debounced find so it can't reactivate highlights
+      // after the search has been cleared.
+      debouncedFind.cancel();
       editor.commands.clearSearch();
     }
     // oxlint-disable-next-line react-hooks/exhaustive-deps
@@ -370,7 +372,10 @@ export default function FindAndReplace({
       >
         <ButtonLarge
           disabled={disabled}
-          onClick={() => editor.commands.prevSearchMatch()}
+          onClick={() => {
+            debouncedFind.flush();
+            editor.commands.prevSearchMatch();
+          }}
           aria-label={t("Previous match")}
         >
           <CaretUpIcon />
@@ -379,7 +384,10 @@ export default function FindAndReplace({
       <Tooltip content={t("Next match")} shortcut="Enter" placement="bottom">
         <ButtonLarge
           disabled={disabled}
-          onClick={() => editor.commands.nextSearchMatch()}
+          onClick={() => {
+            debouncedFind.flush();
+            editor.commands.nextSearchMatch();
+          }}
           aria-label={t("Next match")}
         >
           <CaretDownIcon />

app/editor/extensions/FindAndReplace.tsx

@@ -410,8 +410,8 @@ export default class FindAndReplaceExtension extends Extension<FindAndReplaceOpt
             continue;
           }
 
-          // Check if already exists in results, possible due to duplicated
-          // search string on L257
+          // Check if already exists in results, possible because we search
+          // over `deburr(text) + text`
           const key = `${from}:${to}`;
           if (seen.has(key)) {
             continue;