Merge pull request #134 from alanzeino/indexpath

Pass the IndexPath to an EditAction's selection
venmo · Nov 20, 2018 · f8867ec · f8867ec
2 parents b765be7 + 68ac39d
commit f8867ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -71,11 +71,11 @@ class ViewController: TableViewController {
             ]),
             Section(header: "Editing", rows: [
                 Row(text: "Swipe this row", editActions: [
-                    Row.EditAction(title: "Warn", backgroundColor: .orange, selection: { [unowned self] in
-                        self.showAlert(title: "Warned.")
+                    Row.EditAction(title: "Warn", backgroundColor: .orange, selection: { [unowned self] (indexPath) in
+                        self.showAlert(title: "Warned at indexPath: \(indexPath).")
                     }),
-                    Row.EditAction(title: "Delete", style: .destructive, selection: { [unowned self] in
-                        self.showAlert(title: "Deleted.")
+                    Row.EditAction(title: "Delete", style: .destructive, selection: { [unowned self] (indexPath) in
+                        self.showAlert(title: "Deleted at indexPath: \(indexPath).")
                     })
                 ])
             ]),

diff --git a/Static/DataSource.swift b/Static/DataSource.swift
@@ -246,7 +246,7 @@ extension DataSource: UITableViewDataSource {
         return row(at: indexPath)?.editActions.map {
             action in
             let rowAction = UITableViewRowAction(style: action.style, title: action.title) { (_, _) in
-                action.selection?()
+                action.selection?(indexPath)
             }
 
             // These calls have side effects when setting to nil

diff --git a/Static/Row.swift b/Static/Row.swift
@@ -70,6 +70,7 @@ public struct Row: Hashable, Equatable {
     }
 
     public typealias Context = [String: Any]
+    public typealias EditActionSelection = (IndexPath) -> ()
 
     /// Representation of an editing action, when swiping to edit a cell.
     public struct EditAction {
@@ -86,9 +87,9 @@ public struct Row: Hashable, Equatable {
         public let backgroundEffect: UIVisualEffect?
 
         /// Invoked when selecting the action.
-        public let selection: Selection?
+        public let selection: EditActionSelection?
 
-        public init(title: String, style: UITableViewRowAction.Style = .default, backgroundColor: UIColor? = nil, backgroundEffect: UIVisualEffect? = nil, selection: Selection? = nil) {
+        public init(title: String, style: UITableViewRowAction.Style = .default, backgroundColor: UIColor? = nil, backgroundEffect: UIVisualEffect? = nil, selection: EditActionSelection? = nil) {
             self.title = title
             self.style = style
             self.backgroundColor = backgroundColor