Add flex-basis: 0 to the weight modifiers on JS DOM to be consist…

…ent with the `androidx.compose` behavior
huanshankeji · Sep 10, 2024 · 026d258 · 026d258
1 parent 6690e85
commit 026d258
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/...platform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.js.kt b/...platform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.js.kt
@@ -42,7 +42,7 @@ actual interface ColumnScope {
         @FloatRange(from = 0.0, fromInclusive = false)
         weight: Float
     ): Modifier =
-        with(platformValue) { platformModify { weight(weight) } }
+        with(platformValue) { platformModify { flexBasis0().weight(weight) } }
 
     @Stable
     actual fun Modifier.align(alignment: Alignment.Horizontal): Modifier =

diff --git a/...platform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/FlexBasis.kt b/...platform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/FlexBasis.kt
@@ -0,0 +1,8 @@
+package com.huanshankeji.compose.foundation.layout
+
+import com.huanshankeji.compose.ui.PlatformModifier
+import com.varabyte.kobweb.compose.ui.modifiers.flexBasis
+import org.jetbrains.compose.web.css.px
+
+fun PlatformModifier.flexBasis0() =
+    flexBasis(0.px)
diff --git a/...ltiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.js.kt b/...ltiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.js.kt
@@ -42,7 +42,7 @@ actual interface RowScope {
         @FloatRange(from = 0.0, fromInclusive = false)
         weight: Float
     ): Modifier =
-        with(platformValue) { platformModify { weight(weight) } }
+        with(platformValue) { platformModify { flexBasis0().weight(weight) } }
 
     @Stable
     actual fun Modifier.align(alignment: Alignment.Vertical): Modifier =