Refactor the TextField composable to use modifiers

Author: ShreckYe

compose-multiplatform-material/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/TextField.androidxCommon.kt

@@ -1,17 +1,13 @@
 package com.huanshankeji.compose.material
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.ui.Element
-import com.huanshankeji.compose.ui.ModifierOrAttrs
-import com.huanshankeji.compose.ui.toModifier
-
-actual abstract class TextFieldElement : Element()
+import com.huanshankeji.compose.ui.Modifier
 
 @Composable
 actual fun TextField(
     value: String,
     onValueChange: (String) -> Unit,
-    modifierOrAttrs: ModifierOrAttrs<TextFieldElement>,
+    modifier: Modifier,
     enabled: Boolean,
     label: String?,
     leadingIcon: @Composable (() -> Unit)?,
@@ -20,7 +16,7 @@ actual fun TextField(
     androidx.compose.material.TextField(
         value,
         onValueChange,
-        modifierOrAttrs.toModifier(),
+        modifier.platformModifier,
         enabled = enabled,
         label = label?.let { { Text(it) } },
         leadingIcon = leadingIcon,

compose-multiplatform-material/src/commonMain/kotlin/com/huanshankeji/compose/material/TextField.kt

@@ -1,22 +1,20 @@
 package com.huanshankeji.compose.material
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.ui.Element
-import com.huanshankeji.compose.ui.ModifierOrAttrs
-
-expect abstract class TextFieldElement : Element
+import com.huanshankeji.compose.ui.Modifier
 
 @Composable
 expect fun TextField(
     value: String,
     onValueChange: (String) -> Unit,
-    modifierOrAttrs: ModifierOrAttrs<TextFieldElement> = null,
+    modifier: Modifier = Modifier,
     enabled: Boolean = true,
     label: String? = null,
     /*
+    // These 2 are not the same thing.
     placeholder: String? = null,
     helperText: String? = null,
     */
     leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
+    trailingIcon: @Composable (() -> Unit)? = null
 )

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

@@ -1,27 +1,23 @@
 package com.huanshankeji.compose.material
 
 import androidx.compose.runtime.Composable
-import com.huanshankeji.compose.ui.ModifierOrAttrs
-import com.huanshankeji.compose.ui.toAttrs
+import com.huanshankeji.compose.ui.Modifier
+import com.varabyte.kobweb.compose.ui.toAttrs
 import dev.petuska.kmdc.textfield.MDCTextField
-import org.w3c.dom.HTMLInputElement
-
-actual typealias TextFieldElement = HTMLInputElement
 
 @Composable
 actual fun TextField(
     value: String,
     onValueChange: (String) -> Unit,
-    modifierOrAttrs: ModifierOrAttrs<TextFieldElement>,
+    modifier: Modifier,
     enabled: Boolean,
     label: String?,
     leadingIcon: @Composable (() -> Unit)?,
     trailingIcon: @Composable (() -> Unit)?,
 ) =
     MDCTextField(value,
-        attrs = {
+        attrs = modifier.platformModifier.toAttrs {
             onInput { onValueChange(it.value) }
-            modifierOrAttrs.toAttrs()?.let { it() }
         },
         disabled = !enabled,
         label = label,