Skip to content

fix(ui): prevent auto-animate from overriding user-initiated sheet animations #3740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kairosci wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(ui): prevent auto-animate from overriding user-initiated sheet animations #3740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 34 additions & 7 deletions app/src/main/kotlin/com/metrolist/music/ui/component/BottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ class BottomSheetState(
private val animatable: Animatable<Dp, AnimationVector1D>,
private val onAnchorChanged: (Int) -> Unit,
val collapsedBound: Dp,
private val launchAnimation: (suspend () -> Unit) -> Unit = { block ->
coroutineScope.launch { block() }
},
) : DraggableState by draggableState {
val dismissedBound: Dp
get() = animatable.lowerBound!!
Expand Down Expand Up @@ -182,14 +185,14 @@ class BottomSheetState(

fun collapse(animationSpec: AnimationSpec<Dp>) {
onAnchorChanged(collapsedAnchor)
coroutineScope.launch {
launchAnimation {
animatable.animateTo(collapsedBound, animationSpec)
}
}

fun expand(animationSpec: AnimationSpec<Dp>) {
onAnchorChanged(expandedAnchor)
coroutineScope.launch {
launchAnimation {
animatable.animateTo(animatable.upperBound!!, animationSpec)
}
}
Expand All @@ -212,7 +215,7 @@ class BottomSheetState(

fun dismiss() {
onAnchorChanged(dismissedAnchor)
coroutineScope.launch {
launchAnimation {
animatable.animateTo(animatable.lowerBound!!)
}
}
Expand Down Expand Up @@ -330,22 +333,45 @@ fun rememberBottomSheetState(
var previousAnchor by rememberSaveable {
mutableIntStateOf(initialAnchor)
}

val activeAnimations = remember {
mutableIntStateOf(0)
}

val animatable = remember {
Animatable(0.dp, Dp.VectorConverter)
}

return remember(dismissedBound, expandedBound, collapsedBound, coroutineScope) {
val launchAnimation: (suspend () -> Unit) -> Unit = { block ->
coroutineScope.launch {
activeAnimations.intValue++
try {
block()
} finally {
activeAnimations.intValue--
}
}
}

fun animateToAnchor() {
val initialValue = when (previousAnchor) {
expandedAnchor -> expandedBound
collapsedAnchor -> collapsedBound
dismissedAnchor -> dismissedBound
else -> error("Unknown BottomSheet anchor")
}

animatable.updateBounds(dismissedBound.coerceAtMost(expandedBound), expandedBound)
coroutineScope.launch {
launchAnimation {
animatable.animateTo(initialValue, NavigationBarAnimationSpec)
}
}

return remember(dismissedBound, expandedBound, collapsedBound, coroutineScope) {
animatable.updateBounds(dismissedBound.coerceAtMost(expandedBound), expandedBound)

if (activeAnimations.intValue == 0) {
animateToAnchor()
}

BottomSheetState(
draggableState = DraggableState { delta ->
Expand All @@ -356,7 +382,8 @@ fun rememberBottomSheetState(
onAnchorChanged = { previousAnchor = it },
coroutineScope = coroutineScope,
animatable = animatable,
collapsedBound = collapsedBound
collapsedBound = collapsedBound,
launchAnimation = launchAnimation,
)
}
}
Loading