Skip to content

Commit fd23387

Browse files
lmarceaumergify[bot]
lmarceau
authored and
mergify[bot]
committed
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
1 parent 0da6a08 commit fd23387

File tree

8 files changed

+17
-73
lines changed

8 files changed

+17
-73
lines changed

‎firefox-ios/Client.xcodeproj/project.pbxproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,6 @@
947947
8A6B799B2CDBCF3D003C3077 /* TopSitesManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6B79992CDBCE2E003C3077 /* TopSitesManagerTests.swift */; };
948948
8A6B799D2CDBDAE4003C3077 /* MockContileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6B799C2CDBDAE4003C3077 /* MockContileProvider.swift */; };
949949
8A6B79A02CDBDB0C003C3077 /* MockGoogleTopSiteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6B799F2CDBDB0C003C3077 /* MockGoogleTopSiteManager.swift */; };
950-
8A6CDB472DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6CDB462DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift */; };
951950
8A6E13982A71BA4E00A88FA8 /* TabWebViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6E13972A71BA4E00A88FA8 /* TabWebViewTests.swift */; };
952951
8A6E63C52D4946760040D355 /* JumpBackInCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6E63C42D49466C0040D355 /* JumpBackInCell.swift */; };
953952
8A6E63C72D4946B90040D355 /* JumpBackInSectionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A6E63C62D4946B40040D355 /* JumpBackInSectionState.swift */; };
@@ -8344,7 +8343,6 @@
83448343
8A6B79992CDBCE2E003C3077 /* TopSitesManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopSitesManagerTests.swift; sourceTree = "<group>"; };
83458344
8A6B799C2CDBDAE4003C3077 /* MockContileProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockContileProvider.swift; sourceTree = "<group>"; };
83468345
8A6B799F2CDBDB0C003C3077 /* MockGoogleTopSiteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockGoogleTopSiteManager.swift; sourceTree = "<group>"; };
8347-
8A6CDB462DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTabDisplayViewDragAndDropInteraction.swift; sourceTree = "<group>"; };
83488346
8A6E13972A71BA4E00A88FA8 /* TabWebViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabWebViewTests.swift; sourceTree = "<group>"; };
83498347
8A6E63C42D49466C0040D355 /* JumpBackInCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JumpBackInCell.swift; sourceTree = "<group>"; };
83508348
8A6E63C62D4946B40040D355 /* JumpBackInSectionState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JumpBackInSectionState.swift; sourceTree = "<group>"; };
@@ -13869,7 +13867,11 @@
1386913867
C889D7D22858C85200121E1D /* Mocks */ = {
1387013868
isa = PBXGroup;
1387113869
children = (
13870+
<<<<<<< HEAD
1387213871
8A6CDB462DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift */,
13872+
=======
13873+
8A01FE3F2DF0CE49002C483B /* MockDateProvider.swift */,
13874+
>>>>>>> 9563b5cec (Refactor FXIOS-12520 [Tab tray UI experiment] Disable drag and drop (#27292))
1387313875
8A9F4F042DC8F4ED004644B9 /* MockRemoteTabs.swift */,
1387413876
8A9F4F022DC8F4E6004644B9 /* MockPlaces.swift */,
1387513877
2199A1D32DB8389000DC84BD /* MockZoomStore.swift */,
@@ -18592,7 +18594,6 @@
1859218594
21FA8FB22AE856EB0013B815 /* MockTabTrayCoordinatorDelegate.swift in Sources */,
1859318595
8A87B4382CC1A92D003A9239 /* MockPocketManager.swift in Sources */,
1859418596
C8699152289177F5007ACC5C /* WallpaperNetworkingTests.swift in Sources */,
18595-
8A6CDB472DF9E78400F11139 /* MockTabDisplayViewDragAndDropInteraction.swift in Sources */,
1859618597
C818AD452A2100BA007F30BC /* OnboardingNotificationCardHelperTests.swift in Sources */,
1859718598
E1AEC178286E0CF500062E29 /* LegacyHomepageViewControllerTests.swift in Sources */,
1859818599
8A4EA0D42C01100200E4E4F1 /* MicrosurveySurfaceManagerTests.swift in Sources */,

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class TabTrayCoordinator: BaseCoordinator,
4848
let tabTrayViewController = TabTrayViewController(panelType: panelType, windowUUID: tabManager.windowUUID)
4949
router.setRootViewController(tabTrayViewController)
5050
self.tabTrayViewController = tabTrayViewController
51-
tabTrayViewController.childPanelControllers = makeChildPanels(dragAndDropDelegate: tabTrayViewController)
51+
tabTrayViewController.childPanelControllers = makeChildPanels()
5252
tabTrayViewController.childPanelThemes = makeChildPanelThemes()
5353
tabTrayViewController.delegate = self
5454
tabTrayViewController.navigationHandler = self
@@ -58,14 +58,10 @@ class TabTrayCoordinator: BaseCoordinator,
5858
tabTrayViewController?.setupOpenPanel(panelType: tabTraySection)
5959
}
6060

61-
private func makeChildPanels(dragAndDropDelegate: TabDisplayViewDragAndDropInteraction) -> [UINavigationController] {
61+
private func makeChildPanels() -> [UINavigationController] {
6262
let windowUUID = tabManager.windowUUID
63-
let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false,
64-
windowUUID: windowUUID,
65-
dragAndDropDelegate: dragAndDropDelegate)
66-
let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true,
67-
windowUUID: windowUUID,
68-
dragAndDropDelegate: dragAndDropDelegate)
63+
let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false, windowUUID: windowUUID)
64+
let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true, windowUUID: windowUUID)
6965
let syncTabs = RemoteTabsPanel(windowUUID: windowUUID)
7066

7167
let panels: [UIViewController]

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,13 @@ class TabDisplayPanelViewController: UIViewController,
7676
init(isPrivateMode: Bool,
7777
windowUUID: WindowUUID,
7878
notificationCenter: NotificationProtocol = NotificationCenter.default,
79-
themeManager: ThemeManager = AppContainer.shared.resolve(),
80-
dragAndDropDelegate: TabDisplayViewDragAndDropInteraction) {
79+
themeManager: ThemeManager = AppContainer.shared.resolve()) {
8180
self.panelType = isPrivateMode ? .privateTabs : .tabs
8281
self.tabsState = TabsPanelState(windowUUID: windowUUID, isPrivateMode: isPrivateMode)
8382
self.notificationCenter = notificationCenter
8483
self.themeManager = themeManager
8584
self.windowUUID = windowUUID
8685
super.init(nibName: nil, bundle: nil)
87-
tabDisplayView.dragAndDropDelegate = dragAndDropDelegate
8886
}
8987

9088
required init?(coder: NSCoder) {

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ import Common
66
import Redux
77
import UIKit
88

9-
protocol TabDisplayViewDragAndDropInteraction: AnyObject {
10-
func dragAndDropStarted()
11-
func dragAndDropEnded()
12-
}
13-
149
class TabDisplayView: UIView,
1510
ThemeApplicable,
1611
UICollectionViewDelegate,
@@ -31,7 +26,6 @@ class TabDisplayView: UIView,
3126
private let windowUUID: WindowUUID
3227
private let inactiveTabsTelemetry = InactiveTabsTelemetry()
3328
var theme: Theme?
34-
weak var dragAndDropDelegate: TabDisplayViewDragAndDropInteraction?
3529

3630
lazy var dataSource =
3731
TabDisplayDiffableDataSource(
@@ -132,8 +126,10 @@ class TabDisplayView: UIView,
132126
collectionView.keyboardDismissMode = .onDrag
133127
collectionView.dragInteractionEnabled = true
134128
collectionView.delegate = self
135-
collectionView.dragDelegate = self
136-
collectionView.dropDelegate = self
129+
if !isTabTrayUIExperimentsEnabled {
130+
collectionView.dragDelegate = self
131+
collectionView.dropDelegate = self
132+
}
137133
collectionView.collectionViewLayout = createLayout()
138134
collectionView.accessibilityIdentifier = AccessibilityIdentifiers.TabTray.collectionView
139135
return collectionView
@@ -463,12 +459,4 @@ extension TabDisplayView: UICollectionViewDragDelegate, UICollectionViewDropDele
463459

464460
store.dispatch(action)
465461
}
466-
467-
func collectionView(_ collectionView: UICollectionView, dragSessionWillBegin session: UIDragSession) {
468-
dragAndDropDelegate?.dragAndDropStarted()
469-
}
470-
471-
func collectionView(_ collectionView: UICollectionView, dragSessionDidEnd session: UIDragSession) {
472-
dragAndDropDelegate?.dragAndDropEnded()
473-
}
474462
}

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ class TabTrayViewController: UIViewController,
3030
StoreSubscriber,
3131
FeatureFlaggable,
3232
TabTraySelectorDelegate,
33-
TabTrayAnimationDelegate,
34-
TabDisplayViewDragAndDropInteraction {
33+
TabTrayAnimationDelegate {
3534
typealias SubscriberStateType = TabTrayState
3635
private struct UX {
3736
struct NavigationMenu {
@@ -65,7 +64,6 @@ class TabTrayViewController: UIViewController,
6564

6665
private lazy var panelContainer: UIView = .build { _ in }
6766
private var pageViewController: UIPageViewController?
68-
private weak var pageScrollView: UIScrollView?
6967
private var swipeFromIndex: Int?
7068
private lazy var themeAnimator = TabTrayThemeAnimator()
7169

@@ -720,7 +718,6 @@ class TabTrayViewController: UIViewController,
720718

721719
if let scrollView = pageVC.view.subviews.first(where: { $0 is UIScrollView }) as? UIScrollView {
722720
scrollView.delegate = self
723-
self.pageScrollView = scrollView
724721
}
725722

726723
self.pageViewController = pageVC
@@ -995,14 +992,4 @@ class TabTrayViewController: UIViewController,
995992
func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
996993
swipeFromIndex = nil
997994
}
998-
999-
// MARK: TabDisplayViewDragAndDropInteraction
1000-
1001-
func dragAndDropStarted() {
1002-
pageScrollView?.isScrollEnabled = false
1003-
}
1004-
1005-
func dragAndDropEnded() {
1006-
pageScrollView?.isScrollEnabled = true
1007-
}
1008995
}

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ final class TabDisplayPanelTests: XCTestCase {
5050
let subjectState = createSubjectState(isPrivateMode: isPrivateMode,
5151
emptyTabs: emptyTabs,
5252
emptyInactiveTabs: emptyInactiveTabs)
53-
let delegate = MockTabDisplayViewDragAndDropInteraction()
54-
let subject = TabDisplayPanelViewController(isPrivateMode: isPrivateMode,
55-
windowUUID: .XCTestDefaultUUID,
56-
dragAndDropDelegate: delegate)
53+
let subject = TabDisplayPanelViewController(isPrivateMode: isPrivateMode, windowUUID: .XCTestDefaultUUID)
5754
subject.newState(state: subjectState)
5855

5956
trackForMemoryLeaks(subject, file: file, line: line)

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabTrayViewControllerTests.swift

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,8 @@ final class TabTrayViewControllerTests: XCTestCase {
145145
}
146146

147147
private func makeChildPanels() -> [UINavigationController] {
148-
let delegate = MockTabDisplayViewDragAndDropInteraction()
149-
let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false,
150-
windowUUID: .XCTestDefaultUUID,
151-
dragAndDropDelegate: delegate)
152-
let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true,
153-
windowUUID: .XCTestDefaultUUID,
154-
dragAndDropDelegate: delegate)
148+
let regularTabsPanel = TabDisplayPanelViewController(isPrivateMode: false, windowUUID: .XCTestDefaultUUID)
149+
let privateTabsPanel = TabDisplayPanelViewController(isPrivateMode: true, windowUUID: .XCTestDefaultUUID)
155150
let syncTabs = RemoteTabsPanel(windowUUID: .XCTestDefaultUUID)
156151
return [
157152
ThemedNavigationController(rootViewController: regularTabsPanel, windowUUID: windowUUID),

0 commit comments

Comments
 (0)