Merge pull request #650 from kiwicom/topappbar_scroll_behavior_min_placable_height

Alex Matečný · web-flow · commit 504873ccb2c8 · 2024-04-26T13:52:06.000+02:00
Ensure that the height for layouting the topappbar is always at least…
diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/controls/TopAppBar.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/controls/TopAppBar.kt
@@ -182,7 +182,7 @@ internal fun Modifier.scrollBehaviorLayout(
     if (scrollBehavior.state.heightOffsetLimit != heightOffsetLimit) {
         scrollBehavior.state.heightOffsetLimit = heightOffsetLimit
     }
-    val height = placeable.height + scrollBehavior.state.heightOffset.roundToInt()
+    val height = (placeable.height + scrollBehavior.state.heightOffset.roundToInt()).coerceAtLeast(0)
     layout(placeable.width, height) {
         placeable.place(0, height - placeable.height)
     }

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ internal fun Modifier.scrollBehaviorLayout(`
`182`	`182`	`if (scrollBehavior.state.heightOffsetLimit != heightOffsetLimit) {`
`183`	`183`	`scrollBehavior.state.heightOffsetLimit = heightOffsetLimit`
`184`	`184`	`}`
`185`		`- val height = placeable.height + scrollBehavior.state.heightOffset.roundToInt()`
	`185`	`+ val height = (placeable.height + scrollBehavior.state.heightOffset.roundToInt()).coerceAtLeast(0)`
`186`	`186`	`layout(placeable.width, height) {`
`187`	`187`	`placeable.place(0, height - placeable.height)`
`188`	`188`	`}`