Improve navigation experience for select next

MarkEdit-app · Jan 18, 2025 · e900acf · e900acf
1 parent 7a881f6
commit e900acf
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/CoreEditor/src/bridge/web/search.ts b/CoreEditor/src/bridge/web/search.ts
@@ -31,7 +31,7 @@ export interface WebModuleSearch extends WebModule {
   replaceNext(): void;
   replaceAll(): void;
   selectAllOccurrences(): void;
-  selectNextOccurrence(): void;
+  selectNextOccurrence(): boolean;
   numberOfMatches(): CodeGen_Int;
 }
 
@@ -78,8 +78,8 @@ export class WebModuleSearchImpl implements WebModuleSearch {
     selectAllOccurrences();
   }
 
-  selectNextOccurrence(): void {
-    selectNextOccurrence();
+  selectNextOccurrence(): boolean {
+    return selectNextOccurrence();
   }
 
   numberOfMatches(): CodeGen_Int {

diff --git a/CoreEditor/src/modules/search/index.ts b/CoreEditor/src/modules/search/index.ts
@@ -119,7 +119,18 @@ export function selectAllOccurrences() {
 }
 
 export function selectNextOccurrence() {
-  selectNextOccurrenceCommand(window.editor);
+  const editor = window.editor;
+  const oldRanges = editor.state.selection.ranges;
+  const foundNext = selectNextOccurrenceCommand(editor);
+
+  const newRanges = editor.state.selection.ranges;
+  newRanges.forEach(range => {
+    if (!oldRanges.includes(range)) {
+      scrollIntoView(range, 'center');
+    }
+  });
+
+  return foundNext;
 }
 
 export function numberOfMatches(): CodeGen_Int {

diff --git a/MarkEditKit/Sources/Bridge/Web/Generated/WebBridgeSearch.swift b/MarkEditKit/Sources/Bridge/Web/Generated/WebBridgeSearch.swift
@@ -112,8 +112,14 @@ public final class WebBridgeSearch {
     webView?.invoke(path: "webModules.search.selectAllOccurrences", completion: completion)
   }
 
-  public func selectNextOccurrence(completion: ((Result<Void, WKWebView.InvokeError>) -> Void)? = nil) {
-    webView?.invoke(path: "webModules.search.selectNextOccurrence", completion: completion)
+  public func selectNextOccurrence() async throws -> Bool {
+    return try await withCheckedThrowingContinuation { continuation in
+      webView?.invoke(path: "webModules.search.selectNextOccurrence") { result in
+        Task { @MainActor in
+          continuation.resume(with: result)
+        }
+      }
+    }
   }
 
   public func numberOfMatches() async throws -> Int {

diff --git a/MarkEditMac/Sources/Editor/Controllers/EditorViewController+TextFinder.swift b/MarkEditMac/Sources/Editor/Controllers/EditorViewController+TextFinder.swift
@@ -197,7 +197,11 @@ extension EditorViewController {
   }
 
   func selectNextOccurrence() {
-    bridge.search.selectNextOccurrence()
+    Task {
+      if let foundNext = try? await bridge.search.selectNextOccurrence(), !foundNext {
+        NSSound.beep()
+      }
+    }
   }
 
   func performSearchOperation(_ operation: SearchOperation) {