updated

Author: flocked

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

@@ -25,7 +25,7 @@
       "location" : "https://github.com/flocked/FZUIKit.git",
       "state" : {
         "branch" : "main",
-        "revision" : "2d9103d4c655594313d77b220191afe9ca6de036"
+        "revision" : "b7587758799644fec18437527526b5f964a8900e"
       }
     }
   ],

Example/Example/TableSidebarViewController.swift

@@ -46,15 +46,6 @@ class TableSidebarViewController: NSViewController {
         /// Enables deleting selected rows via backspace key.
         dataSource.deletingHandlers.canDelete = { selectedItems in return selectedItems  }
 
-        dataSource.draggingHandlers.canDrag = { items in return true }
-        dataSource.draggingHandlers.pasteboardContent = { item in return ["Fun"] }
-        
-        dataSource.droppingHandlers.canDrop = { !$0.content.strings.isEmpty }
-        dataSource.droppingHandlers.items = { $0.content.strings.compactMap({ SidebarItem($0, symbolName: "photo") }) }
-        dataSource.droppingHandlers.didDrop = { dropInfo, items, transaction in
-            Swift.print("didDrop")
-        }
-        
         /// Swipe row actions for deleting and favoriting an item.
         dataSource.rowActionProvider = { swippedItem, edge in
             if edge == .leading {

Sources/AdvancedCollectionTableView/Configuration/Configurations/NSListContentConfiguration/Accessory/Accessories/TextStackAccessory.swift

@@ -112,7 +112,5 @@ struct TextStackAccessory {
     public var trailingTextProperties: TextProperties = .primary
 
     /// The spacing between the leading and trailing text.
-    public var leadingToTrailingTextSpacing: CGFloat = 4.0
-    
-    var trailingText: String?
+    public var leadingToTrailingTextSpacing: CGFloat = 4.0    
 }

Sources/AdvancedCollectionTableView/DiffableDataSource/NSCollectionView/CollectionViewDiffableDataSource.swift

@@ -1074,7 +1074,7 @@ open class CollectionViewDiffableDataSource<Section: Identifiable & Hashable, El
         public var animates: Bool = true
 
         /// A Boolean value that indicates whether the items for the proposed drop elements are previewed.
-        public var previewDroppedElements = true
+        public var previewDroppedElements = false
 
         /// The handler that determines whether the proposed drop can be dropped to an element.
         public var canDropInto: ((_ dropInfo: DropInfo, _ element: Element) -> Bool)?

Sources/AdvancedCollectionTableView/DiffableDataSource/NSOutlineView/OutlineViewDiffableDataSource.swift

@@ -1060,7 +1060,7 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
         public var animates: Bool = false
 
         /// A Boolean value that indicates whether the rows for the proposed drop items are previewed.
-        public var previewDroppedItems = true
+        public var previewDroppedItems = false
 
         /// A Boolean value that indicates whether the dropped items are previewed.
         public var previewItems = true

Sources/AdvancedCollectionTableView/DiffableDataSource/NSTableView/TableViewDiffableDataSource.swift

@@ -320,9 +320,7 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
     public func previewImage(for item: Item) -> NSImage? {
         let columns = tableView.tableColumns
         guard !columns.isEmpty else { return nil }
-        
-        Swift.print("previewImage", columns.count, columns.compactMap({ previewImage(for: item, tableColumn: $0, useColumnWidth: $0 !== columns.last!)?.size}).alignHorizontal(alignment: .top), NSImage(combineHorizontalAlt: columns.compactMap({ previewImage(for: item, tableColumn: $0, useColumnWidth: $0 !== columns.last!) }), alignment: .top)?.size ?? "nil")
-        return NSImage(combineHorizontalAlt: columns.compactMap({ previewImage(for: item, tableColumn: $0, useColumnWidth: $0 !== columns.last!) }), alignment: .top)
+        return NSImage(combineHorizontal: columns.compactMap({ previewImage(for: item, tableColumn: $0, useColumnWidth: $0 !== columns.last!) }), alignment: .top)
     }
 
     /// Returns a preview image of the table cell for the specified item and table column.
@@ -332,8 +330,7 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
 
     /// Returns a preview image of the table row for the specified items.
     public func previewImage(for items: [Item]) -> NSImage? {
-        Swift.print("previewImage", items.count)
-        return NSImage(combineVerticalAlt: items.compactMap({ previewImage(for: $0)}).reversed(), alignment: .left)
+        return NSImage(combineVertical: items.compactMap({ previewImage(for: $0)}).reversed(), alignment: .left)
     }
 
     private func previewImage(for item: Item, tableColumn: NSTableColumn, useColumnWidth: Bool) -> NSImage? {
@@ -1309,7 +1306,7 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
         public var animates: Bool = true
 
         /// A Boolean value that indicates whether the rows for the proposed drop items are previewed.
-        public var previewDroppedItems = true
+        public var previewDroppedItems = false
 
         /// The handler that determines whether the proposed drop can be dropped to an item.
         public var canDropInto: ((_ dropInfo: DropInfo, _ item: Item) -> Bool)?
@@ -1468,47 +1465,3 @@ extension CGRect {
         return sqrt(dx * dx + dy * dy)
     }
 }
-
-extension NSUIImage {
-    /**
-     Creates a new image by combining the specified images.
-     
-     - Parameters:
-        - images: The images to combine.
-        - orientation: The orientation of the images when combining them.
-        - alignment: The alignment of the images when combining them.
-     - Returns: The combined images, or `nil` if the images couldn't be combined.
-     */
-    public convenience init?(combineVerticalAlt images: [NSUIImage], alignment: HorizontalAlignment = .center) {
-        guard let image = NSUIImage.combined(images: images, vertical: true, alignment: alignment.rawValue) else { return nil }
-        self.init(size: image.size)
-        lockFocus()
-        defer { unlockFocus() }
-        image.draw(at: .zero, from: CGRect(origin: .zero, size: image.size), operation: .copy, fraction: 1.0)
-    }
-    
-    public convenience init?(combineHorizontalAlt images: [NSUIImage], alignment: VerticalAlignment = .center) {
-        guard let image = NSUIImage.combined(images: images, vertical: false, alignment: alignment.rawValue) else { return nil }
-        self.init(size: image.size)
-        lockFocus()
-        defer { unlockFocus() }
-        image.draw(at: .zero, from: CGRect(origin: .zero, size: image.size), operation: .copy, fraction: 1.0)
-    }
-    
-    private static func combined(images: [NSUIImage], vertical: Bool, alignment: Int) -> NSUIImage? {
-        guard !images.isEmpty else { return nil }
-        let rects = vertical ? images.map({$0.size}).alignVertical(alignment: .init(rawValue: alignment)!) : images.map({$0.size}).alignHorizontal(alignment: .init(rawValue: alignment)!)
-        let finalImage = NSUIImage(size: rects.union().size)
-        finalImage.lockFocus()
-        defer { finalImage.unlockFocus() }
-        var currentPoint: CGPoint = .zero
-        for value in zip(images, rects) {
-            let image = value.0
-            let drawRect = value.1
-            image.draw(in: drawRect)
-            currentPoint = vertical ? CGPoint(x: currentPoint.x, y: currentPoint.y + image.size.height) : CGPoint(x: currentPoint.x + image.size.width, y: currentPoint.y)
-        }
-        Swift.print("combined", finalImage.size, vertical, alignment, images.compactMap({$0.size}), rects, rects.union().size, NSGraphicsContext.current?.imageInterpolation.rawValue)
-        return finalImage
-    }
-}