Merge pull request #5125 from wikimedia/find-in-page-bugfix

Make view first responder when closing find in page
wikimedia · Jan 9, 2025 · 79a6e33 · 79a6e33
2 parents f21857e + 17b30af
commit 79a6e33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/Wikipedia/Code/ArticleViewController+FindInPage.swift b/Wikipedia/Code/ArticleViewController+FindInPage.swift
@@ -66,17 +66,15 @@ extension ArticleViewController {
     }
 
     func hideFindInPage(_ completion: (() -> Void)? = nil) {
-        resetFindInPage {
-            self.findInPage.view?.hide()
-            self.resignFirstResponder()
-            completion?()
+            resetFindInPage {
+                self.findInPage.view?.hide()
+                self.findInPage.view?.removeFromSuperview()
+                self.findInPage.view = nil
+                self.resignFirstResponder()
+                completion?()
+            }
         }
 
-        self.findInPage.view?.removeFromSuperview()
-        self.view.layoutSubviews()
-        self.findInPage.view = nil
-    }
-
     func resetFindInPage(_ completion: (() -> Void)? = nil) {
         webView.evaluateJavaScript("window.wmf.findInPage.removeSearchTermHighlights()", completionHandler: { obj, error in
             self.findInPage.matches = []

diff --git a/Wikipedia/Code/ArticleViewController.swift b/Wikipedia/Code/ArticleViewController.swift
@@ -474,7 +474,6 @@ class ArticleViewController: ViewController, HintPresenting {
         presentModalsIfNeeded()
     }
 
-
     /// Catch-all method for deciding what is the best modal to present on top of Article at this point. This method needs careful if-else logic so that we do not present two modals at the same time, which may unexpectedly suppress one.
     private func presentModalsIfNeeded() {
-Original file line number
+Diff line change
@@ Expand Up @@
             presentModalsIfNeeded()
         }
         /// Catch-all method for deciding what is the best modal to present on top of Article at this point. This method needs careful if-else logic so that we do not present two modals at the same time, which may unexpectedly suppress one.
         private func presentModalsIfNeeded() {
@@ Expand Down @@