@cocreate/utils 1.7.4 → 1.8.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.8.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.7.6...v1.8.0) (2022-07-01)
+
+
+### Features
+
+* queryDocumentSelectorAll - ability to query iframes and parent of iframes ([90bd26b](https://github.com/CoCreate-app/CoCreate-utils/commit/90bd26b139a6a5413ac67a92504cf533f10e0838))
+
+## [1.7.6](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.7.5...v1.7.6) (2022-06-27)
+
+
+### Bug Fixes
+
+* remove functon getAttributes ([162228d](https://github.com/CoCreate-app/CoCreate-utils/commit/162228ddd99bcdf64a59088bddf2a6216a911898))
+
+## [1.7.5](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.7.4...v1.7.5) (2022-06-24)
+
+
+### Bug Fixes
+
+* check path for character < if exist clean up path to mak it in to a valid selector ([9321063](https://github.com/CoCreate-app/CoCreate-utils/commit/93210634425db2dff507919dd32415f0d7bdfc95))
+
 ## [1.7.4](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.7.3...v1.7.4) (2022-06-18)
 
 

package/package.json

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

package/src/index.js

@@ -20,13 +20,6 @@ function clickedElement() {
     }
 }
 
-export function getAttributes(element) {
-  return element.getAttributeNames().reduce((attrMap, name) => {
-    attrMap[name] = element.getAttribute(name);
-    return attrMap;
-  }, {});
-}
-
 export function parseTextToHtml(text) {
   let doc = new DOMParser().parseFromString(text, "text/html");
   if (doc.head.children[0]) return doc.head.children[0];
@@ -47,15 +40,15 @@ export function cssPath(node, container) {
             node = '';
         }
         else {
-            let eid = node.getAttribute('eid');
-            if(/{{\s*([\w\W]+)\s*}}/g.test(eid)) {
-    			eid = false;
-    		}
-            if (eid) {
-                pathSplit += `[eid="${eid}"]`;
-                node = '';
-            }
-            else {
+            // let eid = node.getAttribute('eid');
+            // if(/{{\s*([\w\W]+)\s*}}/g.test(eid)) {
+    		// 	eid = false;
+    		// }
+            // if (eid) {
+            //     pathSplit += `[eid="${eid}"]`;
+            //     node = '';
+            // }
+            // else {
                 // if (node.classList.length) {
                 //     node.classList.forEach((item) => {
                 //         if (item.indexOf(":") === -1) pathSplit += "." + item;
@@ -85,10 +78,21 @@ export function cssPath(node, container) {
                 if (node == null || node.tagName == "HTML" || node.tagName == "DOM-PARSER" || node.nodeName == "#document" || node.hasAttribute('contenteditable'))
                 	node = '';
             }
-        }
+        // }
         pathSplits.unshift(pathSplit);
     } while (node);
-    return pathSplits.join(" > ");
+    let path = pathSplits.join(" > ")
+    if (path && path.includes('<')) {
+		let index = path.lastIndexOf(' >')
+		if (index != -1)
+			path = path.slice(0, index)
+		else{
+			index = path.lastIndexOf('<')
+			path = path.slice(0, index)
+		}
+	}
+
+    return path;
 }
 
 export function domParser(str) {
@@ -116,29 +120,7 @@ export function domParser(str) {
     }
 }
 
-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) {
+export function queryDocumentSelectorAll(selector) {
 	let elements = [];
 
 	if (selector) {
@@ -149,16 +131,22 @@ export function queryFrameSelectorAll(selector) {
 		for (let selector of selectors){
 			let els;
 			if(selector.indexOf(';') !== -1) {
+                let targetDocument;
 				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];
-				}
+				if (['parent', 'parentDocument'].includes(documentSelector))
+                    targetDocument = window.parent.document;
+                else {
+                    let frame = document.querySelector(documentSelector);
+                    if (frame)
+                        targetDocument = frame.contentDocument;
+                }
+                if (targetDocument){
+                    if (targetSelector)
+                        els = targetDocument.querySelectorAll(targetSelector);
+                    else
+                        if (targetDocument.clickedElement)
+                            els = [targetDocument.clickedElement];
+                }
 			}
 			else
 				els = document.querySelectorAll(selector);
@@ -196,8 +184,8 @@ clickedElement();
 
 export default {
   parseTextToHtml,
-  getAttributes,
   cssPath,
   domParser,
+  queryDocumentSelectorAll,
   queryFrameSelectorAll
 };

package/src/index.old.js

@@ -371,7 +371,62 @@ async function complexSelector(comSelector, callback) {
 	   return true;
 	}
 
-
+  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) {
+    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 default {
   getElementPath,
   isValidSelector,