Fix searching during animations case

rubensousa · Oct 8, 2024 · e4519c0 · e4519c0
1 parent db8a9a5
commit e4519c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...erview/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/LayoutConfiguration.kt b/...erview/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/LayoutConfiguration.kt
@@ -90,7 +90,8 @@ internal class LayoutConfiguration(properties: Properties) {
     var isFocusSearchDisabled = false
         private set
 
-    private var isFocusSearchEnabledDuringAnimations = false
+    var isFocusSearchEnabledDuringAnimations = false
+        private set
 
     // Number of items to prefetch when first coming on screen with new data
     var initialPrefetchItemCount = 4

diff --git a/...view/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/focus/FocusDispatcher.kt b/...view/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/focus/FocusDispatcher.kt
@@ -136,6 +136,12 @@ internal class FocusDispatcher(
             return currentRecyclerView.parent?.focusSearch(focused, direction)
         }
 
+        if (!configuration.isFocusSearchEnabledDuringAnimations
+            && currentRecyclerView.isAnimating
+        ) {
+            return focused
+        }
+
         // Get the new focus direction and exit early if none is valid
         val focusDirection: FocusDirection = FocusDirection.from(
             direction = direction,