add: text rendering

Author: kigawa01

renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/state/BasicDslStateBase.kt

@@ -45,8 +45,10 @@ abstract class BasicDslStateBase : DslState {
 
     abstract fun setElements(index: Int, elements: List<TagNode>)
     fun getElements(): List<TagNode> {
-        return ownElement?.let { listOf(it) }
-            ?: subStates.flatMap { it.getElements() }
+        return ownElement?.let {
+            if (it.isEmpty) listOf()
+            else listOf(it)
+        } ?: subStates.flatMap { it.getElements() }
     }
 
     fun remove() {

renlin/src/commonMain/kotlin/net/kigawa/renlin/element/TagNode.kt

@@ -4,9 +4,9 @@ import net.kigawa.renlin.tag.Tag
 
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 expect interface TagNode {
+    val isEmpty: Boolean
     fun setTextContent(text: String?)
     fun newNode(tag: Tag<*>): TagNode
     fun remove()
-
     fun setNodes(index: Int, nodes: List<TagNode>)
 }

renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt

@@ -14,7 +14,7 @@ class DivDsl : DslBase(), Dsl, FlowContentDsl, PhrasingContentDsl {
 
     override var textContent: String? = null
         set(value) {
-            textNodeTag.render(this) {
+            text.render(this) {
                 text = value
             }
             field = value

renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt

@@ -14,7 +14,7 @@ class PDsl() : DslBase(), Dsl, PhrasingContentDsl {
 
     override var textContent: String? = null
         set(value) {
-            textNodeTag.render(this) {
+            text.render(this) {
                 text = value
             }
             field = value

renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Text.kt

@@ -8,13 +8,20 @@ import net.kigawa.renlin.tag.item.FlowContentItem
 
 class TextNodeTagDsl : DslBase(), Dsl {
     var text: String? = null
+        set(value) {
+            dslState?.applyDsl(this)
+            field = value
+        }
+    operator fun String.unaryPlus() {
+        text = this
+    }
 
     override fun applyElement(element: TagNode) {
         element.setTextContent(text)
     }
 }
 
-val textNodeTag = TagComponent0<TextNodeTag, TextNodeTagDsl>(TextNodeTag)
+val text = TagComponent0<TextNodeTag, TextNodeTagDsl>(TextNodeTag)
 
 object TextNodeTag : FlowContentItem<TextNodeTagDsl>, Tag<TextNodeTagDsl> {
     override val name: String

renlin/src/jsMain/kotlin/net/kigawa/renlin/element/DomTagElement.kt

@@ -10,6 +10,9 @@ class DomTagElement(
     override val node: Node,
     private val parent: DomTagElement?,
 ) : TagNode {
+    override val isEmpty: Boolean
+        get() = if (node is Text) node.textContent == null else false
+
     override fun setTextContent(text: String?) {
         node.textContent = text
     }

renlin/src/jsMain/kotlin/net/kigawa/renlin/element/TagNode.kt

@@ -5,6 +5,7 @@ import org.w3c.dom.Node
 
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 actual interface TagNode {
+    actual val isEmpty: Boolean
     val node: Node
     actual fun setTextContent(text: String?)
     actual fun newNode(tag: Tag<*>): TagNode

renlin/src/jvmMain/kotlin/net/kigawa/renlin/element/TagNode.kt

@@ -4,6 +4,7 @@ import net.kigawa.renlin.tag.Tag
 
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 actual interface TagNode {
+    actual val isEmpty: Boolean
     actual fun setTextContent(text: String?)
     actual fun newNode(tag: Tag<*>): TagNode
     actual fun remove()

sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt

@@ -2,19 +2,24 @@ package net.kigawa.renlin.sample
 
 import net.kigawa.renlin.tag.div
 import net.kigawa.renlin.tag.p
+import net.kigawa.renlin.tag.text
 
 class SampleComponent(
     val name: String,
     val sub: Sub,
 ) {
+    lateinit var update: (Int) -> Unit
     val root = div.component {
 //        debug("root")
         key = "uuid aaaddasdawaadadssdasaaaa"
         +"test root"
-        for (i in 0..10) {
-            p {
-                key = "uuid 1"
-                +"repeat $i"
+        div {
+            key = "uuid 1"
+            text {
+                key = "uuid 1-1"
+                update = {
+                    +"repeat $it"
+                }
             }
         }
         sub.display {

sample/src/jsMain/kotlin/net/kigawa/renlin/sample/Main.kt

@@ -1,10 +1,18 @@
 package net.kigawa.renlin.sample
 
 import kotlinx.browser.document
+import kotlinx.browser.window
 import net.kigawa.renlin.Entrypoint
 
 fun main() {
     val root = document.getElementById("root") ?: throw Exception("Root not found")
     val sample = SampleComponent("sample", Sub())
     Entrypoint(root).render(sample.root)
+    var i = 0
+    window.setInterval({
+
+                           i++
+                           sample.update(i)
+                       }, 1000, 1000)
+
 }