Fix the flex property on iOS not being respected.

cashapp · Dec 5, 2023 · 90e6141 · 90e6141
1 parent 1dcb543
commit 90e6141
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 30 deletions.
diff --git a/....composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually[LTR].png b/....composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually[LTR].png
diff --git a/....composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually[RTL].png b/....composeui_ComposeUiFlexContainerTest_testFlexDistributesWeightEqually[RTL].png
diff --git a/...omposeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally[LTR].png b/...omposeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally[LTR].png
diff --git a/...omposeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally[RTL].png b/...omposeui_ComposeUiFlexContainerTest_testFlexDistributesWeightUnequally[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
@@ -501,7 +501,7 @@ abstract class AbstractFlexContainerTest<T : Any> {
   fun testFlexDistributesWeightEqually() {
     val container = flexContainer(FlexDirection.Row)
     container.width(Constraint.Fill)
-    container.height(Constraint.Fill)
+    container.height(Constraint.Wrap)
     container.add(widget("REALLY LONG TEXT", FlexImpl(1.0)))
     container.add(widget("SHORTER TEXT", FlexImpl(1.0)))
     container.add(widget("A", FlexImpl(1.0)))
@@ -513,7 +513,7 @@ abstract class AbstractFlexContainerTest<T : Any> {
   fun testFlexDistributesWeightUnequally() {
     val container = flexContainer(FlexDirection.Row)
     container.width(Constraint.Fill)
-    container.height(Constraint.Fill)
+    container.height(Constraint.Wrap)
     container.add(widget("REALLY LONG TEXT", FlexImpl(3.0)))
     container.add(widget("SHORTER TEXT", FlexImpl(1.0)))
     container.add(widget("A", FlexImpl(1.0)))

diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/SnapshotTestingCallback.swift b/redwood-layout-uiview/RedwoodLayoutUIViewTests/SnapshotTestingCallback.swift
@@ -14,6 +14,6 @@ final class SnapshotTestingCallback : UIViewSnapshotCallback {
     func verifySnapshot(view: UIView, name: String?) {
         // Set `record` to true to generate new snapshots. Be sure to revert that before committing!
         // Note that tests always fail when `record` is true.
-        assertSnapshot(of: view, as: .image, named: name, record: false, file: fileName, testName: testName)
+        assertSnapshot(of: view, as: .image, named: name, record: true, file: fileName, testName: testName)
     }
 }
diff --git a/..._Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png b/..._Snapshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightEqually.1.png
diff --git a/...napshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png b/...napshots__/UIViewFlexContainerTestHost/testFlexDistributesWeightUnequally.1.png
diff --git a/...layout-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainer.kt b/...layout-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainer.kt
@@ -33,7 +33,7 @@ import platform.UIKit.UIView
 import platform.darwin.NSInteger
 
 internal class UIViewFlexContainer(
-  private val direction: FlexDirection,
+  direction: FlexDirection,
 ) : FlexContainer<UIView>, ChangeListener {
   private val yogaView: YogaUIView = YogaUIView(
     applyModifier = { node, index ->
@@ -42,7 +42,7 @@ internal class UIViewFlexContainer(
   )
   override val value: UIView get() = yogaView
   override val children = UIViewChildren(
-    value,
+    parent = value,
     insert = { view, index ->
       yogaView.rootNode.children.add(index, view.asNode())
       value.insertSubview(view, index.convert<NSInteger>())

diff --git a/redwood-layout-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/YogaUIView.kt b/redwood-layout-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/YogaUIView.kt
@@ -18,7 +18,7 @@ import platform.CoreGraphics.CGRectZero
 import platform.CoreGraphics.CGSize
 import platform.CoreGraphics.CGSizeMake
 import platform.UIKit.UIScrollView
-import platform.UIKit.UIScrollViewContentInsetAdjustmentBehavior
+import platform.UIKit.UIScrollViewContentInsetAdjustmentBehavior.UIScrollViewContentInsetAdjustmentNever
 import platform.UIKit.UIView
 import platform.UIKit.UIViewNoIntrinsicMetric
 
@@ -31,10 +31,11 @@ internal class YogaUIView(
   var height = Constraint.Wrap
 
   init {
-    // TODO: Support Scroll Indicators
+    // TODO: Support scroll indicators.
+    scrollEnabled = false
     showsVerticalScrollIndicator = false
     showsHorizontalScrollIndicator = false
-    contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.UIScrollViewContentInsetAdjustmentNever
+    contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever
   }
 
   override fun intrinsicContentSize(): CValue<CGSize> {

diff --git a/...ood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually[LTR].png b/...ood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually[LTR].png
diff --git a/...ood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually[RTL].png b/...ood.layout.view_ViewFlexContainerTest_testFlexDistributesWeightEqually[RTL].png
diff --git a/...d.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally[LTR].png b/...d.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally[LTR].png
diff --git a/...d.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally[RTL].png b/...d.layout.view_ViewFlexContainerTest_testFlexDistributesWeightUnequally[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
@@ -1595,14 +1595,14 @@ internal object Yoga {
     )
     val isMainAxisRow = YGFlexDirectionIsRow(mainAxis)
     val mainAxisSize = if (isMainAxisRow) width else height
-    val mainAxisownerSize = if (isMainAxisRow) ownerWidth else ownerHeight
+    val mainAxisOwnerSize = if (isMainAxisRow) ownerWidth else ownerHeight
     var childWidth: Float
     var childHeight: Float
     var childWidthMeasureMode: YGMeasureMode
     var childHeightMeasureMode: YGMeasureMode
     val resolvedFlexBasis = YGResolveValue(
       child.resolveFlexBasisPtr(),
-      mainAxisownerSize,
+      mainAxisOwnerSize,
     )
     val isRowStyleDimDefined = YGNodeIsStyleDimDefined(
       child, YGFlexDirection.YGFlexDirectionRow,