Fix bug related to stack layout within scroll views

skiptools · Aug 23, 2024 · c89e7f3 · c89e7f3
1 parent b2235b0
commit c89e7f3
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Sources/SkipUI/SkipUI/Compose/ComposeContainer.swift b/Sources/SkipUI/SkipUI/Compose/ComposeContainer.swift
@@ -45,9 +45,10 @@ import androidx.compose.ui.Modifier
     var modifier = modifier
     let inheritedScrollAxes = EnvironmentValues.shared._scrollAxes
     var totalScrollAxes = inheritedScrollAxes
-    if fixedWidth {
+    if fixedWidth || axis == .vertical {
         totalScrollAxes.remove(Axis.Set.horizontal)
-    } else if isFillWidth.value {
+    }
+    if !fixedWidth && isFillWidth.value {
         if fillWidth {
             modifier = modifier.fillWidth()
         } else if inheritedScrollAxes.contains(Axis.Set.horizontal) {
@@ -56,9 +57,10 @@ import androidx.compose.ui.Modifier
             modifier = modifier.fillWidth()
         }
     }
-    if fixedHeight {
+    if fixedHeight || axis == .horizontal {
         totalScrollAxes.remove(Axis.Set.vertical)
-    } else if isFillHeight.value {
+    }
+    if !fixedHeight && isFillHeight.value {
         if fillHeight {
             modifier = modifier.fillHeight()
         } else if inheritedScrollAxes.contains(Axis.Set.vertical) {