@esportsplus/template 0.22.3 → 0.22.5

package/build/slot/cleanup.js

@@ -31,18 +31,19 @@ const ondisconnect = (element, fn) => {
     (element[CLEANUP] ??= []).push(fn);
 };
 const remove = (groups) => {
-    let group, head, tail;
+    let group;
     while (group = groups.pop()) {
-        head = group.head;
-        tail = group.tail || head;
-        for (let node = tail; node; node = previousSibling.call(node)) {
-            if (CLEANUP in node) {
-                cleanup.add(node[CLEANUP]);
+        let head = group.head, next, tail = group.tail || head;
+        while (tail) {
+            if (CLEANUP in tail) {
+                cleanup.add(tail[CLEANUP]);
             }
-            node.remove();
-            if (head === node) {
+            next = previousSibling.call(tail);
+            tail.remove();
+            if (head === tail) {
                 break;
             }
+            tail = next;
         }
     }
     if (!scheduled && cleanup.length) {

package/build/slot/effect.js

@@ -13,20 +13,23 @@ function update(anchor, value) {
     if (value == null || value === false) {
         value = '';
     }
+    let textnode = this.textnode;
     if (typeof value !== 'object') {
-        let textnode = this.textnode;
         if (textnode) {
             nodeValue.call(textnode, String(value));
+            if (!textnode.isConnected) {
+                anchor.after(textnode);
+            }
         }
         else {
-            textnode = this.textnode = text(String(value));
-        }
-        if (!textnode.isConnected) {
-            anchor.after(textnode);
+            anchor.after(this.textnode = text(String(value)));
         }
     }
     else {
         let fragment = render(anchor, value), head = firstChild.call(fragment);
+        if (textnode && textnode.isConnected) {
+            remove([{ head: textnode, tail: textnode }]);
+        }
         if (head) {
             this.group = {
                 head,

package/package.json

@@ -14,7 +14,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.22.3",
+  "version": "0.22.5",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/slot/cleanup.ts

@@ -45,22 +45,26 @@ const ondisconnect = (element: Element, fn: VoidFunction) => {
 };
 
 const remove = (groups: SlotGroup[]) => {
-    let group, head, tail;
+    let group;
 
     while (group = groups.pop()) {
-        head = group.head;
-        tail = group.tail || head;
+        let head = group.head,
+            next,
+            tail = group.tail || head;
 
-        for (let node = tail; node; node = previousSibling.call(node)) {
-            if (CLEANUP in node) {
-                cleanup.add( node[CLEANUP] as VoidFunction[] );
+        while (tail) {
+            if (CLEANUP in tail) {
+                cleanup.add( tail[CLEANUP] as VoidFunction[] );
             }
 
-            node.remove();
+            next = previousSibling.call(tail);
+            tail.remove();
 
-            if (head === node) {
+            if (head === tail) {
                 break;
             }
+
+            tail = next;
         }
     }
 

package/src/slot/effect.ts

@@ -18,24 +18,28 @@ function update(this: { group?: SlotGroup, textnode?: Node }, anchor: Element, v
         value = '';
     }
 
-    if (typeof value !== 'object') {
-        let textnode = this.textnode;
+    let textnode = this.textnode;
 
+    if (typeof value !== 'object') {
         if (textnode) {
             nodeValue.call(textnode, String(value));
+
+            if (!textnode.isConnected) {
+                anchor.after(textnode);
+            }
         }
         else {
-            textnode = this.textnode = text( String(value) );
-        }
-
-        if (!textnode.isConnected) {
-            anchor.after(textnode);
+            anchor.after( this.textnode = text( String(value) ) );
         }
     }
     else {
         let fragment = render(anchor, value),
             head = firstChild.call(fragment);
 
+        if (textnode && textnode.isConnected) {
+            remove([{ head: textnode as Element, tail: textnode as Element }]);
+        }
+
         if (head) {
             this.group = {
                 head,