Bugfix FXIOS-15857 [Newsfeed Categories] Fix search results disappearance after rotation (#33931)

Author: Foxbolts

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

@@ -1629,6 +1629,9 @@ class BrowserViewController: UIViewController,
                 : [topBlurView, bottomBlurView, topTouchArea, statusBarOverlay, header,
                    bottomContentStackView, bottomContainer, overKeyboardContainer]
             frontViews.filter { $0.superview === view }.forEach(view.bringSubviewToFront)
+            if let searchView = searchController?.view, searchView.superview === view {
+                view.bringSubviewToFront(searchView)
+            }
         }
 
         guard let homepageViewController = contentContainer.contentController as? HomepageViewController else { return }

firefox-ios/firefox-ios-tests/Tests/ClientTests/BrowserViewController/Constraints/BrowserViewControllerConstraintTests.swift

@@ -225,6 +225,26 @@ final class BrowserViewControllerConstraintTests: BrowserViewControllerConstrain
         XCTAssertNotNil(subject.bottomContentStackView.superview)
     }
 
+    func test_updateContentContainerTopConstraint_keepsSearchControllerAboveHomepage() throws {
+        setupNimbusHomepagePinnedHeaderTesting(isEnabled: true)
+        let subject = createSubject()
+        let searchController = createSearchController()
+        let homepage = MockHomepageContentViewController()
+
+        subject.searchController = searchController
+        subject.view.addSubview(searchController.view)
+        defer {
+            searchController.view.removeFromSuperview()
+            subject.searchController = nil
+        }
+        subject.contentContainer.update(content: homepage)
+        subject.updateContentContainerTopConstraint()
+
+        let searchIndex = try XCTUnwrap(subject.view.subviews.firstIndex(of: searchController.view))
+        let contentIndex = try XCTUnwrap(subject.view.subviews.firstIndex(of: subject.contentContainer))
+        XCTAssertGreaterThan(searchIndex, contentIndex)
+    }
+
     func test_readerModeBar_hasConstraintsWhenPresent() {
         let subject = createSubject()
 
@@ -280,6 +300,28 @@ final class BrowserViewControllerConstraintTests: BrowserViewControllerConstrain
         return relevantConstraints.count
     }
 
+    private func createSearchController() -> SearchViewController {
+        let searchEnginesManager = SearchEnginesManager(
+            prefs: profile.prefs,
+            files: profile.files,
+            engineProvider: MockSearchEngineProvider()
+        )
+        let searchViewModel = SearchViewModel(
+            isPrivate: false,
+            isBottomSearchBar: false,
+            profile: profile,
+            model: searchEnginesManager,
+            tabManager: tabManager,
+            trendingSearchClient: MockTrendingSearchClient(),
+            recentSearchProvider: MockRecentSearchProvider()
+        )
+        return SearchViewController(
+            profile: profile,
+            viewModel: searchViewModel,
+            tabManager: tabManager
+        )
+    }
+
     /// Check if two sibling views are connected by a constraint
     /// Example: overKeyboard.bottom connects to bottomContainer.top
     private func hasConstraintBetween(firstView: UIView,
@@ -301,3 +343,7 @@ final class BrowserViewControllerConstraintTests: BrowserViewControllerConstrain
         }
     }
 }
+
+private final class MockHomepageContentViewController: UIViewController, ContentContainable {
+    var contentType: ContentType { .homepage }
+}

firefox-ios/firefox-ios-tests/Tests/ClientTests/BrowserViewController/Constraints/BrowserViewControllerConstraintTestsBase.swift

@@ -16,6 +16,7 @@ class BrowserViewControllerConstraintTestsBase: XCTestCase {
         tabManager = MockTabManager()
         DependencyHelperMock().bootstrapDependencies(injectedTabManager: tabManager)
         profile = MockProfile()
+        setupNimbusHomepagePinnedHeaderTesting(isEnabled: false)
     }
 
     override func tearDown() async throws {
@@ -52,6 +53,15 @@ class BrowserViewControllerConstraintTestsBase: XCTestCase {
         }
     }
 
+    func setupNimbusHomepagePinnedHeaderTesting(isEnabled: Bool) {
+        FxNimbus.shared.features.homepageRedesignFeature.with { _, _ in
+            return HomepageRedesignFeature(
+                categoriesEnabled: isEnabled,
+                pinnedHeaderEnabled: isEnabled
+            )
+        }
+    }
+
     func selectTabWithFindInPage() {
         let tab = Tab(profile: MockProfile(), windowUUID: .XCTestDefaultUUID)
         tab.isFindInPageMode = false