From aeb1fb8a1c5da3a514fd3ba416ccc7c72c80d266 Mon Sep 17 00:00:00 2001 From: Jesse Wilson at Work Date: Thu, 17 Oct 2024 17:24:16 -0400 Subject: [PATCH] Explicitly configure layouts in snapshot tests (#2389) We weren't fully configuring Row and Column layouts, which caused the (undocumented) yoga defaults to be used in tests. --- .../composeui/ComposeUiFlexContainerTest.kt | 1 + ...stColumnWithChildModifierChanges_empty.png | 4 +- ...tColumnWithChildModifierChanges_margin.png | 4 +- ...st_RTL_testDynamicElementUpdates_abcde.png | 4 +- ...est_RTL_testDynamicElementUpdates_abde.png | 4 +- ...est_RTL_testDynamicElementUpdates_bcde.png | 4 +- ...t_RTL_testFlexDistributesWeightEqually.png | 4 +- ...RTL_testFlexDistributesWeightUnequally.png | 4 +- ...erTest_RTL_testLayoutAfterDetach_after.png | 4 +- ...rTest_RTL_testLayoutAfterDetach_before.png | 4 +- ..._testRowWithChildModifierChanges_empty.png | 4 +- ...testRowWithChildModifierChanges_margin.png | 4 +- ...stColumnWithChildModifierChanges_empty.png | 4 +- ...tColumnWithChildModifierChanges_margin.png | 4 +- ...erTest_testDynamicElementUpdates_abcde.png | 4 +- ...nerTest_testDynamicElementUpdates_abde.png | 4 +- ...nerTest_testDynamicElementUpdates_bcde.png | 4 +- ...rTest_testFlexDistributesWeightEqually.png | 4 +- ...est_testFlexDistributesWeightUnequally.png | 4 +- ...tainerTest_testLayoutAfterDetach_after.png | 4 +- ...ainerTest_testLayoutAfterDetach_before.png | 4 +- ..._testRowWithChildModifierChanges_empty.png | 4 +- ...testRowWithChildModifierChanges_margin.png | 4 +- .../layout/AbstractFlexContainerTest.kt | 63 ++++++++++++++----- .../testColumnThenRow.1.png | 4 +- ...stColumnWithChildModifierChanges.Empty.png | 4 +- ...tColumnWithChildModifierChanges.Margin.png | 4 +- .../testCrossAxisAlignmentStart.1.png | 4 +- .../testDynamicElementUpdates.ABCDE.png | 4 +- .../testDynamicElementUpdates.ABDE.png | 4 +- .../testDynamicElementUpdates.BCDE.png | 4 +- .../testFlexDistributesWeightEqually.1.png | 4 +- .../testFlexDistributesWeightUnequally.1.png | 4 +- .../testLayoutAfterDetach.After.png | 4 +- .../testLayoutAfterDetach.Before.png | 4 +- .../testRowMargins.1.png | 4 +- .../testRowWithChildModifierChanges.Empty.png | 4 +- ...testRowWithChildModifierChanges.Margin.png | 4 +- .../testTextWrapsInsideRow.1.png | 4 +- .../layout/uiview/UIViewFlexContainerTest.kt | 2 + .../layout/view/ViewFlexContainerTest.kt | 1 + ...lexContainerTest_RTL_testColumnThenRow.png | 4 +- ...stColumnWithChildModifierChanges_empty.png | 4 +- ...tColumnWithChildModifierChanges_margin.png | 4 +- ...st_RTL_testDynamicElementUpdates_abcde.png | 4 +- ...est_RTL_testDynamicElementUpdates_abde.png | 4 +- ...est_RTL_testDynamicElementUpdates_bcde.png | 4 +- ...t_RTL_testFlexDistributesWeightEqually.png | 4 +- ...RTL_testFlexDistributesWeightUnequally.png | 4 +- ...erTest_RTL_testLayoutAfterDetach_after.png | 4 +- ...rTest_RTL_testLayoutAfterDetach_before.png | 4 +- ...ewFlexContainerTest_RTL_testRowMargins.png | 4 +- ..._testRowWithChildModifierChanges_empty.png | 4 +- ...testRowWithChildModifierChanges_margin.png | 4 +- ...ntainerTest_RTL_testTextWrapsInsideRow.png | 4 +- ...iewFlexContainerTest_testColumnThenRow.png | 4 +- ...stColumnWithChildModifierChanges_empty.png | 4 +- ...tColumnWithChildModifierChanges_margin.png | 4 +- ...erTest_testDynamicElementUpdates_abcde.png | 4 +- ...nerTest_testDynamicElementUpdates_abde.png | 4 +- ...nerTest_testDynamicElementUpdates_bcde.png | 4 +- ...rTest_testFlexDistributesWeightEqually.png | 4 +- ...est_testFlexDistributesWeightUnequally.png | 4 +- ...tainerTest_testLayoutAfterDetach_after.png | 4 +- ...ainerTest_testLayoutAfterDetach_before.png | 4 +- ...w_ViewFlexContainerTest_testRowMargins.png | 4 +- ..._testRowWithChildModifierChanges_empty.png | 4 +- ...testRowWithChildModifierChanges_margin.png | 4 +- ...exContainerTest_testTextWrapsInsideRow.png | 4 +- .../layout/composeui/ComposeUiLazyListTest.kt | 1 + .../UIViewLazyListAsFlexContainerTest.kt | 1 + .../view/ViewLazyListAsFlexContainerTest.kt | 1 + 72 files changed, 186 insertions(+), 144 deletions(-) diff --git a/redwood-layout-composeui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt b/redwood-layout-composeui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt index 181f1f1718..e70729862d 100644 --- a/redwood-layout-composeui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt +++ b/redwood-layout-composeui/src/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/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png index 24e4a35cbc..a6efd0a685 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db3450c4ea0c65061c1a77ac9ca8da3eaf3de966335d58018e0cc88501fdce07 -size 43621 +oid sha256:86a8fb21e72b3e1fdf747271802e5cd51e22a25e03b4609967ddb1ea8d5a9fce +size 43929 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png index c271bdf390..c20ed8d653 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:645ff39e4e9dd3950d26f07dcd2670ce27b0fc88f2be50e9ef9291ef7a9062ea -size 44333 +oid sha256:26c1961c54d4d88cc7916b89eead9d48145d30007e2f910a5c6900d4640f6012 +size 44370 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png index 694d059ae1..14e478d231 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2eb83d7b542b9d5c115733113ac825488c5741b595301843a0e553e484635cf9 -size 5311 +oid sha256:5495847eea75a30c3532b7682b18b8d549c562436846851b9da9a203a1c95480 +size 5226 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abde.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abde.png index 9d12cba0f3..831fc61ab0 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abde.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_abde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d07ae2ccc7df2a9dcf79e72a809dd80fc874435d5e61381773b6c2d03c2866f -size 4950 +oid sha256:793c4922287a9bfb40c045ea8157f9530863cddb965773715d9ded6e8057772d +size 4853 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png index ab5c7d0574..af1037617d 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8c70495660e97ee72af5600d54cd7a620d14058045d637e3e20c26803b19e04 -size 5026 +oid sha256:42ddbbabdfac0edf75ea4162a41e71b71c99a502c6693fe78c2e34ba0852cec6 +size 4903 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightEqually.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightEqually.png index 5e8772c758..2111efc8cc 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightEqually.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightEqually.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:137ab7fd50429334ecaa66f84a97b6d817cda945993b00ce377893407200f912 -size 10375 +oid sha256:1e371e9ca3324bf822c955052b9cd5aab9719610b6a898741fbf37c788c94091 +size 10519 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png index 8e2467bdb0..5426c66c35 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3767af3b027cad9f7cdb9bdf28bce7f5b8166d321cfa642c8fa33ce32fa8090f -size 10362 +oid sha256:c677446382ca0cca7fec8e8d8be7dcb063944f2a2076692097f84499cbb1d5fe +size 10353 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_after.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_after.png index 7d6317c026..01ebf295a3 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_after.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_after.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00b2cf28255240ab96f8275c6e0666f8f7d34c66d5b59044c6c96a7f4c7c9199 -size 43721 +oid sha256:856e50e33c2e17a4b873e77c70d13fb4854276b22c66247fbdfa66760b93b0c2 +size 44234 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_before.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_before.png index b402ebe73f..4e89ebf042 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_before.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testLayoutAfterDetach_before.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2def779dc3f294fff52725c31eda6b7d1958b435f461f51548bc786ff5447d8 -size 20179 +oid sha256:54c34a531ee0561595c8ab0ac3f842d3cd3978681bf0af1d353827a465ff5183 +size 20397 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png index 9f7ea029f3..c895257b33 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8aab25e13039a1b9861abbc2302201aa4eb774e9b700caff3a2906c9201d5070 -size 45753 +oid sha256:7a236e1b5c301710e84dd257de52ae3d7a8f9f7a9be7e0c9311e316e8143c01e +size 41655 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png index fe35a9af9a..69dddd9c2e 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4e7a92ff184dea010c1aa05337a454920579c7f3a5f5d6d3073a58683350634 -size 39344 +oid sha256:b084df439a9e40bf22656f8e7217e13fd33dcf22460d52e13ab018d01742eb4f +size 35493 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_empty.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_empty.png index 5eefb4d7f8..fe6741b3dd 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_empty.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:565c39981e7a299e23a9cd88840e23efc46e52d2c4744fcc26e461d0b4f04bdb -size 43511 +oid sha256:e588cba49dbad6e9dd0ad37a825d5497937dfc1c97fc21481f5f5695c5eebb33 +size 43948 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_margin.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_margin.png index 14aa50bf87..ac500da5d9 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_margin.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testColumnWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:558252afe3e5e012c77d79de6660cee3c0e27feba0d4e99a04397a01abe4fa51 -size 44277 +oid sha256:1a0728aec84f874ae6e4054fbc66c286546dd9d80e232f62b6069dcdafca2624 +size 44139 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abcde.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abcde.png index aa086e34a0..9119fdee91 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abcde.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a6c1dc82f5c55690a25e09ffafa6e6846b22378c9f987aad687ade066d39b93 -size 5265 +oid sha256:f968ef565433bf85a17d9e6f3991171e5fb268ba31a9273289fc18e0df465317 +size 5127 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abde.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abde.png index a25c715042..913f67842b 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abde.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_abde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9941d064775d5164ec8cf38478efc9f13d21c31b01ae58bc28c16f945aa5da16 -size 4939 +oid sha256:d651c41d5aaf62d8045c991df12f79ff82858addffdc6554db09b0cea761f556 +size 4789 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_bcde.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_bcde.png index 0e36a59e72..dd39b51dbb 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_bcde.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testDynamicElementUpdates_bcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:936fe2c6d8f1c17bb70e7edcdf145b26cd25c37f54be08b9a040ecc1eccb4ee4 -size 4982 +oid sha256:97692d473bd26318ef7251b58c5cb7b0a050d51c5481848836fd978ac10aa433 +size 4842 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually.png index ab4f03fa1c..a61569dd77 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d5788e74ad8fa1f50f5979f833fc89418c7eadd2ea477797ea654883ea034b3 -size 10422 +oid sha256:342da34fdb59f433bfd2530596b8509cb81bae791ae5e6368a7bb89aa58c7f05 +size 10440 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally.png index 920d5fb329..3a8c0cf4ef 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f83801754110a88664d5b090502a60af8fc1eb7de426841640ec56c8bb3d5780 -size 10266 +oid sha256:5452db4c419bd0ffade25609754137b72b31b5f708e15e3f51d6ad5e9ccfb3e5 +size 10589 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_after.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_after.png index 4eadab0682..488aa4e641 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_after.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_after.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6ab5c73a511994835cdf1cb38fb9366b250439240d6927900c85486d893a0da -size 43764 +oid sha256:d3d846fc4a9d6f759ede6b23837601980c384c93333553c9023d1869d558f85c +size 44498 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_before.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_before.png index be8135526e..51a42e59c0 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_before.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testLayoutAfterDetach_before.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57a7f06048bbb0c417d41cb9342408fd16c916dfacbe09fce3933c2138eca9f7 -size 20386 +oid sha256:8596fd4add757de9dc256c862da17dbae541e4cf2413462537a4708aec8fa7d1 +size 20533 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_empty.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_empty.png index 74245086db..c29ad2f235 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_empty.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52b861a2137d1edb0cb9fa86bf3a1ed104e4a0c131071c8652d62a1764f81287 -size 45077 +oid sha256:cbf4654718a59507e75d9390b7de66564145ad928c46560c037c995374a05295 +size 41754 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_margin.png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_margin.png index 12eb561e23..8264c4324e 100644 --- a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_margin.png +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_testRowWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:664c9bdfc7be488c5ae57ea3b8a62e9d84e638172aaf4e0df583034f8bddbef9 -size 41731 +oid sha256:7d482dde84151d2e89ebe545247b0aff301d78f03740ce32cdb56277fce61631 +size 35499 diff --git a/redwood-layout-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt b/redwood-layout-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt index 3e576b5ebb..f82c74c06a 100644 --- a/redwood-layout-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt +++ b/redwood-layout-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt @@ -48,6 +48,21 @@ abstract class AbstractFlexContainerTest { backgroundColor: Int = argb(51, 0, 0, 255), ): TestFlexContainer + /** + * 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 @@ -119,7 +134,14 @@ abstract class AbstractFlexContainerTest { 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 { 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 { 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 { } .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 { 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 { .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/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png index ab96e0965f..3d53e193d1 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6a7f711ad8a208ce6b6a0c7dac78d2dce3b55866fd062beaa4ec5a66f99d66e -size 98586 +oid sha256:ef515d673afc46ae662ca0dc227efd17a8903434ede8fa7567f22bec6930db8c +size 98527 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Empty.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Empty.png index f33d88ef3c..b9f3a56fc4 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Empty.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:267e7c74b0ae55485a53683aa387775b990bb8cf9ae7e4eb3c016a8c5a5f2e65 -size 137181 +oid sha256:2a407d30b3e053c94d5df94b008b519cdda6db586471a858512145a727cb1074 +size 142435 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Margin.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Margin.png index c1153f0755..661d6a41cd 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Margin.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithChildModifierChanges.Margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72bd0889a3f1b45193c0cba8987d9d31f9f528fa137a06e40cff98a05d252f37 -size 139286 +oid sha256:fe1ec6600db0bbb6aa96118146397020f6cfe1b343e11adea7745c865954d3cb +size 143300 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png index e5efe40300..79f1746328 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testCrossAxisAlignmentStart.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3041a08ac048d99128dcc92579f0c7530f7605c3271298c24b487bc44039a3b6 -size 72499 +oid sha256:2f3eec2d6c20431f22d5bfdf2920b5e7828f2669ca8f38f2e9f7615924546a4f +size 72513 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABCDE.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABCDE.png index 3f2ea20b8c..4b7f8c73f2 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABCDE.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABCDE.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d7d2a342b6c121e44d48e64175f4cc6853f6acdccbea0631969fdb76a917fd2 -size 68997 +oid sha256:d84577b0eda6b39f8a668cb053065aebc6bda12972fe8b3f1c4f0c90c17943ad +size 70895 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABDE.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABDE.png index e97e191375..e349fc9004 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABDE.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.ABDE.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2162a6fccffb3d28208bc0127f25ac225914a8e5d933605df1c6a144d48935f3 -size 68142 +oid sha256:f6fcdab876dd1c874b5652f88d83836da5e3d8ddf20899eef56e16e92d3ef8ff +size 69892 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.BCDE.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.BCDE.png index 98d4e47139..c214c0ab41 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.BCDE.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testDynamicElementUpdates.BCDE.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5e090f271547a8ee7a8ac8cca2365c0eb987d5b3d1dc2f5a6c010fcca21d1e4 -size 68213 +oid sha256:0ce329bde1cae29c80ec6b4bda1e241b3c5479e7cee97a6d4df94f770a24683c +size 70036 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png index 49dfdf2f52..7838f68aa4 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8f1d4b7aed4b45bd9bbf33f0e25082de31e19610eb5c5fc7f7ea46248bd782c -size 74770 +oid sha256:81bc64ffaad3aa2f171cec4081b1aa64b4ce9b582df5bc20b79442a83b800940 +size 80970 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png index 5be43eefdc..ef57506d78 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd0dab78c67973bcbd38b84be3456144b1ed1e5b6f7c86688063e6701f083456 -size 75632 +oid sha256:cb603ed275061d009df4ae74ad155304f40ebe422bc4fa1659fb64b16dd68286 +size 84243 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.After.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.After.png index 16f417144b..c68b6d5742 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.After.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.After.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9aaeba74e7f22e6af9470985844ac9f34a9eba21e711e4930e549650b29b916 -size 138291 +oid sha256:3cdec246f032109b998c440d015bcd8510e8ad89e255dd913a4c5ca5ea0d8d1f +size 143734 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.Before.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.Before.png index d190bd5400..15a7598259 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.Before.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutAfterDetach.Before.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85c5fa02af6e94c9957f92826bd04890e0447283dd7747803ee7fba29f19dff2 -size 94740 +oid sha256:0bc8aea347274e34094b1d7d3c51bbae0bfa59abfc6d0db278d87113ada69092 +size 97436 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png index 41ff167909..a11bbf836f 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9fee7278a3765b686427046e3df2f3132f34e7865576867135e97e2232a2f2f -size 146121 +oid sha256:c930cd607ac9a9c1b46dd4c1f00d2ea51f4a73d737fd9aea51b086afe119d2a9 +size 145708 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Empty.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Empty.png index 4426740478..1b032ba5c9 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Empty.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e0360f0abbe42caf3eb056e708894df686825f8aa8b2b1b3acc4020fc9641c8 -size 149692 +oid sha256:f450f9850d5c27a20a840fec23e5d85f9629e7d047fd3ce32a3a5b2547436305 +size 133970 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Margin.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Margin.png index c67cc48998..16c043217f 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Margin.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowWithChildModifierChanges.Margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dc0173c3f0e94cd6aa75dba7f3df267e4b0bd8c2fed1bc30f75275912e11689 -size 149470 +oid sha256:89123b9d0496687b9ef56ed96a23a4330feddeb2d31a046d920d80bb4515f06d +size 135086 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png index fec708ffd8..bc084c8b43 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testTextWrapsInsideRow.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c2d97267d067eba9f5db84042873d2eb7a2a82a5c594f38b224831f05f29172 -size 100546 +oid sha256:9b082d358a498dfe2896ef25252d70e879d73603348dc725a4b4ba34af5023eb +size 102600 diff --git a/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt b/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt index a151d0916b..2406bdf8cf 100644 --- a/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt +++ b/redwood-layout-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 index 42ebae5b4e..981fb3efd2 100644 --- 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/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnThenRow.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnThenRow.png index 3301058b87..9e740ac563 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnThenRow.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnThenRow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:705f5c8ceb0c69a5f86743bfd085775f41753575178e4c34d58288ad1255c2c9 -size 18607 +oid sha256:82edf3de733f0492092d5f2cf186cc45cf5953a1eb659cdf96888c889d7b30c3 +size 18610 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png index cf6cb4548d..6b40b90681 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4625c27d554e67d50eb32b215822ab327b8c4a34598ac59e37e463c1cf0b0a55 -size 43855 +oid sha256:2dafba077359b1c772f2fa5471a3b24286fcbe91de575a209cabbe969acd1d4d +size 44201 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png index 19d859f022..5cdb96e4ca 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testColumnWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7a6a5c8fd4923531bcd020066f1898bc37da91cd9f0e86e2bf68376879c9b89 -size 44747 +oid sha256:cd4b5e1f3e0a03aedfc786efd27490419fe8500905a8469025a87e417a4240af +size 44553 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png index 91497717ff..2e529eea4e 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25dfe344b7703b0cf63b37f29b03cddb2d781072935776702ec4ceb0e558b9c5 -size 5333 +oid sha256:165f80e674d1354b42612c3e335548b1ba714752c7e2b5204c6ca44e6816bc68 +size 5208 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abde.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abde.png index e48f4b9b31..792b6e2f5e 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abde.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_abde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d783dfafea012c945fd2d9eacbf4495235fce067e8024226c26332854a065163 -size 5013 +oid sha256:04416c3b64a1e6e1543be3a65785ebf4a4891ae9523ff01ee9444e7af38efbf5 +size 4905 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png index b6fd97cb95..382803840d 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testDynamicElementUpdates_bcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcb08a179e8e6210300536fb791f496fc2b89d14230b6110b92a72f23c54b74c -size 5037 +oid sha256:3b9086943c97c3353418a09124b4231700cd3adf9a2d8ddc7e316df22c69fca4 +size 4897 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightEqually.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightEqually.png index c4676d327f..8481182e1d 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightEqually.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightEqually.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13cb83a952aa37382fb8669f91ca77276ce827082cba7e2b26de6c431f0bd0d3 -size 10420 +oid sha256:e219afb7492d3d93a35a4ac7029380724666fc113ffd9a94d841578e6b97377c +size 10489 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png index 8c906c4c16..724bbb211d 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testFlexDistributesWeightUnequally.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9f178816b6969507c8e8715265c9d55640fc621a87c223d5d129e1f95dfc335 -size 10459 +oid sha256:9c6b073c9d39720f797443fd0823112df80a4eb1875751c6cdce50040176b448 +size 10849 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_after.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_after.png index b276f9b87c..759e2546c4 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_after.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_after.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96cb3937fdc385b4040d37c49f070bbfde53cb7c82ae54eea6135d7bb3e650a7 -size 44009 +oid sha256:ec67972a6c6965f5730c20954df8a844670337ac0c72c808ee7457af7b1f48bc +size 44466 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_before.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_before.png index dd9060ba61..610bcbc711 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_before.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testLayoutAfterDetach_before.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a83e7369b206965615c46c7269c2e59d62ddfa7d4f490af4d07977d279dfe489 -size 20505 +oid sha256:aa04173643083beb220a341062c48cacdae21bc54693089a81ae98c5f2603936 +size 20551 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowMargins.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowMargins.png index e5f985b4aa..8c3a1afc2b 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowMargins.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowMargins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:087cd60fd705672b0aee80a9529818cb753e3a39493d0ca215083c441792fccd -size 66151 +oid sha256:6598e9a08cae53fb5af6b2da3277057a5f6ecea86a282529671898be4cec144c +size 65789 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png index e82803d396..5a89e75227 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29882213ee8a2c1db1d97ff7310ec702f91331422d0c60fd43340a0b6afc0cdc -size 45798 +oid sha256:1a7e6c7054a3a2b2f87f21366a40d99be19efce94e489377f58e0b70808c716a +size 41833 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png index c514db3625..baec5cb2a3 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testRowWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d00be7e1af6d65069a64deb9e98547c63432d4c8e52948fd395d59b1c086c965 -size 39019 +oid sha256:dc16049aecec82748dc2cab67bab7e46172ccb52fb2698249027ab5c3754c699 +size 35723 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testTextWrapsInsideRow.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testTextWrapsInsideRow.png index 66ba507982..f5a16ee1dc 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testTextWrapsInsideRow.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_RTL_testTextWrapsInsideRow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c074ccb086bb0b49930f66dbfe985530707eb0ef125140a490d5bf5fc97610e -size 21683 +oid sha256:643793271f47099d36ff2358f94c67b701ff1f9843decce629f08da2904bcd77 +size 22097 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnThenRow.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnThenRow.png index a86cbf3fdd..d036447c18 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnThenRow.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnThenRow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9d9ec6c17d2bfdcbc29d82564b1172077672b18c5e80eac2ecfc9b02491be6e -size 18712 +oid sha256:2bd4686500d788b79af1ca1ac6d6de473c16b42571f140f08b83cd52ba4099cf +size 18707 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_empty.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_empty.png index c09508eac3..09df481e2c 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_empty.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5e550852732d5b18848b88245157e4bd9bfa138cf754828298b4696d481e01f -size 43643 +oid sha256:58fc65253abbb1b795b08a105943ebfbea474fc63f20d37928f45806bc537ccc +size 44146 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_margin.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_margin.png index 97c472b142..49ac7944ac 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_margin.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testColumnWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c94edf810cf51173a4ff3eb71c6bbfb7c0a7c03a26987c14ced368e18f9e5b97 -size 44529 +oid sha256:5e7436eb4939aa4030aa0b9de77cf18f275aab80cdc603d837309ec8c489a3a8 +size 44398 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abcde.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abcde.png index fa9eee49e8..c34ed55a5d 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abcde.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84c70ea7306c335b4f5ef372d5e49b4ce71e4800660f3a9e40613681ff572948 -size 5307 +oid sha256:447b60563e10b2a9447bcbb12063cf3e64ef565801072685f46b27bc5a69b2ed +size 5112 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abde.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abde.png index 67f0d8af8f..053b9d62bf 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abde.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_abde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3def4c79fa6ff36bc428a00d2d866425f067426a3ede81a39ba986cfbdc17524 -size 4970 +oid sha256:bad1bb41743071c9468d065da2e06d1e36e1c08f2ddfdd5ce7f379d7942580db +size 4805 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_bcde.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_bcde.png index 08b4d43983..2ab047ce56 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_bcde.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testDynamicElementUpdates_bcde.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:647993ec7eacd77063d68f106b7eae9750146c1838bcbb5507566548c04d0c99 -size 4976 +oid sha256:aeb31084a2a8a4cfe5c650451e294f5bc2211455470a400e96fbe8dba943dd27 +size 4817 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually.png index e96cd2bbbb..01a1ac1a35 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63e8fc780ee67ed267f4fe07f8d341887a72e413c1b342b0ba46069c881475a6 -size 10446 +oid sha256:c4f6fad424613b7f395f62d9e2afd9668fb54ad6332c670db6ec7de00bdf37e2 +size 10407 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally.png index 490a638eff..6103548c21 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:288aa8debeeea3422d08e4ff1ca3c1485a11f8d0b25d5914987c5c428b4367fe -size 10377 +oid sha256:02243da0a42d5ccb5da360db1dd5bd9768ec6473b9b6d19619cbf51f6e042cdc +size 10827 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_after.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_after.png index da463ca892..099724acb3 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_after.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_after.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48f23316107f93c8e2f39ffdf09e75adf61fea6f01ba1ca7f61474b0f8274b87 -size 44053 +oid sha256:c1790c4c930e5f8d1b1c55ac9665fd6c576d47fb1260aa7a637ecd6218cc2eb2 +size 44779 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_before.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_before.png index 73973cfb7c..b57fa742aa 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_before.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testLayoutAfterDetach_before.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c54e0acadf777a815cd2075be77f3ca627bc98958c200b38d7ea00f58b61611e -size 20673 +oid sha256:6d9dbf7f82fd92f152f5706a4c33e15fcb028a10595c53e6611b0443cae816ec +size 20799 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowMargins.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowMargins.png index e3b328202c..1dbfa60f4e 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowMargins.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowMargins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9904aa956aa07dff705ee12bab4228a2f0b1fbf3ec9c659e92c2da07e0a25894 -size 65298 +oid sha256:6aabee9cb98a1527e69949d3f277e830644b7384a6f626053ec6ba91d0bcab3f +size 65320 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_empty.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_empty.png index 43f7537d89..a1242863ab 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_empty.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_empty.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c86113258ec44ab8a47af6fb0d5862babd6619b6268aeac8e3b7cb91fe80a74a -size 45215 +oid sha256:410d3908a09e956d0535ff174eaf3fd86e4a2d2144726c67ad5129a7054c5dfa +size 42064 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_margin.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_margin.png index 440c57835b..4b6f04789b 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_margin.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testRowWithChildModifierChanges_margin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d644946907e3fba1fd7f6d54bef9ad65b53b55fe1651019709fa7166108d1dfd -size 41457 +oid sha256:780959d011752f8023be0390944d50790b988b4805e7ce9fd49010b92240e5b7 +size 35909 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow.png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow.png index 7e4274e81a..b7b6d39a7a 100644 --- a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow.png +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_testTextWrapsInsideRow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17fb941c33f7f095b36ece205827b3b1f420dd8bbef4ad77658f83cf2e99d3e4 -size 21544 +oid sha256:05c403a405027c4edf7b71df514cf239b222c118294bfe06e480beba4aab57b8 +size 21852 diff --git a/redwood-lazylayout-composeui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiLazyListTest.kt b/redwood-lazylayout-composeui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiLazyListTest.kt index 5e48364128..9dfe21edcf 100644 --- a/redwood-lazylayout-composeui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiLazyListTest.kt +++ b/redwood-lazylayout-composeui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiLazyListTest.kt @@ -59,6 +59,7 @@ class ComposeUiLazyListTest( backgroundColor: Int, ): ComposeTestFlexContainer { return ComposeTestFlexContainer(direction, backgroundColor) + .apply { applyDefaults() } } override fun row(): Row<@Composable () -> Unit> { diff --git a/redwood-lazylayout-uiview/src/commonTest/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyListAsFlexContainerTest.kt b/redwood-lazylayout-uiview/src/commonTest/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyListAsFlexContainerTest.kt index 1ecb5710f0..5a1c7bcc0f 100644 --- a/redwood-lazylayout-uiview/src/commonTest/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyListAsFlexContainerTest.kt +++ b/redwood-lazylayout-uiview/src/commonTest/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyListAsFlexContainerTest.kt @@ -43,6 +43,7 @@ class UIViewLazyListAsFlexContainerTest( direction: FlexDirection, backgroundColor: Int, ) = ViewTestFlexContainer(lazyLayoutWidgetFactory.LazyList(), direction, backgroundColor) + .apply { applyDefaults() } override fun row() = UIViewRedwoodLayoutWidgetFactory().Row() diff --git a/redwood-lazylayout-view/src/test/kotlin/app/cash/redwood/lazylayout/view/ViewLazyListAsFlexContainerTest.kt b/redwood-lazylayout-view/src/test/kotlin/app/cash/redwood/lazylayout/view/ViewLazyListAsFlexContainerTest.kt index 1e93112d55..2744093fcc 100644 --- a/redwood-lazylayout-view/src/test/kotlin/app/cash/redwood/lazylayout/view/ViewLazyListAsFlexContainerTest.kt +++ b/redwood-lazylayout-view/src/test/kotlin/app/cash/redwood/lazylayout/view/ViewLazyListAsFlexContainerTest.kt @@ -58,6 +58,7 @@ class ViewLazyListAsFlexContainerTest( backgroundColor: Int, ): TestFlexContainer { return ViewTestFlexContainer(paparazzi.context, direction, backgroundColor) + .apply { applyDefaults() } } override fun row(): Row {