Tweak up/down command

ipedro · ipedro · commit 20f6498274e0 · 2022-07-02T11:09:47.000+02:00
diff --git a/Sources/UIKeyCommandTableView/UIKeyCommandTableView.swift b/Sources/UIKeyCommandTableView/UIKeyCommandTableView.swift
@@ -149,30 +149,12 @@ public class UIKeyCommandTableView: UITableView {
     
     @objc
     public func selectPreviousRow() {
-        guard let currentSelection = indexPathForSelectedRow else {
-            return selectRowIfPossible(at: {
-                if let lastVisibleRow = indexPathsForVisibleRows?.last {
-                    return lastVisibleRow
-                }
-                return indexPathForLastRowInLastSection
-            }())
-        }
-        
-        selectRowIfPossible(at: currentSelection.previousRow())
+        selectRowIfPossible(at: indexPathForSelectedRow?.previousRow() ?? indexPathForLastVisibleRow)
     }
 
     @objc
     public func selectNextRow() {
-        guard let currentSelection = indexPathForSelectedRow else {
-            return selectRowIfPossible(at: {
-                for indexPath in indexPathsForVisibleRows ?? [] where isRowVisible(at: indexPath) == .fullyVisible {
-                    return indexPath
-                }
-                return IndexPath(row: NSNotFound, section: .zero)
-            }())
-        }
-        
-        selectRowIfPossible(at: currentSelection.nextRow())
+        selectRowIfPossible(at: indexPathForSelectedRow?.nextRow() ?? indexPathForFirstVisibleRow)
     }
     
 }
