@cocreate/utils 1.5.1 → 1.6.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/utils",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "A simple utils component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "utils",

package/src/index.js

@@ -113,29 +113,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 +195,6 @@ export default {
   parseTextToHtml,
   getAttributes,
   cssPath,
-  domParser
+  domParser,
+  queryFrameSelectorAll
 };