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.

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

chore: disable mode controller when connecting via debug controller #33979

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions packages/playwright-core/src/server/debugController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ class InspectingRecorderApp extends EmptyRecorderApp {
this._debugController = debugController;
}

override disableModeController(): boolean {
return true;
}

override async elementPicked(elementInfo: ElementInfo): Promise<void> {
const locator: string = asLocator(this._debugController._sdkLanguage, elementInfo.selector);
this._debugController.emit(DebugController.Events.InspectRequested, { selector: elementInfo.selector, locator, ariaSnapshot: elementInfo.ariaSnapshot });
Expand Down
19 changes: 13 additions & 6 deletions packages/playwright-core/src/server/injected/highlight.css
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,24 @@ x-pw-tools-list {

x-pw-tool-item {
pointer-events: auto;
cursor: pointer;
height: 28px;
width: 28px;
border-radius: 3px;
}

x-pw-tool-item:not(.disabled) {
cursor: pointer;
}

x-pw-tool-item:not(.disabled):hover {
background-color: hsl(0, 0%, 86%);
}

x-pw-tool-item.active {
x-pw-tool-item.toggled {
background-color: rgba(138, 202, 228, 0.5);
}

x-pw-tool-item.active:not(.disabled):hover {
x-pw-tool-item.toggled:not(.disabled):hover {
background-color: #8acae4c4;
}

Expand All @@ -179,18 +182,22 @@ x-pw-tool-item.disabled > x-div {
cursor: default;
}

x-pw-tool-item.record.active {
x-pw-tool-item.record.toggled {
background-color: transparent;
}

x-pw-tool-item.record.active:hover {
x-pw-tool-item.record.toggled:not(.disabled):hover {
background-color: hsl(0, 0%, 86%);
}

x-pw-tool-item.record.active > x-div {
x-pw-tool-item.record.toggled > x-div {
background-color: #a1260d;
}

x-pw-tool-item.record.disabled.toggled > x-div {
opacity: 0.8;
}

x-pw-tool-item.accept > x-div {
background-color: #388a34;
}
Expand Down
20 changes: 14 additions & 6 deletions packages/playwright-core/src/server/injected/recorder/recorder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -883,9 +883,13 @@ class Overlay {
this._dragState = { offsetX: this._offsetX, dragStart: { x: (event as MouseEvent).clientX, y: 0 } };
}),
addEventListener(this._recordToggle, 'click', () => {
if (this._recordToggle.classList.contains('disabled'))
return;
this._recorder.setMode(this._recorder.state.mode === 'none' || this._recorder.state.mode === 'standby' || this._recorder.state.mode === 'inspecting' ? 'recording' : 'standby');
}),
addEventListener(this._pickLocatorToggle, 'click', () => {
if (this._pickLocatorToggle.classList.contains('disabled'))
return;
const newMode: Record<Mode, Mode> = {
'inspecting': 'standby',
'none': 'inspecting',
Expand Down Expand Up @@ -929,15 +933,18 @@ class Overlay {
}

setUIState(state: UIState) {
this._recordToggle.classList.toggle('active', state.mode === 'recording' || state.mode === 'assertingText' || state.mode === 'assertingVisibility' || state.mode === 'assertingValue' || state.mode === 'recording-inspecting');
this._pickLocatorToggle.classList.toggle('active', state.mode === 'inspecting' || state.mode === 'recording-inspecting');
this._assertVisibilityToggle.classList.toggle('active', state.mode === 'assertingVisibility');
this._recordToggle.classList.toggle('disabled', this._recorder.state.disableModeController);
this._pickLocatorToggle.classList.toggle('disabled', this._recorder.state.disableModeController);

this._recordToggle.classList.toggle('toggled', state.mode === 'recording' || state.mode === 'assertingText' || state.mode === 'assertingVisibility' || state.mode === 'assertingValue' || state.mode === 'assertingSnapshot' || state.mode === 'recording-inspecting');
this._pickLocatorToggle.classList.toggle('toggled', state.mode === 'inspecting' || state.mode === 'recording-inspecting');
this._assertVisibilityToggle.classList.toggle('toggled', state.mode === 'assertingVisibility');
this._assertVisibilityToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
this._assertTextToggle.classList.toggle('active', state.mode === 'assertingText');
this._assertTextToggle.classList.toggle('toggled', state.mode === 'assertingText');
this._assertTextToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
this._assertValuesToggle.classList.toggle('active', state.mode === 'assertingValue');
this._assertValuesToggle.classList.toggle('toggled', state.mode === 'assertingValue');
this._assertValuesToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
this._assertSnapshotToggle.classList.toggle('active', state.mode === 'assertingSnapshot');
this._assertSnapshotToggle.classList.toggle('toggled', state.mode === 'assertingSnapshot');
this._assertSnapshotToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
if (this._offsetX !== state.overlay.offsetX) {
this._offsetX = state.overlay.offsetX;
Expand Down Expand Up @@ -1031,6 +1038,7 @@ export class Recorder {
testIdAttributeName: 'data-testid',
language: 'javascript',
overlay: { offsetX: 0 },
disableModeController: false,
};
readonly document: Document;
private _delegate: RecorderDelegate = {};
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/server/recorder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ export class Recorder implements InstrumentationListener, IRecorder {
language: this._currentLanguage,
testIdAttributeName: this._contextRecorder.testIdAttributeName(),
overlay: this._overlayState,
disableModeController: this._recorderApp ? this._recorderApp.disableModeController() : true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
disableModeController: this._recorderApp ? this._recorderApp.disableModeController() : true,
disableModeController: this._recorderApp?.disableModeController() ?? true,

};
return uiState;
});
Expand Down
5 changes: 5 additions & 0 deletions packages/playwright-core/src/server/recorder/recorderApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export class EmptyRecorderApp extends EventEmitter implements IRecorderApp {
async updateCallLogs(callLogs: CallLog[]): Promise<void> {}
async setSources(sources: Source[]): Promise<void> {}
async setActions(actions: actions.ActionInContext[], sources: Source[]): Promise<void> {}
disableModeController(): boolean { return false; }
}

export class RecorderApp extends EventEmitter implements IRecorderApp {
Expand Down Expand Up @@ -171,4 +172,8 @@ export class RecorderApp extends EventEmitter implements IRecorderApp {
window.playwrightUpdateLogs(callLogs);
}).toString(), { isFunction: true }, callLogs).catch(() => {});
}

disableModeController(): boolean {
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export interface IRecorderApp extends EventEmitter {
updateCallLogs(callLogs: CallLog[]): Promise<void>;
setSources(sources: Source[]): Promise<void>;
setActions(actions: actions.ActionInContext[], sources: Source[]): Promise<void>;
disableModeController(): boolean;
}

export type IRecorderAppFactory = (recorder: IRecorder) => Promise<IRecorderApp>;
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ export class RecorderInTraceViewer extends EventEmitter implements IRecorderApp
async setActions(actions: actions.ActionInContext[], sources: Source[]): Promise<void> {
this._transport.deliverEvent('setActions', { actions, sources });
}

disableModeController(): boolean {
return true;
}
}

async function openApp(trace: string, options?: TraceViewerServerOptions & { headless?: boolean }): Promise<{ wsEndpointForTest: string | undefined, tracePage: Page, traceServer: HttpServer }> {
Expand Down
1 change: 1 addition & 0 deletions packages/recorder/src/recorderTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export type UIState = {
language: Language;
testIdAttributeName: string;
overlay: OverlayState;
disableModeController: boolean;
};

export type CallLogStatus = 'in-progress' | 'done' | 'error' | 'paused';
Expand Down
1 change: 1 addition & 0 deletions packages/trace-viewer/src/ui/snapshotTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ export const InspectModeController: React.FunctionComponent<{
const actionSelector = locatorOrSelectorAsSelector(sdkLanguage, highlightedLocator, testIdAttributeName);
recorder.setUIState({
mode: isInspecting ? 'inspecting' : 'none',
disableModeController: true,
actionSelector: actionSelector.startsWith(frameSelector) ? actionSelector.substring(frameSelector.length).trim() : undefined,
language: sdkLanguage,
testIdAttributeName,
Expand Down
Loading