Adding support for the Height Modifier in ComposeUiBox (#2481)

CHANGELOG.md

@@ -16,6 +16,7 @@ Changed:
 
 Fixed:
 - Fix inconsistency in margin application between `ComposeUiBox` and `ViewBox`.
+- Add support for the Height modifier in `ComposeUiBox`.
 
 
 ## [0.16.0] - 2024-11-19

redwood-layout-composeui/src/commonMain/kotlin/app/cash/redwood/layout/composeui/Box.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.layout.MeasureResult
 import androidx.compose.ui.layout.MeasureScope
 import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.util.fastForEachIndexed
@@ -67,6 +68,7 @@ internal data class BoxChildLayoutInfo(
   val alignment: Alignment,
   val matchParentWidth: Boolean,
   val matchParentHeight: Boolean,
+  val requestedHeight: Dp?
 )
 
 @PublishedApi
@@ -109,6 +111,11 @@ internal data class BoxMeasurePolicy(
           minHeight = if (boxHeight != Constraints.Infinity) boxHeight else 0,
           maxHeight = boxHeight,
         )
+      } else if (layoutInfo.requestedHeight != null) {
+        childConstraints = childConstraints.copy(
+          minHeight = layoutInfo.requestedHeight.toPx().toInt(),
+          maxHeight = layoutInfo.requestedHeight.toPx().toInt(),
+        )
       }
       val placeable = measurable.measure(childConstraints)
       placeables[index] = placeable

redwood-layout-composeui/src/commonMain/kotlin/app/cash/redwood/layout/composeui/ComposeUiBox.kt

@@ -31,6 +31,7 @@ import androidx.compose.ui.BiasAlignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.util.fastMap
 import app.cash.redwood.Modifier as RedwoodModifier
 import app.cash.redwood.layout.api.Constraint
@@ -85,6 +86,7 @@ internal class ComposeUiBox(
     var alignment = alignment
     var matchParentWidth = matchParentWidth
     var matchParentHeight = matchParentHeight
+    var requestedHeight: Dp? = null
 
     forEachScoped { childModifier ->
       when (childModifier) {
@@ -109,7 +111,7 @@ internal class ComposeUiBox(
         }
 
         is Height -> {
-          // TODO
+          requestedHeight = childModifier.height.toDp()
         }
 
         is Size -> {
@@ -134,6 +136,7 @@ internal class ComposeUiBox(
       alignment = alignment,
       matchParentWidth = matchParentWidth,
       matchParentHeight = matchParentHeight,
+      requestedHeight = requestedHeight,
     )
   }