Merge branch 'main' into chore/add-address-ui-js-file

BrowserKit/Sources/ComponentLibrary/Buttons/LinkButton.swift

@@ -26,6 +26,7 @@ open class LinkButton: UIButton, ThemeApplicable {
         updatedConfiguration.titleTextAttributesTransformer = UIConfigurationTextAttributesTransformer { incoming in
             var outgoing = incoming
             outgoing.font = viewModel.font
+            outgoing.underlineStyle = .single
             return outgoing
         }
         updatedConfiguration.contentInsets = viewModel.contentInsets

firefox-ios/Client.xcodeproj/project.pbxproj

@@ -21593,7 +21593,7 @@
 			repositoryURL = "https://github.com/mozilla/rust-components-swift.git";
 			requirement = {
 				kind = exactVersion;
-				version = 127.0.20240427050414;
+				version = 127.0.20240430050317;
 			};
 		};
 		435C85EE2788F4D00072B526 /* XCRemoteSwiftPackageReference "glean-swift" */ = {

firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -95,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mozilla/rust-components-swift.git",
       "state" : {
-        "revision" : "67ea48dede8487276ccd6531f9da29ca793c11cc",
-        "version" : "127.0.20240427050414"
+        "revision" : "fb6671d24023c79a1dc2afd3aac7c850167c5c63",
+        "version" : "127.0.20240430050317"
       }
     },
     {

firefox-ios/Client/Assets/CC_Script/FormAutofillSection.sys.mjs

@@ -413,6 +413,7 @@ export class FormAutofillSection {
         profile[`${fieldDetail.fieldName}-formatted`] ||
         profile[fieldDetail.fieldName] ||
         "";
+
       if (HTMLSelectElement.isInstance(element)) {
         // Unlike text input, select element is always previewed even if
         // the option is already selected.

firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+TabToolbarDelegate.swift

@@ -348,8 +348,11 @@ extension BrowserViewController: ToolBarActionMenuDelegate {
                                                  textAlignment: .left)
             let toast = ButtonToast(viewModel: viewModel,
                                     theme: currentTheme()) { [weak self] isButtonTapped in
-                guard let self, let closedTab = tabManager.backupCloseTab else { return }
-                isButtonTapped ? self.tabManager.undoCloseTab(tab: closedTab.tab, position: closedTab.restorePosition) : nil
+                guard let self,
+                        tabManager.backupCloseTab != nil,
+                        isButtonTapped
+                else { return }
+                self.tabManager.undoCloseTab()
             }
             show(toast: toast)
         default:

firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+WebViewDelegates.swift

@@ -912,8 +912,6 @@ extension BrowserViewController: WKNavigationDelegate {
         tab.contentBlocker?.notifyContentBlockingChanged()
         self.scrollController.resetZoomState()
 
-        scrollController.shouldScrollToTop = true
-
         if tabManager.selectedTab === tab {
             updateUIForReaderHomeStateForTab(tab, focusUrlBar: true)
             updateFakespot(tab: tab, isReload: true)

firefox-ios/Client/Frontend/Browser/BrowserViewController/State/BrowserViewControllerState.swift

@@ -81,7 +81,7 @@ struct BrowserViewControllerState: ScreenState, Equatable {
             return BrowserViewControllerState(
                 searchScreenState: state.searchScreenState,
                 showDataClearanceFlow: state.showDataClearanceFlow,
-                fakespotState: FakespotState.reducer(state.fakespotState, action),
+                fakespotState: state.fakespotState,
                 showOverlay: state.showOverlay,
                 windowUUID: state.windowUUID,
                 reloadWebView: false,
@@ -111,7 +111,7 @@ struct BrowserViewControllerState: ScreenState, Equatable {
             return BrowserViewControllerState(
                 searchScreenState: SearchScreenState(inPrivateMode: privacyState),
                 showDataClearanceFlow: privacyState,
-                fakespotState: FakespotState.reducer(state.fakespotState, action),
+                fakespotState: state.fakespotState,
                 windowUUID: state.windowUUID,
                 reloadWebView: true,
                 browserViewType: browserViewType)
@@ -128,7 +128,7 @@ struct BrowserViewControllerState: ScreenState, Equatable {
             return BrowserViewControllerState(
                 searchScreenState: state.searchScreenState,
                 showDataClearanceFlow: state.showDataClearanceFlow,
-                fakespotState: FakespotState.reducer(state.fakespotState, action),
+                fakespotState: state.fakespotState,
                 toast: toastType,
                 windowUUID: state.windowUUID,
                 browserViewType: state.browserViewType)
@@ -137,7 +137,7 @@ struct BrowserViewControllerState: ScreenState, Equatable {
             return BrowserViewControllerState(
                 searchScreenState: state.searchScreenState,
                 showDataClearanceFlow: state.showDataClearanceFlow,
-                fakespotState: FakespotState.reducer(state.fakespotState, action),
+                fakespotState: state.fakespotState,
                 showOverlay: showOverlay,
                 windowUUID: state.windowUUID,
                 browserViewType: state.browserViewType)

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

@@ -510,7 +510,7 @@ class BrowserViewController: UIViewController,
 
     private func dismissModalsIfStartAtHome() {
         guard tabManager.startAtHomeCheck() else { return }
-        let action = FakespotAction(isExpanded: false,
+        let action = FakespotAction(isOpen: false,
                                     windowUUID: windowUUID,
                                     actionType: FakespotActionType.setAppearanceTo)
         store.dispatch(action)
@@ -1807,6 +1807,11 @@ class BrowserViewController: UIViewController,
 
         self.screenshotHelper.takeScreenshot(tab)
 
+        // when navigate in tab, if the tab mime type is pdf, we should scroll to top
+        if tab.mimeType == MIMEType.PDF {
+            tab.shouldScrollToTop = true
+        }
+
         if let url = webView.url {
             if (!InternalURL.isValid(url: url) || url.isReaderModeURL) && !url.isFileURL {
                 postLocationChangeNotificationForTab(tab, navigation: navigation)
@@ -1854,7 +1859,7 @@ class BrowserViewController: UIViewController,
               let url = webView.url
         else {
             // We're on homepage or a blank tab
-            let action = FakespotAction(isExpanded: false,
+            let action = FakespotAction(isOpen: false,
                                         windowUUID: windowUUID,
                                         actionType: FakespotActionType.setAppearanceTo)
             store.dispatch(action)
@@ -1870,7 +1875,7 @@ class BrowserViewController: UIViewController,
         let product = ShoppingProduct(url: url, client: FakespotClient(environment: environment))
 
         guard product.product != nil, !tab.isPrivate else {
-            let action = FakespotAction(isExpanded: false,
+            let action = FakespotAction(isOpen: false,
                                         windowUUID: windowUUID,
                                         actionType: FakespotActionType.setAppearanceTo)
             store.dispatch(action)
@@ -1905,7 +1910,7 @@ class BrowserViewController: UIViewController,
                   fakespotState.sidebarOpenForiPadLandscape,
                   UIDevice.current.userInterfaceIdiom == .pad {
             // Sidebar should be displayed, display Fakespot
-            let action = FakespotAction(isExpanded: true,
+            let action = FakespotAction(isOpen: true,
                                         windowUUID: windowUUID,
                                         actionType: FakespotActionType.setAppearanceTo)
             store.dispatch(action)

firefox-ios/Client/Frontend/Browser/TabDisplayManager.swift

@@ -426,7 +426,7 @@ class LegacyTabDisplayManager: NSObject, FeatureFlaggable {
     }
 
     func undoCloseTab(tab: Tab, index: Int?) {
-        tabManager.undoCloseTab(tab: tab, position: index)
+        tabManager.undoCloseTab()
         _ = profile.recentlyClosedTabs.popFirstTab()
 
         refreshStore { [weak self] in
@@ -549,7 +549,10 @@ extension LegacyTabDisplayManager: UICollectionViewDataSource {
 // MARK: - InactiveTabsDelegate
 extension LegacyTabDisplayManager: LegacyInactiveTabsDelegate {
     func closeInactiveTab(_ tab: Tab, index: Int) {
-        tabManager.backupCloseTab = BackupCloseTab(tab: tab, restorePosition: index)
+        tabManager.backupCloseTab = BackupCloseTab(
+            tab: tab,
+            restorePosition: index,
+            isSelected: false)
         removeSingleInactiveTab(tab)
 
         cfrDelegate?.presentUndoSingleToast { [weak self] undoButtonPressed in
@@ -622,7 +625,7 @@ extension LegacyTabDisplayManager: LegacyInactiveTabsDelegate {
     }
 
     private func undoDeleteInactiveTab(_ tab: Tab, at index: Int) {
-        tabManager.undoCloseTab(tab: tab, position: index)
+        tabManager.undoCloseTab()
         inactiveViewModel?.inactiveTabs.insert(tab, at: index)
 
         if inactiveViewModel?.inactiveTabs.count == 1 {

firefox-ios/Client/Frontend/Browser/TabScrollController.swift

@@ -60,12 +60,6 @@ class TabScrollingController: NSObject, FeatureFlaggable, SearchBarLocationProvi
         return isBottomSearchBar ? bottomShowing : headerTopOffset == 0
     }
 
-    private var shouldSetInitialScrollToTop: Bool {
-        return tab?.mimeType == MIMEType.PDF && shouldScrollToTop
-    }
-
-    var shouldScrollToTop = false
-
     private var isZoomedOut = false
     private var lastZoomedScale: CGFloat = 0
     private var isUserZoom = false
@@ -160,6 +154,8 @@ class TabScrollingController: NSObject, FeatureFlaggable, SearchBarLocationProvi
 
         guard !tabIsLoading() else { return }
 
+        tab?.shouldScrollToTop = false
+
         if let containerView = scrollView?.superview {
             let translation = gesture.translation(in: containerView)
             let delta = lastContentOffset - translation.y
@@ -458,7 +454,7 @@ extension TabScrollingController: UIScrollViewDelegate {
     func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
         guard !tabIsLoading(), !isBouncingAtBottom(), isAbleToScroll else { return }
 
-        shouldScrollToTop = false
+        tab?.shouldScrollToTop = false
 
         if decelerate || (toolbarState == .animating && !decelerate) {
             if scrollDirection == .up {
@@ -473,7 +469,7 @@ extension TabScrollingController: UIScrollViewDelegate {
     // before the WKWebView's contentOffset is reset as a result of the contentView's frame becoming smaller
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         // for PDFs, we should set the initial offset to 0 (ZERO)
-        if shouldSetInitialScrollToTop {
+        if let tab, tab.shouldScrollToTop {
             setOffset(y: 0, for: scrollView)
         }
 

firefox-ios/Client/Frontend/Browser/Tabs/Legacy/LegacyGridTabViewController.swift

@@ -398,8 +398,10 @@ class LegacyGridTabViewController: UIViewController,
 
     /// Handles close tab by clicking on close button or swipe gesture
     func closeTabAction(tab: Tab, cell: LegacyTabCell) {
-        tabManager.backupCloseTab = BackupCloseTab(tab: tab,
-                                                   restorePosition: tabManager.tabs.firstIndex(of: tab))
+        tabManager.backupCloseTab = BackupCloseTab(
+            tab: tab,
+            restorePosition: tabManager.tabs.firstIndex(of: tab),
+            isSelected: tabManager.selectedTab?.tabUUID == tab.tabUUID)
         tabDisplayManager.tabDisplayCompletionDelegate = self
         tabDisplayManager.performCloseAction(for: tab)
 

firefox-ios/Client/Frontend/Browser/Tabs/Middleware/TabManagerMiddleware.swift

@@ -208,7 +208,7 @@ class TabManagerMiddleware {
         let tabManagerTabs = isPrivateMode ? tabManager.privateTabs : tabManager.normalActiveTabs
         tabManagerTabs.forEach { tab in
             let tabModel = TabModel(tabUUID: tab.tabUUID,
-                                    isSelected: tab == selectedTab,
+                                    isSelected: tab.tabUUID == selectedTab?.tabUUID,
                                     isPrivate: tab.isPrivate,
                                     isFxHomeTab: tab.isFxHomeTab,
                                     tabTitle: tab.displayTitle,
@@ -358,10 +358,10 @@ class TabManagerMiddleware {
     private func undoCloseTab(state: AppState, uuid: WindowUUID) {
         let tabManager = tabManager(for: uuid)
         guard let tabsState = state.screenState(TabsPanelState.self, for: .tabsPanel, window: uuid),
-              let backupTab = tabManager.backupCloseTab
+              tabManager.backupCloseTab != nil
         else { return }
 
-        tabManager.undoCloseTab(tab: backupTab.tab, position: backupTab.restorePosition)
+        tabManager.undoCloseTab()
 
         let model = getTabsDisplayModel(for: tabsState.isPrivateMode, shouldScrollToTab: false, uuid: uuid)
         let action = TabPanelMiddlewareAction(tabDisplayModel: model,
@@ -456,7 +456,10 @@ class TabManagerMiddleware {
         Task {
             if let tabToClose = tabManager.getTabForUUID(uuid: tabUUID) {
                 let index = tabsState.inactiveTabs.firstIndex { $0.tabUUID == tabUUID }
-                tabManager.backupCloseTab = BackupCloseTab(tab: tabToClose, restorePosition: index)
+                tabManager.backupCloseTab = BackupCloseTab(
+                    tab: tabToClose,
+                    restorePosition: index,
+                    isSelected: false)
             }
             await tabManager.removeTab(tabUUID)
 
@@ -475,9 +478,9 @@ class TabManagerMiddleware {
 
     private func undoCloseInactiveTab(uuid: WindowUUID) {
         let windowTabManager = self.tabManager(for: uuid)
-        guard let backupTab = windowTabManager.backupCloseTab else { return }
+        guard windowTabManager.backupCloseTab != nil else { return }
 
-        windowTabManager.undoCloseTab(tab: backupTab.tab, position: backupTab.restorePosition)
+        windowTabManager.undoCloseTab()
         let inactiveTabs = self.refreshInactiveTabs(uuid: uuid)
         let refreshAction = TabPanelMiddlewareAction(inactiveTabModels: inactiveTabs,
                                                      windowUUID: uuid,

firefox-ios/Client/Frontend/Fakespot/FakespotAction.swift

@@ -6,15 +6,18 @@ import Common
 import Redux
 
 class FakespotAction: Action {
+    let isOpen: Bool?
     let isExpanded: Bool?
     let tabUUID: TabUUID?
     let productId: String?
 
-    init(isExpanded: Bool? = nil,
+    init(isOpen: Bool? = nil,
+         isExpanded: Bool? = nil,
          tabUUID: TabUUID? = nil,
          productId: String? = nil,
          windowUUID: UUID,
          actionType: ActionType) {
+        self.isOpen = isOpen
         self.isExpanded = isExpanded
         self.tabUUID = tabUUID
         self.productId = productId

firefox-ios/Client/Frontend/Fakespot/FakespotState.swift

@@ -84,13 +84,13 @@ struct FakespotState: ScreenState, Equatable {
             return state
 
         case FakespotActionType.reviewQualityDidChange:
-            let isExpanded = action.isExpanded ?? state.isSettingsExpanded
+            let isExpanded = action.isExpanded ?? state.isReviewQualityExpanded
             var state = state
             state.expandState[state.currentTabUUID, default: ExpandState()].isReviewQualityExpanded = isExpanded
             return state
 
         case FakespotActionType.highlightsDidChange:
-            let isExpanded = action.isExpanded ?? state.isSettingsExpanded
+            let isExpanded = action.isExpanded ?? state.isHighlightsSectionExpanded
             var state = state
             state.expandState[state.currentTabUUID, default: ExpandState()].isHighlightsSectionExpanded = isExpanded
             return state
@@ -138,16 +138,14 @@ struct FakespotState: ScreenState, Equatable {
             return state
 
         case FakespotActionType.setAppearanceTo:
-            let isEnabled = action.isExpanded ?? state.isSettingsExpanded
+            let isEnabled = action.isOpen ?? state.isOpen
             var state = state
             state.isOpen = isEnabled
             state.sendSurfaceDisplayedTelemetryEvent = !isEnabled
             return state
 
         case FakespotActionType.surfaceDisplayedEventSend:
-            let isEnabled = action.isExpanded ?? state.isSettingsExpanded
             var state = state
-            state.isOpen = isEnabled
             state.sendSurfaceDisplayedTelemetryEvent = false
             return state
 

firefox-ios/Client/Frontend/Fakespot/FakespotViewController.swift

@@ -423,7 +423,7 @@ class FakespotViewController: UIViewController,
                 if dismissPermanently {
                     self?.triggerDismiss()
                 } else {
-                    let appearanceAction = FakespotAction(isExpanded: false,
+                    let appearanceAction = FakespotAction(isOpen: false,
                                                           windowUUID: windowUUID,
                                                           actionType: FakespotActionType.setAppearanceTo)
                                                           store.dispatch(appearanceAction)
@@ -468,7 +468,7 @@ class FakespotViewController: UIViewController,
             let reviewQualityCardView: FakespotReviewQualityCardView = .build()
             viewModel.reviewQualityCardViewModel.expandState = fakespotState.isReviewQualityExpanded ? .expanded : .collapsed
             viewModel.reviewQualityCardViewModel.dismissViewController = {
-                let action = FakespotAction(isExpanded: false,
+                let action = FakespotAction(isOpen: false,
                                             windowUUID: windowUUID,
                                             actionType: FakespotActionType.setAppearanceTo)
                 store.dispatch(action)
@@ -527,7 +527,7 @@ class FakespotViewController: UIViewController,
                 self?.viewModel.addTab(url: adData.url)
                 self?.viewModel.recordSurfaceAdsClickedTelemetry()
                 self?.viewModel.reportAdEvent(eventName: .trustedDealsLinkClicked, aidvs: [adData.aid])
-                let action = FakespotAction(isExpanded: false,
+                let action = FakespotAction(isOpen: false,
                                             windowUUID: windowUUID,
                                             actionType: FakespotActionType.setAppearanceTo)
                 store.dispatch(action)