Skip to content

Improve exit animation of the selected message menu #6191

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

Open
gpunto wants to merge 2 commits into
base: v7
Choose a base branch
from
+43 −14
Open

Improve exit animation of the selected message menu #6191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9354148
Improve exit animation of the selected message menu
gpunto Feb 24, 2026
b1027a6
Ensure dismissal only happens once
gpunto Feb 25, 2026
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
57 changes: 43 additions & 14 deletions ...va/io/getstream/chat/android/compose/ui/components/selectedmessage/SelectedMessageMenu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package io.getstream.chat.android.compose.ui.components.selectedmessage
import android.os.Build
import android.view.WindowManager
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.EaseOutCubic
import androidx.compose.animation.core.FastOutSlowInEasing
import androidx.compose.animation.core.tween
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -37,6 +37,7 @@ import androidx.compose.runtime.Stable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clipToBounds
Expand Down Expand Up @@ -70,8 +71,10 @@ import io.getstream.chat.android.previewdata.PreviewMessageData
import io.getstream.chat.android.previewdata.PreviewUserData
import io.getstream.chat.android.ui.common.state.messages.MessageAction
import io.getstream.chat.android.ui.common.state.messages.list.MessageItemState
import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

/**
* Represents the options user can take after selecting a message.
Expand All @@ -87,7 +90,7 @@ import kotlinx.coroutines.launch
* @param onShowMoreReactionsSelected Handler that propagates clicks on the show more reactions button.
* @param modifier Modifier for styling.
* @param currentUser The currently logged-in user, used to build the message preview.
* @param onDismiss Handler called when the menu is dismissed.
* @param onDismiss Handler invoked asynchronously once after the exit animation completes.
*/
@Suppress("LongMethod")
@Composable
Expand All @@ -114,8 +117,30 @@ public fun SelectedMessageMenu(
MessageAlignment.End -> Modifier.padding(end = 8.dp)
}

val isInspection = LocalInspectionMode.current
val animation = rememberMenuAnimation(
sourceBounds = LocalSelectedMessageBounds.current?.value,
messageAlignment = messageAlignment,
)
val scope = rememberCoroutineScope()
val animatedDismiss: () -> Unit = remember(animation, onDismiss, scope) {
var dismissed = false

block@{
if (!dismissed) {
dismissed = true
scope.launch {
withContext(NonCancellable) {
animation.animateOut()
onDismiss()
}
}
}
}
}

Dialog(
onDismissRequest = onDismiss,
onDismissRequest = animatedDismiss,
properties = DialogProperties(
usePlatformDefaultWidth = false,
decorFitsSystemWindows = false,
Expand All @@ -129,14 +154,9 @@ public fun SelectedMessageMenu(
}
}
window.setDimAmount(DimAmount)
window.setWindowAnimations(0)
}

val isInspection = LocalInspectionMode.current
val animation = rememberMenuAnimation(
sourceBounds = LocalSelectedMessageBounds.current?.value,
messageAlignment = messageAlignment,
)

LaunchedEffect(Unit) {
if (isInspection) animation.snapIn() else animation.animateIn()
}
Expand All @@ -145,7 +165,7 @@ public fun SelectedMessageMenu(
modifier = modifier
.semantics { testTagsAsResourceId = true }
.fillMaxSize()
.clickable(onClick = onDismiss, indication = null, interactionSource = null)
.clickable(onClick = animatedDismiss, indication = null, interactionSource = null)
.verticalScroll(rememberScrollState())
.systemBarsPadding()
.padding(StreamTokens.spacingXs),
Expand Down Expand Up @@ -193,7 +213,7 @@ public fun SelectedMessageMenu(
Spacer(
modifier = Modifier
.matchParentSize()
.clickable(onClick = onDismiss, indication = null, interactionSource = null),
.clickable(onClick = animatedDismiss, indication = null, interactionSource = null),
)
}

Expand Down Expand Up @@ -233,7 +253,7 @@ private class MenuAnimationState(
val messageModifier: Modifier
get() = Modifier
.onGloballyPositioned { coords ->
if (coords.isAttached && targetBounds == null) {
if (coords.isAttached) {
targetBounds = coords.boundsInWindow()
}
}
Expand All @@ -258,8 +278,17 @@ private class MenuAnimationState(

suspend fun animateIn() {
coroutineScope {
launch { message.animateTo(1f, tween(durationMillis = 300, easing = EaseOutCubic)) }
launch { peripheral.animateTo(1f, tween(durationMillis = 200, delayMillis = 150)) }
launch { message.animateTo(1f, tween(durationMillis = 250, easing = FastOutSlowInEasing)) }
launch { peripheral.animateTo(1f, tween(durationMillis = 150, delayMillis = 120)) }
}
}

suspend fun animateOut() {
coroutineScope {
launch { peripheral.animateTo(0f, tween(durationMillis = 100)) }
launch {
message.animateTo(0f, tween(durationMillis = 250, delayMillis = 60, easing = FastOutSlowInEasing))
}
}
}

Expand Down
Loading