cashapp · squarejesse · Oct 17, 2024 · Oct 17, 2024 · squarejesse · Oct 17, 2024
diff --git a/...rc/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt b/...rc/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt
@@ -55,6 +55,7 @@ class ComposeUiFlexContainerTest(
     backgroundColor: Int,
   ): ComposeTestFlexContainer {
     return ComposeTestFlexContainer(direction, backgroundColor)
+      .apply { applyDefaults() }
   }
 
   override fun row() = flexContainer(FlexDirection.Row)

diff --git a/...eui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png b/...eui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png
diff --git a/...ui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png b/...ui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png
diff --git a/...ut.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png b/...ut.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png
diff --git a/...out.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abde.png b/...out.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abde.png
diff --git a/...out.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png b/...out.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png
diff --git a/...t.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightEqually.png b/...t.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightEqually.png
diff --git a/...composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png b/...composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png
diff --git a/...layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_after.png b/...layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_after.png
diff --git a/...ayout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_before.png b/...ayout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_before.png
diff --git a/...poseui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png b/...poseui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png
diff --git a/...oseui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png b/...oseui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png
diff --git a/...mposeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_empty.png b/...mposeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_empty.png
diff --git a/...poseui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_margin.png b/...poseui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_margin.png
diff --git a/...layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abcde.png b/...layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abcde.png
diff --git a/....layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abde.png b/....layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abde.png
diff --git a/....layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_bcde.png b/....layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_bcde.png
diff --git a/...ayout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually.png b/...ayout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually.png
diff --git a/...out.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally.png b/...out.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally.png
diff --git a/...ood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_after.png b/...ood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_after.png
diff --git a/...od.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_before.png b/...od.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_before.png
diff --git a/....composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_empty.png b/....composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_empty.png
diff --git a/...composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_margin.png b/...composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_margin.png
diff --git a/...ut-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt b/...ut-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt
@@ -48,6 +48,21 @@ abstract class AbstractFlexContainerTest<T : Any> {
     backgroundColor: Int = argb(51, 0, 0, 255),
   ): TestFlexContainer<T>
 
+  /**
+   * Yoga node’s default values for properties like alignment are different from Redwood's default
+   * values, so we explicitly apply those defaults here. This is only necessary in tests; in
+   * production the framework explicitly sets every property.
+   */
+  protected fun TestFlexContainer<*>.applyDefaults() {
+    width(Constraint.Wrap)
+    height(Constraint.Wrap)
+    margin(Margin.Zero)
+    overflow(Overflow.Clip)
+    crossAxisAlignment(CrossAxisAlignment.Start)
+    mainAxisAlignment(MainAxisAlignment.Start)
+    onScroll(null)
+  }
+
   /** Returns a non-lazy flex container row, even if the test is for a LazyList. */
   abstract fun row(): Row<T>
 
@@ -119,7 +134,14 @@ abstract class AbstractFlexContainerTest<T : Any> {
     val container = flexContainer(flexDirection)
     container.width(width)
     container.height(height)
-    container.add(widgetFactory.text(movies.first()))
+    container.add(
+      widgetFactory.text(
+        text = movies.first(),
+        modifier = Modifier
+          .then(HorizontalAlignmentImpl(CrossAxisAlignment.Stretch))
+          .then(VerticalAlignmentImpl(CrossAxisAlignment.Stretch)),
+      ),
+    )
     container.onEndChanges()
     snapshotter(container.value).snapshot()
   }
