fix(core): update creating jspath from history

ulixee · Mar 17, 2022 · eeed064 · eeed064
1 parent 0de6846
commit eeed064
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/core/lib/CommandFormatter.ts b/core/lib/CommandFormatter.ts
@@ -132,6 +132,10 @@ export default class CommandFormatter {
             command.resultNodeIds = result.nodePointer.iterableItems.map(x => x.id);
           }
         }
+      } else if (meta.resultType === 'Array' && result.length) {
+        if (result[0].nodePointerId) {
+          command.resultNodeIds = result.map(x => x.nodePointerId).filter(Boolean);
+        }
       }
     }
 

diff --git a/core/lib/JsPath.ts b/core/lib/JsPath.ts
@@ -116,7 +116,12 @@ export class JsPath {
     const path: IJsPath = [];
     const history = this.getJsPathHistoryForNode(nodePointer.id);
     for (const entry of history) {
-      path.push(...entry.jsPath);
+      const jsPath = entry.jsPath;
+      if (typeof jsPath[0] === 'number') {
+        path.push(...jsPath.slice(1))
+      } else {
+        path.push(...jsPath);
+      }
     }
     return path;
   }

diff --git a/plugins/default-browser-emulator/lib/helpers/setScreensize.ts b/plugins/default-browser-emulator/lib/helpers/setScreensize.ts
@@ -50,7 +50,6 @@ export default async function setScreensize(
   if (viewport.width === 0 || viewport.height === 0) {
     promises.push(
       devtools.send('Page.getLayoutMetrics').then(x => {
-        // @ts-expect-error - chrome 98 add correctly sized cssVisualViewport.
         const visualViewport: Protocol.Page.VisualViewport = x.cssVisualViewport ?? x.visualViewport;
         viewport.height = visualViewport.clientHeight;
         viewport.width = visualViewport.clientWidth;