Fix a layout bug in Yoga

Keep independent variables for the childWidthRef and childHeightRef.
cashapp · Oct 1, 2024 · 09fe82b · 09fe82b
1 parent ddc0f0c
commit 09fe82b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ Fixed:
 - Don't clip elements of `Column` and `Row` layouts whose unbounded size exceeds the container size.
 - Correctly implement margins for `Box` on iOS.
 - Correctly handle dynamic updates to modifiers on `Column` and `Row`.
+- Fix a layout bug where children of fixed-with `Row` containers were assigned the wrong width.
 
 
 ## [0.14.0] - 2024-08-29

diff --git a/...omposeUiFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[LTR].png b/...omposeUiFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[LTR].png
diff --git a/...omposeUiFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[RTL].png b/...omposeUiFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[RTL].png
diff --git a/.../UIViewFlexContainerTestHost/testRowWithFixedWidthHasChildWithFixedHeight.1.png b/.../UIViewFlexContainerTestHost/testRowWithFixedWidthHasChildWithFixedHeight.1.png
diff --git a/...iew_ViewFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[LTR].png b/...iew_ViewFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[LTR].png
diff --git a/...iew_ViewFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[RTL].png b/...iew_ViewFlexContainerTest_testRowWithFixedWidthHasChildWithFixedHeight[RTL].png
diff --git a/redwood-yoga/src/commonMain/kotlin/app/cash/redwood/yoga/internal/Yoga.kt b/redwood-yoga/src/commonMain/kotlin/app/cash/redwood/yoga/internal/Yoga.kt
@@ -1745,15 +1745,17 @@ internal object Yoga {
         mode = childWidthMeasureMode,
         size = childWidthRef,
       )
+      childWidth = childWidthRef.argValue
+      val childHeightRef = RefObject(childHeight)
       YGConstrainMaxSizeForMode(
         node = child,
         axis = YGFlexDirection.YGFlexDirectionColumn,
         ownerAxisSize = ownerHeight,
         ownerWidth = ownerWidth,
         mode = childHeightMeasureMode,
-        size = childWidthRef,
+        size = childHeightRef,
       )
-      childWidth = childWidthRef.argValue
+      childHeight = childHeightRef.argValue
       YGLayoutNodeInternal(
         node = child,
         availableWidth = childWidth,