Refactor FXIOS-12520 [Tab tray UI experiment] Disable drag and drop (backport #27292) (#27294)

* Refactor FXIOS-12520 [Tab tray UI experiment] Disable drag and drop (#27292)

* Revert "Bugfix FXIOS-12489 [Tab tray UI experiment] Disable swipe when drag and drop happens (#27225)"

This reverts commit fe1e53e.

* Disable drag and drop on tab tray with experiment

(cherry picked from commit 9563b5c)

# Conflicts:
#	firefox-ios/Client.xcodeproj/project.pbxproj

* Fix conflict

---------

Co-authored-by: lmarceau <[email protected]>

Author: mergify[bot]

firefox-ios/Client.xcodeproj/project.pbxproj

@@ -947,7 +947,6 @@
 		8A6B799B2CDBCF3D003C3077 /* TopSitesManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6B79992CDBCE2E003C3077 /* TopSitesManagerTests.swift */; };
 		8A6B799D2CDBDAE4003C3077 /* MockContileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6B799C2CDBDAE4003C3077 /* MockContileProvider.swift */; };
 		8A6B79A02CDBDB0C003C3077 /* MockGoogleTopSiteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6B799F2CDBDB0C003C3077 /* MockGoogleTopSiteManager.swift */; };
-		8A6CDB472DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6CDB462DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift */; };
 		8A6E13982A71BA4E00A88FA8 /* TabWebViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6E13972A71BA4E00A88FA8 /* TabWebViewTests.swift */; };
 		8A6E63C52D4946760040D355 /* JumpBackInCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6E63C42D49466C0040D355 /* JumpBackInCell.swift */; };
 		8A6E63C72D4946B90040D355 /* JumpBackInSectionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6E63C62D4946B40040D355 /* JumpBackInSectionState.swift */; };
@@ -8344,7 +8343,6 @@
 		8A6B79992CDBCE2E003C3077 /* TopSitesManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopSitesManagerTests.swift; sourceTree = "<group>"; };
 		8A6B799C2CDBDAE4003C3077 /* MockContileProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockContileProvider.swift; sourceTree = "<group>"; };
 		8A6B799F2CDBDB0C003C3077 /* MockGoogleTopSiteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockGoogleTopSiteManager.swift; sourceTree = "<group>"; };
-		8A6CDB462DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTabDisplayViewDragAndDropInteraction.swift; sourceTree = "<group>"; };
 		8A6E13972A71BA4E00A88FA8 /* TabWebViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabWebViewTests.swift; sourceTree = "<group>"; };
 		8A6E63C42D49466C0040D355 /* JumpBackInCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JumpBackInCell.swift; sourceTree = "<group>"; };
 		8A6E63C62D4946B40040D355 /* JumpBackInSectionState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JumpBackInSectionState.swift; sourceTree = "<group>"; };
@@ -18592,7 +18590,6 @@
 				21FA8FB22AE856EB0013B815 /* MockTabTrayCoordinatorDelegate.swift in Sources */,
 				8A87B4382CC1A92D003A9239 /* MockPocketManager.swift in Sources */,
 				C8699152289177F5007ACC5C /* WallpaperNetworkingTests.swift in Sources */,
-				8A6CDB472DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift in Sources */,
 				C818AD452A2100BA007F30BC /* OnboardingNotificationCardHelperTests.swift in Sources */,
 				E1AEC178286E0CF500062E29 /* LegacyHomepageViewControllerTests.swift in Sources */,
 				8A4EA0D42C01100200E4E4F1 /* MicrosurveySurfaceManagerTests.swift in Sources */,

firefox-ios/Client/Coordinators/TabTray/TabTrayCoordinator.swift

@@ -48,7 +48,7 @@ class TabTrayCoordinator: BaseCoordinator,
         let tabTrayViewController = TabTrayViewController(panelType: panelType, windowUUID: tabManager.windowUUID)
         router.setRootViewController(tabTrayViewController)
         self.tabTrayViewController = tabTrayViewController
