fixed editActions for iOS 11+

Author: mbuchetics

DataSource/CellDescriptor.swift

@@ -389,9 +389,8 @@ public class CellDescriptor<Item, Cell: UITableViewCell>: CellDescriptorType {
 
     // MARK: swipeActions
 
-    fileprivate var leftSwipeActionClosure: ((RowType, IndexPath) -> Any?)?
-    
-    fileprivate var rightSwipeActionClosure: ((RowType, IndexPath) -> Any?)?
+    private var _leadingSwipeActionsClosure: ((RowType, IndexPath) -> Any?)?
+    private var _trailingSwipeActionsClosure: ((RowType, IndexPath) -> Any?)?
 
     // MARK: editActions
 
@@ -585,28 +584,43 @@ extension CellDescriptor: CellDescriptorTypeiOS11 {
 
     public var leadingSwipeActionsClosure: ((RowType, IndexPath) -> UISwipeActionsConfiguration?)? {
         get {
+            if _leadingSwipeActionsClosure == nil {
+                return nil
+            }
+            
             return { [weak self] (rowType, indexPath) in
-                return self?.leftSwipeActionClosure?(rowType, indexPath) as? UISwipeActionsConfiguration
+                return self?._leadingSwipeActionsClosure?(rowType, indexPath) as? UISwipeActionsConfiguration
             }
         }
     }
 
     public var trailingSwipeActionsClosure: ((RowType, IndexPath) -> UISwipeActionsConfiguration?)? {
         get {
+            if _trailingSwipeActionsClosure == nil {
+                return nil
+            }
+            
             return { [weak self] (rowType, indexPath) in
-                return self?.rightSwipeActionClosure?(rowType, indexPath) as? UISwipeActionsConfiguration
+                return self?._trailingSwipeActionsClosure?(rowType, indexPath) as? UISwipeActionsConfiguration
             }
         }
     }
 
     public func leadingSwipeAction(_ closure: @escaping ((RowType, IndexPath) -> UISwipeActionsConfiguration?)) -> CellDescriptor {
-        leftSwipeActionClosure = closure
+        _leadingSwipeActionsClosure = closure
         return self
     }
 
     public func trailingSwipeAction(_ closure: @escaping ((RowType, IndexPath) -> UISwipeActionsConfiguration?)) -> CellDescriptor {
-        rightSwipeActionClosure = closure
+        _trailingSwipeActionsClosure = closure
         return self
     }
 
+    public var hasLeadingSwipeAction: Bool {
+        return _leadingSwipeActionsClosure != nil
+    }
+    
+    public var hasTrailingSwipeAction: Bool {
+        return _trailingSwipeActionsClosure != nil
+    }
 }

DataSource/DataSource.swift

@@ -53,11 +53,6 @@ public class DataSource: NSObject {
     public var willBeginEditing: ((RowType, IndexPath) -> Void)? = nil
     public var didEndEditing: ((IndexPath?) -> Void)? = nil
 
-    // MARK: iOS 11
-    //See extension
-    fileprivate var leftSwipeActions: ((RowType, IndexPath) -> Any?)? = nil
-    fileprivate var rightSwipeActions: ((RowType, IndexPath) -> Any?)? = nil
-    
     public var sectionHeader: ((SectionType, Int) -> HeaderFooter)? = nil
     public var sectionFooter: ((SectionType, Int) -> HeaderFooter)? = nil
 
@@ -77,6 +72,10 @@ public class DataSource: NSObject {
     public var performAction: ((RowType, Selector, Any?, IndexPath) -> Void)? = nil
     public var canFocus: ((RowType, IndexPath) -> Bool)? = nil
 
+    // MARK: Swipe Actions (iOS 11+ only)
+    private var _leadingSwipeActions: ((RowType, IndexPath) -> Any?)? = nil
+    private var _trailingSwipeActions: ((RowType, IndexPath) -> Any?)? = nil
+    
     // MARK: UITableViewDataSourcePrefetching
 
     public var prefetchRows: (([IndexPath]) -> Void)? = nil
@@ -96,10 +95,48 @@ public class DataSource: NSObject {
 
     public override func responds(to aSelector: Selector!) -> Bool {
         if super.responds(to: aSelector) {
+            if #available(iOS 11.0, *) {
+                switch aSelector {
+                case #selector(UITableViewDelegate.tableView(_:leadingSwipeActionsConfigurationForRowAt:)):
+                    return isLeadingSwipeActionsImplemented ? true : fallbackDelegateResponds(to: aSelector)
+                case #selector(UITableViewDelegate.tableView(_:trailingSwipeActionsConfigurationForRowAt:)):
+                    return isTrailingSwipeActionsImplemented ? true : fallbackDelegateResponds(to: aSelector)
+                default:
+                    return true
+                }
+            } else {
+                return true
+            }
+        }
+        
+        return fallbackDelegateResponds(to: aSelector)
+    }
+    
+    private func fallbackDelegateResponds(to aSelector: Selector!) -> Bool {
+        let result = fallbackDelegate?.responds(to: aSelector) ?? false
+        
+        print(aSelector)
+        print(result)
+        
+        return result
+    }
+    
+    @available(iOS 11.0, *)
+    private var isLeadingSwipeActionsImplemented: Bool {
+        if _leadingSwipeActions != nil {
             return true
-        } else {
-            return fallbackDelegate?.responds(to: aSelector) ?? false
         }
+        
+        return cellDescriptors.values.contains(where: { ($0 as? CellDescriptorTypeiOS11)?.leadingSwipeActionsClosure != nil })
+    }
+    
+    @available(iOS 11.0, *)
+    private var isTrailingSwipeActionsImplemented: Bool {
+        if _trailingSwipeActions != nil {
+            return true
+        }
+        
+        return cellDescriptors.values.contains(where: { ($0 as? CellDescriptorTypeiOS11)?.trailingSwipeActionsClosure != nil })
     }
 
     // MARK: Additional
@@ -309,23 +346,31 @@ public class DataSource: NSObject {
 extension DataSource {
     public var leadingSwipeActions: ((RowType, IndexPath) -> UISwipeActionsConfiguration?)? {
         get {
+            if _leadingSwipeActions == nil {
+                return nil
+            }
+            
             return { [weak self] (rowType, indexPath) in
-                return self?.leftSwipeActions?(rowType, indexPath) as? UISwipeActionsConfiguration
+                return self?._leadingSwipeActions?(rowType, indexPath) as? UISwipeActionsConfiguration
             }
         }
         set {
-            leftSwipeActions = newValue
+            _leadingSwipeActions = newValue
         }
     }
 
     public var trailingSwipeActions: ((RowType, IndexPath) -> UISwipeActionsConfiguration?)? {
         get {
+            if _trailingSwipeActions == nil {
+                return nil
+            }
+            
             return { [weak self] (rowType, indexPath) in
-                return self?.rightSwipeActions?(rowType, indexPath) as? UISwipeActionsConfiguration
+                return self?._trailingSwipeActions?(rowType, indexPath) as? UISwipeActionsConfiguration
             }
         }
         set {
-            rightSwipeActions = newValue
+            _trailingSwipeActions = newValue
         }
     }
 

Example/ViewControllers/Examples/SwipeToDeleteViewController.swift

@@ -37,6 +37,8 @@ class SwipeToDeleteViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        dataSource.fallbackDelegate = self
+        
         tableView.dataSource = dataSource
         tableView.delegate = dataSource
 

Example/ViewControllers/SwipeActionViewController.swift

@@ -30,14 +30,14 @@ class SwipeActionViewController: UITableViewController {
                                 self?.hapticFeedback.impactOccurred()
                                 callback(true)
                             })
-                            ])
+                        ])
                     }.trailingSwipeAction { [weak self] (_, indexPath) -> UISwipeActionsConfiguration? in
                         return UISwipeActionsConfiguration(actions: [
                             UIContextualAction(style: .normal, title: "Change Color", handler: { [weak self] (_, _, callback) in
                                 callback(true)
                                 self?.changeColor(for: indexPath)
                             })
-                            ])
+                        ])
                     }
             ])
     }()