Skip to content

chore: switch to the bulit-in drag&drop implementation for chromium #36287

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: switch to the bulit-in drag&drop implementation for chromium #36287

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: 11 additions & 8 deletions packages/playwright-core/src/server/chromium/crInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class RawKeyboardImpl implements input.RawKeyboard {
constructor(
private _client: CRSession,
private _isMac: boolean,
private _dragManger: DragManager,
private _dragManager: DragManager | undefined,
) { }

_commandsForCode(code: string, modifiers: Set<types.KeyboardModifier>) {
Expand All @@ -55,8 +55,11 @@ export class RawKeyboardImpl implements input.RawKeyboard {

async keydown(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription, autoRepeat: boolean): Promise<void> {
const { code, key, location, text } = description;
if (code === 'Escape' && await progress.race(this._dragManger.cancelDrag()))
return;
if (code === 'Escape') {
if (this._dragManager && await progress.race(this._dragManager.cancelDrag()))
return;
await progress.race(this._client.send('Input.cancelDragging', {}));
}
const commands = this._commandsForCode(code, modifiers);
await progress.race(this._client.send('Input.dispatchKeyEvent', {
type: text ? 'keyDown' : 'rawKeyDown',
Expand Down Expand Up @@ -93,9 +96,9 @@ export class RawKeyboardImpl implements input.RawKeyboard {
export class RawMouseImpl implements input.RawMouse {
private _client: CRSession;
private _page: CRPage;
private _dragManager: DragManager;
private _dragManager: DragManager | undefined;

constructor(page: CRPage, client: CRSession, dragManager: DragManager) {
constructor(page: CRPage, client: CRSession, dragManager: DragManager | undefined) {
this._page = page;
this._client = client;
this._dragManager = dragManager;
Expand All @@ -113,7 +116,7 @@ export class RawMouseImpl implements input.RawMouse {
force: buttons.size > 0 ? 0.5 : 0,
}));
};
if (forClick) {
if (!this._dragManager || forClick) {
// Avoid extra protocol calls related to drag and drop, because click relies on
// move-down-up protocol commands being sent synchronously.
await actualMove();
Expand All @@ -123,7 +126,7 @@ export class RawMouseImpl implements input.RawMouse {
}

async down(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
if (this._dragManager.isDragging())
if (this._dragManager?.isDragging())
return;
await progress.race(this._client.send('Input.dispatchMouseEvent', {
type: 'mousePressed',
Expand All @@ -138,7 +141,7 @@ export class RawMouseImpl implements input.RawMouse {
}

async up(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
if (this._dragManager.isDragging()) {
if (this._dragManager?.isDragging()) {
await this._dragManager.drop(progress, x, y, modifiers);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/playwright-core/src/server/chromium/crPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class CRPage implements PageDelegate {
this._targetId = targetId;
this._opener = opener;
this._isBackgroundPage = bits.isBackgroundPage;
const dragManager = new DragManager(this);
const dragManager = process.env.PLAYWRIGHT_LEGACY_DRAG_AND_DROP ? new DragManager(this) : undefined;
this.rawKeyboard = new RawKeyboardImpl(client, browserContext._browser._platform() === 'mac', dragManager);
this.rawMouse = new RawMouseImpl(this, client, dragManager);
this.rawTouchscreen = new RawTouchscreenImpl(client);
Expand Down
Loading
Loading