phantomwright-driver-core 1.58.1 → 1.58.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/server/frames.js +7 -7
- package/package.json +1 -1
package/lib/server/frames.js
CHANGED
|
@@ -726,8 +726,8 @@ class Frame extends import_instrumentation.SdkObject {
|
|
|
726
726
|
injectedScript.dispatchEvent(element, data.type, data.eventInit);
|
|
727
727
|
}, { type, eventInit }, { mainWorld: true, ...options }, scope);
|
|
728
728
|
}
|
|
729
|
-
async evalOnSelector(selector,
|
|
730
|
-
const handle = await this.selectors.query(selector, { strict
|
|
729
|
+
async evalOnSelector(selector, strict, expression, isFunction, arg, scope) {
|
|
730
|
+
const handle = await this.selectors.query(selector, { strict }, scope);
|
|
731
731
|
if (!handle)
|
|
732
732
|
throw new Error('Failed to find element matching selector "' + selector + '"');
|
|
733
733
|
const result = await handle.evaluateExpression(expression, { isFunction }, arg, true);
|
|
@@ -802,7 +802,7 @@ class Frame extends import_instrumentation.SdkObject {
|
|
|
802
802
|
progress.log(`setting frame content, waiting until "${waitUntil}"`);
|
|
803
803
|
const lifecyclePromise = new Promise((resolve, reject) => {
|
|
804
804
|
this._onClearLifecycle();
|
|
805
|
-
this.
|
|
805
|
+
this.waitForLoadState(progress, waitUntil).then(resolve).catch(reject);
|
|
806
806
|
});
|
|
807
807
|
const setContentPromise = this._page.delegate._mainFrameSession._client.send("Page.setDocumentContent", {
|
|
808
808
|
frameId: this._id,
|
|
@@ -969,7 +969,7 @@ class Frame extends import_instrumentation.SdkObject {
|
|
|
969
969
|
return true;
|
|
970
970
|
return false;
|
|
971
971
|
}
|
|
972
|
-
async _retryWithProgressIfNotConnected(progress, selector, options, action, returnAction) {
|
|
972
|
+
async _retryWithProgressIfNotConnected(progress, selector, options, strict, performActionPreChecks, action, returnAction) {
|
|
973
973
|
progress.log("waiting for " + this._asLocator(selector));
|
|
974
974
|
return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async (continuePolling) => {
|
|
975
975
|
return this._retryWithoutProgress(progress, selector, strict, performActionPreChecks, action, returnAction, continuePolling);
|
|
@@ -1539,9 +1539,9 @@ class Frame extends import_instrumentation.SdkObject {
|
|
|
1539
1539
|
}
|
|
1540
1540
|
return 0;
|
|
1541
1541
|
}
|
|
1542
|
-
async _retryWithoutProgress(progress, selector,
|
|
1543
|
-
if (
|
|
1544
|
-
const resolved = await this.selectors.resolveInjectedForSelector(selector, { strict
|
|
1542
|
+
async _retryWithoutProgress(progress, selector, strict, performActionPreChecks, action, returnAction, continuePolling) {
|
|
1543
|
+
if (performActionPreChecks) await this._page.performActionPreChecks(progress);
|
|
1544
|
+
const resolved = await this.selectors.resolveInjectedForSelector(selector, { strict });
|
|
1545
1545
|
if (!resolved) {
|
|
1546
1546
|
if (returnAction === "returnOnNotResolved" || returnAction === "returnAll") {
|
|
1547
1547
|
const result2 = await action(null);
|