Performance improvements for scroll (#45)

* Add Stable annotation to inheritors of ReorderableLazyCollectionState * Mark ReorderableCollectionItemScope as Stable and cache impl per item --------- Co-authored-by: Dzmitry Strekha <dstrekha@alfa-bank.by>
Calvin-LL · Aug 22, 2024 · a3ab624 · a3ab624
1 parent cdc9af2
commit a3ab624
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyCollection.kt b/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyCollection.kt
@@ -665,6 +665,7 @@ open class ReorderableLazyCollectionState<out T> internal constructor(
     }
 }
 
+@Stable
 interface ReorderableCollectionItemScope {
     /**
      * Make the UI element the draggable handle for the reorderable item.
@@ -830,11 +831,14 @@ internal fun ReorderableCollectionItem(
             itemPosition = it.positionInRoot()
         }
     ) {
-        ReorderableCollectionItemScopeImpl(
-            reorderableLazyCollectionState = state,
-            key = key,
-            itemPositionProvider = { itemPosition },
-        ).content(dragging)
+        val itemScope = remember(state, key) {
+            ReorderableCollectionItemScopeImpl(
+                reorderableLazyCollectionState = state,
+                key = key,
+                itemPositionProvider = { itemPosition },
+            )
+        }
+        itemScope.content(dragging)
     }
 
     LaunchedEffect(state.reorderableKeys, enabled) {

diff --git a/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyGrid.kt b/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyGrid.kt
@@ -28,6 +28,7 @@ import androidx.compose.foundation.lazy.grid.LazyGridItemScope
 import androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -153,6 +154,7 @@ private fun LazyGridState.toLazyCollectionState() =
             this@toLazyCollectionState.scrollToItem(scrollToIndex, firstVisibleItemScrollOffset)
     }
 
+@Stable
 class ReorderableLazyGridState internal constructor(
     state: LazyGridState,
     scope: CoroutineScope,

diff --git a/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyList.kt b/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyList.kt
@@ -28,6 +28,7 @@ import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.LazyListLayoutInfo
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -242,6 +243,7 @@ private fun LazyListState.toLazyCollectionState() =
             this@toLazyCollectionState.scrollToItem(scrollToIndex, firstVisibleItemScrollOffset)
     }
 
+@Stable
 class ReorderableLazyListState internal constructor(
     state: LazyListState,
     scope: CoroutineScope,

diff --git a/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyStaggeredGrid.kt b/reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyStaggeredGrid.kt
@@ -28,6 +28,7 @@ import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope
 import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridLayoutInfo
 import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -152,6 +153,7 @@ private fun LazyStaggeredGridState.toLazyCollectionState() =
             this@toLazyCollectionState.scrollToItem(scrollToIndex, firstVisibleItemScrollOffset)
     }
 
+@Stable
 class ReorderableLazyStaggeredGridState internal constructor(
     state: LazyStaggeredGridState,
     scope: CoroutineScope,