[context menus] Restore the focus (fixes #481)

Signed-off-by: Sven Efftinge <[email protected]>
eclipse-theia · Sep 21, 2017 · f2ec970 · f2ec970
1 parent c7c46de
commit f2ec970
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/core/src/browser/menu/browser-context-menu-renderer.ts b/packages/core/src/browser/menu/browser-context-menu-renderer.ts
@@ -18,9 +18,13 @@ export class BrowserContextMenuRenderer implements ContextMenuRenderer {
     render(path: string, anchor: Anchor, onHide?: () => void): void {
         const contextMenu = this.menuFactory.createContextMenu(path);
         const { x, y } = anchor instanceof MouseEvent ? { x: anchor.clientX, y: anchor.clientY } : anchor;
-        if (onHide) {
-            contextMenu.aboutToClose.connect(() => onHide());
-        }
+        const previouslyActive = window.document.activeElement as HTMLElement;
+        contextMenu.aboutToClose.connect(() => {
+            previouslyActive.focus();
+            if (onHide) {
+                onHide();
+            }
+        });
         contextMenu.open(x, y);
     }