Improve the Text APIs

1. add `RawText`;
1. add an opt-in requirement for `com.huanshankeji.compose.material.Text`;
1. add `modifierAndAttrs` arguments.

Author: ShreckYe

compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/BasicText.kt

@@ -1,6 +1,10 @@
 package com.huanshankeji.compose
 
 import androidx.compose.runtime.Composable
+import com.huanshankeji.compose.ui.Element
+import com.huanshankeji.compose.ui.ModifierOrAttrs
+
+expect abstract class BasicTextElement : Element
 
 @Composable
-expect fun BasicText(text: String)
+expect fun BasicText(text: String, modifierOrAttrs: ModifierOrAttrs<BasicTextElement> = null)

compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/RawText.kt

@@ -0,0 +1,7 @@
+package com.huanshankeji.compose
+
+import androidx.compose.runtime.Composable
+
+/** A raw text composable which doesn't add any element on web. */
+@Composable
+expect fun RawText(text: String)

compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/BasicText.kt

@@ -1,8 +1,14 @@
 package com.huanshankeji.compose
 
 import androidx.compose.runtime.Composable
+import com.huanshankeji.compose.ui.ModifierOrAttrs
+import com.huanshankeji.compose.ui.toAttrs
+import org.jetbrains.compose.web.dom.Span
 import org.jetbrains.compose.web.dom.Text
+import org.w3c.dom.HTMLSpanElement
+
+actual typealias BasicTextElement = HTMLSpanElement
 
 @Composable
-actual fun BasicText(text: String) =
-    Text(text)
+actual fun BasicText(text: String, modifierOrAttrs: ModifierOrAttrs<HTMLSpanElement>) =
+    Span(modifierOrAttrs.toAttrs()) { Text(text) }

compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/RawText.kt

@@ -0,0 +1,8 @@
+package com.huanshankeji.compose
+
+import androidx.compose.runtime.Composable
+import org.jetbrains.compose.web.dom.Text
+
+@Composable
+actual fun RawText(text: String) =
+    Text(text)

compose-multiplatform-common/src/jvmMain/kotlin/com/huanshankeji/compose/BasicText.kt

@@ -1,7 +1,12 @@
 package com.huanshankeji.compose
 
 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 BasicTextElement : Element()
 
 @Composable
-actual fun BasicText(text: String) =
-    androidx.compose.foundation.text.BasicText(text)
+actual fun BasicText(text: String, modifierOrAttrs: ModifierOrAttrs<BasicTextElement>) =
+    androidx.compose.foundation.text.BasicText(text, modifierOrAttrs.toModifier())

compose-multiplatform-common/src/jvmMain/kotlin/com/huanshankeji/compose/RawText.kt

@@ -0,0 +1,7 @@
+package com.huanshankeji.compose
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun RawText(text: String) =
+    androidx.compose.foundation.text.BasicText(text)

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

@@ -1,6 +1,29 @@
 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 TextElement : Element
+
+@RequiresOptIn(
+    "The `com.huanshankeji.compose.material.Text` function " +
+            "can be easily confused with other Composable functions named `Text` " +
+            "such as `androidx.compose.material.Text` and `org.jetbrains.compose.web.dom.Text` " +
+            "if not careful. " +
+            "Opt-in to use this API or use `MaterialText` instead.",
+    RequiresOptIn.Level.WARNING
+)
+@Retention(AnnotationRetention.BINARY)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+annotation class ConfusableTextApi
+
+@ConfusableTextApi
+@Composable
+expect fun Text(text: String, modifierOrAttrs: ModifierOrAttrs<TextElement> = null)
+
+@Suppress("NOTHING_TO_INLINE")
+@OptIn(ConfusableTextApi::class)
 @Composable
-expect fun Text(text: String)
+inline fun MaterialText(text: String, noinline modifierOrAttrs: ModifierOrAttrs<TextElement> = null) =
+    Text(text, modifierOrAttrs)

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

@@ -2,7 +2,11 @@ package com.huanshankeji.compose.material
 
 import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.BasicText
+import com.huanshankeji.compose.ui.ModifierOrAttrs
+import org.w3c.dom.HTMLSpanElement
+
+actual typealias TextElement = HTMLSpanElement
 
 @Composable
-actual fun Text(text: String) =
-    BasicText(text)
+actual fun Text(text: String, modifierOrAttrs: ModifierOrAttrs<TextElement>) =
+    BasicText(text, modifierOrAttrs)

compose-multiplatform-material/src/jvmMain/kotlin/com/huanshankeji/compose/material/Text.kt

@@ -0,0 +1,12 @@
+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 TextElement : Element()
+
+@Composable
+actual fun Text(text: String, modifierOrAttrs: ModifierOrAttrs<TextElement>) =
+    androidx.compose.material.Text(text, modifierOrAttrs.toModifier())