Implement test-only background color support for Compose UI spacer (#…

…2449)
cashapp · Nov 13, 2024 · 3d049b9 · 3d049b9
1 parent 32c53e6
commit 3d049b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...rc/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt b/...rc/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt
@@ -72,8 +72,9 @@ class ComposeUiFlexContainerTest(
     }
 
   override fun spacer(backgroundColor: Int): Spacer<@Composable () -> Unit> {
-    // TODO: honor backgroundColor.
-    return ComposeUiSpacer()
+    return ComposeUiSpacer().apply {
+      testOnlyModifier = Modifier.background(Color(backgroundColor))
+    }
   }
 
   override fun snapshotter(widget: @Composable () -> Unit) = ComposeSnapshotter(paparazzi, widget)

diff --git a/...yout-composeui/src/commonMain/kotlin/app/cash/redwood/layout/composeui/ComposeUiSpacer.kt b/...yout-composeui/src/commonMain/kotlin/app/cash/redwood/layout/composeui/ComposeUiSpacer.kt
@@ -30,9 +30,12 @@ import app.cash.redwood.ui.dp
 internal class ComposeUiSpacer : Spacer<@Composable () -> Unit> {
   private var width by mutableStateOf(0.dp)
   private var height by mutableStateOf(0.dp)
+  var testOnlyModifier: Modifier? = null
 
   override val value = @Composable {
-    Spacer(Modifier.defaultMinSize(width.toDp(), height.toDp()))
+    var modifier = Modifier.defaultMinSize(width.toDp(), height.toDp())
+    testOnlyModifier?.let { modifier = modifier.then(it) }
+    Spacer(modifier)
   }
 
   override var modifier: RedwoodModifier = RedwoodModifier

diff --git a/...eui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiLazyListTest.kt b/...eui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiLazyListTest.kt
@@ -70,8 +70,11 @@ class ComposeUiLazyListTest(
   }
 
   override fun spacer(backgroundColor: Int): Spacer<@Composable () -> Unit> {
-    // TODO: honor backgroundColor.
-    return ComposeUiRedwoodLayoutWidgetFactory().Spacer()
+    return ComposeUiRedwoodLayoutWidgetFactory().Spacer().apply {
+      @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
+      (this as ComposeUiSpacer).testOnlyModifier =
+        Modifier.background(Color(backgroundColor))
+    }
   }
 
   override fun snapshotter(widget: @Composable () -> Unit) = ComposeSnapshotter(paparazzi, widget)