Fix column content changes

redwood-layout-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt

@@ -437,6 +437,60 @@ abstract class AbstractFlexContainerTest<T : Any> {
     verifySnapshot(container, "BCDE")
   }
 
+  @Test
+  fun testDynamicContainerSize() {
+    val parent = flexContainer(FlexDirection.Column).apply {
+      width(Constraint.Fill)
+      height(Constraint.Fill)
+    }
+
+    parent.add(
+      flexContainer(FlexDirection.Column).apply {
+        modifier = GrowImpl(1.0)
+        width(Constraint.Fill)
+        mainAxisAlignment(MainAxisAlignment.SpaceBetween)
+        add(
+          widget(
+            "A",
+            GrowImpl(1.0).then(CrossAxisAlignmentImpl(CrossAxisAlignment.Start)),
+          ),
+        )
+        add(
+          widget(
+            "B",
+            GrowImpl(1.0).then(CrossAxisAlignmentImpl(CrossAxisAlignment.End)),
+          ),
+        )
+      },
+    )
+
+    parent.add(
+      flexContainer(FlexDirection.Column).apply {
+        modifier = GrowImpl(1.0)
+        width(Constraint.Fill)
+        mainAxisAlignment(MainAxisAlignment.SpaceBetween)
+        add(
+          widget(
+            "C",
+            GrowImpl(1.0)
+              .then(CrossAxisAlignmentImpl(CrossAxisAlignment.Start)),
+          ),
+        )
+        add(
+          widget(
+            "D",
+            GrowImpl(1.0).then(CrossAxisAlignmentImpl(CrossAxisAlignment.End)),
+          ),
+        )
+      },
+    )
+
+    verifySnapshot(parent, "both")
+
+    parent.removeAt(1)
+    verifySnapshot(parent, "single")
+  }
+
   /** We don't have assume() on kotlin.test. Tests that fail here should be skipped instead. */
   private fun assumeTrue(b: Boolean) {
     assertTrue(b)

redwood-layout-view/src/main/kotlin/app/cash/redwood/layout/view/ViewFlexContainer.kt

@@ -168,8 +168,7 @@ internal class ViewFlexContainer(
 }
 
 private fun View.asNode(): Node {
-  val childNode = Node()
-  childNode.measureCallback = ViewMeasureCallback(this)
-  applyLayoutParams(childNode, layoutParams)
-  return childNode
+  return Node().apply {
+    measureCallback = ViewMeasureCallback(this@asNode)
+  }
 }

redwood-layout-view/src/main/kotlin/app/cash/redwood/layout/view/YogaLayout.kt

@@ -21,10 +21,6 @@ internal class YogaLayout(
 ) : ViewGroup(context) {
   val rootNode = Node()
 
-  init {
-    applyLayoutParams(rootNode, layoutParams)
-  }
-
   private fun applyLayout(node: Node, xOffset: Float, yOffset: Float) {
     val view = node.view
     if (view != null && view !== this) {
@@ -71,6 +67,11 @@ internal class YogaLayout(
   }
 
   private fun calculateLayout(widthSpec: Int, heightSpec: Int) {
+    rootNode.requestedWidth = Size.Undefined
+    rootNode.requestedMaxWidth = Size.Undefined
+    rootNode.requestedHeight = Size.Undefined
+    rootNode.requestedMaxHeight = Size.Undefined
+
     val widthSize = MeasureSpec.getSize(widthSpec).toFloat()
     when (MeasureSpec.getMode(widthSpec)) {
       MeasureSpec.EXACTLY -> rootNode.requestedWidth = widthSize
@@ -95,16 +96,3 @@ internal class YogaLayout(
 
 private val Node.view: View?
   get() = (measureCallback as ViewMeasureCallback?)?.view
-
-internal fun applyLayoutParams(node: Node, layoutParams: ViewGroup.LayoutParams?) {
-  if (layoutParams != null) {
-    val width = layoutParams.width
-    if (width >= 0) {
-      node.requestedWidth = width.toFloat()
-    }
-    val height = layoutParams.height
-    if (height >= 0) {
-      node.requestedHeight = height.toFloat()
-    }
-  }
-}