Added two more wicket tags: input and form

Author: ageery

bianmen-core/src/main/kotlin/dev/bombinating/bianmen/dsl/tag/WicketForm.kt

@@ -0,0 +1,34 @@
+package dev.bombinating.bianmen.dsl.tag
+
+import dev.bombinating.bianmen.ComponentExt.wicketIdAttr
+import dev.bombinating.bianmen.dsl.WicketTag
+import kotlinx.html.FORM
+import kotlinx.html.FlowContent
+import kotlinx.html.TagConsumer
+import kotlinx.html.attributesMapOf
+import kotlinx.html.visit
+import org.apache.wicket.Component
+
+public class WicketForm(
+    override val component: Component,
+    initialAttributes: Map<String, String>,
+    consumer: TagConsumer<*>
+) : FORM(initialAttributes = initialAttributes, consumer = consumer),
+    WicketTag {
+
+    public companion object {
+
+        public fun FlowContent.form(
+            component: Component,
+            classes: String? = null,
+            block: WicketForm.() -> Unit = {}
+        ): Unit =
+            WicketForm(
+                component = component,
+                initialAttributes = attributesMapOf("class", classes, wicketIdAttr, component.id),
+                consumer = consumer
+            ).visit(block)
+
+    }
+
+}

bianmen-core/src/main/kotlin/dev/bombinating/bianmen/dsl/tag/WicketInput.kt

@@ -0,0 +1,34 @@
+package dev.bombinating.bianmen.dsl.tag
+
+import dev.bombinating.bianmen.ComponentExt.wicketIdAttr
+import dev.bombinating.bianmen.dsl.WicketTag
+import kotlinx.html.FlowContent
+import kotlinx.html.INPUT
+import kotlinx.html.TagConsumer
+import kotlinx.html.attributesMapOf
+import kotlinx.html.visit
+import org.apache.wicket.Component
+
+public class WicketInput(
+    override val component: Component,
+    initialAttributes: Map<String, String>,
+    consumer: TagConsumer<*>
+) : INPUT(initialAttributes = initialAttributes, consumer = consumer),
+    WicketTag {
+
+    public companion object {
+
+        public fun FlowContent.input(
+            component: Component,
+            classes: String? = null,
+            block: WicketInput.() -> Unit = {}
+        ): Unit =
+            WicketInput(
+                component = component,
+                initialAttributes = attributesMapOf("class", classes, wicketIdAttr, component.id),
+                consumer = consumer
+            ).visit(block)
+
+    }
+
+}

bianmen-core/src/test/kotlin/dev/bombianating/bianmen/dsl/DslPanelTest.kt

@@ -26,6 +26,7 @@ class DslPanelTest : AbstractWicketTest() {
             tester.assertComponent("$COMP_ID:test", WebMarkupContainer::class.java)
         }
     }
+
     @Test
     fun `nested element test`() {
         object : DslPanel(id = COMP_ID) {

bianmen-core/src/test/kotlin/dev/bombianating/bianmen/dsl/tag/WicketInputTest.kt

@@ -0,0 +1,46 @@
+package dev.bombianating.bianmen.dsl.tag
+
+import dev.bombianating.bianmen.AbstractWicketTest
+import dev.bombinating.bianmen.ModelExt.model
+import dev.bombinating.bianmen.dsl.DslPanel
+import dev.bombinating.bianmen.dsl.tag.PanelTag
+import dev.bombinating.bianmen.dsl.tag.WicketForm.Companion.form
+import dev.bombinating.bianmen.dsl.tag.WicketInput.Companion.input
+import dev.bombinating.bianmen.factory.FormFactory.form
+import dev.bombinating.bianmen.factory.TextFieldFactory.textField
+import kotlinx.html.InputType
+import org.apache.wicket.markup.html.form.Form
+import org.apache.wicket.markup.html.form.TextField
+import org.apache.wicket.markup.html.panel.Panel
+import kotlin.streams.toList
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+class WicketInputTest : AbstractWicketTest() {
+
+    @Test
+    fun `input text test`() {
+        object : DslPanel(id = COMP_ID) {
+            override val contents: PanelTag.() -> Unit = {
+                val model = "test".model()
+                form(component = form(model = model)) {
+                    input(component = textField(model = model)) {
+                        type = InputType.text
+                    }
+                }
+            }
+        }.test {
+            val panel = tester.getComponentFromLastRenderedPage(COMP_ID) as Panel
+            val panelChildren = panel.streamChildren().toList()
+            assertEquals(2, panelChildren.size)
+            val form = panelChildren.firstOrNull { it is Form<*> } as Form<*>
+            val textField = panelChildren.firstOrNull { it is TextField<*> } as TextField<*>
+            assertNotNull(form)
+            assertNotNull(textField)
+            assertEquals(panel, form.parent)
+            assertEquals(form, textField.parent)
+        }
+    }
+
+}

build.gradle.kts

@@ -45,7 +45,7 @@ subprojects {
         /*
          * Kotlin
          */
-        implementation(kotlin("stdlib"))
+        implementation(kotlin("stdlib-jdk8"))
         /*
          * Wicket
          */
@@ -56,7 +56,10 @@ subprojects {
         /*
          * Kotlin HTML DSL
          */
-        implementation(group = "org.jetbrains.kotlinx", name = "kotlinx-html-jvm", version = kotlinxHtmlVersion)
+        implementation(group = "org.jetbrains.kotlinx", name = "kotlinx-html-jvm", version = kotlinxHtmlVersion) {
+            exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
+            exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-common")
+        }
         /*
          * Testing
          */