From 963e934953f3f3eb0030a89871100343d51fb2ff Mon Sep 17 00:00:00 2001
From: rnentjes <info@nentjes.com>
Date: Thu, 19 Aug 2021 09:53:16 +0200
Subject: [PATCH] Fix svg/unsafe, add onBeforeUpdate, v. 0.5.6

---
 build.gradle.kts                                  |  2 +-
 komp.commonMain.iml                               |  2 +-
 komp.commonTest.iml                               |  2 +-
 komp.iml                                          |  2 +-
 komp.ipr                                          |  7 ++++++-
 komp.jsMain.iml                                   |  2 +-
 komp.jsTest.iml                                   |  2 +-
 src/jsMain/kotlin/nl/astraeus/komp/HtmlBuilder.kt |  9 ++++++++-
 src/jsMain/kotlin/nl/astraeus/komp/Komponent.kt   | 10 ++++++++++
 src/jsTest/kotlin/nl/astraeus/komp/TestUpdate.kt  |  6 ++++++
 10 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 366bd0a..84492cc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "nl.astraeus"
-version = "0.5.5"
+version = "0.5.7-SNAPSHOT"
 
 repositories {
     mavenCentral()
diff --git a/komp.commonMain.iml b/komp.commonMain.iml
index 72b6087..be266c6 100644
--- a/komp.commonMain.iml
+++ b/komp.commonMain.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.4" type="JAVA_MODULE" version="4">
+<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.6-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">
diff --git a/komp.commonTest.iml b/komp.commonTest.iml
index a1fa3f2..b17b328 100644
--- a/komp.commonTest.iml
+++ b/komp.commonTest.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.4" type="JAVA_MODULE" version="4">
+<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.6-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">
diff --git a/komp.iml b/komp.iml
index 964f4ea..a9e480b 100644
--- a/komp.iml
+++ b/komp.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp" 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.version="0.5.4" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp" 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.version="0.5.6-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/komp.ipr b/komp.ipr
index c6bc0cf..625537b 100644
--- a/komp.ipr
+++ b/komp.ipr
@@ -97,6 +97,12 @@
         <element id="module-output" name="komp.jsMain" />
       </root>
     </artifact>
+    <artifact type="jar" name="komp-jslegacy-0.5.6-SNAPSHOT">
+      <output-path>$PROJECT_DIR$/build/libs</output-path>
+      <root id="archive" name="komp-jslegacy-0.5.6-SNAPSHOT.jar">
+        <element id="module-output" name="komp.jsMain" />
+      </root>
+    </artifact>
   </component>
   <component name="CheckStyle-IDEA">
     <option name="configuration">
@@ -490,7 +496,6 @@
     <mapping directory="" vcs="Git" />
   </component>
   <component name="accountSettings">
-    <option name="activeRegion" value="us-east-1" />
     <option name="recentlyUsedRegions">
       <list>
         <option value="us-east-1" />
diff --git a/komp.jsMain.iml b/komp.jsMain.iml
index 092474f..bae6a11 100644
--- a/komp.jsMain.iml
+++ b/komp.jsMain.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.4" type="JAVA_MODULE" version="4">
+<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.6-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">
diff --git a/komp.jsTest.iml b/komp.jsTest.iml
index 8c1368d..e1332c8 100644
--- a/komp.jsTest.iml
+++ b/komp.jsTest.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.4" type="JAVA_MODULE" version="4">
+<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.6-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">
diff --git a/src/jsMain/kotlin/nl/astraeus/komp/HtmlBuilder.kt b/src/jsMain/kotlin/nl/astraeus/komp/HtmlBuilder.kt
index 78cad1f..4fd9cfa 100644
--- a/src/jsMain/kotlin/nl/astraeus/komp/HtmlBuilder.kt
+++ b/src/jsMain/kotlin/nl/astraeus/komp/HtmlBuilder.kt
@@ -303,6 +303,7 @@ class HtmlBuilder(
       currentPosition.replace(currentNode!!)
     } else {
       //logReplace"onTagStart, same node type")
+
     }
 
     currentElement = currentNode as? Element ?: currentElement
@@ -319,6 +320,12 @@ class HtmlBuilder(
       for (entry in tag.attributesEntries) {
         currentElement!!.setKompAttribute(entry.key.lowercase(), entry.value)
       }
+
+      if (tag.namespace != null) {
+        //logReplace"onTagStart, same node type")
+
+        (currentNode as? Element)?.innerHTML = ""
+      }
     }
 
     //logReplace"onTagStart, currentElement2: $currentNode")
@@ -475,7 +482,7 @@ class HtmlBuilder(
         (Komponent.unsafeMode == UnsafeMode.UNSAFE_SVG_ONLY && namespace == "http://www.w3.org/2000/svg")
       ) {
         if (currentElement?.innerHTML != textContent) {
-          currentElement?.innerHTML = textContent
+          currentElement?.innerHTML += textContent
         }
       } else if (currentElement?.textContent != textContent) {
         currentElement?.textContent = textContent
diff --git a/src/jsMain/kotlin/nl/astraeus/komp/Komponent.kt b/src/jsMain/kotlin/nl/astraeus/komp/Komponent.kt
index 18c6cb5..f251359 100644
--- a/src/jsMain/kotlin/nl/astraeus/komp/Komponent.kt
+++ b/src/jsMain/kotlin/nl/astraeus/komp/Komponent.kt
@@ -43,6 +43,7 @@ abstract class Komponent {
   val declaredStyles: MutableMap<String, CSSStyleDeclaration> = HashMap()
 
   open fun create(parent: Element, childIndex: Int? = null) {
+    onBeforeUpdate()
     val builder = HtmlBuilder(
       parent,
       childIndex ?: parent.childElementCount
@@ -65,6 +66,14 @@ abstract class Komponent {
    */
   open fun onAfterUpdate() {}
 
+  /**
+   * This method is called before the Komponent is updated
+   * and before memoizeHash is checked
+   *
+   * note: it's also called at first render
+   */
+  open fun onBeforeUpdate() {}
+
   fun requestUpdate() {
     dirty = true
     scheduleForUpdate(this)
@@ -177,6 +186,7 @@ abstract class Komponent {
               val memoizeHash = next.generateMemoizeHash()
 
               if (memoizeHash == null || next.lastMemoizeHash != memoizeHash) {
+                next.onBeforeUpdate()
                 next.update()
                 next.lastMemoizeHash = memoizeHash
                 next.onAfterUpdate()
diff --git a/src/jsTest/kotlin/nl/astraeus/komp/TestUpdate.kt b/src/jsTest/kotlin/nl/astraeus/komp/TestUpdate.kt
index 0d9612d..a6eb0e9 100644
--- a/src/jsTest/kotlin/nl/astraeus/komp/TestUpdate.kt
+++ b/src/jsTest/kotlin/nl/astraeus/komp/TestUpdate.kt
@@ -120,6 +120,8 @@ class ReplaceKomponent : Komponent() {
   val includeKomponent = IncludeKomponent()
   var includeSpan = true
 
+  override fun generateMemoizeHash(): Int = includeSpan.hashCode() * 7 + includeKomponent.generateMemoizeHash()
+
   override fun HtmlBuilder.render() {
     div {
       +"Child 2"
@@ -166,6 +168,10 @@ class TestUpdate {
 
     println("ReplaceKomponent: ${div.printTree()}")
 
+    rk.requestImmediateUpdate()
+
+    println("ReplaceKomponent: ${div.printTree()}")
+
     rk.includeSpan = false
     rk.requestImmediateUpdate()