From 1cee65722bc45ace5edfc0843654a2ba9ef35608 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Mon, 7 Nov 2022 13:53:15 -0800
Subject: [PATCH] fix(inspector): disable highlight during screenshot actions
 (#18621)

Fixes #18049.
---
 .../playwright-core/src/server/recorder.ts    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/playwright-core/src/server/recorder.ts b/packages/playwright-core/src/server/recorder.ts
index 5881eb8abb..b1cf0ca150 100644
--- a/packages/playwright-core/src/server/recorder.ts
+++ b/packages/playwright-core/src/server/recorder.ts
@@ -151,12 +151,16 @@ export class Recorder implements InstrumentationListener {
     });
 
     await this._context.exposeBinding('__pw_recorderState', false, source => {
-      let actionSelector = this._highlightedSelector;
+      let actionSelector = '';
       let actionPoint: Point | undefined;
-      for (const [metadata, sdkObject] of this._currentCallsMetadata) {
-        if (source.page === sdkObject.attribution.page) {
-          actionPoint = metadata.point || actionPoint;
-          actionSelector = actionSelector || metadata.params.selector;
+      const hasActiveScreenshotCommand = [...this._currentCallsMetadata.keys()].some(isScreenshotCommand);
+      if (!hasActiveScreenshotCommand) {
+        actionSelector = this._highlightedSelector;
+        for (const [metadata, sdkObject] of this._currentCallsMetadata) {
+          if (source.page === sdkObject.attribution.page) {
+            actionPoint = metadata.point || actionPoint;
+            actionSelector = actionSelector || metadata.params.selector;
+          }
         }
       }
       const uiState: UIState = {
@@ -235,7 +239,9 @@ export class Recorder implements InstrumentationListener {
     this._currentCallsMetadata.set(metadata, sdkObject);
     this._updateUserSources();
     this.updateCallLog([metadata]);
-    if (metadata.params && metadata.params.selector) {
+    if (isScreenshotCommand(metadata)) {
+      this.hideHighlightedSelecor();
+    } else if (metadata.params && metadata.params.selector) {
       this._highlightedSelector = metadata.params.selector;
       this._recorderApp?.setSelector(this._highlightedSelector).catch(() => {});
     }
@@ -675,3 +681,7 @@ class ThrottledFile {
     this._text = undefined;
   }
 }
+
+function isScreenshotCommand(metadata: CallMetadata) {
+  return metadata.method.includes('screenshot');
+}