Disable reordering when sort by name is enabled

duckduckgo · Nov 14, 2024 · ff64721 · ff64721
1 parent ce3975e
commit ff64721
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift b/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift
@@ -48,6 +48,7 @@ final class BookmarkOutlineViewDataSource: NSObject, BookmarksOutlineViewDataSou
     private var outlineView: BookmarksOutlineView?
 
     private let contentMode: ContentMode
+    private var sortMode: BookmarksSortMode
     private(set) var expandedNodesIDs = Set<String>()
     @Published private(set) var isSearching = false
 
@@ -95,18 +96,21 @@ final class BookmarkOutlineViewDataSource: NSObject, BookmarksOutlineViewDataSou
         self.dragDropManager = dragDropManager
         self.treeController = treeController
         self.presentFaviconsFetcherOnboarding = presentFaviconsFetcherOnboarding
+        self.sortMode = sortMode
 
         super.init()
     }
 
     func reloadData(with sortMode: BookmarksSortMode, withRootFolder rootFolder: BookmarkFolder? = nil) {
         isSearching = false
         dragDestinationFolder = nil
+        self.sortMode = sortMode
         treeController.rebuild(for: sortMode, withRootFolder: rootFolder)
     }
 
     func reloadData(forSearchQuery searchQuery: String, sortMode: BookmarksSortMode) {
         isSearching = true
+        self.sortMode = sortMode
         treeController.rebuild(forSearchQuery: searchQuery, sortMode: sortMode)
     }
 
@@ -260,6 +264,8 @@ final class BookmarkOutlineViewDataSource: NSObject, BookmarksOutlineViewDataSou
     }
 
     func outlineView(_ outlineView: NSOutlineView, validateDrop info: NSDraggingInfo, proposedItem item: Any?, proposedChildIndex index: Int) -> NSDragOperation {
+        if !sortMode.isReorderingEnabled { return .none }
+
         let destinationNode = nodeForItem(item)
 
         if contentMode == .foldersOnly, destinationNode.isRoot {

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
@@ -555,6 +555,7 @@ extension BookmarkManagementDetailViewController: NSTableViewDelegate, NSTableVi
                    validateDrop info: NSDraggingInfo,
                    proposedRow row: Int,
                    proposedDropOperation dropOperation: NSTableView.DropOperation) -> NSDragOperation {
+        if !sortBookmarksViewModel.selectedSortMode.isReorderingEnabled { return .none }
         let destination = destination(for: dropOperation, at: row)
 
         guard !isSearching || destination is BookmarkFolder else { return .none }

diff --git a/DuckDuckGo/Bookmarks/ViewModel/SortBookmarksViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/SortBookmarksViewModel.swift
@@ -55,6 +55,10 @@ enum BookmarksSortMode: Codable {
         return self == .nameAscending || self == .nameDescending
     }
 
+    var isReorderingEnabled: Bool{
+        return self == .manual
+    }
+
     func menu(target: AnyObject) -> NSMenu {
         switch self {
         case .manual:

diff --git a/UnitTests/Bookmarks/ViewModels/BookmarksSortModeTests.swift b/UnitTests/Bookmarks/ViewModels/BookmarksSortModeTests.swift
@@ -100,4 +100,10 @@ class BookmarksSortModeTests: XCTestCase {
         XCTAssertEqual(descendingMenu.items[4].title, UserText.bookmarksSortByNameDescending)
         XCTAssertEqual(descendingMenu.items[4].state, .on)
     }
+
+    func testReorderingValueIsCorrect() {
+        XCTAssertTrue(BookmarksSortMode.manual.isReorderingEnabled)
+        XCTAssertFalse(BookmarksSortMode.nameAscending.isReorderingEnabled)
+        XCTAssertFalse(BookmarksSortMode.nameDescending.isReorderingEnabled)
+    }
 }