updated

Author: flocked

Example/Example/TableSidebarViewController.swift

@@ -16,7 +16,7 @@ class TableSidebarViewController: NSViewController {
     @IBOutlet var tableView: NSTableView!
 
     lazy var dataSource = DataSource(tableView: tableView, cellRegistration: cellRegistration)
-
+    
     let cellRegistration = CellRegistration { tableCell, _, _, sidebarItem in
         /// `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()

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

@@ -15,22 +15,19 @@ extension NSCollectionView {
             setAssociatedValue(newValue, key: "draggingSessionMoveHandler")
             let selector = #selector(NSCollectionView.draggingSession(_:movedTo:))
             if newValue != nil {
-                guard !isMethodReplaced(selector) else { return }
+                guard !isMethodHooked(selector) else { return }
                 do {
-                    try replaceMethod(
-                        selector,
-                        methodSignature: (@convention(c)  (AnyObject, Selector, NSDraggingSession, CGPoint) -> ()).self,
-                        hookSignature: (@convention(block)  (AnyObject, NSDraggingSession, CGPoint) -> ()).self) { store in {
-                            object, session, point in
-                            (object as? NSCollectionView)?.draggingSessionMoveHandler?(session, point)
-                            store.original(object, selector, session, point)
-                        }
-                        }
+                    try hook(selector, closure: { original, object, sel, session, point in
+                        (object as? NSCollectionView)?.draggingSessionMoveHandler?(session, point)
+                        original(object, sel, session, point)
+                    } as @convention(block) (
+                        (AnyObject, Selector, NSDraggingSession, CGPoint) -> Void,
+                        AnyObject, Selector, NSDraggingSession, CGPoint) -> Void)
                 } catch {
                    debugPrint(error)
                 }
             } else {
-                resetMethod(selector)
+                revertHooks(for: selector)
             }
         }
     }

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

@@ -14,15 +14,15 @@ extension NSTableView {
         set {
             setAssociatedValue(newValue, key: "draggingSessionMoveHandler")
             let selector = #selector(NSTableView.draggingSession(_:movedTo:))
-            if newValue != nil, !isMethodReplaced(selector) {
+            if newValue != nil, !isMethodReplaced(selector), !isMethodHooked(selector) {
                 do {
                     if responds(to: selector) {
-                        try replaceMethod(selector,
-                            methodSignature: (@convention(c) (AnyObject, Selector, NSDraggingSession, CGPoint) -> ()).self,
-                            hookSignature: (@convention(block) (AnyObject, NSDraggingSession, CGPoint) -> ()).self) { store in { object, session, point in
-                                (object as? NSTableView)?.draggingSessionMovedHandler?(session, point)
-                                store.original(object, selector, session, point)
-                            } }
+                        try hook(selector, closure: { original, object, sel, session, point in
+                            (object as? NSTableView)?.draggingSessionMovedHandler?(session, point)
+                            original(object, sel, session, point)
+                        } as @convention(block) (
+                            (AnyObject, Selector, NSDraggingSession, CGPoint) -> Void,
+                            AnyObject, Selector, NSDraggingSession, CGPoint) -> Void)
                     } else {
                         try addMethod(selector,
                             methodSignature: (@convention(block) (AnyObject, NSDraggingSession, CGPoint) -> ()).self) { object, session, point in
@@ -34,6 +34,7 @@ extension NSTableView {
                 }
             } else if newValue == nil {
                 resetMethod(selector)
+                revertHooks(for: selector)
             }
         }
     }