-        tabTrayViewController.childPanelControllers = makeChildPanels(dragAndDropDelegate: tabTrayViewController)
+        tabTrayViewController.childPanelControllers = makeChildPanels()
         tabTrayViewController.childPanelThemes = makeChildPanelThemes()
         tabTrayViewController.delegate = self
         tabTrayViewController.navigationHandler = self
@@ -58,14 +58,10 @@ class TabTrayCoordinator: BaseCoordinator,
         tabTrayViewController?.setupOpenPanel(panelType: tabTraySection)
     }
 
-    private func makeChildPanels(dragAndDropDelegate: TabDisplayViewDragAndDropInteraction) -> [UINavigationController] {
+    private func makeChildPanels() -> [UINavigationController] {
         let windowUUID = tabManager.windowUUID
-        let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false,
-                                                             windowUUID: windowUUID,
-                                                             dragAndDropDelegate: dragAndDropDelegate)
-        let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true,
-                                                             windowUUID: windowUUID,
-                                                             dragAndDropDelegate: dragAndDropDelegate)
+        let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false, windowUUID: windowUUID)
+        let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true, windowUUID: windowUUID)
         let syncTabs = RemoteTabsPanel(windowUUID: windowUUID)
 
         let panels: [UIViewController]

firefox-ios/Client/Frontend/Browser/Tabs/Views/TabDisplayPanelViewController.swift

@@ -76,15 +76,13 @@ class TabDisplayPanelViewController: UIViewController,
     init(isPrivateMode: Bool,
          windowUUID: WindowUUID,
          notificationCenter: NotificationProtocol = NotificationCenter.default,
-         themeManager: ThemeManager = AppContainer.shared.resolve(),
-         dragAndDropDelegate: TabDisplayViewDragAndDropInteraction) {
+         themeManager: ThemeManager = AppContainer.shared.resolve()) {
         self.panelType = isPrivateMode ? .privateTabs : .tabs
         self.tabsState = TabsPanelState(windowUUID: windowUUID, isPrivateMode: isPrivateMode)
         self.notificationCenter = notificationCenter
         self.themeManager = themeManager
         self.windowUUID = windowUUID
         super.init(nibName: nil, bundle: nil)
-        tabDisplayView.dragAndDropDelegate = dragAndDropDelegate
     }
 
     required init?(coder: NSCoder) {

firefox-ios/Client/Frontend/Browser/Tabs/Views/TabDisplayView.swift

@@ -6,11 +6,6 @@ import Common
 import Redux
 import UIKit
 
-protocol TabDisplayViewDragAndDropInteraction: AnyObject {
-    func dragAndDropStarted()
-    func dragAndDropEnded()
-}
-
 class TabDisplayView: UIView,
                       ThemeApplicable,
                       UICollectionViewDelegate,
@@ -31,7 +26,6 @@ class TabDisplayView: UIView,
     private let windowUUID: WindowUUID
     private let inactiveTabsTelemetry = InactiveTabsTelemetry()
     var theme: Theme?
-    weak var dragAndDropDelegate: TabDisplayViewDragAndDropInteraction?
 
     lazy var dataSource =
     TabDisplayDiffableDataSource(
@@ -132,8 +126,10 @@ class TabDisplayView: UIView,
         collectionView.keyboardDismissMode = .onDrag
         collectionView.dragInteractionEnabled = true
         collectionView.delegate = self
-        collectionView.dragDelegate = self
-        collectionView.dropDelegate = self
+        if !isTabTrayUIExperimentsEnabled {
+            collectionView.dragDelegate = self
+            collectionView.dropDelegate = self
+        }
         collectionView.collectionViewLayout = createLayout()
         collectionView.accessibilityIdentifier = AccessibilityIdentifiers.TabTray.collectionView
         return collectionView
@@ -463,12 +459,4 @@ extension TabDisplayView: UICollectionViewDragDelegate, UICollectionViewDropDele
 
         store.dispatch(action)
     }
-
-    func collectionView(_ collectionView: UICollectionView, dragSessionWillBegin session: UIDragSession) {
-        dragAndDropDelegate?.dragAndDropStarted()
-    }
-
-    func collectionView(_ collectionView: UICollectionView, dragSessionDidEnd session: UIDragSession) {
-        dragAndDropDelegate?.dragAndDropEnded()
-    }
 }

