[Fix] Webview is not focused after cancelling quick open widget

Signed-off-by: Shahar Harari <shahar.harari@sap.com>
eclipse-theia · Jul 5, 2020 · a48cd94 · a48cd94
1 parent 7a88d28
commit a48cd94
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/packages/plugin-ext/src/main/browser/webview/webview.ts b/packages/plugin-ext/src/main/browser/webview/webview.ts
@@ -199,6 +199,15 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget {
         this.toDisposeOnDetach.push(Disposable.create(() => this.forceHide()));
     }
 
+    protected onAfterAttach(msg: Message): void {
+        super.onAfterAttach(msg);
+        this.node.addEventListener('focus', () => {
+            if (this.element) {
+                this.doSend('focus');
+            }
+        });
+    }
+
     protected onBeforeShow(msg: Message): void {
         super.onBeforeShow(msg);
         this.doShow();
@@ -376,14 +385,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget {
 
     protected onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
-        this.focus();
-    }
-
-    focus(): void {
         this.node.focus();
-        if (this.element) {
-            this.doSend('focus');
-        }
     }
 
     reload(): void {