updated

Author: flocked

Example/Example/OutlineSidebarViewController.swift

@@ -25,9 +25,11 @@ class OutlineSidebarViewController: NSViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        
         outlineView.dataSource = dataSource
 
+        dataSource.applyHeaderRegistration(cellRegistration)
+        
         /// Enables reordering selected rows by dragging them.
         dataSource.reorderingHandlers.canReorder = { _, _ in return true }
 
@@ -39,9 +41,10 @@ class OutlineSidebarViewController: NSViewController {
 
     func applySnapshot() {
         var snapshot = dataSource.emptySnapshot()
+        
         let rootItems: [OutlineItem] = ["Root 1", "Root 2", "Root 3", "Root 4", "Root 5"]
         snapshot.append(rootItems)
-
+        
         rootItems.forEach { rootItem in
             let childItems = (1...5).map { OutlineItem("\(rootItem.title).\($0)") }
             snapshot.append(childItems, to: rootItem)

Example/Example/SidebarViewController.swift

@@ -38,6 +38,7 @@ class TableSidebarViewController: NSViewController {
         super.viewDidLoad()
 
         tableView.dataSource = dataSource
+        dataSource.applySectionHeaderRegistration(sectionHeaderRegistration)
 
         /// Enables reordering selected rows by dragging them.
         dataSource.reorderingHandlers.canReorder = { selectedItems in return selectedItems }

Sources/AdvancedCollectionTableView/Configuration/Configurations/NSItemContentConfiguration/NSItemContentView.swift

@@ -15,7 +15,7 @@ import FZUIKit
 
  A item content view relies on its item content configuration to supply its styling and content. You create a item content view by passing in a ``NSItemContentConfiguration`` to ``init(configuration:)``. To update the content view, you set a new configuration on it through its ``configuration`` property.
 
- If you’re using a ``AppKit/NSCollectionView`` or ``AppKit/NSTableView``, you don’t need to manually create a item content view to take advantage of the item configuration. Instead, you assign a ``NSItemContentConfiguration`` to the ``AppKit/NSCollectionViewItem/contentConfiguration`` property of the collection view items or table view cells.
+ If you’re using a [NSCollectionView](https://developer.apple.com/documentation/appkit/nscollectionview) or [NSTableView](https://developer.apple.com/documentation/appkit/nstableview), you don’t need to manually create a item content view to take advantage of the item configuration. Instead, you assign a ``NSItemContentConfiguration`` to the ``AppKit/NSCollectionViewItem/contentConfiguration`` property of the collection view items or table view cells.
  */
 open class NSItemContentView: NSView, NSContentView, EditingContentView {
 

Sources/AdvancedCollectionTableView/Configuration/Configurations/NSListContentConfiguration/NSListContentView.swift

@@ -16,7 +16,7 @@ import FZUIKit
 
  A list content view relies on its list content configuration to supply its styling and content. You create a list content view by passing in a ``NSListContentConfiguration`` to ``init(configuration:)``. To update the content view, you set a new configuration on it through its ``configuration`` property.
 
- If you’re using a ``AppKit/NSTableView`` or ``AppKit/NSCollectionView``, you don’t need to manually create a list content view to take advantage of the list configuration. Instead, you assign a ``NSListContentConfiguration`` to the ``AppKit/NSTableCellView/contentConfiguration`` property of the table view cells or collection view items.
+ If you’re using a [NSTableView](https://developer.apple.com/documentation/appkit/nstableview) or [NSCollectionView](https://developer.apple.com/documentation/appkit/nscollectionview), you don’t need to manually create a list content view to take advantage of the list configuration. Instead, you assign a ``NSListContentConfiguration`` to the ``AppKit/NSTableCellView/contentConfiguration`` property of the table view cells or collection view items.
  */
 open class NSListContentView: NSView, NSContentView, EditingContentView {
 

Sources/AdvancedCollectionTableView/Configuration/Configurations/Shared/TextProperties.swift

@@ -108,11 +108,11 @@ public struct TextProperties {
     public var color: NSUIColor = .labelColor
 
     /// The color transformer for resolving the text color.
-    public var colorTansform: ColorTransformer?
+    public var colorTransformer: ColorTransformer?
 
     /// Generates the resolved text color, using the text color and color transformer.
     public func resolvedColor() -> NSUIColor {
-        colorTansform?(color) ?? color
+        colorTransformer?(color) ?? color
     }
 
     /// The tooltip of the text. If set to to an empty string, the text of the textfield is used.
@@ -125,7 +125,7 @@ public struct TextProperties {
     var bezel: BezelType = .none
 
     /// The text field bezel.
-    public enum BezelType: Int, Hashable {
+    enum BezelType: Int, Hashable {
         /// Square bezel.
         case square
         /// Rounded bezel.
@@ -263,7 +263,7 @@ extension TextProperties: Hashable {
         hasher.combine(isEditable)
         hasher.combine(isSelectable)
         hasher.combine(color)
-        hasher.combine(colorTansform)
+        hasher.combine(colorTransformer)
         hasher.combine(numberFormatter)
         hasher.combine(adjustsFontSizeToFitWidth)
         hasher.combine(minimumScaleFactor)

Sources/AdvancedCollectionTableView/DiffableDataSource/NSCollectionView/CollectionViewDiffableDataSource.swift

@@ -15,8 +15,8 @@ import QuickLookUI
  A  `NSCollectionViewDiffableDataSource` with additional functionality.
 
  The diffable data source provides:
- - Reordering elements via ``ReorderingHandlers-swift.struct``.
- - Deleting elements via  ``DeletingHandlers-swift.struct``.
+ - Reordering elements via ``reorderingHandlers-swift.property``.
+ - Deleting elements via  ``deletingHandlers-swift.property``.
  - Quicklook previews of elements via spacebar by providing elements conforming to `QuicklookPreviewable`.
  - A right click menu for selected elements via ``menuProvider``.
 
@@ -27,7 +27,6 @@ import QuickLookUI
  - Highlighting elements via ``highlightHandlers-swift.property``.
  - Displaying elements via ``displayHandlers-swift.property``.
  - Hovering elements by mouse via ``hoverHandlers-swift.property``.
- - Pinching of the collection view via ``pinchHandler``.
 
  ### Configurating the data source
 

Sources/AdvancedCollectionTableView/DiffableDataSource/NSOutlineView/OutlineItem.swift

@@ -0,0 +1,33 @@
+//
+//  OutlineItem.swift
+//  
+//
+//  Created by Florian Zand on 20.01.25.
+//
+
+/*
+import AppKit
+
+public protocol OutlineItem {
+    var isGroupRow: Bool { get }
+    func makeCellView(_ outlineView: NSOutlineView, forColumn tableCoulmn: NSTableColumn, row: Int) -> NSView
+}
+extension OutlineItem {
+    public var isGroupRow: Bool {
+        false
+    }
+}
+
+extension OutlineViewDiffableDataSource {
+    public convenience init(outlineView: NSOutlineView) where ItemIdentifierType: OutlineItem {
+        self.init(outlineView: outlineView, cellProvider: {
+            outlineView, column, item in
+            item.makeCellView(outlineView, forColumn: column ?? .outline, row: 0)
+        })
+    }
+}
+
+fileprivate extension NSTableColumn {
+    static let outline = NSTableColumn()
+}
+*/

Sources/AdvancedCollectionTableView/DiffableDataSource/NSOutlineView/OutlineViewDiffableDataSource+Delegate.swift

@@ -124,7 +124,15 @@ extension OutlineViewDiffableDataSource {
         }
 
         func outlineView(_ outlineView: NSOutlineView, viewFor tableColumn: NSTableColumn?, item: Any) -> NSView? {
-            dataSource.cellProvider(outlineView, tableColumn, item as! ItemIdentifierType)
+            if self.outlineView(outlineView, isGroupItem: item), let headerCellProvider = dataSource.headerCellProvider {
+                return headerCellProvider(outlineView, tableColumn, item as! ItemIdentifierType)
+            }
+            return dataSource.cellProvider(outlineView, tableColumn, item as! ItemIdentifierType)
+        }
+        
+        func outlineView(_ outlineView: NSOutlineView, isGroupItem item: Any) -> Bool {
+            guard let item = item as? ItemIdentifierType, dataSource.headerCellProvider != nil else { return false }
+            return dataSource.currentSnapshot.groupItems.contains(item)
         }
 
         init(_ dataSource: OutlineViewDiffableDataSource!) {

Sources/AdvancedCollectionTableView/DiffableDataSource/NSOutlineView/OutlineViewDiffableDataSource.swift

@@ -14,12 +14,11 @@ import FZSwiftUtils
  The object you use to manage data and provide items for a outline view.
 
  The diffable data source provides:
- - Expanding/collapsing items via ``ExpansionHandlers-swift.struct``.
- - Reordering items via ``ReorderingHandlers-swift.struct``.
- - Deleting items via  ``DeletingHandlers-swift.struct``.
+ - Expanding/collapsing items via ``expanionHandlers-swift.property``.
+ - Reordering items via ``reorderingHandlers-swift.property``.
+ - Deleting items via  ``deletingHandlers-swift.property``.
  - Quicklook previews of items via spacebar by providing items conforming to `QuicklookPreviewable`.
  - Right click menu provider for selected items via ``menuProvider``.
- - Row action provider via ``rowActionProvider``.
 
  __It includes handlers for:__
 
@@ -54,7 +53,7 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
     var draggedIndexes: [Int] = []
 
     /// The closure that configures and returns the outline view’s row views from the diffable data source.
-    open var rowViewProvider: RowProvider?
+    open var rowViewProvider: RowViewProvider?
 
     /**
      A closure that configures and returns a row view for a outline view from its diffable data source.
@@ -66,7 +65,7 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
 
      - Returns: A configured row view object.
      */
-    public typealias RowProvider = (_ outlineView: NSOutlineView, _ row: Int, _ item: ItemIdentifierType) -> NSTableRowView
+    public typealias RowViewProvider = (_ outlineView: NSOutlineView, _ row: Int, _ item: ItemIdentifierType) -> NSTableRowView
 
     /// Applies the row view registration to configure and return outline row views.
     open func applyRowViewRegistration<Row: NSTableRowView>(_ registration: NSTableView.RowRegistration<Row, ItemIdentifierType>) {
@@ -75,6 +74,19 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
         }
     }
 
+    open var headerCellProvider: HeaderCellProvider?
+    
+    /// Uses the specified cell registration to configure and return section header cell views.
+    open func applyHeaderRegistration<Cell: NSTableCellView>(_ registration: NSTableView.CellRegistration<Cell, ItemIdentifierType>) {
+        headerCellProvider = { outlineView, column, item in
+            outlineView.makeCellView(using: registration, forColumn: column ?? .outline, row: 0, item: item)!
+        }
+    }
+    
+    /// ``ExpanionHandlers-swift.struct`` ``expanionHandlers-swift.property``
+    public typealias HeaderCellProvider = (_ outlineView: NSOutlineView, _ tableColumn: NSTableColumn?, _ identifier: ItemIdentifierType) -> NSView
+
+    
     /**
      The right click menu provider.
 
@@ -548,7 +560,7 @@ public class OutlineViewDiffableDataSource<ItemIdentifierType: Hashable>: NSObje
         guard let item = item as? ItemIdentifierType else { return nil }
         return NSPasteboardItem(forItem: item)
     }
-
+    
     /// Handlers for selecting items.
     public struct ExpanionHandlers {
         /// The handler that determines if an item should expand. The default value is `nil` which indicates that all items should expand.

Sources/AdvancedCollectionTableView/DiffableDataSource/NSOutlineView/Snapshot/OutlineViewDiffableDataSourceSnapshot+OutlineItem.swift

@@ -5,9 +5,11 @@
 //  Created by Florian Zand on 09.01.25.
 //
 
+/*
 import AppKit
 import FZSwiftUtils
 
+
 extension OutlineViewDiffableDataSourceSnapshot where ItemIdentifierType: ExpandingOutlineItem {
     public mutating func append(_ items: [ItemIdentifierType], to parent: ItemIdentifierType? = nil) {
         validateItems(items + items.flatMap({ $0.descendants() }))
@@ -76,3 +78,4 @@ extension ExpandingOutlineItem {
         return nodes
     }
 }
+*/

Sources/AdvancedCollectionTableView/DiffableDataSource/NSOutlineView/Snapshot/OutlineViewDiffableDataSourceSnapshot.swift

@@ -32,7 +32,8 @@ public struct OutlineViewDiffableDataSourceSnapshot<ItemIdentifierType: Hashable
     struct Node {
         var parent: ItemIdentifierType?
         var children: [ItemIdentifierType] = []
-        var isExpanded: Bool = false
+        var isExpanded = false
+        var isGroup = false
     }
 
     // MARK: - Creating a snapshot
@@ -294,6 +295,8 @@ public struct OutlineViewDiffableDataSourceSnapshot<ItemIdentifierType: Hashable
         items.forEach({ nodes[$0]?.isExpanded = false })
     }
 
+    var groupItems: [ItemIdentifierType] = []
+    
     /// Returns a string with an ASCII representation of the snapshot.
     public func visualDescription() -> String {
         var result = "OutlineViewDiffableDataSourceSnapshot<\(String(describing: ItemIdentifierType.self))>\n"

Sources/AdvancedCollectionTableView/DiffableDataSource/NSTableView/TableViewDiffableDataSource.swift

@@ -92,7 +92,7 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
 
 
     /// The closure that configures and returns the table view’s row views from the diffable data source.
-    open var rowViewProvider: RowProvider? {
+    open var rowViewProvider: RowViewProvider? {
         didSet {
             if let rowViewProvider = rowViewProvider {
                 dataSource.rowViewProvider = { [weak self] tableview, row, identifier in
@@ -115,7 +115,7 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
 
      - Returns: A configured row view object.
      */
-    public typealias RowProvider = (_ tableView: NSTableView, _ row: Int, _ item: Item) -> NSTableRowView
+    public typealias RowViewProvider = (_ tableView: NSTableView, _ row: Int, _ item: Item) -> NSTableRowView
 
     /// Applies the row view registration to configure and return table row views.
     open func applyRowViewRegistration<Row: NSTableRowView>(_ registration: NSTableView.RowRegistration<Row, Item>) {
@@ -338,6 +338,7 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
         })
     }
 
+    /*
     /**
      Creates a diffable data source with the specified cell registration, and connects it to the specified table view.
 
@@ -350,15 +351,16 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
      - Parameters:
         - tableView: The initialized table view object to connect to the diffable data source.
         - cellRegistration: A cell registration which returns each of the cells for the table view from the data the diffable data source provides.
-        - sectionRegistration: A cell registration which returns each of the table view’s section header views from the data the diffable data source provides.
+        - sectionHeaderRegistration: A cell registration which returns each of the table view’s section header views from the data the diffable data source provides.
      */
     public convenience init<Cell: NSTableCellView, SectionCell: NSTableCellView>(tableView: NSTableView, cellRegistration: NSTableView.CellRegistration<Cell, Item>, sectionHeaderRegistration: NSTableView.CellRegistration<SectionCell, Section>) {
         self.init(tableView: tableView, cellProvider: {
             tableView, column, row, item in
             return tableView.makeCellView(using: cellRegistration, forColumn: column, row: row, item: item)!
         })
         applySectionHeaderRegistration(sectionHeaderRegistration)
-        }
+    }
+    */
 
     /**
      Creates a diffable data source with the specified cell registrations, and connects it to the specified table view.
@@ -383,6 +385,27 @@ open class TableViewDiffableDataSource<Section, Item>: NSObject, NSTableViewData
         })
     }
 
+    /*
+    /**
+     Creates a diffable data source with the specified cell registrations, and connects it to the specified table view.
+     
+     To connect a diffable data source to a table view, you create the diffable data source using this initializer, passing in the table view you want to associate with that data source. You also pass in a cell registration, where each of your cells gets determine how to display your data in the UI.
+     
+     ```swift
+     dataSource = TableViewDiffableDataSource<Section, Item>(tableView: tableView, cellRegistrations: cellRegistrations)
+     ```
+     
+     - Parameters:
+        - tableView: The initialized table view object to connect to the diffable data source.
+        - cellRegistrations: Cell registrations which returns each of the cells for the table view from the data the diffable data source provides.
+        - sectionHeaderRegistration: A cell registration which returns each of the table view’s section header views from the data the diffable data source provides.
+     */
+    public convenience init<SectionCell: NSTableCellView>(tableView: NSTableView, cellRegistrations: [NSTableViewCellRegistration], sectionHeaderRegistration: NSTableView.CellRegistration<SectionCell, Section>) {
+        self.init(tableView: tableView, cellRegistrations: cellRegistrations)
+        applySectionHeaderRegistration(sectionHeaderRegistration)
+    }
+    */
+    
     /**
      Creates a diffable data source with the specified cell provider, and connects it to the specified table view.
 

Sources/AdvancedCollectionTableView/Documentation/AdvancedCollectionTableView.docc/AdvancedCollectionTableView.md

@@ -8,13 +8,19 @@ A collection of classes and extensions for `NSCollectionView` and `NSTableView`,
 
 ## Topics
 
-### Data Sources
+### Collection- & TableView Data Sources
 
 - ``CollectionViewDiffableDataSource``
 - ``TableViewDiffableDataSource``
 - ``DiffableDataSourceTransaction``
 - ``NSDiffableDataSourceSnapshotApplyOption``
 
+### OutlineView Data Source
+
+- ``OutlineViewDiffableDataSource``
+- ``OutlineViewDiffableDataSourceSnapshot``
+- ``OutlineViewDiffableDataSourceTransaction``
+
 ### CollectionView Registration
 
 - ``AppKit/NSCollectionView/ItemRegistration``
@@ -24,7 +30,6 @@ A collection of classes and extensions for `NSCollectionView` and `NSTableView`,
 
 - ``AppKit/NSTableView/CellRegistration``
 - ``AppKit/NSTableView/RowRegistration``
-- ``AppKit/NSTableView/SectionHeaderRegistration``
 
 ### Item Content Configuration
 
@@ -53,5 +58,4 @@ A collection of classes and extensions for `NSCollectionView` and `NSTableView`,
 - <doc:NSTableCellView+>
 - <doc:NSTableRowView+>
 - <doc:NSTableViewDiffableDataSource+>
-- ``NSTableSectionHeaderView``
 - ``NSTableViewCellRegistration``

Sources/AdvancedCollectionTableView/Documentation/AdvancedCollectionTableView.docc/Extensions/AppKit Extensions/NSCollecionView/NSCollectionViewItem+.md

@@ -22,7 +22,3 @@ Extensions for `NSCollectionViewItem`.
 - ``AppKit/NSCollectionViewItem/updateConfiguration(using:)``
 - ``AppKit/NSCollectionViewItem/configurationUpdateHandler-swift.property``
 - ``AppKit/NSCollectionViewItem/ConfigurationUpdateHandler-swift.typealias``
-
-### Managing the view
-
-- ``AppKit/NSCollectionViewItem/loadView()``

Sources/AdvancedCollectionTableView/Documentation/AdvancedCollectionTableView.docc/Extensions/AppKit Extensions/NSTableView/NSTableViewDiffableDataSource+.md

@@ -13,7 +13,7 @@ Extensions for `NSTableViewDiffableDataSource`.
 
 ### Creating Section Views
 
-- ``AppKit/NSTableViewDiffableDataSource/useSectionHeaderViewRegistration(_:)``
+- ``applySectionHeaderViewRegistration(_:)``
 
 ### Updating data