Fix Komponent.create, v. 0.5.8

Took 7 minutes

build.gradle.kts

@@ -1,79 +1,78 @@
-
 plugins {
-    kotlin("multiplatform") version "1.5.21"
+  kotlin("multiplatform") version "1.5.21"
-    `maven-publish`
+  `maven-publish`
 }
 
 group = "nl.astraeus"
-version = "0.5.8-SNAPSHOT"
+version = "0.5.8"
 
 repositories {
-    mavenCentral()
+  mavenCentral()
 }
 
 kotlin {
-    js(BOTH) {
+  js(BOTH) {
-        browser {
+    browser {
-            testTask {
+      testTask {
-                useKarma {
+        useKarma {
-                    useChromiumHeadless()
+          useChromiumHeadless()
-                    //useChromeHeadless()
+          //useChromeHeadless()
-                }
-            }
         }
+      }
     }
+  }
 
-    sourceSets {
+  sourceSets {
-        val commonMain by getting {
+    val commonMain by getting {
-            dependencies {
+      dependencies {
-                implementation(kotlin("stdlib-common"))
+        implementation(kotlin("stdlib-common"))
 
-                api("org.jetbrains.kotlinx:kotlinx-html-js:0.7.3")
+        api("org.jetbrains.kotlinx:kotlinx-html-js:0.7.3")
-            }
+      }
-        }
-        val jsMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
-        }
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
-        }
     }
+    val jsMain by getting {
+      dependencies {
+        implementation(kotlin("stdlib-js"))
+      }
+    }
+    val jsTest by getting {
+      dependencies {
+        implementation(kotlin("test-js"))
+      }
+    }
+  }
 }
 
 publishing {
-    repositories {
+  repositories {
-        if (project.properties["nexusUsername"] != null) {
+    if (project.properties["nexusUsername"] != null) {
-            maven {
+      maven {
-                name = "releases"
+        name = "releases"
-                url = uri("https://nexus.astraeus.nl/nexus/content/repositories/releases")
+        url = uri("https://nexus.astraeus.nl/nexus/content/repositories/releases")
-                credentials {
+        credentials {
-                    val nexusUsername: String by project
+          val nexusUsername: String by project
-                    val nexusPassword: String by project
+          val nexusPassword: String by project
 
-                    username = nexusUsername
+          username = nexusUsername
-                    password = nexusPassword
+          password = nexusPassword
-                }
-            }
-            maven {
-                name = "snapshots"
-                url = uri("https://nexus.astraeus.nl/nexus/content/repositories/snapshots")
-                credentials {
-                    val nexusUsername: String by project
-                    val nexusPassword: String by project
-
-                    username = nexusUsername
-                    password = nexusPassword
-                }
-            }
-        } else {
-            println("Publishing disabled properties not found.")
         }
+      }
+      maven {
+        name = "snapshots"
+        url = uri("https://nexus.astraeus.nl/nexus/content/repositories/snapshots")
+        credentials {
+          val nexusUsername: String by project
+          val nexusPassword: String by project
+
+          username = nexusUsername
+          password = nexusPassword
+        }
+      }
+    } else {
+      println("Publishing disabled properties not found.")
     }
-    publications {
+  }
-        val kotlinMultiplatform by getting {}
+  publications {
-    }
+    val kotlinMultiplatform by getting {}
+  }
 }

komp.commonMain.iml

@@ -2,7 +2,7 @@
 <module external.linked.project.id="komp:commonMain" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.5.8-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.8]/Native []/Native [general]" useProjectSettings="false" isTestModule="false" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.8]/Native []/Native [general]" useProjectSettings="false" isTestModule="false" externalProjectId="komp">
         <newMppModelJpsModuleKind>SOURCE_SET_HOLDER</newMppModelJpsModuleKind>
         <compilerSettings />
         <compilerArguments>

komp.commonTest.iml

@@ -2,7 +2,7 @@
 <module external.linked.project.id="komp:commonTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.5.8-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.8]/Native []/Native [general]" useProjectSettings="false" isTestModule="true" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.8]/Native []/Native [general]" useProjectSettings="false" isTestModule="true" externalProjectId="komp">
         <newMppModelJpsModuleKind>SOURCE_SET_HOLDER</newMppModelJpsModuleKind>
         <externalSystemTestTasks>
           <externalSystemTestTask>jsLegacyBrowserTest|komp:jsTest|jsLegacy</externalSystemTestTask>

komp.jsMain.iml

@@ -2,7 +2,7 @@
 <module external.linked.project.id="komp:jsMain" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.5.8-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="false" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="false" externalProjectId="komp">
         <dependsOnModuleNames>komp:commonMain</dependsOnModuleNames>
         <sourceSets>
           <sourceSet>komp.commonMain</sourceSet>

komp.jsTest.iml

@@ -2,7 +2,7 @@
 <module external.linked.project.id="komp:jsTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.5.8-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="true" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="true" externalProjectId="komp">
         <dependsOnModuleNames>komp:commonTest</dependsOnModuleNames>
         <sourceSets>
           <sourceSet>komp.commonTest</sourceSet>

src/jsMain/kotlin/nl/astraeus/komp/HtmlBuilder.kt

@@ -112,7 +112,7 @@ private fun Element.getKompAttributes(): MutableSet<String> {
   return result
 }
 
-private fun Element.setKompAttribute(name: String, value: String) {
+fun Element.setKompAttribute(name: String, value: String) {
   val setAttrs: MutableSet<String> = getKompAttributes()
   setAttrs.add(name)
 
@@ -388,7 +388,7 @@ class HtmlBuilder(
             element.focus()
           }
 
-          if (!setAttrs.contains(attr.name)) {
+          if (attr.name != "style" && !setAttrs.contains(attr.name)) {
             if (element is HTMLInputElement) {
               if (attr.name == "checkbox") {
                 element.checked = false
@@ -515,7 +515,7 @@ class HtmlBuilder(
       val container = document.createElement("div") as HTMLElement
       val consumer = HtmlBuilder(container, 0)
       content.invoke(consumer)
-      return consumer.root ?: error("error")
+      return consumer.root ?: error("No root element found after render!")
     }
   }
 }

src/jsMain/kotlin/nl/astraeus/komp/Komponent.kt

@@ -4,7 +4,6 @@ import kotlinx.browser.window
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
-import org.w3c.dom.css.CSSStyleDeclaration
 import org.w3c.dom.get
 import kotlin.reflect.KProperty
 
@@ -40,13 +39,12 @@ abstract class Komponent {
   private var lastMemoizeHash: Int? = null
 
   var element: Node? = null
-  val declaredStyles: MutableMap<String, CSSStyleDeclaration> = HashMap()
 
   open fun create(parent: Element, childIndex: Int? = null) {
     onBeforeUpdate()
     val builder = HtmlBuilder(
       parent,
-      childIndex ?: parent.childElementCount
+      childIndex ?: parent.childNodes.length
     )
 
     builder.render()