Remove the dependency on compose-multiplatform-common-legacy in compose-multiplatform-material and improve code

Author: ShreckYe

compose-multiplatform-material/build.gradle.kts

@@ -16,7 +16,6 @@ kotlin {
             dependencies {
                 api(compose.runtime)
                 implementation("org.jetbrains.compose.annotation-internal:annotation:${DependencyVersions.composeMultiplatform}")
-                api(project(":compose-multiplatform-common:compose-multiplatform-common-legacy")) // TODO remove
                 api(project(":compose-multiplatform-common"))
                 //compileOnly(compose.material) // for KDoc element links only
             }

compose-multiplatform-material/src/jsMain/kotlin/com/huanshankeji/compose/material/Button.js.kt

@@ -6,11 +6,8 @@ import com.huanshankeji.compose.foundation.layout.RowScope
 import com.huanshankeji.compose.material.ext.ButtonType
 import com.huanshankeji.compose.material.ext.toMDCButtonType
 import com.huanshankeji.compose.ui.Modifier
-import com.huanshankeji.compose.web.attributes.attrs
-import com.huanshankeji.compose.web.attributes.plus
 import com.varabyte.kobweb.compose.ui.toAttrs
 import dev.petuska.kmdc.button.MDCButton
-import org.w3c.dom.HTMLButtonElement
 
 @Composable
 private fun Button(
@@ -20,9 +17,9 @@ private fun Button(
     content: @Composable RowScope.() -> Unit
 ) =
     MDCButton(buttonType.toMDCButtonType(),
-        attrs = attrs<HTMLButtonElement> {
+        attrs = modifier.platformModifier.toAttrs {
             onClick { onClick() }
-        } + modifier.platformModifier.toAttrs()) {
+        }) {
         Row(content = content)
     }
 

compose-multiplatform-material/src/jsMain/kotlin/com/huanshankeji/compose/material/Card.js.kt

@@ -2,15 +2,11 @@ package com.huanshankeji.compose.material
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
-import com.huanshankeji.compose.web.css.FIT_CONTENT
-import com.huanshankeji.compose.web.css.width
+import com.huanshankeji.kobweb.compose.ui.modifiers.sizeFitContent
 import com.varabyte.kobweb.compose.ui.toAttrs
 import dev.petuska.kmdc.card.MDCCard
+import com.varabyte.kobweb.compose.ui.Modifier as PlatformModifier
 
 @Composable
 actual fun Card(modifier: Modifier, content: @Composable () -> Unit) =
-    MDCCard(attrs = modifier.platformModifier.toAttrs {
-        style {
-            width(FIT_CONTENT)
-        }
-    }) { content() }
+    MDCCard(attrs = PlatformModifier.sizeFitContent().then(modifier.platformModifier).toAttrs()) { content() }

compose-multiplatform-material/src/jsMain/kotlin/com/huanshankeji/compose/material/ext/Button.js.kt

@@ -3,8 +3,6 @@ package com.huanshankeji.compose.material.ext
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.material.ext.ButtonType.*
 import com.huanshankeji.compose.ui.Modifier
-import com.huanshankeji.compose.web.attributes.attrs
-import com.huanshankeji.compose.web.attributes.plus
 import com.varabyte.kobweb.compose.ui.toAttrs
 import dev.petuska.kmdc.button.Label
 import dev.petuska.kmdc.button.MDCButton
@@ -20,9 +18,9 @@ actual fun Button(
     content: @Composable ButtonScope.() -> Unit
 ) =
     MDCButton(buttonType.toMDCButtonType(),
-        attrs = attrs<HTMLButtonElement> {
+        attrs = modifier.platformModifier.toAttrs {
             onClick { onClick() }
-        } + modifier.platformModifier.toAttrs()) {
+        }) {
         ButtonScope(this).content()
     }