Fix testRecursiveLayoutIsIncremental in UIViewLazyList (#2298)

* Fix testRecursiveLayoutIsIncremental in UIViewLazyList The test was incorrectly nesting a UITableView inside a UITableView instead of nesting a Row inside a UITableView. See: #2289 * More fixed snapshots
cashapp · Sep 11, 2024 · bebfbd0 · bebfbd0
1 parent a2fcabc
commit bebfbd0
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 37 deletions.
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
@@ -45,8 +45,10 @@ abstract class AbstractFlexContainerTest<T : Any> {
     backgroundColor: Int = argb(51, 0, 0, 255),
   ): TestFlexContainer<T>
 
+  /** Returns a non-lazy flex container row, even if the test is for a LazyList. */
   abstract fun row(): Row<T>
 
+  /** Returns a non-lazy flex container column, even if the test is for a LazyList. */
   abstract fun column(): Column<T>
 
   abstract fun text(): Text<T>
@@ -691,33 +693,33 @@ abstract class AbstractFlexContainerTest<T : Any> {
     container.height(Constraint.Fill)
     container.crossAxisAlignment(CrossAxisAlignment.Start)
 
-    val rowA = flexContainer(FlexDirection.Row)
+    val rowA = row()
       .apply {
         width(Constraint.Fill)
         height(Constraint.Wrap)
       }
       .also { container.add(it) }
-    val rowB = flexContainer(FlexDirection.Row)
+    val rowB = row()
       .apply {
         width(Constraint.Fill)
         height(Constraint.Wrap)
       }
       .also { container.add(it) }
-    val rowC = flexContainer(FlexDirection.Row)
+    val rowC = row()
       .apply {
         width(Constraint.Fill)
         height(Constraint.Wrap)
       }
       .also { container.add(it) }
     val a = text("A")
       .apply { modifier = HeightImpl(100.dp) }
-      .also { rowA.add(it) }
+      .also { rowA.children.insert(0, it) }
     val b = text("B")
       .apply { modifier = HeightImpl(100.dp) }
-      .also { rowB.add(it) }
+      .also { rowB.children.insert(0, it) }
     val c = text("C")
       .apply { modifier = HeightImpl(100.dp) }
-      .also { rowC.add(it) }
+      .also { rowC.children.insert(0, it) }
     container.onEndChanges()
     verifySnapshot(container.value, "v1")
     val aMeasureCountV1 = a.measureCount

diff --git a/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[LTR]_v1.png b/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[LTR]_v1.png
diff --git a/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[LTR]_v2.png b/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[LTR]_v2.png
diff --git a/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[LTR]_v3.png b/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[LTR]_v3.png
diff --git a/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[RTL]_v1.png b/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[RTL]_v1.png
diff --git a/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[RTL]_v2.png b/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[RTL]_v2.png
diff --git a/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[RTL]_v3.png b/...ut.composeui_ComposeUiLazyListTest_testRecursiveLayoutIsIncremental[RTL]_v3.png
diff --git a/..._/UIViewLazyListAsFlexContainerTestHost/testRecursiveLayoutIsIncremental.v1.png b/..._/UIViewLazyListAsFlexContainerTestHost/testRecursiveLayoutIsIncremental.v1.png
diff --git a/..._/UIViewLazyListAsFlexContainerTestHost/testRecursiveLayoutIsIncremental.v2.png b/..._/UIViewLazyListAsFlexContainerTestHost/testRecursiveLayoutIsIncremental.v2.png
diff --git a/..._/UIViewLazyListAsFlexContainerTestHost/testRecursiveLayoutIsIncremental.v3.png b/..._/UIViewLazyListAsFlexContainerTestHost/testRecursiveLayoutIsIncremental.v3.png
diff --git a/...commonTest/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyListAsFlexContainerTest.kt b/...commonTest/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyListAsFlexContainerTest.kt
@@ -26,6 +26,7 @@ import app.cash.redwood.lazylayout.toUIColor
 import app.cash.redwood.lazylayout.widget.LazyList
 import app.cash.redwood.ui.Px
 import app.cash.redwood.widget.ChangeListener
+import app.cash.redwood.widget.ResizableWidget
 import app.cash.redwood.widget.Widget
 import app.cash.redwood.yoga.FlexDirection
 import kotlin.time.Duration.Companion.milliseconds
@@ -48,16 +49,18 @@ class UIViewLazyListAsFlexContainerTest(
 
   override fun column() = UIViewRedwoodLayoutWidgetFactory().Column()
 
-  override fun text() = object : Text<UIView> {
+  override fun text(): Text<UIView> = object : Text<UIView>, ResizableWidget<UIView> {
     override val value = UILabel().apply {
       numberOfLines = 0
       textColor = platform.UIKit.UIColor.blackColor
     }
     override var modifier: Modifier = Modifier
     override val measureCount = 0
+    override var sizeListener: ResizableWidget.SizeListener? = null
 
     override fun text(text: String) {
       value.text = text
+      sizeListener?.invalidateSize()
     }
 
     override fun bgColor(color: Int) {

diff --git a/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[LTR]_v1.png b/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[LTR]_v1.png
diff --git a/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[LTR]_v2.png b/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[LTR]_v2.png
diff --git a/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[LTR]_v3.png b/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[LTR]_v3.png
diff --git a/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[RTL]_v1.png b/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[RTL]_v1.png
diff --git a/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[RTL]_v2.png b/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[RTL]_v2.png
diff --git a/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[RTL]_v3.png b/...ew_ViewLazyListAsFlexContainerTest_testRecursiveLayoutIsIncremental[RTL]_v3.png