@rpascene/shared 0.30.13 → 0.30.14

package/dist/lib/extractor/web-extractor.js

@@ -253,12 +253,9 @@ async function extractTreeNodeAsString(initNode, visibleOnly = false, debugMode
 async function extractTreeNode(initNode, debugMode = false, basePoint = {
     left: 0,
     top: 0
-}, baseZoom = 1, containerPaths = []) {
+}, baseZoom = 1) {
     (0, external_util_js_namespaceObject.setDebugMode)(debugMode);
     indexId = 0;
-    let containerPathClone = [
-        ...containerPaths
-    ];
     const topDocument = (0, external_util_js_namespaceObject.getTopDocument)();
     const startNode = initNode || topDocument;
     const topChildren = [];
@@ -269,11 +266,6 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
         if (!node) return null;
         if (node.nodeType && 10 === node.nodeType) return null;
         const elementInfo = collectElementInfo(node, currentWindow, currentDocument, baseZoom, basePoint, false);
-        if (elementInfo) {
-            const allPaths = (0, external_customLocator_js_namespaceObject.getLocators)(node);
-            elementInfo.allPaths = allPaths;
-            elementInfo.containerPaths = containerPathClone;
-        }
         if (node instanceof currentWindow.HTMLIFrameElement) {
             if (node.contentWindow && node.contentWindow) return null;
         }
@@ -295,20 +287,6 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
         }
         return nodeInfo;
     }
-    function getCssScale(ele) {
-        try {
-            const { width, height } = ele.getBoundingClientRect();
-            return {
-                cssScaleX: Number((width / ele.offsetWidth).toFixed(1)),
-                cssScaleY: Number((height / ele.offsetHeight).toFixed(1))
-            };
-        } catch (error) {
-            return {
-                cssScaleX: 1,
-                cssScaleY: 1
-            };
-        }
-    }
     const rootNodeInfo = dfs(startNode, window, document, baseZoom, basePoint);
     if (Array.isArray(rootNodeInfo)) topChildren.push(...rootNodeInfo);
     else if (rootNodeInfo) topChildren.push(rootNodeInfo);
@@ -317,19 +295,7 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
         for(let i = 0; i < iframes.length; i++){
             const iframe = iframes[i];
             const iframeInfo = collectElementInfo(iframe, window, document, 1);
-            const baseZoom = getCssScale(iframe).cssScaleX;
-            const containerPath = (0, external_customLocator_js_namespaceObject.getContainerPath)(iframe);
-            containerPathClone = containerPathClone.concat(containerPath);
-            if (iframeInfo) if (iframe.contentDocument && iframe.contentWindow) {
-                console.log("iframe\u540C\u57DF");
-                const iframeChildren = dfs(iframe.contentDocument.body, iframe.contentWindow, iframe.contentDocument, baseZoom, {
-                    left: iframeInfo.rect.left,
-                    top: iframeInfo.rect.top
-                });
-                if (Array.isArray(iframeChildren)) topChildren.push(...iframeChildren);
-                else if (iframeChildren) topChildren.push(iframeChildren);
-            } else {
-                console.log(iframeInfo, "iframe\u8DE8\u57DF\u4E86");
+            if (iframeInfo) {
                 const iframeChildren = await (0, external_cs_postmessage_js_namespaceObject.postWindowMessage)(iframe.contentWindow, window, {
                     action: 'extractTreeNode',
                     data: {
@@ -337,8 +303,7 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
                             left: iframeInfo.rect.left,
                             top: iframeInfo.rect.top
                         },
-                        baseZoom,
-                        containerPaths: containerPathClone
+                        baseZoom
                     }
                 });
                 if (Array.isArray(iframeChildren)) topChildren.push(...iframeChildren);
@@ -384,7 +349,7 @@ function mergeElementAndChildrenRects(node, currentWindow, currentDocument, base
 }
 if ('undefined' != typeof window) (0, external_cs_postmessage_js_namespaceObject.onWindowMessage)(window, async ({ action, data }, { source })=>{
     if ('extractTreeNode' === action) try {
-        return await extractTreeNode(document.body, false, data.basePoint, data.baseZoom, data.containerPaths);
+        return await extractTreeNode(document.body, false, data.basePoint, data.baseZoom);
     } catch (error) {
         return {
             error: 'error message'