Bottom sheet: initial state must be Hidden else there is no animation when opening the bottom sheet.

This commit is contained in:
Benoit Marty
2026-06-19 09:19:04 +02:00
parent 33e2f72792
commit 82c6167441
17 changed files with 17 additions and 17 deletions
@@ -87,7 +87,7 @@ internal fun SelectParentSpaceOptions(
if (displaySelectSpaceBottomSheet) { if (displaySelectSpaceBottomSheet) {
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
) )
ModalBottomSheet( ModalBottomSheet(
@@ -58,7 +58,7 @@ fun SpaceFiltersView(
) { ) {
val isSelecting by rememberUpdatedState(state is SpaceFiltersState.Selecting) val isSelecting by rememberUpdatedState(state is SpaceFiltersState.Selecting)
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
confirmValueChange = { sheetValueTarget -> confirmValueChange = { sheetValueTarget ->
// This ensures the hide animation is not cancelled // This ensures the hide animation is not cancelled
@@ -106,7 +106,7 @@ fun ShareLocationView(
val scaffoldState = rememberBottomSheetScaffoldState( val scaffoldState = rememberBottomSheetScaffoldState(
bottomSheetState = rememberBottomSheetState( bottomSheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
) )
) )
val cameraState = rememberCameraState(firstPosition = MapDefaults.defaultCameraPosition) val cameraState = rememberCameraState(firstPosition = MapDefaults.defaultCameraPosition)
@@ -93,7 +93,7 @@ fun ShowLocationView(
val scaffoldState = rememberBottomSheetScaffoldState( val scaffoldState = rememberBottomSheetScaffoldState(
bottomSheetState = rememberBottomSheetState( bottomSheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
) )
) )
LaunchedEffect(state.isSheetDraggable) { LaunchedEffect(state.isSheetDraggable) {
@@ -111,7 +111,7 @@ fun ActionListView(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
) )
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
val targetItem = (state.target as? ActionListState.Target.Success)?.event val targetItem = (state.target as? ActionListState.Target.Success)?.event
@@ -45,7 +45,7 @@ fun ResolveVerifiedUserSendFailureView(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
) )
var showSheet by remember { mutableStateOf(false) } var showSheet by remember { mutableStateOf(false) }
@@ -74,7 +74,7 @@ internal fun AttachmentsBottomSheet(
ModalBottomSheet( ModalBottomSheet(
modifier = modifier, modifier = modifier,
sheetState = rememberBottomSheetState( sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
), ),
onDismissRequest = { isVisible = false }, onDismissRequest = { isVisible = false },
@@ -32,7 +32,7 @@ fun CustomReactionBottomSheet(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
) )
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
val target = state.target as? CustomReactionState.Target.Success val target = state.target as? CustomReactionState.Target.Success
@@ -46,7 +46,7 @@ internal fun ReadReceiptBottomSheet(
val isVisible = state.selectedEvent != null val isVisible = state.selectedEvent != null
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
) )
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
if (isVisible) { if (isVisible) {
@@ -143,7 +143,7 @@ private fun ChangeOwnRoleBottomSheet(
) { ) {
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
) )
fun dismiss() { fun dismiss() {
@@ -223,7 +223,7 @@ private fun RoomMemberActionsBottomSheet(
) { ) {
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
val bottomSheetState = rememberBottomSheetState( val bottomSheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
) )
ModalBottomSheet( ModalBottomSheet(
@@ -49,7 +49,7 @@ fun JoinRoomByAddressView(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
) )
ModalBottomSheet( ModalBottomSheet(
@@ -41,7 +41,7 @@ fun SimpleModalBottomSheet(
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
modifier = modifier, modifier = modifier,
sheetState = rememberBottomSheetState( sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
), ),
scrollable = false, scrollable = false,
@@ -59,7 +59,7 @@ fun ModalBottomSheet(
scrollable: Boolean, scrollable: Boolean,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
sheetState: SheetState = rememberBottomSheetState( sheetState: SheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
), ),
shape: Shape = BottomSheetDefaults.ExpandedShape, shape: Shape = BottomSheetDefaults.ExpandedShape,
containerColor: Color = MaterialTheme.colorScheme.surface, containerColor: Color = MaterialTheme.colorScheme.surface,
@@ -49,7 +49,7 @@ fun AvatarActionBottomSheet(
) { ) {
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
val sheetState = rememberBottomSheetState( val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
) )
@@ -77,7 +77,7 @@ fun CreateDmConfirmationBottomSheet(
modifier = modifier, modifier = modifier,
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
sheetState = rememberBottomSheetState( sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
), ),
scrollable = false, scrollable = false,
@@ -61,7 +61,7 @@ fun MediaDeleteConfirmationBottomSheet(
modifier = modifier, modifier = modifier,
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
sheetState = rememberBottomSheetState( sheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded, initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded), enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
), ),
scrollable = false, scrollable = false,