Force sheet content's alignment to TopCenter

The alignment of the sheet is important as all calculations are based off TopCenter. If the user changes this the sheet breaks.
composablehorizons · Aug 2, 2024 · 070d768 · 070d768
1 parent 607df47
commit 070d768
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/core/src/commonMain/kotlin/BottomSheet.kt b/core/src/commonMain/kotlin/BottomSheet.kt
@@ -230,8 +230,7 @@ public fun BottomSheet(
                 .onSizeChanged {
                     containerHeight = with(density) { it.height.toDp() }
                     state.containerHeight = it.height.toFloat()
-                },
-            contentAlignment = Alignment.TopCenter
+                }
         ) {
             Box(
                 contentAlignment = Alignment.TopCenter,
@@ -294,6 +293,7 @@ public fun BottomSheet(
                         enabled = scope.enabled
                     )
                     .pointerInput(Unit) { detectTapGestures { } }
+                    .align(Alignment.TopCenter)
                     .then(modifier)
             ) {
                 scope.content()

diff --git a/demo-modalsheet/src/commonMain/kotlin/ModalBottomSheetDemo.kt b/demo-modalsheet/src/commonMain/kotlin/ModalBottomSheetDemo.kt
@@ -78,7 +78,6 @@ fun ModalBottomSheetDemo() {
                 modifier = Modifier
                     .padding(top = 12.dp)
                     .let { if (isCompact) it else it.padding(horizontal = 56.dp) }
-                    .align(Alignment.BottomCenter)
                     .statusBarsPadding()
                     .padding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal).asPaddingValues())
                     .shadow(4.dp, RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp))

diff --git a/demo-sheet/src/commonMain/kotlin/BottomSheetDemo.kt b/demo-sheet/src/commonMain/kotlin/BottomSheetDemo.kt
@@ -72,7 +72,6 @@ fun BottomSheetDemo() {
             modifier = Modifier
                 .padding(top = 12.dp)
                 .let { if (isCompact) it else it.padding(horizontal = 56.dp) }
-                .align(Alignment.BottomCenter)
                 .statusBarsPadding()
                 .padding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal).asPaddingValues())
                 .shadow(4.dp, RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp))