Cancel scrolling to target before updating the layout

rubensousa · Sep 26, 2024 · 05536f5 · 05536f5
1 parent 3e6044b
commit 05536f5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...lerview/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/PivotLayoutManager.kt b/...lerview/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/PivotLayoutManager.kt
@@ -145,13 +145,13 @@ class PivotLayoutManager(properties: Properties) : RecyclerView.LayoutManager(),
     override fun onLayoutChildren(recycler: RecyclerView.Recycler, state: RecyclerView.State) {
         // If we have focus, save it temporarily since the views will change and we might lose it
         hadFocusBeforeLayout = hasFocus()
+        if (layoutInfo.isScrollingToTarget) {
+            scroller.cancelScrollToTarget()
+        }
         pivotLayout.onLayoutChildren(recycler, state)
         if (hadFocusBeforeLayout) {
             focusDispatcher.focusSelectedView()
         }
-        if (layoutInfo.isScrollingToTarget) {
-            scroller.cancelScrollToTarget()
-        }
         hadFocusBeforeLayout = false
     }