fix: further improvements for dealing with iframes

amtrack · Nov 15, 2023 · fc4b6b5 · fc4b6b5
1 parent 7ac69a2
commit fc4b6b5
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/browserforce.ts b/src/browserforce.ts
@@ -131,15 +131,14 @@ export class Browserforce {
   // Wait for either the selector in the page or in the iframe.
   // returns the page or the frame
   public async waitForSelectorInFrameOrPage(page: Page, selector: string): Promise<Page | Frame> {
-    await page.waitForSelector(`pierce/${VF_IFRAME_SELECTOR}, ${VF_IFRAME_SELECTOR}, ${selector}`);
-    const frameElementHandle = await page.$(`pierce/${VF_IFRAME_SELECTOR}, ${VF_IFRAME_SELECTOR}`);
+    await page.waitForSelector(`pierce/${VF_IFRAME_SELECTOR}, ${selector}`);
+    const frameElementHandle = await page.$(`pierce/${VF_IFRAME_SELECTOR}`);
     let frameOrPage: Page | Frame = page;
     if (frameElementHandle) {
-      const frame = await frameElementHandle.contentFrame();
-      if (frame) {
-        await frame.waitForNavigation();
-        frameOrPage = frame;
-      }
+      const frame = await page.waitForFrame(
+        async (f) => f.name().startsWith('vfFrameId') && f.url()?.length > 0 && f.url() !== 'about:blank'
+      );
+      frameOrPage = frame;
     }
     await frameOrPage.waitForSelector(selector);
     return frameOrPage;