firefox-ios/Client/Frontend/Browser/Tabs/Views/TabTrayViewController.swift

@@ -30,8 +30,7 @@ class TabTrayViewController: UIViewController,
                              StoreSubscriber,
                              FeatureFlaggable,
                              TabTraySelectorDelegate,
-                             TabTrayAnimationDelegate,
-                             TabDisplayViewDragAndDropInteraction {
+                             TabTrayAnimationDelegate {
     typealias SubscriberStateType = TabTrayState
     private struct UX {
         struct NavigationMenu {
@@ -65,7 +64,6 @@ class TabTrayViewController: UIViewController,
 
     private lazy var panelContainer: UIView = .build { _ in }
     private var pageViewController: UIPageViewController?
-    private weak var pageScrollView: UIScrollView?
     private var swipeFromIndex: Int?
     private lazy var themeAnimator = TabTrayThemeAnimator()
 
@@ -720,7 +718,6 @@ class TabTrayViewController: UIViewController,
 
         if let scrollView = pageVC.view.subviews.first(where: { $0 is UIScrollView }) as? UIScrollView {
             scrollView.delegate = self
-            self.pageScrollView = scrollView
         }
 
         self.pageViewController = pageVC
@@ -995,14 +992,4 @@ class TabTrayViewController: UIViewController,
     func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
         swipeFromIndex = nil
     }
-
-    // MARK: TabDisplayViewDragAndDropInteraction
-
-    func dragAndDropStarted() {
-        pageScrollView?.isScrollEnabled = false
-    }
-
-    func dragAndDropEnded() {
-        pageScrollView?.isScrollEnabled = true
-    }
 }

firefox-ios/firefox-ios-tests/Tests/ClientTests/Mocks/MockTabDisplayViewDragAndDropInteraction.swift

@@ -50,10 +50,7 @@ final class TabDisplayPanelTests: XCTestCase {
         let subjectState = createSubjectState(isPrivateMode: isPrivateMode,
                                               emptyTabs: emptyTabs,
                                               emptyInactiveTabs: emptyInactiveTabs)
-        let delegate = MockTabDisplayViewDragAndDropInteraction()
-        let subject = TabDisplayPanelViewController(isPrivateMode: isPrivateMode,
-                                                    windowUUID: .XCTestDefaultUUID,
-                                                    dragAndDropDelegate: delegate)
+        let subject = TabDisplayPanelViewController(isPrivateMode: isPrivateMode, windowUUID: .XCTestDefaultUUID)
         subject.newState(state: subjectState)
 
         trackForMemoryLeaks(subject, file: file, line: line)

firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabDisplayPanelTests.swift

@@ -145,13 +145,8 @@ final class TabTrayViewControllerTests: XCTestCase {
     }
 
     private func makeChildPanels() -> [UINavigationController] {
-        let delegate = MockTabDisplayViewDragAndDropInteraction()
-        let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false,
-                                                             windowUUID: .XCTestDefaultUUID,
-                                                             dragAndDropDelegate: delegate)
-        let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true,
-                                                             windowUUID: .XCTestDefaultUUID,
-                                                             dragAndDropDelegate: delegate)
+        let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false, windowUUID: .XCTestDefaultUUID)
+        let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true, windowUUID: .XCTestDefaultUUID)
         let syncTabs = RemoteTabsPanel(windowUUID: .XCTestDefaultUUID)
         return [
             ThemedNavigationController(rootViewController: regularTabsPanel, windowUUID: windowUUID),