Add AttrBuilderContext<TElement>?.toModifierOrAttrs() and Modifier.toModifierOrAttrs()

Author: ShreckYe

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

@@ -6,6 +6,8 @@ import com.huanshankeji.compose.ui.unit.SizeValue
 typealias ModifierOrAttrs<TElement> = (ModifierOrAttrsScope<TElement>.() -> Unit)?
 
 expect abstract class Element
+
+// TODO: add `out` to `TElement`
 expect class ModifierOrAttrsScope<TElement : Element> {
     fun style(builder: StyleScope.() -> Unit)
 }

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

@@ -9,6 +9,9 @@ import org.w3c.dom.HTMLElement
 fun <TElement : Element> ModifierOrAttrs<TElement>.toAttrs(): AttrBuilderContext<TElement>? =
     this?.let { { ModifierOrAttrsScope(this).it() } }
 
+fun <TElement : Element> AttrBuilderContext<TElement>?.toModifierOrAttrs(): ModifierOrAttrs<TElement> =
+    this?.let { { attrsScope.it() } }
+
 actual typealias Element = HTMLElement
 
 actual class ModifierOrAttrsScope<TElement : Element>(val attrsScope: AttrsScope<TElement>) {

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

@@ -9,6 +9,11 @@ fun <TElement : Element> ModifierOrAttrs<TElement>.toModifier(): Modifier =
         ModifierOrAttrsScope<TElement>(Modifier).apply(it).modifier
     } ?: Modifier
 
+fun <TElement : Element> Modifier.toModifierOrAttrs(): ModifierOrAttrs<TElement> =
+    if (this !== Modifier) {
+        { modify { this then this@toModifierOrAttrs } }
+    } else null
+
 actual abstract class Element
 
 actual class ModifierOrAttrsScope<TElement : Element>(modifier: Modifier) {