Do not keep searching across all items

rubensousa · Oct 7, 2024 · 689a898 · 689a898
1 parent 3eee9c5
commit 689a898
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.../main/java/com/rubensousa/dpadrecyclerview/layoutmanager/focus/DefaultFocusInterceptor.kt b/.../main/java/com/rubensousa/dpadrecyclerview/layoutmanager/focus/DefaultFocusInterceptor.kt
@@ -101,8 +101,9 @@ internal class DefaultFocusInterceptor(
     ): View? {
         var currentPosition = fromPosition
         while (currentPosition >= 0 && currentPosition < layoutInfo.getItemCount()) {
-            val view = layoutInfo.findViewByPosition(currentPosition)
-            if (view != null && layoutInfo.isViewFocusable(view)) {
+            // Exit early if we've exhausted the current layout structure
+            val view = layoutInfo.findViewByPosition(currentPosition) ?: return null
+            if (layoutInfo.isViewFocusable(view)) {
                 return view
             }
             currentPosition += positionIncrement