Merge "Merge cherrypicks of ['android-review.googlesource.com/2821832…

…'] into androidx-compose-beta-release." into androidx-compose-beta-release
JetBrains · Nov 14, 2023 · d103e69 · d103e69
2 parents a8915c4 + 43b15e0
commit d103e69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
@@ -35,6 +35,7 @@ androidXMultiplatform {
         commonMain {
             dependencies {
                 implementation(libs.kotlinStdlibCommon)
+                api(project(':collection:collection'))
                 api(project(':compose:animation:animation'))
                 api(project(':compose:runtime:runtime'))
                 api(project(':compose:ui:ui'))

diff --git a/...on/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt b/...on/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt
@@ -16,6 +16,9 @@
 
 package androidx.compose.foundation.lazy.layout
 
+import androidx.collection.MutableObjectIntMap
+import androidx.collection.ObjectIntMap
+import androidx.collection.emptyObjectIntMap
 import androidx.compose.foundation.ExperimentalFoundationApi
 
 /**
@@ -54,7 +57,7 @@ internal class NearestRangeKeyIndexMap(
     nearestRange: IntRange,
     intervalContent: LazyLayoutIntervalContent<*>
 ) : LazyLayoutKeyIndexMap {
-    private val map: Map<Any, Int>
+    private val map: ObjectIntMap<Any>
     private val keys: Array<Any?>
     private val keysStartIndex: Int
 
@@ -66,13 +69,14 @@ internal class NearestRangeKeyIndexMap(
         check(first >= 0) { "negative nearestRange.first" }
         val last = minOf(nearestRange.last, list.size - 1)
         if (last < first) {
-            map = emptyMap()
+            map = emptyObjectIntMap()
             keys = emptyArray()
             keysStartIndex = 0
         } else {
-            keys = arrayOfNulls<Any?>(last - first + 1)
+            val size = last - first + 1
+            keys = arrayOfNulls<Any?>(size)
             keysStartIndex = first
-            map = hashMapOf<Any, Int>().also { map ->
+            map = MutableObjectIntMap<Any>(size).also { map ->
                 list.forEach(
                     fromIndex = first,
                     toIndex = last,