Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand All @@ -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)
}
}

/**
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down