j-templates 7.0.101 → 7.0.103

package/DOM/domNodeConfig.js

@@ -166,7 +166,7 @@ exports.DOMNodeConfig = {
                 break;
             case 1:
                 lastChild = getHTMLNode(children[0], target.firstChild);
-                if (lastChild !== null && target.firstChild !== lastChild)
+                if (target.firstChild !== lastChild)
                     target.insertBefore(lastChild, target.firstChild);
                 break;
             default: {
@@ -174,22 +174,20 @@ exports.DOMNodeConfig = {
                 let inNextChildren = false;
                 for (let x = 0; x < children.length; x++) {
                     const nextChild = (lastChild = getHTMLNode(children[x], currentChild));
-                    if (nextChild !== null) {
-                        if (!currentChild)
-                            target.appendChild(nextChild);
-                        else if (nextChild !== currentChild) {
-                            while (currentChild && (!(inNextChildren = inNextChildren || children.indexOf(currentChild, x + 1) >= 0))) {
-                                const toRemove = currentChild;
-                                currentChild = currentChild.nextSibling;
-                                target.removeChild(toRemove);
-                            }
-                            nextChild !== currentChild &&
-                                target.insertBefore(nextChild, currentChild);
+                    if (!currentChild)
+                        target.appendChild(nextChild);
+                    else if (nextChild !== currentChild) {
+                        while (currentChild && (!(inNextChildren = inNextChildren || children.indexOf(currentChild, x + 1) >= 0))) {
+                            const toRemove = currentChild;
+                            currentChild = currentChild.nextSibling;
+                            target.removeChild(toRemove);
                         }
-                        else
-                            inNextChildren = false;
-                        currentChild = nextChild.nextSibling;
+                        nextChild !== currentChild &&
+                            target.insertBefore(nextChild, currentChild);
                     }
+                    else
+                        inNextChildren = false;
+                    currentChild = nextChild.nextSibling;
                 }
                 break;
             }

package/Node/vNode.js

@@ -204,13 +204,29 @@ function ToArray(result) {
         return result;
     return [result];
 }
-function GetNode(vnode) {
-    switch (vnode.type) {
-        case vNode_types_1.FRAGMENT_NODE:
-            return vnode.children.flatMap(GetNode);
-        default:
-            return vnode.node;
+function IsFragmentOrNull(vnode) {
+    return vnode === null || vnode.type === vNode_types_1.FRAGMENT_NODE;
+}
+function FlattenFragmentsRecursive(children, startIndex, result) {
+    for (let x = startIndex; x < children.length; x++) {
+        const vnode = children[x];
+        switch (vnode.type) {
+            case vNode_types_1.FRAGMENT_NODE:
+                FlattenFragmentsRecursive(vnode.children, 0, result);
+            default:
+                if (vnode.node !== null)
+                    result.push(vnode.node);
+        }
     }
+    return result;
+}
+function CleanupChildrenArray(children) {
+    const index = children.findIndex(IsFragmentOrNull);
+    if (index < 0)
+        return children;
+    const result = [];
+    FlattenFragmentsRecursive(children, index, result);
+    return result;
 }
 function UpdateChildren(vnode, init = false, skipInit = false) {
     if (!vnode.children)
@@ -234,13 +250,13 @@ function UpdateChildren(vnode, init = false, skipInit = false) {
                 return;
             if (init) {
                 if (vnode.node !== null)
-                    nodeConfig_1.NodeConfig.reconcileChildren(vnode.node, vnode.children.flatMap(GetNode));
+                    nodeConfig_1.NodeConfig.reconcileChildren(vnode.node, CleanupChildrenArray(vnode.children));
             }
             else if (!async) {
                 let reconcileNode = vnode;
                 while (reconcileNode.node === null)
                     reconcileNode = reconcileNode.parentNode;
-                nodeConfig_1.NodeConfig.reconcileChildren(reconcileNode.node, reconcileNode.children.flatMap(GetNode));
+                nodeConfig_1.NodeConfig.reconcileChildren(reconcileNode.node, CleanupChildrenArray(reconcileNode.children));
             }
             else {
                 nodeConfig_1.NodeConfig.scheduleUpdate(function () {
@@ -249,7 +265,7 @@ function UpdateChildren(vnode, init = false, skipInit = false) {
                     let reconcileNode = vnode;
                     while (reconcileNode.node === null)
                         reconcileNode = reconcileNode.parentNode;
-                    nodeConfig_1.NodeConfig.reconcileChildren(reconcileNode.node, reconcileNode.children.flatMap(GetNode));
+                    nodeConfig_1.NodeConfig.reconcileChildren(reconcileNode.node, CleanupChildrenArray(reconcileNode.children));
                 });
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "j-templates",
-  "version": "7.0.101",
+  "version": "7.0.103",
   "description": "j-templates",
   "license": "MIT",
   "repository": "https://github.com/TypesInCode/jTemplates",