@cocreate/elements 1.26.2 → 1.26.4

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.26.4](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.26.3...v1.26.4) (2023-11-18)
+
+
+### Bug Fixes
+
+* dataKey.string ([57cc534](https://github.com/CoCreate-app/CoCreate-elements/commit/57cc5344e7ba3d66e949c9f6999aaf90d066d2d3))
+* return if no dataKey ([ace669b](https://github.com/CoCreate-app/CoCreate-elements/commit/ace669b19c59f37d1a0a2e62043171fd0b0999d2))
+
+## [1.26.3](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.26.2...v1.26.3) (2023-11-16)
+
+
+### Bug Fixes
+
+* element grouping ([0507b00](https://github.com/CoCreate-app/CoCreate-elements/commit/0507b00fa53a2c1ec774885d6da515c48fcc4f85))
+
 ## [1.26.2](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.26.1...v1.26.2) (2023-11-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/elements",
-  "version": "1.26.2",
+  "version": "1.26.4",
   "description": "Fetch content into any html element by using html5 attributes to query data stored in CoCreate headless CMS. If data is changed it will instantly reflect in html tags as changes are broadcasted in realtime",
   "keywords": [
     "elements",

package/src/index.js

@@ -60,8 +60,8 @@ async function init(element) {
 
     if (dataObjects && dataObjects.size > 0) {
         for (let key of dataObjects.keys()) {
-            let { data } = keys.get(key)
-            read(Array.from(element), data, { string: key });
+            let { data, elements } = keys.get(key)
+            read(Array.from(elements.keys()), data, { string: key });
         }
     }
 }
@@ -125,15 +125,11 @@ async function initElement(el) {
 
         el.setFilter = (filter) => {
             data.$filter = filter
-            let dataKey = initDataKey(el, data)
-            read(el, data, dataKey)
+            // let dataKey = initDataKey(el, data)
+            read(el, data)
         }
     }
 
-    const isRead = el.getAttribute('read');
-    if (isRead === 'false')
-        return;
-
     return data;
 }
 
@@ -219,10 +215,12 @@ function initDataKey(element, data) {
 
 async function read(element, data, dataKey) {
     if (!dataKey)
-        dataKey = elements.get(element)
+        dataKey = { string: elements.get(element) }
     if (!data)
         data = { ...keys.get(dataKey).dataKey.object }
 
+    if (!dataKey || !data.type)
+        return
     if (!data.$filter && (!data[data.type] || !data[data.type].length))
         return
 
@@ -236,8 +234,14 @@ async function read(element, data, dataKey) {
     if (!delay.elements)
         delay.elements = new Map()
 
-    for (let el of element)
-        delay.elements.set(el, true)
+    for (let el of element) {
+        const isRead = el.getAttribute('read');
+        if (isRead !== 'false')
+            delay.elements.set(el, true)
+    }
+
+    if (!delay.elements.size)
+        return
 
     clearTimeout(delay.timer);
     delay.timer = setTimeout(function () {
@@ -256,14 +260,14 @@ async function read(element, data, dataKey) {
 
         data.method = data.type + '.read'
 
-        CRUD.send(data).then((data) => {
+        CRUD.send(data).then((Data) => {
             debounce.delete(dataKey.string)
             let els = Array.from(delay.elements.keys())
             clearTimeout(delay.timer);
             delete delay.elements
             delete delay.timer
 
-            setData(els, data);
+            setData(els, Data);
         })
     }, 500);
 }
@@ -322,10 +326,10 @@ async function filterData(element, data, type, key) {
                         Data.push(doc[key])
                 }
             }
-            if (Data.length === 1) {
-                data = { [key]: Data[0] }
-            } else
-                data = Data
+            // if (Data.length === 1) {
+            //     data = { [key]: Data[0] }
+            // } else
+            data = Data
         } else {
             data = { [key]: data[type][key] }
         }
@@ -338,7 +342,8 @@ async function filterData(element, data, type, key) {
     } else if (data)
         element.setValue(data)
 
-    filter.filters.get(element).index = data.$filter.index
+    if (data.$filter)
+        filter.filters.get(element).index = data.$filter.index
 
     const evt = new CustomEvent('fetchedData', { bubbles: true });
     element.dispatchEvent(evt);
@@ -529,8 +534,9 @@ async function getData(form) {
     let formObject = forms.get(form)
     for (let type of formObject.types.values()) {
         for (let [element, data] of type.entries()) {
-            if (!element.hasAttribute('key'))
+            if (!element.hasAttribute('key') || element.getAttribute('save') === 'false')
                 continue
+
             if (element.hasAttribute('actions')) {
                 let attribute = element.getAttribute('actions')
                 if (attribute.includes('save', 'delete'))
@@ -690,7 +696,7 @@ async function save(element) {
 
     let Data = []
     for (let i = 0; i < data.length; i++) {
-        if (data[i].type === 'object' && !data[i].method) {
+        if (data[i].type === 'object') {
             if (typeof data[i].object === 'string') {
                 if (!data[i]._id)
                     data[i].method = 'object.create'
@@ -778,6 +784,8 @@ function setTypeValue(element, data) {
                 el.setAttribute(data.type, data[data.type].name)
             }
         }
+        setData(Array.from(elements.keys()), data)
+
 
         //     const pass_ids = new Map();
 
@@ -882,7 +890,9 @@ async function remove(element) {
                     if (!form.elements.size)
                         forms.delete(form)
                 }
-            }
+            } else
+                elements.delete(element[i])
+
         }
     }
 }
@@ -1073,8 +1083,11 @@ Observer.init({
     attributeName: ['storage', 'database', 'array', 'index', 'object', 'key'],
     // target: selector, // blocks mutations when applied
     callback: function (mutation) {
-        remove(mutation.target)
-        init([mutation.target]);
+        let currentValue = mutation.target.getAttribute(mutation.attributeName)
+        if (currentValue !== mutation.oldValue) {
+            remove(mutation.target)
+            init([mutation.target])
+        }
     }
 });