Bugfix [Add new tab gesture] FXIOS issues on new Tab gesture (#27993)

FilippoZazzeroni · Filippo · mergify[bot] · commit 0f8279683f51 · 2025-07-21T09:33:16.000Z
* Added new tab page settings for the AddressbarPanGestureHandler * Fix new tab page * Add missing tests * Refactor code for better readability * Refactor as per code review --------- Co-authored-by: Filippo <fzazzeroni@mozilla.com> (cherry picked from commit 0023ba8)
diff --git a/BrowserKit/Sources/ToolbarKit/AddressToolbar/AddressToolbarAddTabView.swift b/BrowserKit/Sources/ToolbarKit/AddressToolbar/AddressToolbarAddTabView.swift
@@ -32,6 +32,7 @@ public final class AddressToolbarAddTabView: UIView,
 
     public func configure(_ configuration: AddressToolbarUXConfiguration) {
         layer.cornerRadius = configuration.toolbarCornerRadius
+        layer.shadowRadius = configuration.toolbarCornerRadius
     }
 
     public func showHideAddTabIcon(shouldShow: Bool) {
@@ -41,6 +42,7 @@ public final class AddressToolbarAddTabView: UIView,
     // MARK: - ThemeApplicable
 
     public func applyTheme(theme: any Theme) {
+        layer.shadowColor = theme.colors.shadowStrong.cgColor
         plusIconView.tintColor = theme.colors.textPrimary
         backgroundColor = theme.colors.layerSurfaceMedium
     }
diff --git a/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift b/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift
@@ -162,10 +162,16 @@ class BrowserCoordinator: BaseCoordinator,
     }
 
     func homepageScreenshotTool() -> (any Screenshotable)? {
-        if tabManager.selectedTab?.isPrivate == true {
-            return privateHomepageViewController
+        let newTabSettings = browserViewController.newTabSettings
+        switch newTabSettings {
+        case .blankPage, .homePage:
+            return nil
+        case .topSites:
+            if tabManager.selectedTab?.isPrivate == true {
+                return privateHomepageViewController
+            }
+            return homepageViewController ?? legacyHomepageViewController
         }
-        return homepageViewController ?? legacyHomepageViewController
     }
 
     func setHomepageVisibility(isVisible: Bool) {
diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
@@ -970,6 +970,7 @@ class BrowserViewController: UIViewController,
         statusBarOverlay.hasTopTabs = toolbarHelper.shouldShowTopTabs(for: traitCollection)
         statusBarOverlay.applyTheme(theme: theme)
         topTabsViewController?.applyTheme()
+        webPagePreview.applyTheme(theme: theme)
 
         KeyboardHelper.defaultHelper.addDelegate(self)
         listenForThemeChange(view)
@@ -1247,7 +1248,8 @@ class BrowserViewController: UIViewController,
             statusBarOverlay: statusBarOverlay,
             tabManager: tabManager,
             windowUUID: windowUUID,
-            screenshotHelper: screenshotHelper
+            screenshotHelper: screenshotHelper,
+            prefs: profile.prefs
         )
     }
 
@@ -1288,6 +1290,9 @@ class BrowserViewController: UIViewController,
             addressBarPanGestureHandler?.homepageScreenshotToolProvider = { [weak self] in
                 return self?.browserDelegate?.homepageScreenshotTool()
             }
+            addressBarPanGestureHandler?.newTabSettingsProvider = { [weak self] in
+                return self?.newTabSettings
+            }
         }
     }
 
