webdetta 0.1.234 → 0.1.236

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdetta",
-  "version": "0.1.234",
+  "version": "0.1.236",
   "author": "Fedot Kriutchenko <fodyadev@gmail.com>",
   "description": "",
   "license": "MIT",

package/packages/realdom/dynamic.js

@@ -1,4 +1,4 @@
-import { isIterable, isObject, unwrapFn } from '../common/utils.js';
+import { isIterable, isObject, callFn } from '../common/utils.js';
 import { once } from '../execution/index.js';
 import { r } from '../reactivity/index.js';
 import { Element, Operator, processItem } from './base.js';
@@ -15,12 +15,13 @@ const listItemsToEntries = (items, keyFn) => new Map(
   : null
 );
 
+const lastNodes = new WeakMap();
 const createContainer = (content) => {
   let startNode;
 
   const nodes = [], operators = [];
   const contentEffect = r.effect(() => {
-    const items = unwrapFn(content);
+    const items = callFn(content);
     processItem(items, o => operators.push(o), c => nodes.push(c), true);
     if (startNode) appendAfter(startNode);
     return () => {
@@ -41,9 +42,10 @@ const createContainer = (content) => {
     let lastNode = startNode = newStartNode;
     if (parentChanged) operatorsEffect.run();
     for (const node of nodes) {
-      if (node !== lastNode.nextSibling) Element.appendAfter(lastNode, node);
-      lastNode = node;
+      if (lastNode.nextSibling !== node) Element.appendAfter(lastNode, node);
+      lastNode = lastNodes.get(node) ?? node;
     }
+    lastNodes.set(newStartNode, lastNode);
     return lastNode;
   };
 
@@ -69,7 +71,7 @@ export const createList = (itemsFn, renderItem, keyFn = listItemKey) => {
   });
 
   const effect = r.effect(() => {
-    const items = unwrapFn(itemsFn);
+    const items = callFn(itemsFn);
     const entries = listItemsToEntries(items, keyFn);
 
     let last = root, i = 0;
@@ -104,7 +106,7 @@ export const createSlot = (content) => {
 export const createIf = () => {
   const conditions = [];
   const node = createSlot(() =>
-    conditions.find(d => unwrapFn(d.cond))?.value
+    conditions.find(d => callFn(d.cond))?.value
   );
 
   node.elif = (cond, ...args) => {