j-templates 7.0.102 → 7.0.104

package/Node/vNode.js

@@ -204,12 +204,18 @@ function ToArray(result) {
         return result;
     return [result];
 }
-function FlattenNodes(children, result = []) {
-    for (let x = 0; x < children.length; x++) {
+function IsFragmentOrNull(vnode) {
+    return vnode === null || vnode.type === vNode_types_1.FRAGMENT_NODE;
+}
+function GetNode(vnode) {
+    return vnode.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:
-                FlattenNodes(vnode.children, result);
+                FlattenFragmentsRecursive(vnode.children, 0, result);
             default:
                 if (vnode.node !== null)
                     result.push(vnode.node);
@@ -217,14 +223,14 @@ function FlattenNodes(children, result = []) {
     }
     return result;
 }
-/* function GetNode(vnode: vNodeType): string | Node | (string | Node)[] {
-  switch (vnode.type) {
-    case FRAGMENT_NODE:
-      return vnode.children.flatMap(GetNode);
-    default:
-      return vnode.node;
-  }
-} */
+function CleanupChildrenArray(children) {
+    const index = children.findIndex(IsFragmentOrNull);
+    if (index < 0)
+        return children;
+    const result = children.slice(0, index).map(GetNode);
+    FlattenFragmentsRecursive(children, index, result);
+    return result;
+}
 function UpdateChildren(vnode, init = false, skipInit = false) {
     if (!vnode.children)
         return;
@@ -247,13 +253,13 @@ function UpdateChildren(vnode, init = false, skipInit = false) {
                 return;
             if (init) {
                 if (vnode.node !== null)
-                    nodeConfig_1.NodeConfig.reconcileChildren(vnode.node, FlattenNodes(vnode.children));
+                    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, FlattenNodes(reconcileNode.children));
+                nodeConfig_1.NodeConfig.reconcileChildren(reconcileNode.node, CleanupChildrenArray(reconcileNode.children));
             }
             else {
                 nodeConfig_1.NodeConfig.scheduleUpdate(function () {
@@ -262,7 +268,7 @@ function UpdateChildren(vnode, init = false, skipInit = false) {
                     let reconcileNode = vnode;
                     while (reconcileNode.node === null)
                         reconcileNode = reconcileNode.parentNode;
-                    nodeConfig_1.NodeConfig.reconcileChildren(reconcileNode.node, FlattenNodes(reconcileNode.children));
+                    nodeConfig_1.NodeConfig.reconcileChildren(reconcileNode.node, CleanupChildrenArray(reconcileNode.children));
                 });
             }
         });

package/package.json

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