[plugin-indoorselector] Fix scroll position not resetting when switching buildings (#15677)

GitOrigin-RevId: 2bb69f9bab9c949188107543a09fe49cef8d1d1a

Author: pengdev

CHANGELOG.md

@@ -80,6 +80,9 @@ Mapbox welcomes participation and contributions from everyone.
 ## Dependencies
 * Update gl-native to [v11.26.0](https://github.com/mapbox/mapbox-maps-android/releases/tag/v11.26.0), common to [v24.26.0](https://github.com/mapbox/mapbox-maps-android/releases/tag/v11.26.0).
 
+## Bug fixes 🐞
+* [plugin-indoorselector] Fix scroll position not scrolling to the selected floor when switching to a different building.
+
 # 11.26.0-rc.1 June 29, 2026
 
 ## Features ✨ and improvements 🏁

plugin-indoorselector/build.gradle.kts

@@ -9,6 +9,11 @@ android {
     minSdk = libs.versions.androidMinSdkVersion.get().toInt()
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+  testOptions {
+    unitTests {
+      isIncludeAndroidResources = true
+    }
+  }
 }
 
 mapboxLibrary {

plugin-indoorselector/src/main/java/com/mapbox/maps/plugin/indoorselector/IndoorSelectorViewImpl.kt

@@ -15,7 +15,10 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.TextView
+import androidx.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting.Companion.PRIVATE
 import androidx.core.content.ContextCompat
+import androidx.core.view.doOnLayout
 import androidx.core.view.isVisible
 import com.mapbox.maps.IndoorFloor
 import com.mapbox.maps.MapboxExperimental
@@ -40,7 +43,8 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
   defStyleAttr: Int = 0
 ) : IndoorSelectorView, FrameLayout(context, attrs, defStyleAttr) {
 
-  private val itemHeightPx = resources.getDimensionPixelSize(R.dimen.mapbox_indoor_item_height)
+  @VisibleForTesting(otherwise = PRIVATE)
+  internal val itemHeightPx = resources.getDimensionPixelSize(R.dimen.mapbox_indoor_item_height)
   private val cornerRadiusPx = resources.getDimension(R.dimen.mapbox_indoor_corner_radius)
 
   private val containerLayout = LinearLayout(context).apply {
@@ -166,7 +170,22 @@ internal class IndoorSelectorViewImpl @JvmOverloads constructor(
     }
 
     updateContainerHeight()
-    post { updateArrows() }
+    val targetScrollY = selectedFloorScrollOffset(floors, selectedFloorId)
+    doOnLayout {
+      scrollView.scrollTo(0, targetScrollY)
+      updateArrows()
+    }
+  }
+
+  @VisibleForTesting(otherwise = PRIVATE)
+  internal fun selectedFloorScrollOffset(floors: List<IndoorFloor>, selectedId: String?): Int {
+    val index = floors.indexOfFirst { it.id == selectedId }
+    if (index < 0) return 0
+    // Offset by 1 so the selected floor lands below the up-arrow overlay when there are floors above it.
+    val rawOffset = (index - 1).coerceAtLeast(0) * itemHeightPx
+    if (floors.size <= MAX_VISIBLE_ITEMS) return rawOffset
+    val maxScroll = (floors.size - MAX_VISIBLE_ITEMS) * itemHeightPx
+    return rawOffset.coerceAtMost(maxScroll)
   }
 
   // Updates background and text color for all floor items based on selection

plugin-indoorselector/src/test/java/com/mapbox/maps/plugin/indoorselector/IndoorSelectorViewImplTest.kt

@@ -0,0 +1,81 @@
+package com.mapbox.maps.plugin.indoorselector
+
+import com.mapbox.annotation.MapboxExperimental
+import com.mapbox.maps.indoorFloor
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+
+@OptIn(MapboxExperimental::class)
+@RunWith(RobolectricTestRunner::class)
+class IndoorSelectorViewImplTest {
+
+  private lateinit var view: IndoorSelectorViewImpl
+
+  @Before
+  fun setUp() {
+    view = IndoorSelectorViewImpl(RuntimeEnvironment.getApplication())
+  }
+
+  @Test
+  fun `scroll offset positions selected floor below up-arrow`() {
+    val floors = listOf(
+      indoorFloor("b0", "G"),
+      indoorFloor("b1", "1"),
+      indoorFloor("b2", "2"),
+    )
+    // index 2 → (2-1)*itemHeightPx so floor above selected is covered by arrow, not selected itself
+    assertEquals(1 * view.itemHeightPx, view.selectedFloorScrollOffset(floors, "b2"))
+  }
+
+  @Test
+  fun `scroll offset is zero when first floor selected`() {
+    val floors = listOf(
+      indoorFloor("b0", "G"),
+      indoorFloor("b1", "1"),
+      indoorFloor("b2", "2"),
+    )
+    // index 0 → coerceAtLeast(0) = 0
+    assertEquals(0, view.selectedFloorScrollOffset(floors, "b0"))
+  }
+
+  @Test
+  fun `scroll offset is zero when second floor selected`() {
+    val floors = listOf(
+      indoorFloor("b0", "G"),
+      indoorFloor("b1", "1"),
+      indoorFloor("b2", "2"),
+    )
+    // index 1 → (1-1)*itemHeightPx = 0
+    assertEquals(0, view.selectedFloorScrollOffset(floors, "b1"))
+  }
+
+  @Test
+  fun `scroll offset is zero when selected floor not found`() {
+    val floors = listOf(
+      indoorFloor("b0", "G"),
+      indoorFloor("b1", "1"),
+    )
+    assertEquals(0, view.selectedFloorScrollOffset(floors, null))
+  }
+
+  @Test
+  fun `scroll offset is clamped to max scroll when last floor selected beyond visible window`() {
+    // 6 floors > MAX_VISIBLE_ITEMS (4): naive (index - 1) offset would be 4 * itemHeightPx,
+    // but only 2 items' worth of content is scrollable, so it must clamp to that.
+    val floors = (0..5).map { indoorFloor("b$it", "$it") }
+    val maxScroll = 2 * view.itemHeightPx
+    assertEquals(maxScroll, view.selectedFloorScrollOffset(floors, "b5"))
+  }
+
+  @Test
+  fun `scroll offset is unclamped when mid-list floor selected in a long floor list`() {
+    // 6 floors > MAX_VISIBLE_ITEMS (4), but index 2 → (2-1)*itemHeightPx stays within
+    // max scroll (2*itemHeightPx), so the clamp should be a no-op here.
+    val floors = (0..5).map { indoorFloor("b$it", "$it") }
+    assertEquals(1 * view.itemHeightPx, view.selectedFloorScrollOffset(floors, "b2"))
+  }
+}