@@ -4791,8 +4796,8 @@ extension BrowserViewController: TopTabsDelegate {
     }
 
     func topTabsDidPressNewTab(_ isPrivate: Bool) {
-        let shouldLoadCustomHomePage = isToolbarRefactorEnabled && NewTabAccessors.getHomePage(profile.prefs) == .homePage
-        let homePageURL = HomeButtonHomePageAccessors.getHomePage(profile.prefs)
+        let shouldLoadCustomHomePage = isToolbarRefactorEnabled && newTabSettings == .homePage
+        let homePageURL = NewTabHomePageAccessors.getHomePage(profile.prefs)
 
         if shouldLoadCustomHomePage, let url = homePageURL {
             openBlankNewTab(focusLocationField: false, isPrivate: isPrivate)
diff --git a/firefox-ios/Client/Frontend/Browser/Toolbars/AddressBarPanGestureHandler.swift b/firefox-ios/Client/Frontend/Browser/Toolbars/AddressBarPanGestureHandler.swift
@@ -5,6 +5,7 @@
 import UIKit
 import Common
 import Redux
+import Shared
 
 final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
     typealias SubscriberStateType = ToolbarState
@@ -30,8 +31,10 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
     private let windowUUID: WindowUUID
     private let screenshotHelper: ScreenshotHelper?
     var homepageScreenshotToolProvider: (() -> Screenshotable?)?
+    var newTabSettingsProvider: (() -> NewTabPage?)?
     private var homepageScreenshot: UIImage?
     private var toolbarState: ToolbarState?
+    private let prefs: Prefs
 
     private var isRTL: Bool {
         return UIView.userInterfaceLayoutDirection(
@@ -47,7 +50,8 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
         statusBarOverlay: StatusBarOverlay,
         tabManager: TabManager,
         windowUUID: WindowUUID,
-        screenshotHelper: ScreenshotHelper?
+        screenshotHelper: ScreenshotHelper?,
+        prefs: Prefs
     ) {
         self.addressToolbarContainer = addressToolbarContainer
         self.contentContainer = contentContainer
@@ -56,6 +60,7 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
         self.windowUUID = windowUUID
         self.screenshotHelper = screenshotHelper
         self.statusBarOverlay = statusBarOverlay
+        self.prefs = prefs
         super.init()
         subscribeToRedux()
         setupGesture()
@@ -141,7 +146,8 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
                 )
             )
             statusBarOverlay.showOverlay(animated: !UIAccessibility.isReduceMotionEnabled)
-            if nextTab == nil {
+        case .changed:
+            if nextTab == nil, homepageScreenshot == nil {
                 let homepageScreenshotTool = homepageScreenshotToolProvider?()
                 homepageScreenshot = homepageScreenshotTool?.screenshot(bounds: CGRect(
                     x: 0.0,
@@ -150,7 +156,6 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
                     height: webPagePreview.frame.height
                 ))
             }
-        case .changed:
             handleGestureChangedState(translation: translation, nextTab: nextTab)
         case .ended, .cancelled, .failed:
             let velocity = gesture.velocity(in: contentContainer)
@@ -160,7 +165,6 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
     }
 
     private func handleGestureChangedState(translation: CGPoint, nextTab: Tab?) {
-        webPagePreview.isHidden = false
         let shouldAddNewTab = shouldAddNewTab(translation: translation.x, nextTab: nextTab)
         applyCurrentTabTransform(translation.x, shouldAddNewTab: shouldAddNewTab)
         applyPreviewTransform(translation: translation)
@@ -172,7 +176,15 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
             let translation = width * (1 - progress)
             webPagePreview.transform = CGAffineTransform(scaleX: scale, y: scale).translatedBy(x: translation, y: 0.0)
             webPagePreview.alpha = progress
-            webPagePreview.setScreenshot(homepageScreenshot)
+            let pageSetting = newTabSettingsProvider?()
+            switch pageSetting {
+            case .homePage:
+                webPagePreview.setScreenshot(url: NewTabHomePageAccessors.getHomePage(prefs))
+            case .topSites:
+                webPagePreview.setScreenshot(homepageScreenshot)
+            case nil, .blankPage:
+                webPagePreview.setScreenshot(url: nil)
+            }
         } else {
             webPagePreview.alpha = 1.0
             webPagePreview.setScreenshot(nextTab)
@@ -207,8 +219,8 @@ final class AddressBarPanGestureHandler: NSObject, StoreSubscriber {
             webPagePreview.alpha = shouldCompleteTransition ? 1.0 : 0.0
             webPagePreview.transform = shouldCompleteTransition ? .identity : previewTransform
         } completion: { [self] _ in
-            webPagePreview.isHidden = true
             webPagePreview.transitionDidEnd()
+            homepageScreenshot = nil
 
             if shouldCompleteTransition {
                 store.dispatchLegacy(
diff --git a/firefox-ios/Client/Frontend/Browser/Toolbars/AddressToolbarContainer.swift b/firefox-ios/Client/Frontend/Browser/Toolbars/AddressToolbarContainer.swift
@@ -379,6 +379,9 @@ final class AddressToolbarContainer: UIView,
         rightSkeletonAddressBar.transform = transform
         if shouldAddNewTab {
             let percentageTransform = abs(transform.tx) / bounds.width
+            if transform == .identity {
+                addNewTabView.showHideAddTabIcon(shouldShow: false)
+            }
             UIView.animate(withDuration: UX.addNewTabFadeAnimationDuration) {
                 self.addNewTabView.showHideAddTabIcon(shouldShow:
                                                         percentageTransform > UX.addNewTabPercentageAnimationThreshold)
diff --git a/firefox-ios/Client/TabManagement/TabWebViewPreview.swift b/firefox-ios/Client/TabManagement/TabWebViewPreview.swift
@@ -6,10 +6,13 @@ import UIKit
 import SiteImageView
 import Common
 
-final class TabWebViewPreview: UIView {
+final class TabWebViewPreview: UIView, ThemeApplicable {
     private struct UX {
         static let faviconCornerRadius: CGFloat = 20.0
         static let faviconImageViewSize: CGFloat = 45.0
+        static let backgroundShadowCornerRadius: CGFloat = 14.0
+        static let backgroundShadowOpacity: Float = 1
+        static let backgroundShadowOffset = CGSize(width: 0, height: 2)
     }
     private lazy var webPageScreenshotImageView: UIImageView = .build {
         $0.contentMode = .top
@@ -34,6 +37,12 @@ final class TabWebViewPreview: UIView {
 
     // MARK: - Layout
     private func setupLayout() {
+        layer.shadowRadius = UX.backgroundShadowCornerRadius
+        layer.cornerRadius = screenCornerRadius
+        layer.shadowOpacity = UX.backgroundShadowOpacity
+        layer.shadowOffset = UX.backgroundShadowOffset
+        layer.masksToBounds = false
+
         webPageScreenshotImageView.layer.cornerRadius = screenCornerRadius
         addSubviews(webPageScreenshotImageView, faviconImageView)
 
@@ -83,6 +92,13 @@ final class TabWebViewPreview: UIView {
         }
     }
 
+    func setScreenshot(url: URL? = nil) {
+        faviconImageView.isHidden = url == nil
+        webPageScreenshotImageView.isHidden = true
+        faviconImageView.setFavicon(FaviconImageViewModel(siteURLString: url?.absoluteString,
+                                                          faviconCornerRadius: UX.faviconCornerRadius))
+    }
+
     func setScreenshot(_ image: UIImage?) {
         faviconImageView.isHidden = true
         webPageScreenshotImageView.isHidden = false
@@ -96,4 +112,11 @@ final class TabWebViewPreview: UIView {
     func transitionDidEnd() {
         layoutWasInvalidated = false
     }
+
+    // MARK: - ThemeApplicable
+
+    func applyTheme(theme: any Theme) {
+        backgroundColor = theme.colors.layerSurfaceMedium
+        layer.shadowColor = theme.colors.shadowStrong.cgColor
+    }
 }
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/BrowserCoordinatorTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/BrowserCoordinatorTests.swift
@@ -145,6 +145,7 @@ final class BrowserCoordinatorTests: XCTestCase, FeatureFlaggable {
 
     func testHomepageScreenshotTool_returnsHomepage_forNormalTab() throws {
         let subject = createSubject()
+        subject.browserViewController = browserViewController
         subject.showHomepage(
             overlayManager: overlayModeManager,
             isZeroSearch: false,
@@ -156,8 +157,36 @@ final class BrowserCoordinatorTests: XCTestCase, FeatureFlaggable {
         XCTAssertTrue(screenshotTool is HomepageViewController)
     }
 
+    func testHomepageScreenshotTool_returnsNil_forNewBlankNewTab() throws {
+        let subject = createSubject()
+        subject.browserViewController = browserViewController
+        browserViewController.overrideNewTabSettings = .blankPage
+        subject.showHomepage(
+            overlayManager: overlayModeManager,
+            isZeroSearch: false,
+            statusBarScrollDelegate: scrollDelegate,
+            toastContainer: UIView()
+        )
+        XCTAssertNil(subject.homepageScreenshotTool())
+    }
+
+    func testHomepageScreenshotTool_returnsNil_forNewCustomURLNewTab() throws {
+        let subject = createSubject()
+        subject.browserViewController = browserViewController
+        browserViewController.overrideNewTabSettings = .homePage
+        subject.showHomepage(
+            overlayManager: overlayModeManager,
+            isZeroSearch: false,
+            statusBarScrollDelegate: scrollDelegate,
+            toastContainer: UIView()
+        )
+
+        XCTAssertNil(subject.homepageScreenshotTool())
+    }
+
     func testHomepageScreenshotTool_returnsLegacyHomepage_forNormalTab() throws {
         let subject = createSubject()
+        browserViewController.overrideNewTabSettings = .topSites
         subject.showLegacyHomepage(
             inline: false,
             toastContainer: UIView(),
@@ -173,6 +202,7 @@ final class BrowserCoordinatorTests: XCTestCase, FeatureFlaggable {
 
     func testHomepageScreenshotTool_returnsPrivateHomepage_forPrivateTab() throws {
         let subject = createSubject()
+        browserViewController.overrideNewTabSettings = .topSites
         let tab = tabManager.addTab(nil, afterTab: nil, zombie: false, isPrivate: true)
         tabManager.selectTab(tab)
         subject.showPrivateHomepage(overlayManager: overlayModeManager)
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Mocks/MockBrowserViewController.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Mocks/MockBrowserViewController.swift
@@ -58,6 +58,19 @@ class MockBrowserViewController: BrowserViewController {
 
     var viewControllerToPresent: UIViewController?
 
+    var createWebViewCalled = 0
+    var runJavaScriptAlertPanelCalled = 0
+    var runJavaScriptConfirmPanelCalled = 0
+    var runJavaScriptTextInputPanelCalled = 0
+    var webViewDidCloseCalled = 0
+    var contextMenuConfigurationCalled = 0
+    var requestMediaCapturePermissionCalled = 0
+    var contextMenuDidEndForElementCalled = 0
+    override var newTabSettings: NewTabPage {
+        return overrideNewTabSettings
+    }
+    var overrideNewTabSettings: NewTabPage = .topSites
+
     override var presentedViewController: UIViewController? {
         return viewControllerToPresent
     }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public final class AddressToolbarAddTabView: UIView,`
`32`	`32`
`33`	`33`	`public func configure(_ configuration: AddressToolbarUXConfiguration) {`
`34`	`34`	`layer.cornerRadius = configuration.toolbarCornerRadius`
	`35`	`+ layer.shadowRadius = configuration.toolbarCornerRadius`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public func showHideAddTabIcon(shouldShow: Bool) {`
`@@ -41,6 +42,7 @@ public final class AddressToolbarAddTabView: UIView,`
`41`	`42`	`// MARK: - ThemeApplicable`
`42`	`43`
`43`	`44`	`public func applyTheme(theme: any Theme) {`
	`45`	`+ layer.shadowColor = theme.colors.shadowStrong.cgColor`
`44`	`46`	`plusIconView.tintColor = theme.colors.textPrimary`
`45`	`47`	`backgroundColor = theme.colors.layerSurfaceMedium`
`46`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,16 @@ class BrowserCoordinator: BaseCoordinator,`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`func homepageScreenshotTool() -> (any Screenshotable)? {`
`165`		`- if tabManager.selectedTab?.isPrivate == true {`
`166`		`- return privateHomepageViewController`
	`165`	`+ let newTabSettings = browserViewController.newTabSettings`
	`166`	`+ switch newTabSettings {`
	`167`	`+ case .blankPage, .homePage:`
	`168`	`+ return nil`
	`169`	`+ case .topSites:`
	`170`	`+ if tabManager.selectedTab?.isPrivate == true {`
	`171`	`+ return privateHomepageViewController`
	`172`	`+ }`
	`173`	`+ return homepageViewController ?? legacyHomepageViewController`
`167`	`174`	`}`
`168`		`- return homepageViewController ?? legacyHomepageViewController`
`169`	`175`	`}`
`170`	`176`
`171`	`177`	`func setHomepageVisibility(isVisible: Bool) {`
Original file line number	Diff line number	Diff line change
`@@ -970,6 +970,7 @@ class BrowserViewController: UIViewController,`
`970`	`970`	`statusBarOverlay.hasTopTabs = toolbarHelper.shouldShowTopTabs(for: traitCollection)`
`971`	`971`	`statusBarOverlay.applyTheme(theme: theme)`
`972`	`972`	`topTabsViewController?.applyTheme()`
	`973`	`+ webPagePreview.applyTheme(theme: theme)`
`973`	`974`
`974`	`975`	`KeyboardHelper.defaultHelper.addDelegate(self)`
`975`	`976`	`listenForThemeChange(view)`
`@@ -1247,7 +1248,8 @@ class BrowserViewController: UIViewController,`
`1247`	`1248`	`statusBarOverlay: statusBarOverlay,`
`1248`	`1249`	`tabManager: tabManager,`
`1249`	`1250`	`windowUUID: windowUUID,`
`1250`		`- screenshotHelper: screenshotHelper`
	`1251`	`+ screenshotHelper: screenshotHelper,`
	`1252`	`+ prefs: profile.prefs`
`1251`	`1253`	`)`
`1252`	`1254`	`}`
`1253`	`1255`
`@@ -1288,6 +1290,9 @@ class BrowserViewController: UIViewController,`
`1288`	`1290`	`addressBarPanGestureHandler?.homepageScreenshotToolProvider = { [weak self] in`
`1289`	`1291`	`return self?.browserDelegate?.homepageScreenshotTool()`
`1290`	`1292`	`}`
	`1293`	`+ addressBarPanGestureHandler?.newTabSettingsProvider = { [weak self] in`
	`1294`	`+ return self?.newTabSettings`
	`1295`	`+ }`
`1291`	`1296`	`}`
`1292`	`1297`	`}`
`1293`	`1298`
`@@ -4791,8 +4796,8 @@ extension BrowserViewController: TopTabsDelegate {`
`4791`	`4796`	`}`
`4792`	`4797`
`4793`	`4798`	`func topTabsDidPressNewTab(_ isPrivate: Bool) {`
`4794`		`- let shouldLoadCustomHomePage = isToolbarRefactorEnabled && NewTabAccessors.getHomePage(profile.prefs) == .homePage`
`4795`		`- let homePageURL = HomeButtonHomePageAccessors.getHomePage(profile.prefs)`
	`4799`	`+ let shouldLoadCustomHomePage = isToolbarRefactorEnabled && newTabSettings == .homePage`
	`4800`	`+ let homePageURL = NewTabHomePageAccessors.getHomePage(profile.prefs)`
`4796`	`4801`
`4797`	`4802`	`if shouldLoadCustomHomePage, let url = homePageURL {`
`4798`	`4803`	`openBlankNewTab(focusLocationField: false, isPrivate: isPrivate)`