Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cherry-pick(#29069): Revert "feat(codegen): add range input recording support (#28767)" #29074

Merged
merged 1 commit into from
Jan 19, 2024
Merged

cherry-pick(#29069): Revert "feat(codegen): add range input recording support (#28767)" #29074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions packages/playwright-core/src/server/injected/recorder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class RecordActionTool implements RecorderTool {
return;
if (this._actionInProgress(event))
return;
if (this._consumedDueWrongTarget(event, this._hoveredModel))
if (this._consumedDueToNoModel(event, this._hoveredModel))
return;

const checkbox = asCheckbox(this._recorder.deepEventTarget(event));
Expand Down Expand Up @@ -283,7 +283,7 @@ class RecordActionTool implements RecorderTool {
}

// Non-navigating actions are simply recorded by Playwright.
if (this._consumedDueWrongTarget(event, this._activeModel))
if (this._consumedDueWrongTarget(event))
return;
this._recorder.delegate.recordAction?.({
name: 'fill',
Expand Down Expand Up @@ -313,7 +313,7 @@ class RecordActionTool implements RecorderTool {
this._expectProgrammaticKeyUp = true;
return;
}
if (this._consumedDueWrongTarget(event, this._activeModel))
if (this._consumedDueWrongTarget(event))
return;
// Similarly to click, trigger checkbox on key event, not input.
if (event.key === ' ') {
Expand Down Expand Up @@ -373,7 +373,7 @@ class RecordActionTool implements RecorderTool {
const nodeName = target.nodeName;
if (nodeName === 'SELECT' || nodeName === 'OPTION')
return true;
if (nodeName === 'INPUT' && ['date', 'range'].includes((target as HTMLInputElement).type))
if (nodeName === 'INPUT' && ['date'].includes((target as HTMLInputElement).type))
return true;
return false;
}
Expand All @@ -387,8 +387,15 @@ class RecordActionTool implements RecorderTool {
return false;
}

private _consumedDueWrongTarget(event: Event, model: HighlightModel | null): boolean {
if (model && model.elements[0] === this._recorder.deepEventTarget(event))
private _consumedDueToNoModel(event: Event, model: HighlightModel | null): boolean {
if (model)
return false;
consumeEvent(event);
return true;
}

private _consumedDueWrongTarget(event: Event): boolean {
if (this._activeModel && this._activeModel.elements[0] === this._recorder.deepEventTarget(event))
return false;
consumeEvent(event);
return true;
Expand Down
28 changes: 0 additions & 28 deletions tests/library/inspector/cli-codegen-1.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,32 +746,4 @@ await page.GetByText("Click me").ClickAsync(new LocatorClickOptions
Button = MouseButton.Middle,
});`);
});

test('should record slider', async ({ page, openRecorder }) => {
const recorder = await openRecorder();

await recorder.setContentAndWait(`<input type="range" min="0" max="10" value="5">`);

const dragSlider = async () => {
await page.locator('input').focus();
const { x, y, width, height } = await page.locator('input').boundingBox();
await page.mouse.move(x + width / 2, y + height / 2);
await page.mouse.down();
await page.mouse.move(x + width, y + height / 2);
await page.mouse.up();
};

const [sources] = await Promise.all([
recorder.waitForOutput('JavaScript', 'fill'),
dragSlider(),
]);

await expect(page.locator('input')).toHaveValue('10');

expect(sources.get('JavaScript')!.text).toContain(`
await page.getByRole('slider').fill('10');`);

expect(sources.get('JavaScript')!.text).not.toContain(`
await page.getByRole('slider').click();`);
});
});
Loading