@cocreate/render 1.8.2 → 1.9.0

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [1.9.0](https://github.com/CoCreate-app/CoCreate-render/compare/v1.8.4...v1.9.0) (2022-07-03)
+
+
+### Features
+
+* added @cocreate/utils queryDocumentSelector to return an element from ann irframe or parent of iframe ([b9bb90f](https://github.com/CoCreate-app/CoCreate-render/commit/b9bb90f9ab72fc24fc71e64a37bcfee73a0c0c9c))
+* support for value-type attribute to define if render will be a string, text, innerHTML. Defaults to innerHTML ([a14fcc2](https://github.com/CoCreate-app/CoCreate-render/commit/a14fcc2ff886df7207c537cca67c3343be2da997))
+
+## [1.8.4](https://github.com/CoCreate-app/CoCreate-render/compare/v1.8.3...v1.8.4) (2022-06-19)
+
+
+### Bug Fixes
+
+* update templates to use placeholder ([9299cce](https://github.com/CoCreate-app/CoCreate-render/commit/9299ccef3864ffe087044a3614aa35799e89f31c))
+
+## [1.8.3](https://github.com/CoCreate-app/CoCreate-render/compare/v1.8.2...v1.8.3) (2022-06-18)
+
+
+### Bug Fixes
+
+* bump dependencies ([a9db63c](https://github.com/CoCreate-app/CoCreate-render/commit/a9db63c1c00c5df943151e122ffef310c2aa17d7))
+
 ## [1.8.2](https://github.com/CoCreate-app/CoCreate-render/compare/v1.8.1...v1.8.2) (2022-06-12)
 
 

package/demo/render.array.html

@@ -19,8 +19,8 @@
                 </cc-options>
 
             <div class="template" template_id="abc1">
-                <div class="template" render-array="data.current_org" render-key="current_org"  value="{{current_org}}">
-                    <h3>{{current_org}}</h3>
+                <div class="template" render-array="data.current" render-key="current_org"  value="{{current_org.name}}">
+                    <h3>{{current_org.name}}</h3>
                 </div>
             </div>
      
@@ -34,7 +34,8 @@
                     collection : 'dededede',
                     data: [{
                          _id : '123kijfhgfkel45',
-                         current_org: ['test1', 'test2', 'test31', 'test3']
+                         current_org: ['test1', 'test2', 'test31', 'test3'],
+                         current: [{name: 'test1w'}, {name: 'test2'}, {name: 'test31'}, {name: 'test3'}]
                      }]
                 }
                 

package/demo/render.object.html

@@ -11,8 +11,8 @@
     <body>
         
         <div class="template" template_id="abc1">
-            <div>{{data}}</div>
-            <h1> {{data.collection}} {{data._id}}</h1>
+            <!-- <div>{{data}}</div>
+            <h1> {{data.collection}} {{data._id}}</h1> -->
             <div class="template" render-object="" render-key="one">
                 <h5>{{one.key}}: {{one.value}}</h5>
             </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/render",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "A simple render component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "render",
@@ -61,8 +61,9 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.4.2",
-    "@cocreate/api": "^1.3.2",
-    "@cocreate/docs": "^1.3.2"
+    "@cocreate/actions": "^1.4.3",
+    "@cocreate/api": "^1.3.3",
+    "@cocreate/docs": "^1.3.3",
+    "@cocreate/utils": "^1.8.1"
   }
 }

package/src/index.js

@@ -1,5 +1,6 @@
 /*globals CustomEvent*/
 import action from '@cocreate/actions';
+import { queryDocumentSelector } from '@cocreate/utils';
 // import api from '@cocreate/api';
 
 const CoCreateRender = {
@@ -48,7 +49,7 @@ const CoCreateRender = {
 		}
 	},
 	
-	__replaceValue: function(data, inputValue) {
+	__replaceValue: function(data, inputValue, renderKey) {
 		let isPass = false;
 		let self = this;
 		let resultValue = null;
@@ -71,6 +72,9 @@ const CoCreateRender = {
 					isPass = true;
 					inputValue = inputValue.replace(attr, value);
 				}
+				if (!isPass && renderKey && attr.includes(`{{${renderKey}.`)) {
+					resultValue = '';
+				}
 			});
 			
 			if (isPass) {
@@ -82,7 +86,7 @@ const CoCreateRender = {
 	
 	render: function(template, data) {
 		let type = template.getAttribute('render-array') || "data";
-		const render_key = template.getAttribute('render-key') || type;
+		const renderKey = template.getAttribute('render-key') || type;
 		const self = this;
 
 		// const arrayData = this.__getValueFromObject(data, type);
@@ -118,7 +122,7 @@ const CoCreateRender = {
 		if (!arrayData) {
 			let cloneEl = this.cloneEl(template);
 			cloneEl.classList.add('cloned');
-			self.setValue([cloneEl], data);
+			self.setValue([cloneEl], data, renderKey);
 			template.insertAdjacentHTML('beforebegin', cloneEl.outerHTML);
 		}
 
@@ -126,9 +130,9 @@ const CoCreateRender = {
 			arrayData.forEach((item) => {
 				let cloneEl = this.cloneEl(template);
 				cloneEl.classList.add('clone_' + type);
-				let r_data = self.__createObject(item, render_key);
+				let r_data = self.__createObject(item, renderKey);
 
-				self.setValue([cloneEl], r_data);
+				self.setValue([cloneEl], r_data, renderKey);
 				template.insertAdjacentHTML('beforebegin', cloneEl.outerHTML);
 			});
 		}
@@ -143,7 +147,7 @@ const CoCreateRender = {
 		return cloneEl;
 	},
  
-	setValue:function(els, data, template){
+	setValue:function(els, data, renderKey){
 		if (!data) return;
 		const that = this;
 		Array.from(els).forEach(el => {
@@ -151,15 +155,22 @@ const CoCreateRender = {
 				Array.from(el.attributes).forEach(attr=>{
 					let attr_name = attr.name.toLowerCase();
 					let attrValue = attr.value;
-					attrValue = that.__replaceValue(data, attrValue);
+					attrValue = that.__replaceValue(data, attrValue, renderKey);
 					
-					if (attrValue) {
+					if (attrValue || attrValue == "") {
 						el.setAttribute(attr_name, attrValue);
 					}
 				});
 
+				// if (el.classList.contains('template')) {
+				// 	that.render(el, data);
+				// } 
+				// if(el.childNodes.length > 0) {
+				// 	that.setValue(el.childNodes, data, renderKey);
+				// }
+
 				if(el.childNodes.length > 0) {
-					that.setValue(el.childNodes, data, template);
+					that.setValue(el.childNodes, data, renderKey);
 				}
 				if (el.classList.contains('template')) {
 					that.render(el, data);
@@ -167,12 +178,17 @@ const CoCreateRender = {
 			}
 			
 			if (el.nodeType == 3) {
+				let valueType = el.parentElement.getAttribute('value-type')
 				let textContent = el.textContent;
-				let text = that.__replaceValue(data, textContent);
-				if (text) {
-					const newNode = document.createElement('div');
-					newNode.innerHTML = text;
-					el.replaceWith(...newNode.childNodes)
+				let text = that.__replaceValue(data, textContent, renderKey);
+				if (text || text == "") {
+					if (valueType == 'text' || valueType == 'string'){
+						el.textContent = text;
+					} else {
+						const newNode = document.createElement('div');
+						newNode.innerHTML = text;
+						el.replaceWith(...newNode.childNodes)
+					}
 				}
 			}
 
@@ -181,13 +197,13 @@ const CoCreateRender = {
 	
 	data: function({selector, data, elements}) {
 		if (selector) {
-			let template = document.querySelector(selector);
+			let template = queryDocumentSelector(selector);
 			if (!template) return;
 			if (template.classList.contains('template')) {
 				this.render(template, data);
 			}
 			else
-				this.setValue([template], data, template);
+				this.setValue([template], data);
 		} else if (elements) {
 			this.setValue(elements, data);
 		}