[FXIOS-13321] Change fix, address root issue to avoid keyboard being hidden in PBM

Author: mattreaganmozilla

firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift

@@ -837,13 +837,9 @@ class BrowserViewController: UIViewController,
         processAppleIntelligenceState()
         privacyWindowHelper.removeWindow()
 
-        if let tab = tabManager.selectedTab {
-            if tab.isFindInPageMode {
-                refreshFindInPageUI()
-            } else {
-                // Re-show toolbar which might have been hidden during scrolling (prior to app moving into the background)
-                scrollController.showToolbars(animated: false)
-            }
+        if let tab = tabManager.selectedTab, !tab.isFindInPageMode {
+            // Re-show toolbar which might have been hidden during scrolling (prior to app moving into the background)
+            scrollController.showToolbars(animated: false)
         }
 
         navigationHandler?.showTermsOfUse(context: .appBecameActive)
@@ -1726,17 +1722,6 @@ class BrowserViewController: UIViewController,
                                                                     hasZoomPageBar: zoomPageBar != nil)
     }
 
-    func refreshFindInPageUI() {
-        guard #available(iOS 16, *) else { return }
-        guard let tab =  tabManager.selectedTab else { return }
-        guard tab.isPrivate, let webView = tab.webView, webView.isFindInteractionEnabled else { return }
-
-        // Ensure keyboard is available and Find In Page UI is refreshed in PBM (FXIOS-13321)
-        let text = webView.findInteraction?.searchText
-        updateFindInPageVisibility(isVisible: true)
-        webView.findInteraction?.searchText = text ?? ""
-    }
-
     // TODO: SnapKit removal clean up
     private func updateSnapKitOverKeyboardContainerConstraints() {
         guard !isSnapKitRemovalEnabled else { return }

firefox-ios/Client/PrivacyWindowHelper.swift

@@ -16,7 +16,9 @@ final class PrivacyWindowHelper {
         privacyWindow?.rootViewController?.view.backgroundColor = color
         // Set the privacy window level to be above alert windows (highest in importance).
         privacyWindow?.windowLevel = .alert + 1
-        privacyWindow?.makeKeyAndVisible()
+        // Avoid makeKeyAndVisible(), becoming key steals first responder
+        // and causses iOS keyboard to dismiss on background/foreground in private mode.
+        privacyWindow?.isHidden = false
     }
 
     @MainActor