Skip to content

Commit 5c90aa3

Browse files
flockedflocked
committed
updated
1 parent 34e0e5b commit 5c90aa3

File tree

17 files changed

+674
-595
lines changed

17 files changed

+674
-595
lines changed

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Example/OutlineSidebarViewController.swift‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import AppKit
99
import AdvancedCollectionTableView
10+
import FZUIKit
1011

1112
class OutlineSidebarViewController: NSViewController {
1213
typealias DataSource = OutlineViewDiffableDataSource<OutlineItem>
@@ -37,6 +38,12 @@ class OutlineSidebarViewController: NSViewController {
3738
/// Enables deleting selected items via backspace key.
3839
dataSource.deletingHandlers.canDelete = { items in return items }
3940

41+
dataSource.droppingHandlers.canDrop = { _,parent in parent == nil }
42+
dataSource.droppingHandlers.items = { content,_ in
43+
return content.strings.compactMap({ OutlineItem("\($0)") })
44+
45+
}
46+
4047
applySnapshot()
4148
}
4249

‎Example/Example/TableSidebarViewController.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ class TableSidebarViewController: NSViewController {
2121
/// `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).
2222
var configuration = tableCell.defaultContentConfiguration()
2323
configuration.text = sidebarItem.title
24-
configuration.image = NSImage(systemSymbolName: sidebarItem.symbolName)
24+
// configuration.secondaryText = "sdsd\n"
25+
configuration.secondaryTextProperties.maximumNumberOfLines = 0
26+
// configuration.image = NSImage(systemSymbolName: sidebarItem.symbolName)
2527
if sidebarItem.isFavorite {
2628
configuration.badge = .symbolImage("star.fill", color: .systemYellow, backgroundColor: nil)
2729
}
@@ -53,14 +55,14 @@ class TableSidebarViewController: NSViewController {
5355
dataSource.rowActionProvider = { swippedItem, edge in
5456
if edge == .leading {
5557
/// Left swipe
56-
return [NSTableViewRowAction.regular(symbolName: swippedItem.isFavorite ? "star" : "star.fill", color: .systemYellow) { _,_ in
58+
return [NSTableViewRowAction.regular("SomeTest", color: .systemYellow) { _,_ in
5759
swippedItem.isFavorite = !swippedItem.isFavorite
5860
self.dataSource.reconfigureItems([swippedItem])
5961
self.tableView.rowActionsVisible = false
6062
}, ]
6163
} else {
6264
/// Right swipe
63-
return [NSTableViewRowAction.destructive(symbolName: "trash.fill") { _,_ in
65+
return [NSTableViewRowAction.regular("SomeTest") { _,_ in
6466
var snapshot = self.dataSource.snapshot()
6567
snapshot.deleteItems([swippedItem])
6668
self.dataSource.apply(snapshot)

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

Lines changed: 5 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ extension NSCollectionView {
2828

2929
func setupObservation(shouldObserve: Bool = true) {
3030
if !shouldObserve {
31-
observerView?.removeFromSuperview()
31+
observerView?._removeFromSuperview()
3232
observerView = nil
3333
} else if observerView == nil {
34-
observerView = ObserverView(for: self)
34+
observerView = .init(for: self)
3535
}
3636
}
3737

38-
var observerView: ObserverView? {
38+
var observerView: TableCollectionObserverView? {
3939
get { getAssociatedValue("collectionViewObserverView") }
4040
set { setAssociatedValue(newValue, key: "collectionViewObserverView") }
4141
}
@@ -55,107 +55,6 @@ extension NSCollectionView {
5555
var isActive: Bool {
5656
window?.isKeyWindow == true
5757
}
58-
59-
/*
60-
/// A Boolean value that indicates whether the collection view reacts to mouse events.
61-
@objc open var isEnabled: Bool {
62-
get { getAssociatedValue("isEnabled", initialValue: false) }
63-
set {
64-
guard newValue != isEnabled else { return }
65-
setAssociatedValue(newValue, key: "isEnabled")
66-
visibleItems().forEach({ $0.setNeedsAutomaticUpdateConfiguration() })
67-
}
68-
}
69-
*/
70-
71-
class ObserverView: NSView {
72-
var tokens: [NotificationToken] = []
73-
lazy var trackingArea = TrackingArea(for: self, options: [.mouseMoved, .mouseEnteredAndExited, .activeInKeyWindow])
74-
weak var collectionView: NSCollectionView?
75-
var focusObservation: KeyValueObservation?
76-
var isFocused = false {
77-
didSet {
78-
guard oldValue != isFocused else { return }
79-
collectionView?.visibleItems().forEach { $0.setNeedsAutomaticUpdateConfiguration() }
80-
}
81-
}
82-
weak var editingView: NSView? {
83-
didSet {
84-
guard oldValue != editingView else { return }
85-
(oldValue?.firstSuperview(where: { $0.parentController is NSCollectionViewItem })?.parentController as? NSCollectionViewItem)?.setNeedsAutomaticUpdateConfiguration()
86-
(editingView?.firstSuperview(where: { $0.parentController is NSCollectionViewItem })?.parentController as? NSCollectionViewItem)?.setNeedsAutomaticUpdateConfiguration()
87-
}
88-
}
89-
90-
init(for collectionView: NSCollectionView) {
91-
super.init(frame: .zero)
92-
self.collectionView = collectionView
93-
collectionView.addSubview(withConstraint: self)
94-
zPosition = -CGFloat.greatestFiniteMagnitude
95-
isFocused = collectionView.isDescendantFirstResponder
96-
sendToBack()
97-
updateTrackingAreas()
98-
focusObservation = observeChanges(for: \.window?.firstResponder) { [weak self] oldValue, newValue in
99-
guard let self = self, let collectionView = self.collectionView else { return }
100-
if let view = (newValue as? NSView ?? (newValue as? NSText)?.delegate as? NSView), view.isDescendant(of: collectionView) {
101-
self.isFocused = true
102-
self.editingView = (view as? EditiableView)?.isEditable == true ? view : nil
103-
} else {
104-
self.isFocused = false
105-
}
106-
}
107-
}
108-
109-
required init?(coder: NSCoder) {
110-
fatalError("init(coder:) has not been implemented")
111-
}
112-
113-
override func updateTrackingAreas() {
114-
super.updateTrackingAreas()
115-
trackingArea.update()
116-
}
117-
118-
override func mouseEntered(with event: NSEvent) {
119-
updateHoveredItem(for: event)
120-
}
121-
122-
override func mouseMoved(with event: NSEvent) {
123-
updateHoveredItem(for: event)
124-
}
125-
126-
override func mouseExited(with event: NSEvent) {
127-
collectionView?.hoveredIndexPath = nil
128-
}
129-
130-
func updateHoveredItem(for event: NSEvent) {
131-
guard let collectionView = collectionView else { return }
132-
let location = event.location(in: collectionView)
133-
collectionView.hoveredIndexPath = collectionView.indexPathForItem(at: location)
134-
if let item = collectionView.hoveredItem {
135-
if let view = item.view as? NSItemContentView {
136-
item.isHovered = view.isHovering(at: collectionView.convert(location, to: view))
137-
} else {
138-
item.isHovered = true
139-
}
140-
}
141-
}
142-
143-
override func hitTest(_ point: NSPoint) -> NSView? {
144-
return nil
145-
}
146-
147-
override func viewWillMove(toWindow newWindow: NSWindow?) {
148-
tokens = []
149-
if let newWindow = newWindow {
150-
tokens = [NotificationCenter.default.observe(NSWindow.didBecomeKeyNotification, object: newWindow) { [weak self] _ in
151-
guard let self = self, let collectionView = self.collectionView else { return }
152-
collectionView.visibleItems().forEach { $0.setNeedsAutomaticUpdateConfiguration() }
153-
}, NotificationCenter.default.observe(NSWindow.didResignKeyNotification, object: newWindow) { [weak self] _ in
154-
guard let self = self, let collectionView = self.collectionView else { return }
155-
collectionView.hoveredIndexPath = nil
156-
collectionView.visibleItems().forEach { $0.setNeedsAutomaticUpdateConfiguration() }
157-
}]
158-
}
159-
}
160-
}
16158
}
59+
60+

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,8 @@ extension NSCollectionViewItem {
177177
To add your own custom state, see `NSConfigurationStateCustomKey`.
178178
*/
179179
@objc open var configurationState: NSItemConfigurationState {
180-
let collectionView = _collectionView
181-
let activeState = collectionView?.activeState ?? .inactive
182-
let isEditing = collectionView?.editingView?.isDescendant(of: view) == true
183180
let isSelected = isRightClickSelected == true ? true : isSelected
184-
let state = NSItemConfigurationState(isSelected: isSelected, highlight: highlightState, isEditing: isEditing, activeState: activeState, isHovered: isHovered, isReordering: isReordering, isDropTarget: isDropTarget)
181+
let state = NSItemConfigurationState(isSelected: isSelected, highlight: highlightState, isEditing: isEditing, activeState: activeState, isHovered: isHovered, isDragging: isDragging, isReordering: isReordering, isDropTarget: isDropTarget)
185182
return state
186183
}
187184

@@ -291,10 +288,16 @@ extension NSCollectionViewItem {
291288
set {
292289
guard newValue != isReordering else { return }
293290
setAssociatedValue(newValue, key: "isReordering")
294-
setNeedsAutomaticUpdateConfiguration()
295291
}
296292
}
297293

294+
var isDragging: Bool {
295+
get { getAssociatedValue("isDragging", initialValue: false) }
296+
set {
297+
guard newValue != isReordering else { return }
298+
setAssociatedValue(newValue, key: "isDragging")
299+
}
300+
}
298301

299302
/// A Boolean value that indicates whether the item is enabled.
300303
var isEnabled: Bool {

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

Lines changed: 32 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension NSTableCellView {
2626
set {
2727
let newValue = (newValue as? NSListContentConfiguration)?.updated(for: self) ?? newValue
2828
setAssociatedValue(newValue, key: "contentConfiguration")
29-
observeTableCellView()
29+
observeCellView()
3030
configurateContentView()
3131
}
3232
}
@@ -177,54 +177,11 @@ extension NSTableCellView {
177177
get { getAssociatedValue("configurationUpdateHandler") }
178178
set {
179179
setAssociatedValue(newValue, key: "configurationUpdateHandler")
180-
observeTableCellView()
180+
observeCellView()
181181
setNeedsUpdateConfiguration()
182182
}
183183
}
184184

185-
func updateContentConfigurationStyle() {
186-
if let configuration = (contentConfiguration as? NSListContentConfiguration)?.updated(for: self) {
187-
setAssociatedValue(configuration, key: "contentConfiguration")
188-
NSAnimationContext.runNonAnimated {
189-
contentView?.configuration = configuration
190-
}
191-
}
192-
}
193-
194-
func observeTableCellView() {
195-
if contentConfiguration != nil || configurationUpdateHandler != nil {
196-
guard tableCellObserverView == nil else { return }
197-
tableCellObserverView = TableViewObserverView { [weak self] tableView in
198-
guard let self = self else { return }
199-
tableView.setupObservation()
200-
if self.contentConfiguration is AutomaticHeightSizable {
201-
tableView.usesAutomaticRowHeights = true
202-
}
203-
self.updateContentConfigurationStyle()
204-
self.rowView?.translatesAutoresizingMaskIntoConstraints = false
205-
self.rowView?.observeSelection()
206-
self.setNeedsAutomaticUpdateConfiguration()
207-
}
208-
insertSubview(tableCellObserverView!, at: 0)
209-
/*
210-
tableCellObserver = observeChanges(for: \.superview, handler: { [weak self] _, _ in
211-
guard let self = self else { return }
212-
let rowView = self.rowView
213-
if self.contentConfiguration is AutomaticHeightSizable {
214-
self.tableView?.usesAutomaticRowHeights = true
215-
rowView?.needsAutomaticRowHeights = true
216-
}
217-
self.updateContentConfigurationStyle()
218-
rowView?.observeTableRowView()
219-
self.setNeedsUpdateConfiguration()
220-
})
221-
*/
222-
} else {
223-
tableCellObserverView?.removeFromSuperview()
224-
tableCellObserverView = nil
225-
}
226-
}
227-
228185
/**
229186
A Boolean value that specifies whether the cell view is hovered.
230187

@@ -293,19 +250,38 @@ extension NSTableCellView {
293250
setAssociatedValue(newValue, key: "_contentView")
294251
}
295252
}
296-
297-
var tableCellObserver: KeyValueObservation? {
298-
get { getAssociatedValue("tableCellObserver") }
299-
set { setAssociatedValue(newValue, key: "tableCellObserver") }
300-
}
301253

302-
var tableCellObserverView: TableViewObserverView? {
303-
get { getAssociatedValue("tableCellObserverView") }
304-
set { setAssociatedValue(newValue, key: "tableCellObserverView") }
254+
func updateContentConfigurationStyle() {
255+
if let configuration = (contentConfiguration as? NSListContentConfiguration)?.updated(for: self) {
256+
setAssociatedValue(configuration, key: "contentConfiguration")
257+
NSAnimationContext.runNonAnimated {
258+
contentView?.configuration = configuration
259+
}
260+
}
261+
}
262+
263+
func observeCellView() {
264+
if contentConfiguration != nil || configurationUpdateHandler != nil {
265+
guard tableViewObservation == nil else { return }
266+
tableViewObservation = observeChanges(for: \.window) { [weak self] _, window in
267+
guard window != nil, let self = self, let tableView = self.tableView else { return }
268+
tableView.setupObservation()
269+
if self.contentConfiguration is AutomaticHeightSizable {
270+
tableView.usesAutomaticRowHeights = true
271+
}
272+
self.updateContentConfigurationStyle()
273+
self.setNeedsAutomaticUpdateConfiguration()
274+
guard let rowView = self.rowView else { return }
275+
rowView.translatesAutoresizingMaskIntoConstraints = false
276+
rowView.observeSelection()
277+
}
278+
} else {
279+
tableViewObservation = nil
280+
}
305281
}
306282

307-
var tableViewStyle: NSTableView.Style? {
308-
get { getAssociatedValue("tableViewStyle") }
309-
set { setAssociatedValue(newValue, key: "tableViewStyle") }
283+
var tableViewObservation: KeyValueObservation? {
284+
get { getAssociatedValue("tableViewObservation") }
285+
set { setAssociatedValue(newValue, key: "tableViewObservation") }
310286
}
311287
}

0 commit comments

Comments
 (0)