fix(codegen): do not reset current source on every recorded action (#13925)

Currently, when I choose "Java" in the sources list and then
click on the page to generate the "click" action, sources reset
to "JavaScript". This is very inconvenient.

This changes the logic to only forcefully change files if either
old or new file is a user file, not a generated one.

Use cases considered:
- run `codegen`, click around, choose different language, click more;
- run script with inspector, pause, click "Record" and record an action;
- same as above, but then continue and see that user source is revealed.
This commit is contained in:
Dmitry Gozman 2022-05-04 17:16:24 +01:00 коммит произвёл GitHub
Родитель 9e0aa67d28
Коммит cd53346594
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 19 добавлений и 10 удалений

Просмотреть файл

@ -127,7 +127,7 @@ export class Recorder implements InstrumentationListener {
this._contextRecorder.on(ContextRecorder.Events.Change, (data: { sources: Source[], primaryFileName: string }) => {
this._recorderSources = data.sources;
this._pushAllSources();
this._recorderApp?.setFile(data.primaryFileName);
this._recorderApp?.setFileIfNeeded(data.primaryFileName);
});
await this._context.exposeBinding('_playwrightRecorderState', false, source => {
@ -229,7 +229,7 @@ export class Recorder implements InstrumentationListener {
const { file, line } = metadata.stack[0];
let source = this._userSources.get(file);
if (!source) {
source = { file, text: this._readSource(file), highlight: [], language: languageForFile(file) };
source = { isRecorded: false, file, text: this._readSource(file), highlight: [], language: languageForFile(file) };
this._userSources.set(file, source);
}
if (line) {
@ -241,7 +241,7 @@ export class Recorder implements InstrumentationListener {
}
this._pushAllSources();
if (fileToSelect)
this._recorderApp?.setFile(fileToSelect);
this._recorderApp?.setFileIfNeeded(fileToSelect);
}
private _pushAllSources() {
@ -325,6 +325,7 @@ class ContextRecorder extends EventEmitter {
this._recorderSources = [];
for (const languageGenerator of orderedLanguages) {
const source: Source = {
isRecorded: true,
file: languageGenerator.fileName,
text: generator.generateText(languageGenerator),
language: languageGenerator.highlighter,

Просмотреть файл

@ -28,7 +28,7 @@ import { findChromiumChannel } from '../registry';
declare global {
interface Window {
playwrightSetFile: (file: string) => void;
playwrightSetFileIfNeeded: (file: string) => void;
playwrightSetMode: (mode: Mode) => void;
playwrightSetPaused: (paused: boolean) => void;
playwrightSetSources: (sources: Source[]) => void;
@ -42,7 +42,7 @@ export interface IRecorderApp extends EventEmitter {
close(): Promise<void>;
setPaused(paused: boolean): Promise<void>;
setMode(mode: 'none' | 'recording' | 'inspecting'): Promise<void>;
setFile(file: string): Promise<void>;
setFileIfNeeded(file: string): Promise<void>;
setSelector(selector: string, focus?: boolean): Promise<void>;
updateCallLogs(callLogs: CallLog[]): Promise<void>;
bringToFront(): void;
@ -133,9 +133,9 @@ export class RecorderApp extends EventEmitter implements IRecorderApp {
}).toString(), true, mode, 'main').catch(() => {});
}
async setFile(file: string): Promise<void> {
async setFileIfNeeded(file: string): Promise<void> {
await this._page.mainFrame().evaluateExpression(((file: string) => {
window.playwrightSetFile(file);
window.playwrightSetFileIfNeeded(file);
}).toString(), true, file, 'main').catch(() => {});
}
@ -181,7 +181,7 @@ class HeadlessRecorderApp extends EventEmitter implements IRecorderApp {
async close(): Promise<void> {}
async setPaused(paused: boolean): Promise<void> {}
async setMode(mode: 'none' | 'recording' | 'inspecting'): Promise<void> {}
async setFile(file: string): Promise<void> {}
async setFileIfNeeded(file: string): Promise<void> {}
async setSelector(selector: string, focus?: boolean): Promise<void> {}
async updateCallLogs(callLogs: CallLog[]): Promise<void> {}
bringToFront(): void {}

Просмотреть файл

@ -52,6 +52,7 @@ export type SourceHighlight = {
};
export type Source = {
isRecorded: boolean;
file: string;
text: string;
language: string;

Просмотреть файл

@ -25,7 +25,7 @@ import './recorder.css';
declare global {
interface Window {
playwrightSetFile: (file: string) => void;
playwrightSetFileIfNeeded: (file: string) => void;
playwrightSetSelector: (selector: string, focus?: boolean) => void;
dispatch(data: any): Promise<void>;
}
@ -54,15 +54,22 @@ export const Recorder: React.FC<RecorderProps> = ({
};
const [f, setFile] = React.useState<string | undefined>();
window.playwrightSetFile = setFile;
const file = f || sources[0]?.file;
const source = sources.find(s => s.file === file) || {
isRecorded: false,
text: '',
language: 'javascript',
file: '',
highlight: []
};
window.playwrightSetFileIfNeeded = (value: string) => {
const newSource = sources.find(s => s.file === value);
// Do not forcefully switch between two recorded sources, because
// user did explicitly choose one.
if (newSource && !newSource.isRecorded || !source.isRecorded)
setFile(value);
};
const messagesEndRef = React.createRef<HTMLDivElement>();
React.useLayoutEffect(() => {