version 3.2.0-alpha.37

Camplejs · Apr 5, 2024 · 78b924b · 78b924b
1 parent 361e83e
commit 78b924b
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cample",
-  "version": "3.2.0-alpha.36",
+  "version": "3.2.0-alpha.37",
   "description": "Cample.js - fast modern javascript framework. Reactivity without virtual DOM!",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/core/components/each/each.ts b/src/core/components/each/each.ts
@@ -173,11 +173,18 @@ export class Each extends DataComponent {
           currentNode: NodeType,
           indexData: any,
           eachIndex: number,
-          importData: any
+          importData: any,
+          oldData: any
         ) => {
-          const { values, nodes, stack } = currentNode;
-          for (let i = 0; i < values.length; i++) {
-            const value = values[i];
+          const { values, nodes, stack, valuesImport } = currentNode;
+          if (oldData[eachIndex] !== indexData) {
+            for (let i = 0; i < values.length; i++) {
+              const value = values[i];
+              value(nodes, stack, indexData, importData, eachIndex, value);
+            }
+          }
+          for (let i = 0; i < (valuesImport as any).length; i++) {
+            const value = (valuesImport as any)[i];
             value(nodes, stack, indexData, importData, eachIndex, value);
           }
         };
@@ -303,7 +310,8 @@ export class Each extends DataComponent {
                   oldNodes[oldFirstIndex],
                   data[newFirstIndex],
                   newFirstIndex,
-                  importData
+                  importData,
+                  oldData
                 );
                 newData[newFirstIndex++] = oldNodes[oldFirstIndex++];
                 continue;
@@ -323,7 +331,8 @@ export class Each extends DataComponent {
                   oldNodes[currentOldLastIndex],
                   data[currentNewLastIndex],
                   currentNewLastIndex,
-                  importData
+                  importData,
+                  oldData
                 );
                 newData[currentNewLastIndex] = oldNodes[currentOldLastIndex];
                 if (
@@ -344,13 +353,15 @@ export class Each extends DataComponent {
                   oldNodes[currentOldLastIndex],
                   data[newFirstIndex],
                   newFirstIndex,
-                  importData
+                  importData,
+                  oldData
                 );
                 renderValuesNode(
                   oldNodes[oldFirstIndex],
                   data[currentNewLastIndex],
                   currentNewLastIndex,
-                  importData
+                  importData,
+                  oldData
                 );
                 const el1 = (newData[newFirstIndex] =
                   oldNodes[currentOldLastIndex]).el as Element;
@@ -460,7 +471,8 @@ export class Each extends DataComponent {
                       oldNodes[oldFirstIndex],
                       data[newFirstIndex],
                       newFirstIndex,
-                      importData
+                      importData,
+                      oldData
                     );
                     newData[newFirstIndex] = oldNodes[oldFirstIndex++];
                     if (
@@ -486,7 +498,8 @@ export class Each extends DataComponent {
                       oldNodes[currentOldLastIndex],
                       data[currentNewLastIndex],
                       currentNewLastIndex,
-                      importData
+                      importData,
+                      oldData
                     );
                     newData[currentNewLastIndex] =
                       oldNodes[currentOldLastIndex];
@@ -508,13 +521,15 @@ export class Each extends DataComponent {
                       oldNodes[currentOldLastIndex],
                       data[newFirstIndex],
                       newFirstIndex,
-                      importData
+                      importData,
+                      oldData
                     );
                     renderValuesNode(
                       oldNodes[oldFirstIndex],
                       data[currentNewLastIndex],
                       currentNewLastIndex,
-                      importData
+                      importData,
+                      oldData
                     );
                     const el1 = (newData[newFirstIndex] =
                       oldNodes[currentOldLastIndex]).el as Element;
@@ -541,7 +556,8 @@ export class Each extends DataComponent {
                       newData[newFirstIndex],
                       data[newFirstIndex],
                       newFirstIndex++,
-                      importData
+                      importData,
+                      oldData
                     );
                     oldNodes[currentIndex] = undefined as unknown as NodeType;
                     continue;

diff --git a/src/core/functions/data/create-element.ts b/src/core/functions/data/create-element.ts
@@ -28,13 +28,14 @@ export const createElement = (
     nodes: templateNodes,
     el: templateElemenet,
     render: templateRender,
-    values: newValues
+    values: newValues,
+    valuesImport,
+    valuesLength: lengthValues
   } = templateEl;
   const el = (templateElemenet as Element).cloneNode(true);
   el[EACH_INDEX_NAME] = eachIndex;
   const length = templateNodes.length;
   const nodes: NodeNodesType = new Array(length + 1);
-  const lengthValues = newValues.length;
   const stack: StackType = new Array(lengthValues);
   const newNodes = new Array(lengthValues);
   nodes[0] = el as ChildNode;
@@ -74,6 +75,7 @@ export const createElement = (
   }
   const currentNode: NodeType = {
     values: newValues,
+    valuesImport,
     dataId,
     nodes: newNodes,
     stack,

diff --git a/src/core/functions/parse/parse-key.ts b/src/core/functions/parse/parse-key.ts
@@ -96,6 +96,12 @@ export const parseKey = (
     key: isValue ? (renderedKey as string) : key,
     originType
   };
+  if (val) {
+    const isValKey = val.some((e) => {
+      return e.isValueImport;
+    });
+    keyObj.isValueImport = isValKey;
+  }
   if (isValue) {
     keyObj.isValue = isValue;
   }