yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup locators implementation (#7990)

Browse Source
This commit is contained in:
Max Schmitt 2021-08-05 17:13:46 +02:00 committed by GitHub
parent 611a8556c8
commit 62a4d82b7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/client/locator.ts
View File

@ -32,23 +32,21 @@ export class Locator implements api.Locator {
this._selector = selector;
}
private async _withElement<R, O extends TimeoutOptions>(task: (handle: ElementHandle<SVGElement | HTMLElement>, options?: O) => Promise<R>, options?: O): Promise<R> {
if (!options)
options = {} as O;
const timeout = this._frame.page()._timeoutSettings.timeout(options!);
private async _withElement<R>(task: (handle: ElementHandle<SVGElement | HTMLElement>, timeout?: number) => Promise<R>, timeout?: number): Promise<R> {
timeout = this._frame.page()._timeoutSettings.timeout({ timeout });
const deadline = timeout ? monotonicTime() + timeout : 0;
const handle = await this.elementHandle({ timeout });
if (!handle)
throw new Error(`Could not resolve ${this._selector} to DOM Element`);
try {
return await task(handle, { ...options!, timeout: deadline ? deadline - monotonicTime() : 0 });
return await task(handle, deadline ? deadline - monotonicTime() : 0);
} finally {
handle.dispose();
}
}
async boundingBox(options?: TimeoutOptions): Promise<Rect | null> {
return this._withElement(h => h.boundingBox(), { strict: true, ...options });
return this._withElement(h => h.boundingBox(), options?.timeout);
}
async check(options: channels.ElementHandleCheckOptions = {}) {
@ -68,7 +66,7 @@ export class Locator implements api.Locator {
}
async evaluate<R, Arg>(pageFunction: structs.PageFunctionOn<SVGElement | HTMLElement, Arg, R>, arg?: Arg, options?: TimeoutOptions): Promise<R> {
return this._withElement(h => h.evaluate(pageFunction, arg), { strict: true, ...options });
return this._withElement(h => h.evaluate(pageFunction, arg), options?.timeout);
}
async evaluateAll<R, Arg>(pageFunction: structs.PageFunctionOn<Element[], Arg, R>, arg?: Arg): Promise<R> {
@ -76,7 +74,7 @@ export class Locator implements api.Locator {
}
async evaluateHandle<R, Arg>(pageFunction: structs.PageFunctionOn<any, Arg, R>, arg?: Arg, options?: TimeoutOptions): Promise<structs.SmartHandle<R>> {
return this._withElement(h => h.evaluateHandle(pageFunction, arg), { strict: true, ...options });
return this._withElement(h => h.evaluateHandle(pageFunction, arg), options?.timeout);
}
async fill(value: string, options: channels.ElementHandleFillOptions = {}): Promise<void> {
@ -164,11 +162,11 @@ export class Locator implements api.Locator {
}
async screenshot(options: channels.ElementHandleScreenshotOptions & { path?: string } = {}): Promise<Buffer> {
return this._withElement((h, o) => h.screenshot(o), { strict: true, ...options });
return this._withElement((h, timeout) => h.screenshot({ ...options, timeout }), options.timeout);
}
async scrollIntoViewIfNeeded(options: channels.ElementHandleScrollIntoViewIfNeededOptions = {}) {
return this._withElement((h, o) => h.scrollIntoViewIfNeeded(o), { strict: true, ...options });
return this._withElement((h, timeout) => h.scrollIntoViewIfNeeded({ ...options, timeout }), options.timeout);
}
async selectOption(values: string | api.ElementHandle | SelectOption | string[] | api.ElementHandle[] | SelectOption[] | null, options: SelectOptionOptions = {}): Promise<string[]> {
@ -176,7 +174,7 @@ export class Locator implements api.Locator {
}
async selectText(options: channels.ElementHandleSelectTextOptions = {}): Promise<void> {
return this._withElement((h, o) => h.selectText(o), { strict: true, ...options });
return this._withElement((h, timeout) => h.selectText({ ...options, timeout }), options.timeout);
}
async setInputFiles(files: string | FilePayload | string[] | FilePayload[], options: channels.ElementHandleSetInputFilesOptions = {}) {