From 1dc6be13fad14fade436ce6a474af4d004677f45 Mon Sep 17 00:00:00 2001 From: Adetunji Dahunsi Date: Thu, 27 Aug 2026 22:37:35 -0400 Subject: [PATCH] Make ScrollbarState implement official ScrollIndicatorState --- .../composables/scrollbars/ScrollbarState.kt | 31 +++++++++++++++++-- .../scrollable/grid/ScrollbarState.kt | 10 +++++- .../scrollable/list/ScrollbarState.kt | 11 ++++++- .../scrollable/scroll/ScrollbarState.kt | 6 +++- .../staggeredgrid/ScrollbarState.kt | 10 +++++- 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/ScrollbarState.kt b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/ScrollbarState.kt index 8c0c361..0779fc6 100644 --- a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/ScrollbarState.kt +++ b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/ScrollbarState.kt @@ -16,6 +16,7 @@ package com.tunjid.composables.scrollbars +import androidx.compose.foundation.ScrollIndicatorState import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.gestures.detectHorizontalDragGestures import androidx.compose.foundation.gestures.detectTapGestures @@ -72,7 +73,9 @@ private const val SCROLLBAR_PRESS_DELAY_MS = 10L private const val SCROLLBAR_PRESS_DELTA_PCT = 0.02f @Stable -class ScrollbarState { +class ScrollbarState private constructor( + private val viewportSizePx: () -> Int, +) : ScrollIndicatorState { private var packedValue by mutableLongStateOf(0L) internal fun onScroll(stateValue: ScrollbarStateValue) { @@ -96,6 +99,30 @@ class ScrollbarState { */ val thumbTrackSizePercent get() = 1f - thumbSizePercent + + override val viewportSize: Int + get() = if (thumbSizePercent > 0f) viewportSizePx() else Int.MAX_VALUE + + override val contentSize: Int + get() = if (thumbSizePercent > 0f) { + (viewportSizePx() / thumbSizePercent).roundToInt() + } else { + Int.MAX_VALUE + } + + override val scrollOffset: Int + get() { + if (thumbSizePercent <= 0f) return Int.MAX_VALUE + val track = thumbTrackSizePercent + if (track <= 0f) return 0 + val progress = (thumbMovedPercent / track).coerceIn(0f, 1f) + return (progress * (contentSize - viewportSize)).roundToInt() + } + + internal companion object { + internal operator fun invoke(viewportSizePx: () -> Int): ScrollbarState = + ScrollbarState(viewportSizePx) + } } /** @@ -215,7 +242,7 @@ fun Scrollbar( withTimeout(viewConfiguration.longPressTimeoutMillis) { tryAwaitRelease() } - } catch (e: TimeoutCancellationException) { + } catch (_: TimeoutCancellationException) { // Start the press triggered scroll val initialPress = PressInteraction.Press(offset) interactionSource?.tryEmit(initialPress) diff --git a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/grid/ScrollbarState.kt b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/grid/ScrollbarState.kt index a490e3a..c811251 100644 --- a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/grid/ScrollbarState.kt +++ b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/grid/ScrollbarState.kt @@ -74,7 +74,15 @@ fun LazyGridState.scrollbarState( itemsAvailable: Int, itemIndex: (LazyGridItemInfo) -> Int = LazyGridItemInfo::index, ): ScrollbarState { - val state = remember { ScrollbarState() } + val state = remember(this) { + ScrollbarState( + viewportSizePx = { + layoutInfo.orientation.valueOf( + intSize = layoutInfo.viewportSize, + ) + }, + ) + } LaunchedEffect(this, itemsAvailable) { snapshotFlow { if (itemsAvailable == 0) return@snapshotFlow null diff --git a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/list/ScrollbarState.kt b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/list/ScrollbarState.kt index 3338f38..e6b1020 100644 --- a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/list/ScrollbarState.kt +++ b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/list/ScrollbarState.kt @@ -32,6 +32,7 @@ import com.tunjid.composables.scrollbars.ScrollbarState import com.tunjid.composables.scrollbars.scrollable.rememberScrollbarThumbMover import com.tunjid.composables.scrollbars.scrollable.sumOf import com.tunjid.composables.scrollbars.scrollbarStateValue +import com.tunjid.composables.valueOf import kotlin.math.min import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filterNotNull @@ -73,7 +74,15 @@ fun LazyListState.scrollbarState( itemsAvailable: Int, itemIndex: (LazyListItemInfo) -> Int = LazyListItemInfo::index, ): ScrollbarState { - val state = remember { ScrollbarState() } + val state = remember(this) { + ScrollbarState( + viewportSizePx = { + layoutInfo.orientation.valueOf( + intSize = layoutInfo.viewportSize, + ) + }, + ) + } LaunchedEffect(this, itemsAvailable) { snapshotFlow { if (itemsAvailable == 0) return@snapshotFlow null diff --git a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/scroll/ScrollbarState.kt b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/scroll/ScrollbarState.kt index d25d52f..710aa63 100644 --- a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/scroll/ScrollbarState.kt +++ b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/scroll/ScrollbarState.kt @@ -51,7 +51,11 @@ fun ScrollState.rememberScrollbarThumbMover(): (Float) -> Unit { */ @Composable fun ScrollState.scrollbarState(): ScrollbarState { - val state = remember { ScrollbarState() } + val state = remember(this) { + ScrollbarState( + viewportSizePx = ::viewportSize, + ) + } LaunchedEffect(this) { snapshotFlow { scrollbarStateValue( diff --git a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/staggeredgrid/ScrollbarState.kt b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/staggeredgrid/ScrollbarState.kt index a55277f..424e2cf 100644 --- a/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/staggeredgrid/ScrollbarState.kt +++ b/library/composables/src/commonMain/kotlin/com/tunjid/composables/scrollbars/scrollable/staggeredgrid/ScrollbarState.kt @@ -76,7 +76,15 @@ fun LazyStaggeredGridState.scrollbarState( itemsAvailable: Int, itemIndex: (LazyStaggeredGridItemInfo) -> Int = LazyStaggeredGridItemInfo::index, ): ScrollbarState { - val state = remember { ScrollbarState() } + val state = remember(this) { + ScrollbarState( + viewportSizePx = { + layoutInfo.orientation.valueOf( + intSize = layoutInfo.viewportSize, + ) + }, + ) + } LaunchedEffect(this, itemsAvailable) { snapshotFlow { if (itemsAvailable == 0) return@snapshotFlow null