@cocreate/render 1.28.3 → 1.28.5

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.28.5](https://github.com/CoCreate-app/CoCreate-render/compare/v1.28.4...v1.28.5) (2023-10-16)
+
+
+### Bug Fixes
+
+* render delete nodes ([1921e57](https://github.com/CoCreate-app/CoCreate-render/commit/1921e572051d62aa53513f5379538f3df3c76d93))
+* update and delete for loop data.type ([cc5e4b5](https://github.com/CoCreate-app/CoCreate-render/commit/cc5e4b5ef33814de59159204f6af8648b6fdfbca))
+
+## [1.28.4](https://github.com/CoCreate-app/CoCreate-render/compare/v1.28.3...v1.28.4) (2023-10-14)
+
+
+### Bug Fixes
+
+* bump dependencies ([ac79266](https://github.com/CoCreate-app/CoCreate-render/commit/ac79266c1f0934c2e9321536626074e1d4090070))
+* improved finding clones to update and delete ([9bafc8b](https://github.com/CoCreate-app/CoCreate-render/commit/9bafc8b56fc20a03da8963a5888164ceb5fe28fc))
+* use tbody as new element to prevent lost of tr and td elements ([88ca483](https://github.com/CoCreate-app/CoCreate-render/commit/88ca483c30e5c66c54fc70a8064d90fa8bdadff9))
+
 ## [1.28.3](https://github.com/CoCreate-app/CoCreate-render/compare/v1.28.2...v1.28.3) (2023-10-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/render",
-  "version": "1.28.3",
+  "version": "1.28.5",
   "description": "A simple render component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "render",
@@ -58,10 +58,10 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.11.5",
-    "@cocreate/api": "^1.15.3",
-    "@cocreate/element-prototype": "^1.11.4",
-    "@cocreate/observer": "^1.11.4",
-    "@cocreate/utils": "^1.25.2"
+    "@cocreate/actions": "^1.11.6",
+    "@cocreate/api": "^1.15.4",
+    "@cocreate/element-prototype": "^1.11.5",
+    "@cocreate/observer": "^1.11.5",
+    "@cocreate/utils": "^1.25.3"
   }
 }

package/src/index.js

@@ -88,12 +88,19 @@ async function render({ source, element, data, key, index, currentIndex, update,
         remove = remove || data.$filter.remove
     }
 
+    let type = data.type
+    if (!type && data.method) {
+        type = data.method.split('.')[1]
+    } else if (type == 'key')
+        type = 'object'
+
+
     if (!Array.isArray(element) && !(element instanceof HTMLCollection) && !(element instanceof NodeList))
         element = [element]
 
     for (let i = 0; i < element.length; i++) {
         if (!key)
-            key = element[i].getAttribute('render')
+            key = element[i].getAttribute('render') || type
 
         let renderedNode = renderedNodes.get(element[i])
         if (source) {
@@ -104,47 +111,51 @@ async function render({ source, element, data, key, index, currentIndex, update,
         }
 
         if (remove) {
-            if (renderedNode.source) {
-                if (key)
-                    renderedNode.source.data[key].splice(index, 1)
-                else {
-
+            for (let j = 0; j < data[type].length; j++) {
+                let cloneKey
+                if (type === 'object') {
+                    cloneKey = data[type][j]._id;
+                } else {
+                    cloneKey = data[type][j].name;
                 }
-            }
 
-            let clone = Array.from(renderedNode.clones)[index]
-            if (!clone) return
+                let clone = renderedNode.clones.get(cloneKey)
+                if (!clone) return
 
-            renderedNode.clones.delete(clone[0])
-            renderedNodes.delete(clone[1])
-            clone[1].remove()
+                renderedNode.clones.delete(cloneKey)
+                renderedNodes.delete(clone)
+                clone.remove()
+            }
         } else if (key || Array.isArray(data)) {
             if (update) {
-                let clone
-
-                if (!currentIndex)
-                    currentIndex = data.$filter.currentIndex
+                for (let j = 0; j < data[type].length; j++) {
+                    let clone
+                    if (type === 'object') {
+                        clone = renderedNode.clones.get(data[type][j]._id);
+                    } else {
+                        clone = renderedNode.clones.get(data[type][j].name);
+                    }
 
-                if (currentIndex >= 0)
-                    clone = Array.from(renderedNode.clones)[currentIndex]
-                else
-                    clone = Array.from(renderedNode.clones)[index]
+                    if (!currentIndex)
+                        currentIndex = data.$filter.currentIndex
 
-                if (!clone) return
+                    if (!clone) return
 
-                await renderValues(clone[1], data);
-                if (currentIndex >= 0)
-                    insertElement(renderedNode, clone[1], index, currentIndex)
-            }
+                    await renderValues(clone, { object: data[type][j] });
+                    if (currentIndex >= 0)
+                        insertElement(renderedNode, clone, index, currentIndex)
+                }
+            } else {
 
-            // TODO: if $auto here every subsequent clone will have same value, not replacing here will apply unique value to each clone
-            if (key === '$auto')
-                key = key.replace(/\$auto/g, uuid.generate(6));
+                // TODO: if $auto here every subsequent clone will have same value, not replacing here will apply unique value to each clone
+                if (key === '$auto')
+                    key = key.replace(/\$auto/g, uuid.generate(6));
 
-            if (key)
-                element[i].setAttribute('render', key);
+                if (key)
+                    element[i].setAttribute('render', key);
 
-            renderTemplate(element[i], data, key, index);
+                renderTemplate(element[i], data, key, index);
+            }
         } else
             await renderValues(element[i], data);
 
@@ -153,8 +164,8 @@ async function render({ source, element, data, key, index, currentIndex, update,
 }
 
 async function renderTemplate(template, data, key, index, keyPath) {
-    if (!key)
-        key = template.getAttribute('render')
+    // if (!key)
+    //     key = template.getAttribute('render')
 
     let templateData = renderedNodes.get(template)
     if (!templateData) {
@@ -297,7 +308,7 @@ function cloneTemplate(template) {
     }
 
     if (typeof clone === 'string') {
-        let container = document.createElement('div');
+        let container = document.createElement('tbody');
         container.innerHTML = clone;
         clone = container.firstChild
         container.remove()