updated

Author: flocked

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

@@ -21,10 +21,7 @@ class MainViewController: NSViewController {
     let itemRegistration = ItemRegistration() { collectionViewItem, _, galleryItem in
         /// Configurate the item
         var configuration = NSItemContentConfiguration()
-URL(filePath: <#T##String#>)
         configuration.text = galleryItem.title
-        configuration.textProperties.isSelectable = true
-        configuration.textProperties.isEditable = true
         configuration.secondaryText = galleryItem.detail
         configuration.image = NSImage(named: galleryItem.title)
         configuration.contentProperties.shadow = .black(opacity: 0.5, radius: 5.0)

Example/Example/MainViewController.swift

@@ -21,8 +21,6 @@ class SidebarViewController: 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.textProperties.isSelectable = true
-        configuration.textProperties.isEditable = true
         configuration.image = NSImage(systemSymbolName: sidebarItem.symbolName)
         if sidebarItem.isFavorite {
             configuration.badge = .symbolImage("star.fill", color: .systemYellow, backgroundColor: nil)

Example/Example/SidebarViewController.swift

@@ -94,19 +94,6 @@ open class NSItemContentView: NSView, NSContentView, EditingContentView {
         }
     }
 
-    var isEditing: Bool = false {
-        didSet {
-            guard oldValue != isEditing else { return }
-            if let collectionViewItem = collectionViewItem, collectionViewItem.view == self {
-                collectionViewItem.setNeedsAutomaticUpdateConfiguration()
-            } else if let tableCellView = tableCellView, tableCellView.contentView == self {
-                tableCellView.setNeedsAutomaticUpdateConfiguration()
-            } else if let tableRowView = tableRowView, tableRowView.contentView == self {
-                tableRowView.setNeedsAutomaticUpdateConfiguration()
-            }
-        }
-    }
-
     var tableCellView: NSTableCellView? {
         firstSuperview(for: NSTableCellView.self)
     }

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

@@ -69,22 +69,7 @@ open class NSListContentView: NSView, NSContentView, EditingContentView {
     lazy var imageTextStackView = NSStackView(views: [imageView, textStackView]).orientation(.horizontal).distribution(.fill)
     lazy var badgeStackView = NSStackView(views: [imageTextStackView]).orientation(.horizontal).distribution(.fill).alignment(.centerY)
     var stackViewConstraints: [NSLayoutConstraint] = []
-    
-    var isEditing: Bool = false {
-        didSet {
-            guard oldValue != isEditing else { return }
-            if let tableCellView = tableCellView, tableCellView.contentView == self {
-                tableCellView.setNeedsAutomaticUpdateConfiguration()
-            } else if let tableRowView = tableRowView, tableRowView.contentView == self {
-                tableRowView.setNeedsAutomaticUpdateConfiguration()
-            } else if let collectionViewItem = collectionViewItem {
-                collectionViewItem.setNeedsAutomaticUpdateConfiguration()
-            }
-            // textField.preferredMaxLayoutWidth = isEditing ? bounds.width-34 : 0
-            // secondaryTextField.preferredMaxLayoutWidth = isEditing ? bounds.width-34 : 0
-        }
-    }
-    
+        
     var tableCellView: NSTableCellView? {
         superview as? NSTableCellView
     }

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

@@ -26,13 +26,16 @@ class ListItemTextField: NSTextField, NSTextFieldDelegate {
     static var textField = WidthTextField.wrapping().truncatesLastVisibleLine(true)
 
     var editingContentView: EditingContentView? {
-        firstSuperview(where: { $0 is EditingContentView }) as? EditingContentView
+        firstSuperview(for: NSView.self)
+       // firstSuperview(for: EditingContentView.self)
+        return firstSuperview(where: { $0 is EditingContentView }) as? EditingContentView
     }
 
     var tableCollectionView: NSView? {
-        guard let editingContentView = editingContentView else { return nil }
-        let isTable = editingContentView.superview is NSTableCellView
-        return editingContentView.firstSuperview(for: isTable ? NSTableView.self : NSCollectionView.self)
+        if editingContentView?.superview is NSCollectionView {
+            return editingContentView?.superview
+        }
+        return firstSuperview(for: NSTableView.self)
     }
 
     func updateText(_ text: String?, _ attributedString: AttributedString?, _ placeholder: String? = nil, _ attributedPlaceholder: AttributedString? = nil) {
@@ -105,7 +108,6 @@ class ListItemTextField: NSTextField, NSTextFieldDelegate {
             previousStringValue = isEditing ? stringValue : ""
             editingString = previousStringValue
             focusRingType = isEditing ? .none : .default
-            editingContentView?.isEditing = isEditing
         }
     }
 

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

@@ -15,6 +15,4 @@ extension NSListContentConfiguration: AutomaticHeightSizable { }
 extension NSHostingConfiguration: AutomaticHeightSizable { }
 
 /// Content configuration views with editable text fields.
-protocol EditingContentView: NSView {
-    var isEditing: Bool { get set }
-}
+protocol EditingContentView: NSView { }

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

@@ -40,6 +40,22 @@ extension NSCollectionView {
         set { setAssociatedValue(newValue, key: "collectionViewObserverView") }
     }
 
+    var editingView: NSView? {
+        observerView?.editingView
+    }
+    
+    var activeState: NSItemConfigurationState.ActiveState {
+        isActive ? isFocused ? .focused : .active : .inactive
+    }
+    
+    var isFocused: Bool {
+        observerView?.isFocused == true
+    }
+    
+    var isActive: Bool {
+        window?.isKeyWindow == true
+    }
+    
     /*
     /// A Boolean value that indicates whether the collection view reacts to mouse events.
     @objc open var isEnabled: Bool {
@@ -60,14 +76,14 @@ extension NSCollectionView {
         var isFocused = false {
             didSet {
                 guard oldValue != isFocused else { return }
-                Swift.print("CollectionView isFocused", isFocused)
-                // collectionView?.visibleItems().forEach { $0.setNeedsAutomaticUpdateConfiguration() }
+                collectionView?.visibleItems().forEach { $0.setNeedsAutomaticUpdateConfiguration() }
             }
         }
         weak var editingView: NSView? {
             didSet {
                 guard oldValue != editingView else { return }
-                Swift.print("CollectionView isEditing", editingView != nil)
+                (oldValue?.firstSuperview(where: { $0.parentController is NSCollectionViewItem })?.parentController as? NSCollectionViewItem)?.setNeedsAutomaticUpdateConfiguration()
+                (editingView?.firstSuperview(where: { $0.parentController is NSCollectionViewItem })?.parentController as? NSCollectionViewItem)?.setNeedsAutomaticUpdateConfiguration()
             }
         }
 

Sources/AdvancedCollectionTableView/Configuration/Extensions/NSCollectionView+/NSCollectionView+.swift

@@ -177,7 +177,10 @@ extension NSCollectionViewItem {
      To add your own custom state, see `NSConfigurationStateCustomKey`.
      */
     @objc open var configurationState: NSItemConfigurationState {
-        let state = NSItemConfigurationState(isSelected: isSelected, highlight: highlightState, isEditing: isEditing, isActive: isActive, isHovered: isHovered, isReordering: isReordering, isDropTarget: isDropTarget)
+        let collectionView = _collectionView
+        let activeState = collectionView?.activeState ?? .inactive
+        let isEditing = collectionView?.editingView?.isDescendant(of: view) == true
+        let state = NSItemConfigurationState(isSelected: isSelected, highlight: highlightState, isEditing: isEditing, activeState: activeState, isHovered: isHovered, isReordering: isReordering, isDropTarget: isDropTarget)
         return state
     }
 
@@ -296,18 +299,14 @@ extension NSCollectionViewItem {
     var isEnabled: Bool {
         _collectionView?.isEnabled ?? true
     }
-
+    
     /**
      A Boolean value that indicates whether the item is in an editing state.
 
      The value of this property is `true` when the text of a list or item content configuration is being edited.
      */
     @objc var isEditing: Bool {
-        (view as? EditingContentView)?.isEditing ?? false
-    }
-    
-    @objc var _isEditing: Bool {
-        if let editingView = view.window?.firstResponder as? EditiableView, editingView.isEditing, editingView.isDescendant(of: view) {
+        if let editingView = view.window?.firstResponder as? EditiableView ?? (view.window?.firstResponder as? NSText)?.delegate as? EditiableView, editingView.isEditing, editingView.isDescendant(of: view) {
             return true
         }
         return false

Sources/AdvancedCollectionTableView/Configuration/Extensions/NSCollectionView+/NSCollectionViewItem+.swift

@@ -101,7 +101,10 @@ extension NSTableCellView {
      */
     @objc open var configurationState: NSListConfigurationState {
         let rowView = rowView
-        return NSListConfigurationState(isSelected: rowView?.isSelected ?? false, isEnabled: rowView?.isEnabled ?? true, isHovered: rowView?.isHovered ?? false, isEditing: isEditing, isActive: isActive, isReordering: rowView?.isReordering ?? false, isDropTarget: rowView?.isDropTarget ?? false, isNextSelected: rowView?.isNextRowSelected ?? false, isPreviousSelected: rowView?.isPreviousRowSelected ?? false)
+        let tableView = tableView
+        let activeState = tableView?.activeState ?? .inactive
+        let isEditing = tableView?.editingView?.isDescendant(of: self) == true
+        return NSListConfigurationState(isSelected: rowView?.isSelected ?? false, isEnabled: rowView?.isEnabled ?? true, isHovered: rowView?.isHovered ?? false, isEditing: isEditing, activeState: activeState, isReordering: rowView?.isReordering ?? false, isDropTarget: rowView?.isDropTarget ?? false, isNextSelected: rowView?.isNextRowSelected ?? false, isPreviousSelected: rowView?.isPreviousRowSelected ?? false)
     }
 
     /**
@@ -249,7 +252,10 @@ extension NSTableCellView {
 
     /// A Boolean value that indicates whether the cell is in an editable state. (the text of a content configuration is currently edited).
     @objc var isEditing: Bool {
-        (contentView as? EditingContentView)?.isEditing ?? false
+        if let editingView = window?.firstResponder as? EditiableView ?? (window?.firstResponder as? NSText)?.delegate as? EditiableView, editingView.isEditing, editingView.isDescendant(of: self) {
+            return true
+        }
+        return false
     }
 
     var isNextRowSelected: Bool {

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

@@ -115,7 +115,10 @@ extension NSTableRowView {
      To add your own custom state, see `NSConfigurationStateCustomKey`.
      */
     @objc open var configurationState: NSListConfigurationState {
-        let state = NSListConfigurationState(isSelected: isSelected, isEnabled: isEnabled, isHovered: isHovered, isEditing: isEditing, isActive: isActive, isNextSelected: isNextRowSelected, isPreviousSelected: isPreviousRowSelected)
+        let tableView = tableView
+        let activeState = tableView?.activeState ?? .inactive
+        let isEditing = tableView?.editingView?.isDescendant(of: self) == true
+        let state = NSListConfigurationState(isSelected: isSelected, isEnabled: isEnabled, isHovered: isHovered, isEditing: isEditing, activeState: activeState, isNextSelected: isNextRowSelected, isPreviousSelected: isPreviousRowSelected)
         return state
     }
 
@@ -166,17 +169,29 @@ extension NSTableRowView {
     @objc var isEnabled: Bool {
         tableView?.isEnabled ?? true
     }
-
+    
     /// A Boolean value that indicates whether the row view is in an editable state. (the text of a content configuration is currently edited).
     @objc var isEditing: Bool {
-        (contentView as? EditingContentView)?.isEditing ?? false
+        if let editingView = window?.firstResponder as? EditiableView ?? (window?.firstResponder as? NSText)?.delegate as? EditiableView, editingView.isEditing, editingView.isDescendant(of: self) {
+            return true
+        }
+        return false
     }
 
     /// A Boolean value that specifies whether the row view is active (it's window is focused).
     @objc var isActive: Bool {
         window?.isKeyWindow ?? false
     }
 
+    /// A Boolean value that indicates whether the collection view and it's items are focused.
+    @objc var isTableViewFocused: Bool {
+        tableView?.isDescendantFirstResponder == true
+    }
+    
+    var activeState: NSListConfigurationState.ActiveState {
+        isActive ? isTableViewFocused ? .focused : .active : .inactive
+    }
+    
     @objc var isReordering: Bool {
         get { getAssociatedValue("isReordering") ?? false }
         set { 

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

@@ -42,6 +42,22 @@ extension NSTableView {
         set { setAssociatedValue(newValue, key: "tableViewObserverView") }
     }
 
+    var editingView: NSView? {
+        observerView?.editingView
+    }
+    
+    var activeState: NSListConfigurationState.ActiveState {
+        isActive ? isFocused ? .focused : .active : .inactive
+    }
+    
+    var isFocused: Bool {
+        observerView?.isFocused == true
+    }
+    
+    var isActive: Bool {
+        window?.isKeyWindow == true
+    }
+    
     class ObserverView: NSView {
         var tokens: [NotificationToken] = []
         lazy var trackingArea = TrackingArea(for: self, options: [.mouseMoved, .mouseEnteredAndExited, .activeInKeyWindow])
@@ -51,14 +67,16 @@ extension NSTableView {
         var isFocused: Bool = false {
             didSet {
                 guard oldValue != isFocused else { return }
-                Swift.print("TableView isFocused", isFocused)
-                // tableView?.visibleRows().forEach { $0.setNeedsAutomaticUpdateConfiguration() }
+                Swift.print("focus updated", isFocused)
+                tableView?.visibleRows().forEach { $0.setNeedsAutomaticUpdateConfiguration() }
             }
         }
         weak var editingView: NSView? {
             didSet {
                 guard oldValue != editingView else { return }
-                Swift.print("TableView isEditing", editingView ?? "nil")
+                Swift.print("editingView updated")
+                oldValue?.firstSuperview(for: NSTableRowView.self)?.setNeedsAutomaticUpdateConfiguration()
+                editingView?.firstSuperview(for: NSTableRowView.self)?.setNeedsAutomaticUpdateConfiguration()
             }
         }
 
@@ -76,6 +94,11 @@ extension NSTableView {
             }
             focusObservation = observeChanges(for: \.window?.firstResponder) { [weak self] oldValue, newValue in
                 guard let self = self, let tableView = self.tableView else { return }
+                if let newValue = newValue {
+                    Swift.print("firstResponder", type(of: newValue))
+                } else {
+                    Swift.print("firstResponder nil")
+                }
                 if let view = (newValue as? NSView ?? (newValue as? NSText)?.delegate as? NSView), view.isDescendant(of: tableView) {
                     self.isFocused = true
                     self.editingView = (view as? EditiableView)?.isEditable == true ? view : nil

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

@@ -14,5 +14,5 @@ protocol ConfigurationState: NSConfigurationState {
     var isHovered: Bool { get }
 }
 
-extension NSItemConfigurationState: ConfigurationState {}
-extension NSListConfigurationState: ConfigurationState {}
+extension NSItemConfigurationState: ConfigurationState { }
+extension NSListConfigurationState: ConfigurationState { }