Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure that all the ModalBottomSheet can scroll.

Browse source
This commit is contained in:
Benoit Marty 2026-04-27 10:23:56 +02:00
parent bf57223d05
commit 09ff3294d5
21 changed files with 88 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt
View file

@ -11,6 +11,8 @@ package io.element.android.features.home.impl.roomlist
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@ -43,6 +45,7 @@ fun RoomListContextMenu(
) {
ModalBottomSheet(
onDismissRequest = { eventSink(RoomListEvent.HideContextMenu) },
scrollable = false,
) {
RoomListModalBottomSheetContent(
contextMenu = contextMenu,
@ -91,7 +94,9 @@ private fun RoomListModalBottomSheetContent(
onReportRoomClick: () -> Unit,
) {
Column(
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState())
) {
ListItem(
headlineContent = {

6
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenu.kt
View file

@ -13,6 +13,8 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@ -45,6 +47,7 @@ fun RoomListDeclineInviteMenu(
) {
ModalBottomSheet(
onDismissRequest = { eventSink(RoomListEvent.HideDeclineInviteMenu) },
scrollable = false,
) {
RoomListDeclineInviteMenuContent(
roomName = menu.roomSummary.name?.toSafeLength(
@ -81,7 +84,8 @@ private fun RoomListDeclineInviteMenuContent(
Column(
modifier = Modifier
.fillMaxWidth()
.padding(all = 16.dp),
.padding(all = 16.dp)
.verticalScroll(rememberScrollState()),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(

3
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersView.kt
View file

@ -81,7 +81,8 @@ fun SpaceFiltersView(
if (state is SpaceFiltersState.Selecting) {
state.eventSink(SpaceFiltersEvent.Selecting.Cancel)
}
}
},
scrollable = false,
) {
Box(
modifier = Modifier