Skip to content

Commit 8b2c7e1

Browse files
authored
Remove horizontal safe insets for ModalBottomSheet (#5979)
* Fix scroll within the modal
1 parent aa27aa8 commit 8b2c7e1

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

app/src/main/kotlin/io/homeassistant/companion/android/util/compose/ModalBottomSheet.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@ import androidx.compose.foundation.layout.fillMaxWidth
99
import androidx.compose.foundation.layout.padding
1010
import androidx.compose.foundation.layout.size
1111
import androidx.compose.foundation.layout.windowInsetsPadding
12+
import androidx.compose.foundation.rememberScrollState
1213
import androidx.compose.foundation.shape.RoundedCornerShape
14+
import androidx.compose.foundation.verticalScroll
1315
import androidx.compose.material.MaterialTheme
1416
import androidx.compose.material.Surface
1517
import androidx.compose.material.Text
1618
import androidx.compose.runtime.Composable
1719
import androidx.compose.ui.Modifier
1820
import androidx.compose.ui.draw.clip
21+
import androidx.compose.ui.input.nestedscroll.nestedScroll
22+
import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
1923
import androidx.compose.ui.res.colorResource
2024
import androidx.compose.ui.res.dimensionResource
2125
import androidx.compose.ui.text.style.TextAlign
@@ -33,9 +37,12 @@ fun ModalBottomSheet(title: String?, showHandle: Boolean = true, content: @Compo
3337
val sheetCornerRadius = dimensionResource(R.dimen.bottom_sheet_corner_radius)
3438
Surface(
3539
shape = RoundedCornerShape(topStart = sheetCornerRadius, topEnd = sheetCornerRadius),
40+
modifier = Modifier.nestedScroll(rememberNestedScrollInteropConnection()),
3641
) {
3742
Column(
38-
modifier = Modifier.windowInsetsPadding(safeBottomWindowInsets()),
43+
modifier = Modifier
44+
.verticalScroll(rememberScrollState())
45+
.windowInsetsPadding(safeBottomWindowInsets(false)),
3946
) {
4047
if (showHandle) {
4148
Row(

0 commit comments

Comments
 (0)