Fix bookmark folder being able to be dragger to children folders

duckduckgo · Jul 23, 2024 · 9133780 · 9133780
1 parent b3e528d
commit 9133780
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift b/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift
@@ -271,7 +271,7 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
         let containsDescendantOfDestination = draggedFolders.contains { draggedFolder in
             let folder = BookmarkFolder(id: draggedFolder.id, title: draggedFolder.name, parentFolderUUID: draggedFolder.parentFolderUUID, children: draggedFolder.children)
 
-            guard let draggedNode = treeController.node(representing: folder) else {
+            guard let draggedNode = treeController.findNodeWithId(representing: folder) else {
                 return false
             }
 

diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkTreeController.swift b/DuckDuckGo/Bookmarks/Model/BookmarkTreeController.swift
@@ -70,7 +70,7 @@ final class BookmarkTreeController {
         return nodeInArrayRepresentingObject(nodes: [rootNode]) { $0.representedObjectEquals(object) }
     }
 
-    func findNodeInSearchMode(representing object: AnyObject) -> BookmarkNode? {
+    func findNodeWithId(representing object: AnyObject) -> BookmarkNode? {
         return nodeInArrayRepresentingObject(nodes: [rootNode]) { $0.representedObjectHasSameId(object) }
     }
 

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift
@@ -548,7 +548,7 @@ final class BookmarkListViewController: NSViewController {
     }
 
     private func expandFoldersAndScrollUntil(_ folder: BookmarkFolder) {
-        guard let folderNode = treeController.findNodeInSearchMode(representing: folder) else {
+        guard let folderNode = treeController.findNodeWithId(representing: folder) else {
             return
         }