updated

Author: flocked

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

@@ -1,5 +1,5 @@
 //
-//  ViewController.swift
+//  MainViewController.swift
 //
 //
 //  Created by Florian Zand on 19.01.23.

Example/Example/MainViewController.swift

@@ -14,11 +14,11 @@ struct OutlineItem: Hashable, ExpressibleByStringLiteral, CustomStringConvertibl
         self.title = title
     }
 
-    var description: String {
-        title
-    }
-    
     init(stringLiteral value: String) {
         self.title = value
     }
+    
+    var description: String {
+        title
+    }
 }

Example/Example/Model/OutlineItem.swift

@@ -17,7 +17,7 @@ class SidebarItem: NSObject, Identifiable {
         self.title = title
         self.symbolName = symbolName
     }
-
+    
     static let sampleItems1 = [SidebarItem("Messages", symbolName: "message.fill"),
                                       SidebarItem("Photos", symbolName: "photo"),
                                       SidebarItem("Videos", symbolName: "film")]

Example/Example/Model/SidebarItem.swift

@@ -7,12 +7,12 @@
 
 import AppKit
 import AdvancedCollectionTableView
-import FZUIKit
 
 class OutlineSidebarViewController: NSViewController {
     typealias DataSource = OutlineViewDiffableDataSource<OutlineItem>
     typealias CellRegistration = NSTableView.CellRegistration<NSTableCellView, OutlineItem>
 
+
     @IBOutlet var outlineView: NSOutlineView!
 
     lazy var dataSource = DataSource(outlineView: outlineView, cellRegistration: cellRegistration)
@@ -22,34 +22,28 @@ class OutlineSidebarViewController: NSViewController {
     }
 
     lazy var cellRegistration = CellRegistration { tableCell, _, _, outlineItem in
-        var configuration = NSListContentConfiguration.sidebar()
+        var configuration = tableCell.defaultContentConfiguration()
         configuration.text = outlineItem.title
         tableCell.contentConfiguration = configuration
     }
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+                
         outlineView.dataSource = dataSource
+        dataSource.applyGroupItemCellRegistration(cellRegistration)
 
         /// Enables reordering selected rows by dragging them.
         dataSource.reorderingHandlers.canReorder = { _,_ in return true }
 
         /// Enables deleting selected items via backspace key.
         dataSource.deletingHandlers.canDelete = { items in return items }
-        
-        dataSource.droppingHandlers.canDrop = { _,parent in parent == nil }
-        dataSource.droppingHandlers.items = { content,_ in
-            return content.strings.compactMap({ OutlineItem("\($0)")  })
-            
-        }
-        
+
         applySnapshot()
     }
 
     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
@@ -61,7 +55,7 @@ class OutlineSidebarViewController: NSViewController {
             }
         }
         dataSource.apply(snapshot, .withoutAnimation)
-        dataSource.expand(rootItems[0])
+        dataSource.expand(rootItems)
     }
 
     @IBAction func segmentedPressed(_ segmentedControl: NSSegmentedControl) {

Example/Example/OutlineSidebarViewController.swift

@@ -1,19 +1,16 @@
 //
 //  SplitViewController.swift
-//  Example
+//
 //
 //  Created by Florian Zand on 20.01.25.
 //
 
 import Cocoa
-import FZUIKit
 
 class SplitViewController: NSSplitViewController {
-    
     func swapSidebar() {
         splitViewItems[0].isCollapsed = true
         splitViewItems.swapAt(0, 2)
         splitViewItems[0].isCollapsed = false
     }
-    
 }

Example/Example/SplitViewController.swift

@@ -21,9 +21,7 @@ class TableSidebarViewController: NSViewController {
         /// `defaultContentConfiguration` returns a table cell content configuration with default styling based on the table view it's displayed at (in this case a sidebar table).
         var configuration = tableCell.defaultContentConfiguration()
         configuration.text = sidebarItem.title
-     //   configuration.secondaryText = "sdsd\n"
-        configuration.secondaryTextProperties.maximumNumberOfLines = 0
-     //   configuration.image = NSImage(systemSymbolName: sidebarItem.symbolName)
+        configuration.image = NSImage(systemSymbolName: sidebarItem.symbolName)
         if sidebarItem.isFavorite {
             configuration.badge = .symbolImage("star.fill", color: .systemYellow, backgroundColor: nil)
         }
@@ -87,13 +85,3 @@ class TableSidebarViewController: NSViewController {
         segmentedControl.selectedSegment = 0
     }
 }
-
-struct Handlers {
-    var options: ((_ draggingInfo: any NSDraggingInfo)->(NSSpringLoadingOptions))?
-}
-
-protocol AAAAa {
-    
-    func options(_ draggingInfo: any NSDraggingInfo) -> NSSpringLoadingOptions
-    
-}

Example/Example/TableSidebarViewController.swift

@@ -88,8 +88,12 @@ extension NSTableCellView {
                 if let contentView = contentView as? NSListContentView {
                     textField = contentView.textField
                     imageView = contentView.imageView
+                } else {
+                    textField = nil
+                    imageView = nil
                 }
                  */
+                 
             }
             setNeedsDisplay()
             contentView?.setNeedsDisplay()
@@ -232,7 +236,15 @@ extension NSTableCellView {
     }
 
     var isGroupRowCell: Bool {
-        rowView?.isGroupRowStyle == true
+        guard let rowView = rowView else { return false }
+        let isGroup = rowView.identifier != "_GroupCellRowView" ? rowView.isGroupRowStyle : (rowView.superview as? NSTableRowView)?.isGroupRowStyle == true
+        if isGroup, rowView.superview is NSTableRowView {
+            if let contentView = contentView as? NSListContentView {
+                Swift.print("CHECK",   contentView.textField.stringValue, textField != nil)
+              
+            }
+        }
+        return rowView.identifier != "_GroupCellRowView" ? rowView.isGroupRowStyle : (rowView.superview as? NSTableRowView)?.isGroupRowStyle == true
     }
 
     var isReordering: Bool {

Sources/AdvancedCollectionTableView/Configuration/Extensions/NSTableView+/NSTableCellVew+.swift

@@ -241,7 +241,7 @@ extension NSTableRowView {
         set { setAssociatedValue(newValue, key: "isSelectedObservation") }
     }
 
-    func observeRowView() {
+    public func observeRowView() {
         observeSelection()
         if contentConfiguration != nil || configurationUpdateHandler != nil {
             guard tableViewObservation == nil else { return }

Sources/AdvancedCollectionTableView/Configuration/Extensions/NSTableView+/NSTableRowView+.swift

@@ -102,7 +102,7 @@ open class CollectionViewDiffableDataSource<Section: Identifiable & Hashable, El
                     }
                     return menu
                 }
-            } else {
+            } else if oldValue != nil {
                 collectionView.menuProvider = nil
             }
         }
@@ -123,7 +123,7 @@ open class CollectionViewDiffableDataSource<Section: Identifiable & Hashable, El
                     guard let self = self, let handler = self.rightClickHandler else { return }
                     handler(self.collectionView.rightClickIndexPaths(for: event).compactMap({ self.element(for:$0) }))
                 }
-            } else {
+            } else if oldValue != nil {
                 collectionView.mouseHandlers.rightDown = nil
             }
         }