Added SPDiffableItemActionable protocol.

Author: ivanvorobei

Example Apps/SPDiffable.xcodeproj/project.xcworkspace/xcuserdata/ivanvorobei.xcuserdatad/UserInterfaceState.xcuserstate

@@ -70,11 +70,11 @@ class RootController: DiffableTableController {
             header: SPDiffableTextHeaderFooter(text: "Presenter"),
             footer: SPDiffableTextHeaderFooter(text: "Push in navigation processing by table controller. Sometimes you need manually deselect cell."),
             items: [
-                SPDiffableTableRow(text: "Deselect", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] indexPath in
+                SPDiffableTableRow(text: "Deselect", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in
                     guard let self = self else { return }
                     self.tableView.deselectRow(at: indexPath, animated: true)
                 }),
-                SPDiffableTableRow(text: "Push", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] indexPath in
+                SPDiffableTableRow(text: "Push", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in
                     guard let self = self else { return }
                     let controller = UIViewController()
                     controller.view.backgroundColor = .secondarySystemGroupedBackground
@@ -99,7 +99,7 @@ class RootController: DiffableTableController {
                 identifier: Section.sidebar.identifier,
                 footer: SPDiffableTextHeaderFooter(text: "Example of new Side Bar."),
                 items: [
-                    SPDiffableTableRow(text: "Present Side Bar", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] indexPath in
+                    SPDiffableTableRow(text: "Present Side Bar", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in
                         guard let self = self else { return }
                         self.tableView.deselectRow(at: indexPath, animated: true)
                         let sideBarController = SideBarSplitController()
@@ -115,7 +115,7 @@ class RootController: DiffableTableController {
             identifier: Section.checkmark.identifier,
             footer: SPDiffableTextHeaderFooter(text: "Example how usage search by models and change checkmark without reload table."),
             items: [
-                SPDiffableTableRow(text: "Chekmarks", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] indexPath in
+                SPDiffableTableRow(text: "Chekmarks", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in
                     guard let self = self else { return }
                     self.tableView.deselectRow(at: indexPath, animated: true)
                 })
@@ -127,7 +127,7 @@ class RootController: DiffableTableController {
             identifier: Section.customCellProvider.identifier,
             footer: SPDiffableTextHeaderFooter(text: "Also you can add more providers for specific controller, and use default and custom specially for some contorllers."),
             items: [
-                SPDiffableTableRow(text: "Custom Cell Provider", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] indexPath in
+                SPDiffableTableRow(text: "Custom Cell Provider", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in
                     guard let self = self else { return }
                     self.tableView.deselectRow(at: indexPath, animated: true)
                 })

Example Apps/iOS Example/Controllers/RootController.swift

@@ -67,3 +67,14 @@ open class SPDiffableItem: NSObject, NSCopying {
 
     public typealias Identifier = String
 }
+
+/**
+ SPDiffable: Protocol for items which shoud have actions.
+ In default controllers will be handled.
+ */
+public protocol SPDiffableItemActionable: AnyObject {
+    
+    var action: Action? { get set }
+    
+    typealias Action = (_ item: SPDiffableItem, _ indexPath: IndexPath) -> Void
+}

Sources/SPDiffable/Models/SPDiffableItem.swift

@@ -29,7 +29,7 @@ import UIKit
 
  Also need pass uniq `identifier`.
  */
-open class SPDiffableWrapperItem: SPDiffableItem {
+open class SPDiffableWrapperItem: SPDiffableItem, SPDiffableItemActionable {
 
     /**
      SPDiffable: You can pass any object as model.
@@ -42,6 +42,4 @@ open class SPDiffableWrapperItem: SPDiffableItem {
         self.model = model
         super.init(identifier: identifier)
     }
-    
-    public typealias Action = (_ indexPath: IndexPath) -> Void
 }

Sources/SPDiffable/Models/SPDiffableWrapperItem.swift

@@ -28,14 +28,14 @@ import UIKit
  By default if action is nil, selection style set to `.none`.
  If accessory is control, you can find reay-use class for it.
  */
-open class SPDiffableTableRow: SPDiffableItem {
+open class SPDiffableTableRow: SPDiffableItem, SPDiffableItemActionable {
 
     open var text: String
     open var detail: String? = nil
     open var icon: UIImage? = nil
     open var selectionStyle: UITableViewCell.SelectionStyle
     open var accessoryType: UITableViewCell.AccessoryType
-    open var action: Action?
+    public var action: Action?
 
     public init(identifier: String? = nil, text: String, detail: String? = nil, icon: UIImage? = nil, accessoryType: UITableViewCell.AccessoryType = .none, selectionStyle: UITableViewCell.SelectionStyle = .none, action: Action? = nil) {
         self.text = text
@@ -46,6 +46,4 @@ open class SPDiffableTableRow: SPDiffableItem {
         self.action = action
         super.init(identifier: identifier ?? text)
     }
-    
-    public typealias Action = (_ indexPath: IndexPath) -> Void
 }

Sources/SPDiffable/Table/Models/SPDiffableTableRow.swift

@@ -28,7 +28,7 @@ import UIKit
  By default if action is nil, selection style set to `.none`.
  If accessory is control, you can find reay-use class for it.
  */
-open class SPDiffableTableRowSubtitle: SPDiffableItem {
+open class SPDiffableTableRowSubtitle: SPDiffableItem, SPDiffableItemActionable {
 
     open var text: String
     open var subtitle: String? = nil
@@ -46,6 +46,4 @@ open class SPDiffableTableRowSubtitle: SPDiffableItem {
         self.action = action
         super.init(identifier: identifier ?? text)
     }
-    
-    public typealias Action = (_ indexPath: IndexPath) -> Void
 }

Sources/SPDiffable/Table/Models/SPDiffableTableRowSubtitle.swift

@@ -65,12 +65,8 @@ open class SPDiffableTableController: UITableViewController {
         diffableDelegate?.diffableTableView?(tableView, didSelectItem: item, indexPath: indexPath)
 
         switch item {
-        case let model as SPDiffableTableRow:
-            model.action?(indexPath)
-        case let model as SPDiffableTableRowSubtitle:
-            model.action?(indexPath)
-        case let model as SPDiffableWrapperItem:
-            model.action?(indexPath)
+        case let model as SPDiffableItemActionable:
+            model.action?(item, indexPath)
         default:
             break
         }