updated

Author: flocked

Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -165,16 +165,15 @@ extension CollectionViewDiffableDataSource {
 
         func validateDropInto(_ draggingInfo: NSDraggingInfo, _ proposedIndexPath: IndexPath) -> NSDragOperation {
             guard dataSource.droppingHandlers.isDroppableInto, let handler = dataSource.droppingHandlers.canDropInto, let element = dataSource.element(for: proposedIndexPath) else { return [] }
-            let content = draggingInfo.draggingPasteboard.content
-            dropIntoElement = !content.isEmpty && handler(content, element) ? element : nil
+            dropIntoElement = handler(draggingInfo.dropInfo(for: dataSource.collectionView), element) ? element : nil
             return dropIntoElement != nil ? .copy : []
         }
 
         func validateDrop(_ draggingInfo: NSDraggingInfo) -> NSDragOperation {
             guard let canDrop = dataSource.droppingHandlers.canDrop, let elementsHandler = dataSource.droppingHandlers.elements else { return [] }
-            let content = draggingInfo.draggingPasteboard.content
-            if !content.isEmpty && canDrop(content) {
-                droppingElements = elementsHandler(content)
+            let dropInfo = draggingInfo.dropInfo(for: dataSource.collectionView)
+            if canDrop(dropInfo) {
+                droppingElements = elementsHandler(dropInfo)
             }
             return !droppingElements.isEmpty ? .copy : []
         }
@@ -238,6 +237,7 @@ extension CollectionViewDiffableDataSource {
         }
 
         func collectionView(_ collectionView: NSCollectionView, acceptDrop draggingInfo: NSDraggingInfo, indexPath: IndexPath, dropOperation: NSCollectionView.DropOperation) -> Bool {
+            let dropInfo = draggingInfo.dropInfo(for: dataSource.collectionView)
             if draggingInfo.draggingSource as? NSCollectionView === collectionView {
                 guard !draggingElements.isEmpty else { return false }
                 if dropOperation == .before {
@@ -252,16 +252,14 @@ extension CollectionViewDiffableDataSource {
                     return false
                 }
             } else if dropOperation == .on, let element = dropIntoElement {
-                let content = draggingInfo.draggingPasteboard.content
-                dataSource.droppingHandlers.didDropInto?(content, element)
+                dataSource.droppingHandlers.didDropInto?(dropInfo, element)
                 return true
             } else if dropOperation == .before, !droppingElements.isEmpty {
-                let content = draggingInfo.draggingPasteboard.content
                 let transaction: DiffableDataSourceTransaction<Section, Element> = dataSource.dropTransaction(droppingElements, indexPath: indexPath)
-                dataSource.droppingHandlers.willDrop?(content, droppingElements, transaction)
+                dataSource.droppingHandlers.willDrop?(dropInfo, droppingElements, transaction)
                 dataSource.apply(transaction.finalSnapshot, dataSource.droppingHandlers.animates ? .animated : .withoutAnimation)
                 dataSource.selectElements(droppingElements, scrollPosition: [])
-                dataSource.droppingHandlers.didDrop?(content, droppingElements, transaction)
+                dataSource.droppingHandlers.didDrop?(dropInfo, droppingElements, transaction)
                 return true
             }
             return false

Sources/AdvancedCollectionTableView/DiffableDataSource/NSCollectionView/CollectionViewDiffableDataSource+Delegate.swift

@@ -994,41 +994,40 @@ open class CollectionViewDiffableDataSource<Section: Identifiable & Hashable, El
 
     /// Handlers for dragging pasteboard items inside the collection view.
     public struct DroppingHandlers {
-        public var canDropInto: ((_ content: [PasteboardReading], _ element: Element) -> (Bool))?
-        public var didDropInto: ((_ content: [PasteboardReading], _ element: Element)->())?
+        /// The handler that determines whether the proposed drop can be dropped to an element.
+        public var canDropInto: ((_ dropInfo: DropInfo, _ element: Element) -> Bool)?
+        /// The handler that gets called when pasteboard content is dropped to an element.
+        public var didDropInto: ((_ dropInfo: DropInfo, _ element: Element)->())?
         var isDroppableInto: Bool {
             canDropInto != nil && didDropInto != nil
         }
-
 
         /**
-         The handler that determines the elements to be inserted for the dropping pasteboard content.
+         The handler that determines whether the pasteboard content can be dropped to the collection view.
 
-         - Parameters:
-            - content: The content of the dropping pasteboard.
-            - target: The target element of the drop.
+         - Parameter dropInfo: The information about the proposed drop.
          */
-        public var canDrop: ((_ content: [PasteboardReading]) -> (Bool))?
+        public var canDrop: ((_ dropInfo: DropInfo) -> Bool)?
         /**
          The handler that gets called when pasteboard content is about to drop inside the collection view.
 
          - Parameters:
-            - content: The content of the dropping pasteboard.
-            - target: The target element of the drop.
-            - transaction: The transaction for the drop, if new elements are provided via ``elements``.
+            - dropInfo: The information about the drop.
+            - newElements: The new elements to be inserted for the drop.
+            - transaction: The transaction for the drop.
          */
-        public var willDrop: ((_ content: [PasteboardReading], _ newElements: [Element], _ transaction: DiffableDataSourceTransaction<Section, Element>) -> ())?
+        public var willDrop: ((_ dropInfo: DropInfo, _ newElements: [Element], _ transaction: DiffableDataSourceTransaction<Section, Element>) -> ())?
         /**
          The handler that gets called when pasteboard content was dropped inside the collection view.
 
          - Parameters:
-            - content: The content of the pasteboard.
-            - target: The target element of the drop.
-            - transaction: The transaction for the drop, if new elements are provided via ``elements``.
+            - dropInfo: The information about the drop.
+            - newElements: The new elements that have be inserted for the drop.
+            - transaction: The transaction for the drop.
          */
-        public var didDrop: ((_ content: [PasteboardReading], _ newElements: [Element], _ transaction: DiffableDataSourceTransaction<Section, Element>) -> ())?
-        /// The handler that determinates the elements for the dropping pasteboard content.
-        public var elements: ((_ content: [PasteboardReading]) -> ([Element]))?
+        public var didDrop: ((_ dropInfo: DropInfo, _ newElements: [Element], _ transaction: DiffableDataSourceTransaction<Section, Element>) -> ())?
+        /// The handler that determinates the elements for the proposed drop.
+        public var elements: ((_ dropInfo: DropInfo) -> ([Element]))?
         /// A Boolean value that indicates whether dropping elements is animated.
         public var animates: Bool = true
     }

Sources/AdvancedCollectionTableView/DiffableDataSource/NSCollectionView/CollectionViewDiffableDataSource.swift

@@ -802,8 +802,7 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
             return reorderingHandlers.canReorder?(draggedItems, item as? ItemIdentifierType) ?? true == true ? .move : []
         } else if let canDrop = droppingHandlers.canDrop {
             dropItems = []
-            dropContent = info.draggingPasteboard.content
-            if canDrop(dropContent, item as? ItemIdentifierType), let items = droppingHandlers.items?(dropContent, item as? ItemIdentifierType), !items.isEmpty {
+            if canDrop(info.dropInfo(for: outlineView), item as? ItemIdentifierType), let items = droppingHandlers.items?(info.dropInfo(for: outlineView), item as? ItemIdentifierType), !items.isEmpty {
                 dropItems = items
                 return .move
             }
@@ -835,9 +834,9 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
             var snapshot = snapshot()
             snapshot.insert(dropItems, atIndex: index, of: item as? ItemIdentifierType)
             let transaction = OutlineViewDiffableDataSourceTransaction<ItemIdentifierType>.init(initial: currentSnapshot, final: snapshot)
-            droppingHandlers.willDrop?(dropContent, item as? ItemIdentifierType, dropItems, transaction)
+            droppingHandlers.willDrop?(info.dropInfo(for: outlineView), item as? ItemIdentifierType, dropItems, transaction)
             apply(snapshot, droppingHandlers.animates ? .animated : .withoutAnimation)
-            droppingHandlers.didDrop?(dropContent, item as? ItemIdentifierType, dropItems, transaction)
+            droppingHandlers.didDrop?(info.dropInfo(for: outlineView), item as? ItemIdentifierType, dropItems, transaction)
             return true
         }
         return false
@@ -1014,13 +1013,13 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
     /// Handlers for dropping items inside the outline view.
     public struct DroppingHandlers {
         /// The handler that determines whether a drop with the pasteboard content is accepted.
-        public var canDrop: ((_ content: [PasteboardReading], _ parent: ItemIdentifierType?) -> (Bool))?
+        public var canDrop: ((_ dropInfo: DropInfo, _ parent: ItemIdentifierType?) -> Bool)?
         /// The handler that determinates the items to be inserted for the pasteboard content.
-        public var items: ((_ content: [PasteboardReading], _ parent: ItemIdentifierType?) -> ([ItemIdentifierType]))?
+        public var items: ((_ dropInfo: DropInfo, _ parent: ItemIdentifierType?) -> ([ItemIdentifierType]))?
         /// The handler that gets called before new items are dropped.
-        public var willDrop: ((_ content: [PasteboardReading], _ parent: ItemIdentifierType?, _ newItems: [ItemIdentifierType], _ transaction: OutlineViewDiffableDataSourceTransaction<ItemIdentifierType>) -> ())?
+        public var willDrop: ((_ dropInfo: DropInfo, _ parent: ItemIdentifierType?, _ newItems: [ItemIdentifierType], _ transaction: OutlineViewDiffableDataSourceTransaction<ItemIdentifierType>) -> ())?
         /// The handler that gets called after new items are dropped.
-        public var didDrop: ((_ content: [PasteboardReading], _ parent: ItemIdentifierType?, _ newItems: [ItemIdentifierType], _ transaction: OutlineViewDiffableDataSourceTransaction<ItemIdentifierType>) -> ())?
+        public var didDrop: ((_ dropInfo: DropInfo, _ parent: ItemIdentifierType?, _ newItems: [ItemIdentifierType], _ transaction: OutlineViewDiffableDataSourceTransaction<ItemIdentifierType>) -> ())?
         /// A Boolean value that indicates whether dropping items is animated.
         public var animates: Bool = false
         /// A Boolean value that indicates whether the dropped items are previewed.