Find first focusable view starting from adapter order

rubensousa · Jun 4, 2024 · 0705ce0 · 0705ce0
1 parent 1b4a96c
commit 0705ce0
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/...lerview/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/layout/PivotLayout.kt b/...lerview/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/layout/PivotLayout.kt
@@ -215,16 +215,10 @@ internal class PivotLayout(
     }
 
     private fun findFirstFocusableView(): View? {
-        val childCount = layoutInfo.getChildCount()
-        for (i in 0 until childCount) {
-            val actualIndex = if (layoutInfo.shouldReverseLayout()) {
-                childCount - 1 - i
-            } else {
-                i
-            }
-            val child = layoutInfo.getChildAt(actualIndex)
-            if (child != null && child.hasFocusable()) {
-                return child
+        for (i in 0 until layoutManager.itemCount) {
+            val view = layoutInfo.findViewByAdapterPosition(i)
+            if (view != null && layoutInfo.isViewFocusable(view)) {
+                return view
             }
         }
         return null