@cocreate/render 1.20.0 → 1.21.1

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.21.1](https://github.com/CoCreate-app/CoCreate-render/compare/v1.21.0...v1.21.1) (2023-01-13)
+
+
+### Bug Fixes
+
+* bump dependencies ([8be30b6](https://github.com/CoCreate-app/CoCreate-render/commit/8be30b676bb20b53165dadd8a7fd8b05388df793))
+
+# [1.21.0](https://github.com/CoCreate-app/CoCreate-render/compare/v1.20.0...v1.21.0) (2023-01-10)
+
+
+### Bug Fixes
+
+* bump dependencies ([115c000](https://github.com/CoCreate-app/CoCreate-render/commit/115c0005e3b4a0e4fc2cbc7c2dc80083bfa7b135))
+
+
+### Features
+
+* run cocreate.pass prior to rendering in dom ([968b82b](https://github.com/CoCreate-app/CoCreate-render/commit/968b82b9fa159e1196729555ebf40228cca92017))
+
 # [1.20.0](https://github.com/CoCreate-app/CoCreate-render/compare/v1.19.2...v1.20.0) (2023-01-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/render",
-  "version": "1.20.0",
+  "version": "1.21.1",
   "description": "A simple render component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "render",
@@ -60,11 +60,11 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.5.51",
-    "@cocreate/api": "^1.6.2",
-    "@cocreate/docs": "^1.5.5",
-    "@cocreate/element-prototype": "^1.2.27",
-    "@cocreate/observer": "^1.5.55",
-    "@cocreate/utils": "^1.17.18"
+    "@cocreate/actions": "^1.5.53",
+    "@cocreate/api": "^1.6.4",
+    "@cocreate/docs": "^1.5.7",
+    "@cocreate/element-prototype": "^1.4.3",
+    "@cocreate/observer": "^1.5.57",
+    "@cocreate/utils": "^1.17.20"
   }
 }

package/src/index.js

@@ -24,8 +24,8 @@ const CoCreateRender = {
 
 				if (parentTemplate) {
 					do {
-						if (parentTemplate.renderData)
-							value = getValueFromObject(parentTemplate.renderData, result[1].trim());
+						if (parentTemplate.renderedData)
+							value = getValueFromObject(parentTemplate.renderedData, result[1].trim());
 						if (!value && parentTemplate.parentElement)
 							parentTemplate = parentTemplate.parentElement.closest('[templateid]')
 						else
@@ -228,10 +228,10 @@ const CoCreateRender = {
 
 			if (el.nodeType == 1) {
 				if (el.hasAttribute('render-clone')) {
-					if (!el.renderData)
-						el.renderData = {...data}
-					else if (Object.keys(el.renderData)[0] == Object.keys(data)[0]) {
-						el.renderData = {...data}
+					if (!el.renderedData)
+						el.renderedData = {...data}
+					else if (Object.keys(el.renderedData)[0] == Object.keys(data)[0]) {
+						el.renderedData = {...data}
 					}
 
 				}
@@ -301,9 +301,29 @@ const CoCreateRender = {
 					}
 				});
 
+				if (CoCreate.pass) {
+					if (el.hasAttribute('[pass_id]'))
+						CoCreate.pass.initElement(el)
+				}
+
+				if (el.tagName === 'SCRIPT' && el.src) {
+					if (el.src.includes('CoCreate.js') || el.src.includes('CoCreate.min.js')) {
+						el.remove()
+						return
+					}
+				}
+
+				if (el.tagName === 'LINK' && el.href) {
+					if (el.href.includes('CoCreate.css') || el.href.includes('CoCreate.min.css')) {
+						el.remove()
+						return
+					}
+				}
+
 				if (el.childNodes.length > 0) {		
 					that.setValue(el.childNodes, updateData || data, renderArray, renderKey);
 				}
+				
 				if ((el.tagName == 'TEMPLATE' || el.hasAttribute('template') || el.classList.contains('template')) && !el.hasAttribute('template_id')) {
 					if (el.getAttribute('render-object') || el.getAttribute('render-array'))
 						that.render(el, data);
@@ -317,19 +337,20 @@ const CoCreateRender = {
 				let textContent, placeholder, text;
 				if (el.renderMap)
 					placeholder = el.renderMap.get(el)
-					if (placeholder && !isRenderKey) {
-						let updateData = data;
-						textContent = placeholder.placeholder
-						renderKey = placeholder.renderKey
-						renderArray = placeholder.renderArray
-						if (renderArray && Array.isArray(data[renderArray]))
-							updateData = data[renderArray][0]
-						else
-							updateData = data[renderArray]
-						if (renderKey)
-							updateData = {[renderKey]: updateData}
-						text = that.__replaceValue(updateData, textContent, renderKey, el);
-					}
+				if (placeholder && !isRenderKey) {
+					let updateData = data;
+					textContent = placeholder.placeholder
+					renderKey = placeholder.renderKey
+					renderArray = placeholder.renderArray
+					if (renderArray && Array.isArray(data[renderArray]))
+						updateData = data[renderArray][0]
+					else
+						updateData = data[renderArray]
+					if (renderKey)
+						updateData = {[renderKey]: updateData}
+					text = that.__replaceValue(updateData, textContent, renderKey, el);
+				}
+				
 				if (!placeholder && !text) {
 					textContent = el.textContent;
 					if (!el.renderMap)
@@ -353,6 +374,10 @@ const CoCreateRender = {
 							} else if (!parentElement['renderMap'].has(parentElement))
 								that.renderMap(parentElement, textContent, renderArray, renderKey)
 							el.replaceWith(...newNode.childNodes)
+
+							if (el.childNodes.length > 0) {		
+								that.setValue(el.childNodes, updateData || data, renderArray, renderKey);
+							}
 						}
 					}
 				}
@@ -423,15 +448,15 @@ observer.init({
 		if (parentElement) {
 			let el = element
 			let parentKeys = [];
-			let renderData = new Map();
+			let renderedData = new Map();
 			do {
 				let data;
 				el = el.parentElement
 				if (el) {
 					if (el.hasAttribute('render-clone'))
-						data = el.renderData
+						data = el.renderedData
 					if (data) {
-						renderData.set(data, '')
+						renderedData.set(data, '')
 					}
 					let parentKey = el.getAttribute('parentKey')
 					if (parentKey && parentKey != null) {
@@ -471,7 +496,7 @@ observer.init({
 
 			element = parentElement.firstElementChild
 			let obj = {}
-			let array = Array.from(renderData.keys())
+			let array = Array.from(renderedData.keys())
 			for (let data of array.reverse()){
 				obj = {...obj, ...data}
 			}