Add a test for the already-fixed CrossAxisAlignment layout bug (#2363)

* Add a test for the already-fixed CrossAxisAlignment layout bug Closes: #2093 * Add a test for the already-fixed Row-child-wrapping bug Closes: #2011
cashapp · Oct 4, 2024 · d96b659 · d96b659
1 parent 1d5d711
commit d96b659
Show file tree

Hide file tree

Showing 21 changed files with 98 additions and 0 deletions.
diff --git a/...ayout.composeui_ComposeUiFlexContainerTest_testCrossAxisAlignmentStart[LTR].png b/...ayout.composeui_ComposeUiFlexContainerTest_testCrossAxisAlignmentStart[LTR].png
diff --git a/...ayout.composeui_ComposeUiFlexContainerTest_testCrossAxisAlignmentStart[RTL].png b/...ayout.composeui_ComposeUiFlexContainerTest_testCrossAxisAlignmentStart[RTL].png
diff --git a/...ood.layout.composeui_ComposeUiFlexContainerTest_testTextWrapsInsideRow[LTR].png b/...ood.layout.composeui_ComposeUiFlexContainerTest_testTextWrapsInsideRow[LTR].png
diff --git a/...ood.layout.composeui_ComposeUiFlexContainerTest_testTextWrapsInsideRow[RTL].png b/...ood.layout.composeui_ComposeUiFlexContainerTest_testTextWrapsInsideRow[RTL].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
@@ -871,6 +871,44 @@ abstract class AbstractFlexContainerTest<T : Any> {
 
     snapshotter(root.value).snapshot()
   }
+
+  /**
+   * CrossAxisAlignment.Start forces child to wrap its size on Android
+   * https://github.com/cashapp/redwood/issues/2093
+   */
+  @Test fun testCrossAxisAlignmentStart() {
+    val root = flexContainer(FlexDirection.Column).apply {
+      width(Constraint.Fill)
+      crossAxisAlignment(CrossAxisAlignment.Start)
+    }
+
+    val row = row().apply {
+      width(Constraint.Fill)
+      horizontalAlignment(MainAxisAlignment.SpaceBetween)
+      root.add(this)
+    }
+
+    row.children.insert(0, widgetFactory.text("Something"))
+    row.children.insert(1, widgetFactory.text("Something else"))
+
+    snapshotter(root.value).snapshot()
+  }
+
+  /**
+   * Text not wrapping inside a row.
+   * https://github.com/cashapp/redwood/issues/2011
+   */
+  @Test fun testTextWrapsInsideRow() {
+    val root = flexContainer(FlexDirection.Row)
+
+    root.add(
+      widgetFactory.text(
+        "This is a long piece of text that will wrap the screen. ".repeat(3),
+      ),
+    )
+
+    snapshotter(root.value).snapshot()
+  }
 }
 
 interface TestFlexContainer<T : Any> :

diff --git a/...sts/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png b/...sts/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png
diff --git a/...iewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png b/...iewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png
diff --git a/....redwood.layout.view_ViewFlexContainerTest_testCrossAxisAlignmentStart[LTR].png b/....redwood.layout.view_ViewFlexContainerTest_testCrossAxisAlignmentStart[LTR].png
diff --git a/....redwood.layout.view_ViewFlexContainerTest_testCrossAxisAlignmentStart[RTL].png b/....redwood.layout.view_ViewFlexContainerTest_testCrossAxisAlignmentStart[RTL].png
diff --git a/....cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow[LTR].png b/....cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow[LTR].png
diff --git a/....cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow[RTL].png b/....cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow[RTL].png
diff --git a/...ood.layout.composeui_ComposeUiLazyListTest_testCrossAxisAlignmentStart[LTR].png b/...ood.layout.composeui_ComposeUiLazyListTest_testCrossAxisAlignmentStart[LTR].png
diff --git a/...ood.layout.composeui_ComposeUiLazyListTest_testCrossAxisAlignmentStart[RTL].png b/...ood.layout.composeui_ComposeUiLazyListTest_testCrossAxisAlignmentStart[RTL].png
diff --git a/....redwood.layout.composeui_ComposeUiLazyListTest_testTextWrapsInsideRow[LTR].png b/....redwood.layout.composeui_ComposeUiLazyListTest_testTextWrapsInsideRow[LTR].png
diff --git a/....redwood.layout.composeui_ComposeUiLazyListTest_testTextWrapsInsideRow[RTL].png b/....redwood.layout.composeui_ComposeUiLazyListTest_testTextWrapsInsideRow[RTL].png
diff --git a/...shots__/UIViewLazyListAsFlexContainerTestHost/testCrossAxisAlignmentStart.1.png b/...shots__/UIViewLazyListAsFlexContainerTestHost/testCrossAxisAlignmentStart.1.png
diff --git a/..._Snapshots__/UIViewLazyListAsFlexContainerTestHost/testTextWrapsInsideRow.1.png b/..._Snapshots__/UIViewLazyListAsFlexContainerTestHost/testTextWrapsInsideRow.1.png
diff --git a/...ayout.view_ViewLazyListAsFlexContainerTest_testCrossAxisAlignmentStart[LTR].png b/...ayout.view_ViewLazyListAsFlexContainerTest_testCrossAxisAlignmentStart[LTR].png
diff --git a/...ayout.view_ViewLazyListAsFlexContainerTest_testCrossAxisAlignmentStart[RTL].png b/...ayout.view_ViewLazyListAsFlexContainerTest_testCrossAxisAlignmentStart[RTL].png
diff --git a/...lazylayout.view_ViewLazyListAsFlexContainerTest_testTextWrapsInsideRow[LTR].png b/...lazylayout.view_ViewLazyListAsFlexContainerTest_testTextWrapsInsideRow[LTR].png
diff --git a/...lazylayout.view_ViewLazyListAsFlexContainerTest_testTextWrapsInsideRow[RTL].png b/...lazylayout.view_ViewLazyListAsFlexContainerTest_testTextWrapsInsideRow[RTL].png