Renamed find panel cancel actions to dismiss.

Author: austincondiff

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Views/ContentView.swift

@@ -24,6 +24,7 @@ struct ContentView: View {
     @State private var cursorPositions: [CursorPosition] = [.init(line: 1, column: 1)]
     @AppStorage("systemCursor") private var useSystemCursor: Bool = false
     @State private var isInLongParse = false
+    @State private var settingsIsPresented: Bool = false
     @State private var treeSitterClient = TreeSitterClient()
 
     init(document: Binding<CodeEditSourceEditorExampleDocument>, fileURL: URL?) {
@@ -49,21 +50,24 @@ struct ContentView: View {
             )
             .overlay(alignment: .bottom) {
                 HStack {
-                    Toggle("Wrap Lines", isOn: $wrapLines)
-                        .toggleStyle(.button)
-                        .buttonStyle(.accessoryBar)
-                    if #available(macOS 14, *) {
-                        Toggle("Use System Cursor", isOn: $useSystemCursor)
-                            .toggleStyle(.button)
-                            .buttonStyle(.accessoryBar)
-                    } else {
-                        Toggle("Use System Cursor", isOn: $useSystemCursor)
-                            .disabled(true)
-                            .help("macOS 14 required")
-                            .toggleStyle(.button)
-                            .buttonStyle(.accessoryBar)
+                    Menu {
+                        Toggle("Wrap Lines", isOn: $wrapLines)
+                        if #available(macOS 14, *) {
+                            Toggle("Use System Cursor", isOn: $useSystemCursor)
+                        } else {
+                            Toggle("Use System Cursor", isOn: $useSystemCursor)
+                                .disabled(true)
+                                .help("macOS 14 required")
+                        }
+                    } label: {}
+                    .background {
+                        Image(systemName: "switch.2")
+                            .foregroundStyle(.secondary)
+                            .font(.system(size: 13.5, weight: .regular))
                     }
-
+                    .menuStyle(.borderlessButton)
+                    .menuIndicator(.hidden)
+                    .frame(maxWidth: 18, alignment: .center)
                     Spacer()
                     Group {
                         if isInLongParse {

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -159,7 +159,7 @@ extension TextViewController {
             self.searchController?.showFindPanel()
             return nil
         case (0, "\u{1b}"): // Escape key
-            self.searchController?.findPanel.cancel()
+            self.searchController?.findPanel.dismiss()
             return nil
         case (_, _):
             return event

Sources/CodeEditSourceEditor/Find/FindPanelDelegate.swift

@@ -9,7 +9,7 @@ import Foundation
 
 protocol FindPanelDelegate: AnyObject {
     func findPanelOnSubmit()
-    func findPanelOnCancel()
+    func findPanelOnDismiss()
     func findPanelDidUpdate(_ searchText: String)
     func findPanelPrevButtonClicked()
     func findPanelNextButtonClicked()

Sources/CodeEditSourceEditor/Find/FindViewController.swift

@@ -16,9 +16,7 @@ final class FindViewController: NSViewController {
     private var findMatches: [NSRange] = []
     private var currentFindMatchIndex: Int = 0
     private var findText: String = ""
-
     private var findPanelVerticalConstraint: NSLayoutConstraint!
-
     private(set) public var isShowingFindPanel: Bool = false
 
     init(target: FindPanelTarget, childView: NSView) {
@@ -178,15 +176,6 @@ final class FindViewController: NSViewController {
 // MARK: - Toggle find panel
 
 extension FindViewController {
-    /// Toggle the find panel
-    func toggleFindPanel() {
-        if isShowingFindPanel {
-            hideFindPanel()
-        } else {
-            showFindPanel()
-        }
-    }
-
     /// Show the find panel
     func showFindPanel(animated: Bool = true) {
         if isShowingFindPanel {
@@ -260,9 +249,15 @@ extension FindViewController: FindPanelDelegate {
         findPanelNextButtonClicked()
     }
 
-    func findPanelOnCancel() {
+    func findPanelOnDismiss() {
         if isShowingFindPanel {
             hideFindPanel()
+            // Ensure text view becomes first responder after hiding
+            if let textViewController = target as? TextViewController {
+                DispatchQueue.main.async {
+                    _ = textViewController.textView.window?.makeFirstResponder(textViewController.textView)
+                }
+            }
         }
     }
 

Sources/CodeEditSourceEditor/Find/PanelView/FindPanel.swift

@@ -84,7 +84,7 @@ final class FindPanel: NSView {
     func addEventMonitor() {
         eventMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event -> NSEvent? in
             if event.keyCode == 53 { // if esc pressed
-                self?.cancel()
+                self?.dismiss()
                 return nil // do not play "beep" sound
             }
             return event
@@ -100,8 +100,8 @@ final class FindPanel: NSView {
 
     // MARK: - Public Methods
 
-    func cancel() {
-        viewModel.onCancel()
+    func dismiss() {
+        viewModel.onDismiss()
     }
 
     func updateMatchCount(_ count: Int) {

Sources/CodeEditSourceEditor/Find/PanelView/FindPanelView.swift

@@ -65,7 +65,7 @@ struct FindPanelView: View {
                 }
                 .controlGroupStyle(PanelControlGroupStyle())
                 .fixedSize()
-                Button(action: viewModel.onCancel) {
+                Button(action: viewModel.onDismiss) {
                     Text("Done")
                         .padding(.horizontal, 5)
                 }

Sources/CodeEditSourceEditor/Find/PanelView/FindPanelViewModel.swift

@@ -33,8 +33,8 @@ class FindPanelViewModel: ObservableObject {
         delegate?.findPanelOnSubmit()
     }
 
-    func onCancel() {
-        delegate?.findPanelOnCancel()
+    func onDismiss() {
+        delegate?.findPanelOnDismiss()
     }
 
     func setFocus(_ focused: Bool) {

Tests/CodeEditSourceEditorTests/Mock.swift

@@ -62,7 +62,8 @@ enum Mock {
             isEditable: true,
             isSelectable: true,
             letterSpacing: 1.0,
-            useSystemCursor: false
+            useSystemCursor: false,
+            bracketPairEmphasis: .flash
         )
     }