@cocreate/utils 1.5.0 → 1.6.2

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.6.2](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.6.1...v1.6.2) (2022-02-07)
+
+
+### Bug Fixes
+
+* if eid contains {{...}} continue with cssPath ([34e142c](https://github.com/CoCreate-app/CoCreate-utils/commit/34e142ce50e82da94c603c431244727f479bd333))
+
+## [1.6.1](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.6.0...v1.6.1) (2022-02-03)
+
+
+### Bug Fixes
+
+* replaced show and hide class hidden with attribute hidden ([f1ad793](https://github.com/CoCreate-app/CoCreate-utils/commit/f1ad793841db4abe67032a24625e8a46f7560bbf))
+
+# [1.6.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.5.1...v1.6.0) (2022-02-03)
+
+
+### Features
+
+* queryFrameSelectorAll to return elements from other documents, getFrameSelector to pase a selector and return document and selector ([c3b8c27](https://github.com/CoCreate-app/CoCreate-utils/commit/c3b8c27fc1f452b7eac0ac801770e3c0809295f8))
+
+## [1.5.1](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.5.0...v1.5.1) (2022-02-01)
+
+
+### Bug Fixes
+
+* update dependency versions ([f85b89a](https://github.com/CoCreate-app/CoCreate-utils/commit/f85b89a8b27e0a92153739e89345c753917b350f))
+
 # [1.5.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.4.3...v1.5.0) (2022-01-29)
 
 

package/docs/index.html

@@ -104,7 +104,7 @@
 						<div class="container svColumn overflow:hidden card position:relative border-radius:2px width:auto height:100%" id="sandbox">
 							<div class="font-size:20px position:absolute top:10px right:10px opacity:0.6">
 								<a class="margin-right:10px" id="code" show="#preview" hide="#code, #view"><i class="far fa-eye"></i></a>
-								<a class="margin-right:10px hidden" id="preview" show="#code, #view" hide="#preview"><i class="fas fa-code"></i></a>
+								<a class="margin-right:10px" id="preview" show="#code, #view" hide="#preview" hidden><i class="fas fa-code"></i></a>
 								<a class="margin-right:5px" fullscreen target="#playground"><i class="fas fa-expand"></i></a>
 							</div>
 							<div class="svRow">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/utils",
-  "version": "1.5.0",
+  "version": "1.6.2",
   "description": "A simple utils component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "utils",
@@ -61,6 +61,6 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.2.62"
+    "@cocreate/docs": "^1.2.65"
   }
 }

package/src/index.js

@@ -48,6 +48,9 @@ export function cssPath(node, container) {
         }
         else {
             let eid = node.getAttribute('eid');
+            if(/{{\s*([\w\W]+)\s*}}/g.test(eid)) {
+    			eid = false;
+    		}
             if (eid) {
                 pathSplit += `[eid="${eid}"]`;
                 node = '';
@@ -113,29 +116,61 @@ export function domParser(str) {
     }
 }
 
-export function queryFrameSelector(selector) {
-		if(selector.indexOf(';') !== -1) {
-			let [frameSelector, target] = selector.split(';');
-			let frame = document.querySelector(frameSelector);
-			if (frame) {
-			 	let Document = frame.contentDocument;
-			 	let elements = Document.querySelectorAll(target);
-			 	return elements;
+export function getFrameSelector(selector) {
+	let selectorArray = [];
+	if (selector) {
+		let selectors = [selector];
+		if(selector.indexOf(',') !== -1){
+			selectors = selector.split(',');
+		}
+		for (let selector of selectors){
+			let els;
+			if(selector.indexOf(';') !== -1) {
+				let [documentSelector, targetSelector] = selector.split(';');
+				let frame = document.querySelector(documentSelector);
+				if (frame)
+				 	selectorArray.push({Document: frame.contentDocument, selector: targetSelector});
 			}
+			else
+				selectorArray.push({Document: document, selector: selector});
 		}
+		return selectorArray;
+	}
 }
 
 export function queryFrameSelectorAll(selector) {
-		if(selector.indexOf(';') !== -1) {
-			let [frameSelector, target] = selector.split(';');
-			let frame = document.querySelector(frameSelector);
-			if (frame) {
-			 	let Document = frame.contentDocument;
-			 	let element = Document.querySelector(target);
-			 	return element;
+	let elements = [];
+
+	if (selector) {
+		let selectors = [selector];
+		if(selector.indexOf(',') !== -1){
+			selectors = selector.split(',');
+		}
+		for (let selector of selectors){
+			let els;
+			if(selector.indexOf(';') !== -1) {
+				let [documentSelector, targetSelector] = selector.split(';');
+				let frame = document.querySelector(documentSelector);
+				if (frame) {
+				 	let targetDocument = frame.contentDocument;
+					if (targetSelector)
+						els = targetDocument.querySelectorAll(targetSelector);
+					else
+						if (targetDocument.clickedElement)
+							els = [targetDocument.clickedElement];
+				}
+			}
+			else
+				els = document.querySelectorAll(selector);
+			if (els){
+				els = Array.prototype.slice.call(els);
+				elements = elements.concat(els);
 			}
 		}
+		return elements;
+	}
 }
+
 // export function computeStyles(el, properties) {
 //   let computed = window.getComputedStyle(el);
 //   let result = {};
@@ -163,5 +198,6 @@ export default {
   parseTextToHtml,
   getAttributes,
   cssPath,
-  domParser
+  domParser,
+  queryFrameSelectorAll
 };