@@ -484,7 +506,10 @@ abstract class AbstractFlexContainerTest<T : Any> {
     parent.children.insert(
       0,
       flexContainer(FlexDirection.Column).apply {
-        modifier = GrowImpl(1.0)
+        modifier = Modifier
+          .then(GrowImpl(1.0))
+          .then(HorizontalAlignmentImpl(CrossAxisAlignment.Stretch))
+          .then(VerticalAlignmentImpl(CrossAxisAlignment.Stretch))
         width(Constraint.Fill)
         mainAxisAlignment(MainAxisAlignment.SpaceBetween)
         add(
@@ -505,7 +530,10 @@ abstract class AbstractFlexContainerTest<T : Any> {
     parent.children.insert(
       1,
       flexContainer(FlexDirection.Column).apply {
-        modifier = GrowImpl(1.0)
+        modifier = Modifier
+          .then(GrowImpl(1.0))
+          .then(HorizontalAlignmentImpl(CrossAxisAlignment.Stretch))
+          .then(VerticalAlignmentImpl(CrossAxisAlignment.Stretch))
         width(Constraint.Fill)
         mainAxisAlignment(MainAxisAlignment.SpaceBetween)
         add(
@@ -777,12 +805,20 @@ abstract class AbstractFlexContainerTest<T : Any> {
       }
       .also { column.add(it) }
 
-    val rowA1 = widgetFactory.text("A1 ".repeat(50))
-      .apply { modifier = FlexImpl(1.0) }
-      .also { rowA.children.insert(0, it) }
-    val rowA2 = widgetFactory.text("A-TWO ".repeat(50))
-      .apply { modifier = FlexImpl(1.0) }
-      .also { rowA.children.insert(1, it) }
+    val rowA1 = widgetFactory.text(
+      text = "A1 ".repeat(50),
+      modifier = Modifier
+        .then(FlexImpl(1.0))
+        .then(HorizontalAlignmentImpl(CrossAxisAlignment.Stretch))
+        .then(VerticalAlignmentImpl(CrossAxisAlignment.Stretch)),
+    ).also { rowA.children.insert(0, it) }
+    val rowA2 = widgetFactory.text(
+      text = "A-TWO ".repeat(50),
+      modifier = Modifier
+        .then(FlexImpl(1.0))
+        .then(HorizontalAlignmentImpl(CrossAxisAlignment.Stretch))
+        .then(VerticalAlignmentImpl(CrossAxisAlignment.Stretch)),
+    ).also { rowA.children.insert(1, it) }
 
     val rowB = widgetFactory.text("B1 ".repeat(5))
       .apply {
@@ -811,13 +847,12 @@ abstract class AbstractFlexContainerTest<T : Any> {
       height(Constraint.Fill)
     }
 
-    val alignStart = HorizontalAlignmentImpl(CrossAxisAlignment.Start)
     flexContainer(FlexDirection.Column)
       .apply {
         width(Constraint.Fill)
         modifier = WidthImpl(25.dp)
-        add(widgetFactory.text("ok", alignStart)) // This is under 25.dp in width.
-        add(widgetFactory.text("1 2 3 4", alignStart)) // Each character is under 25.dp in width.
+        add(widgetFactory.text("ok")) // This is under 25.dp in width.
+        add(widgetFactory.text("1 2 3 4")) // Each character is under 25.dp in width.
         onEndChanges()
       }
       .also { fullWidthParent.children.insert(0, it) }
@@ -826,8 +861,8 @@ abstract class AbstractFlexContainerTest<T : Any> {
       .apply {
         width(Constraint.Fill)
         modifier = WidthImpl(25.dp)
-        add(widgetFactory.text("overflows parent", alignStart)) // This is over 25.dp in width.
-        add(widgetFactory.text("1 2 3 4", alignStart)) // Each character is under 25.dp in width.
+        add(widgetFactory.text("overflows parent")) // This is over 25.dp in width.
+        add(widgetFactory.text("1 2 3 4")) // Each character is under 25.dp in width.
         onEndChanges()
       }
       .also { fullWidthParent.children.insert(1, it) }

diff --git a/...utUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png b/...utUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png
diff --git a/...hots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Empty.png b/...hots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Empty.png
diff --git a/...ots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Margin.png b/...ots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Margin.png
diff --git a/...sts/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png b/...sts/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png
diff --git a/...s/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABCDE.png b/...s/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABCDE.png
diff --git a/...ts/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABDE.png b/...ts/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABDE.png
diff --git a/...ts/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.BCDE.png b/...ts/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.BCDE.png
diff --git a/..._Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png b/..._Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png
diff --git a/...napshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png b/...napshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png
diff --git a/...Tests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.After.png b/...Tests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.After.png
diff --git a/...ests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.Before.png b/...ests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.Before.png
diff --git a/...ayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png b/...ayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png
diff --git a/...apshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Empty.png b/...apshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Empty.png
diff --git a/...pshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Margin.png b/...pshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Margin.png
diff --git a/...iewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png b/...iewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png
diff --git a/...ut-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt b/...ut-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt
@@ -62,6 +62,8 @@ class UIViewFlexContainerTest(
         override fun invalidateSize() {
         }
       }
+
+      applyDefaults()
     }
   }
 

diff --git a/redwood-layout-view/src/test/kotlin/app/cash/redwood/layout/view/ViewFlexContainerTest.kt b/redwood-layout-view/src/test/kotlin/app/cash/redwood/layout/view/ViewFlexContainerTest.kt
@@ -56,6 +56,7 @@ class ViewFlexContainerTest(
       value.setBackgroundColor(backgroundColor)
     }
     return ViewTestFlexContainer(delegate)
+      .apply { applyDefaults() }
   }
 
   override fun row() = flexContainer(FlexDirection.Row)

diff --git a/...es/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnThenRow.png b/...es/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnThenRow.png
diff --git a/...out.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png b/...out.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png
diff --git a/...ut.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png b/...ut.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png
diff --git a/...dwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png b/...dwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png
diff --git a/...edwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abde.png b/...edwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abde.png
diff --git a/...edwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png b/...edwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,8 @@ class UIViewFlexContainerTest( @@
             override fun invalidateSize() {
             }
           }
+          applyDefaults()
         }
       }
@@ Expand Down @@