Change key up/down row selection to first/last visible rows, instead of global first/last

ipedro · ipedro · commit 5eba9cc780ce · 2022-07-02T08:44:29.000+02:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/ipedro/UIKitOptions.git", from: "0.3.0"),
+        .package(url: "https://github.com/ipedro/UIKitOptions.git", from: "0.3.1"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
diff --git a/Sources/UIKeyCommandTableView/UIKeyCommandTableView.swift b/Sources/UIKeyCommandTableView/UIKeyCommandTableView.swift
@@ -293,15 +293,25 @@ private extension UIKeyCommandTableView {
     
     func selectPrevious() {
         guard let currentSelection = indexPathForSelectedRow else {
-            return selectRowIfPossible(at: indexPathForLastRowInLastSection)
+            return selectRowIfPossible(at: {
+                if let lastVisibleRow = indexPathsForVisibleRows?.last {
+                    return lastVisibleRow
+                }
+                return indexPathForLastRowInLastSection
+            }())
         }
         
         selectRowIfPossible(at: currentSelection.previousRow())
     }
 
     func selectNext() {
         guard let currentSelection = indexPathForSelectedRow else {
-            return selectRowIfPossible(at: .first)
+            return selectRowIfPossible(at: {
+                if let firstVisibleRow = indexPathsForVisibleRows?.first {
+                    return firstVisibleRow
+                }
+                return IndexPath(row: NSNotFound, section: .zero)
+            }())
         }
         
         selectRowIfPossible(at: currentSelection.nextRow())
