@rpascene/shared 0.30.13 → 0.30.15

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

@@ -63,7 +63,7 @@ function collectElementInfo(node, currentWindow, currentDocument, baseZoom = 1,
         rect.left += basePoint.left;
         rect.top += basePoint.top;
     }
-    if (rect.height >= window.innerHeight && rect.width >= window.innerWidth) return null;
+    if (rect.height >= currentWindow.innerHeight && rect.width >= currentWindow.innerWidth) return null;
     if ((0, external_dom_util_js_namespaceObject.isFormElement)(node, currentWindow)) {
         const attributes = (0, external_util_js_namespaceObject.getNodeAttributes)(node, currentWindow);
         let valueContent = attributes.value || attributes.placeholder || node.textContent || '';
@@ -98,6 +98,10 @@ function collectElementInfo(node, currentWindow, currentDocument, baseZoom = 1,
     if ((0, external_dom_util_js_namespaceObject.isButtonElement)(node, currentWindow)) {
         const rect = mergeElementAndChildrenRects(node, currentWindow, currentDocument, baseZoom);
         if (!rect) return null;
+        if (0 !== basePoint.left || 0 !== basePoint.top) {
+            rect.left += basePoint.left;
+            rect.top += basePoint.top;
+        }
         const attributes = (0, external_util_js_namespaceObject.getNodeAttributes)(node, currentWindow);
         const pseudo = (0, external_util_js_namespaceObject.getPseudoElementContent)(node, currentWindow);
         const content = node.innerText || pseudo.before || pseudo.after || '';
@@ -253,12 +257,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 +270,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;
         }
@@ -318,18 +314,7 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
             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 +322,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 +368,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'