fix: consider existing frames when waiting for a frame

puppeteer · Apr 6, 2022 · ba38097 · ba38097
1 parent 12260b1
commit ba38097
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/common/Page.ts b/src/common/Page.ts
@@ -2039,7 +2039,7 @@ export class Page extends EventEmitter {
       return false;
     }
 
-    return Promise.race([
+    const eventRace = Promise.race([
       helper.waitForEvent(
         this._frameManager,
         FrameManagerEmittedEvents.FrameAttached,
@@ -2055,6 +2055,18 @@ export class Page extends EventEmitter {
         this._sessionClosePromise()
       ),
     ]);
+
+    return Promise.race([
+      eventRace,
+      (async () => {
+        for (const frame of this.frames()) {
+          if (await predicate(frame)) {
+            return frame;
+          }
+        }
+        await eventRace;
+      })(),
+    ]);
   }
 
   /**