Add accessory button selection support

ipedro · ipedro · commit 6df9f36e01e6 · 2021-04-21T08:50:45.000+02:00
diff --git a/Sources/UIKeyCommandTableView/UIKeyCommandTableView.swift b/Sources/UIKeyCommandTableView/UIKeyCommandTableView.swift
@@ -71,6 +71,8 @@ public class UIKeyCommandTableView: UITableView {
     
     public var activateSelectionKeyCommandOptions: [UIKeyCommand.Options] = [.spaceBar, .return]
     
+    public var activateAccessoryButtonKeyCommandOptions: [UIKeyCommand.Options] = []
+    
     public var clearSelectionKeyCommandOptions: [UIKeyCommand.Options] = []
     
     public override var keyCommands: [UIKeyCommand]? {
@@ -88,6 +90,10 @@ public class UIKeyCommandTableView: UITableView {
             keyCommands.append(UIKeyCommand($0, action: #selector(activateSelection)))
         }
         
+        activateAccessoryButtonKeyCommandOptions.forEach {
+            keyCommands.append(UIKeyCommand($0, action: #selector(activateAccessorySelection)))
+        }
+        
         clearSelectionKeyCommandOptions.forEach {
             keyCommands.append(UIKeyCommand($0, action: #selector(clearSelection)))
         }
@@ -252,24 +258,19 @@ private extension UIKeyCommandTableView {
     }
 
     func activateSelection() {
-        var selectableIndexPath: IndexPath? {
-            guard let indexPathForSelectedRow = indexPathForSelectedRow else {
-                return nil
-            }
-            
-            guard
-                let delegate = delegate,
-                delegate.responds(to: #selector(UITableViewDelegate.tableView(_:willSelectRowAt:)))
-            else {
-                return indexPathForSelectedRow
-            }
-            
-            return delegate.tableView?(self, willSelectRowAt: indexPathForSelectedRow)
+        guard let selectedIndexPath = selectableIndexPath else {
+            return
         }
         
-        if let selectedIndexPath = selectableIndexPath {
-            delegate?.tableView?(self, didSelectRowAt: selectedIndexPath)
+        delegate?.tableView?(self, didSelectRowAt: selectedIndexPath)
+    }
+    
+    func activateAccessorySelection() {
+        guard let selectedIndexPath = selectableIndexPath else {
+            return
         }
+        
+        delegate?.tableView?(self, accessoryButtonTappedForRowWith: selectedIndexPath)
     }
     
     func selectPrevious() {
@@ -287,6 +288,21 @@ private extension UIKeyCommandTableView {
         
         selectRowIfPossible(at: currentSelection.nextRow())
     }
+    
+    var selectableIndexPath: IndexPath? {
+        guard let indexPathForSelectedRow = indexPathForSelectedRow else {
+            return nil
+        }
+        
+        guard
+            let delegate = delegate,
+            delegate.responds(to: #selector(UITableViewDelegate.tableView(_:willSelectRowAt:)))
+        else {
+            return indexPathForSelectedRow
+        }
+        
+        return delegate.tableView?(self, willSelectRowAt: indexPathForSelectedRow)
+    }
 }
 
 // MARK: - Row Visibility
