Select all Find In Page text on cmd+f (#2783)

Task/Issue URL: https://app.asana.com/0/1177771139624306/1207298392719916/f
duckduckgo · May 17, 2024 · 75e5ccc · 75e5ccc
1 parent e889707
commit 75e5ccc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/DuckDuckGo/Common/Extensions/NSTextFieldExtension.swift b/DuckDuckGo/Common/Extensions/NSTextFieldExtension.swift
@@ -21,6 +21,10 @@ import Common
 
 extension NSTextField {
 
+    var isFirstResponder: Bool {
+        window?.firstResponder == currentEditor()
+    }
+
     static func label(titled title: String) -> NSTextField {
         let label = NSTextField(string: title)
 

diff --git a/DuckDuckGo/FindInPage/FindInPageViewController.swift b/DuckDuckGo/FindInPage/FindInPageViewController.swift
@@ -102,7 +102,12 @@ final class FindInPageViewController: NSViewController {
     }
 
     func makeMeFirstResponder() {
-        textField.makeMeFirstResponder()
+        if textField.isFirstResponder {
+            // select all on Cmd+F while editing
+            textField.currentEditor()?.selectAll(nil)
+        } else {
+            textField.makeMeFirstResponder()
+        }
     }
 
     private func subscribeToModelChanges() {

diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -51,10 +51,6 @@ final class AddressBarTextField: NSTextField {
         tabCollectionViewModel.isBurner
     }
 
-    var isFirstResponder: Bool {
-        window?.firstResponder == currentEditor()
-    }
-
     private var suggestionResultCancellable: AnyCancellable?
     private var selectedSuggestionViewModelCancellable: AnyCancellable?
     private var selectedTabViewModelCancellable: AnyCancellable?

diff --git a/DuckDuckGo/Tab/TabExtensions/FindInPageTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/FindInPageTabExtension.swift
@@ -219,7 +219,7 @@ extension FindInPageTabExtension: NavigationResponder {
     }
 
     func navigation(_ navigation: Navigation, didSameDocumentNavigationOf navigationType: WKSameDocumentNavigationType) {
-        if case .sessionStateReplace = navigationType {
+        if [.sessionStatePush, .sessionStatePop].contains(navigationType) {
             close()
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -219,7 +219,7 @@ extension FindInPageTabExtension: NavigationResponder { @@
         }
         func navigation(_ navigation: Navigation, didSameDocumentNavigationOf navigationType: WKSameDocumentNavigationType) {
-            if case .sessionStateReplace = navigationType {
+            if [.sessionStatePush, .sessionStatePop].contains(navigationType) {
                 close()
             }
         }
@@ Expand Down @@