@theia/core 1.37.0-next.3 → 1.37.0-next.30

package/lib/electron-browser/keyboard/electron-keyboard-layout-change-notifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-keyboard-layout-change-notifier.js","sourceRoot":"","sources":["../../../src/electron-browser/keyboard/electron-keyboard-layout-change-notifier.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,8DAA8D;AAC9D,yCAAsD;AAEtD,8CAAoD;AAEpD;;;GAGG;AAEH,IAAa,oCAAoC,GAAjD,MAAa,oCAAoC;IAAjD;QAEuB,wBAAmB,GAAG,IAAI,eAAO,EAAwB,CAAC;IAWjF,CAAC;IATG,IAAI,uBAAuB;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;IAC1C,CAAC;IAGS,UAAU;QAChB,sBAAW,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAC,KAAgC,EAAE,SAA+B,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7J,CAAC;CAEJ,CAAA;AAJG;IADC,IAAA,yBAAa,GAAE;;;;sEAGf;AAXQ,oCAAoC;IADhD,IAAA,sBAAU,GAAE;GACA,oCAAoC,CAahD;AAbY,oFAAoC"}
+{"version":3,"file":"electron-keyboard-layout-change-notifier.js","sourceRoot":"","sources":["../../../src/electron-browser/keyboard/electron-keyboard-layout-change-notifier.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,yCAAsD;AAEtD,8CAAoD;AAEpD;;;GAGG;AAEH,IAAa,oCAAoC,GAAjD,MAAa,oCAAoC;IAAjD;QAEuB,wBAAmB,GAAG,IAAI,eAAO,EAAwB,CAAC;IAWjF,CAAC;IATG,IAAI,uBAAuB;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;IAC1C,CAAC;IAGS,UAAU;QAChB,MAAM,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC,SAA+B,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACpI,CAAC;CAEJ,CAAA;AAJG;IADC,IAAA,yBAAa,GAAE;;;;sEAGf;AAXQ,oCAAoC;IADhD,IAAA,sBAAU,GAAE;GACA,oCAAoC,CAahD;AAbY,oFAAoC"}

package/lib/electron-browser/menu/electron-context-menu-renderer.d.ts

@@ -1,12 +1,11 @@
-import * as electron from '../../../electron-shared/electron';
 import { ContextMenuRenderer, RenderContextMenuOptions, ContextMenuAccess, FrontendApplicationContribution, PreferenceService } from '../../browser';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
 import { ContextMenuContext } from '../../browser/menu/context-menu-context';
 import { MenuPath, MenuContribution, MenuModelRegistry } from '../../common';
 import { BrowserContextMenuRenderer } from '../../browser/menu/browser-context-menu-renderer';
 export declare class ElectronContextMenuAccess extends ContextMenuAccess {
-    readonly menu: electron.Menu;
-    constructor(menu: electron.Menu);
+    readonly menuHandle: Promise<number>;
+    constructor(menuHandle: Promise<number>);
 }
 export declare namespace ElectronTextInputContextMenu {
     const MENU_PATH: MenuPath;

package/lib/electron-browser/menu/electron-context-menu-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,QAAQ,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EACH,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,+BAA+B,EAAwC,iBAAiB,EAC7J,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAG9F,qBAAa,yBAA0B,SAAQ,iBAAiB;IAChD,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBAAnB,IAAI,EAAE,QAAQ,CAAC,IAAI;CAK3C;AAED,yBAAiB,4BAA4B,CAAC;IACnC,MAAM,SAAS,EAAE,QAAkC,CAAC;IACpD,MAAM,oBAAoB,UAAsC,CAAC;IACjE,MAAM,UAAU,UAAiC,CAAC;IAClD,MAAM,YAAY,UAAmC,CAAC;CAChE;AAED,qBACa,wCAAyC,YAAW,+BAA+B,EAAE,gBAAgB;IAG9G,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,OAAO,IAAI,IAAI;IAiBf,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CASnD;AAED,qBACa,2BAA4B,SAAQ,0BAA0B;IAU1B,OAAO,CAAC,mBAAmB;IAPxE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAQ;gBAEY,mBAAmB,EAAE,uBAAuB;cAKjF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAOlB,QAAQ,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB;CAqBpF"}
+{"version":3,"file":"electron-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"AAmBA,OAAO,EACH,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,+BAA+B,EAAwC,iBAAiB,EAC7J,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAE9F,qBAAa,yBAA0B,SAAQ,iBAAiB;IAChD,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;gBAA3B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;CAKnD;AAED,yBAAiB,4BAA4B,CAAC;IACnC,MAAM,SAAS,EAAE,QAAkC,CAAC;IACpD,MAAM,oBAAoB,UAAsC,CAAC;IACjE,MAAM,UAAU,UAAiC,CAAC;IAClD,MAAM,YAAY,UAAmC,CAAC;CAChE;AAED,qBACa,wCAAyC,YAAW,+BAA+B,EAAE,gBAAgB;IAG9G,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,OAAO,IAAI,IAAI;IAiBf,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CASnD;AAED,qBACa,2BAA4B,SAAQ,0BAA0B;IAU1B,OAAO,CAAC,mBAAmB;IAPxE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAQ;gBAEY,mBAAmB,EAAE,uBAAuB;cAKjF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIlB,QAAQ,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB;CAmBpF"}

package/lib/electron-browser/menu/electron-context-menu-renderer.js

@@ -29,19 +29,17 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElectronContextMenuRenderer = exports.ElectronTextInputContextMenuContribution = exports.ElectronTextInputContextMenu = exports.ElectronContextMenuAccess = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const electron = require("../../../electron-shared/electron");
 const inversify_1 = require("inversify");
 const browser_1 = require("../../browser");
 const electron_main_menu_factory_1 = require("./electron-main-menu-factory");
 const context_menu_context_1 = require("../../browser/menu/context-menu-context");
 const browser_context_menu_renderer_1 = require("../../browser/menu/browser-context-menu-renderer");
-const electron_messages_1 = require("../../electron-common/messaging/electron-messages");
 class ElectronContextMenuAccess extends browser_1.ContextMenuAccess {
-    constructor(menu) {
+    constructor(menuHandle) {
         super({
-            dispose: () => menu.closePopup()
+            dispose: () => menuHandle.then(handle => window.electronTheiaCore.closePopup(handle))
         });
-        this.menu = menu;
+        this.menuHandle = menuHandle;
     }
 }
 exports.ElectronContextMenuAccess = ElectronContextMenuAccess;
@@ -93,27 +91,21 @@ let ElectronContextMenuRenderer = class ElectronContextMenuRenderer extends brow
         this.useNativeStyle = true;
     }
     async init() {
-        electron.ipcRenderer.on(electron_messages_1.TitleBarStyleAtStartup, (_event, style) => {
-            this.useNativeStyle = style === 'native';
-        });
-        electron.ipcRenderer.send(electron_messages_1.RequestTitleBarStyle);
+        this.useNativeStyle = await window.electronTheiaCore.getTitleBarStyleAtStartup() === 'native';
     }
     doRender(options) {
         if (this.useNativeStyle) {
             const { menuPath, anchor, args, onHide, context, contextKeyService } = options;
             const menu = this.electronMenuFactory.createElectronContextMenu(menuPath, args, context, contextKeyService);
             const { x, y } = (0, browser_1.coordinateFromAnchor)(anchor);
-            const zoom = electron.webFrame.getZoomFactor();
-            // TODO: Remove the offset once Electron fixes https://github.com/electron/electron/issues/31641
-            const offset = process.platform === 'win32' ? 0 : 2;
-            // x and y values must be Ints or else there is a conversion error
-            menu.popup({ x: Math.round(x * zoom) + offset, y: Math.round(y * zoom) + offset });
+            const menuHandle = window.electronTheiaCore.popup(menu, x, y, () => {
+                if (onHide) {
+                    onHide();
+                }
+            });
             // native context menu stops the event loop, so there is no keyboard events
             this.context.resetAltPressed();
-            if (onHide) {
-                menu.once('menu-will-close', () => onHide());
-            }
-            return new ElectronContextMenuAccess(menu);
+            return new ElectronContextMenuAccess(menuHandle);
         }
         else {
             return super.doRender(options);

package/lib/electron-browser/menu/electron-context-menu-renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/menu/electron-main-menu-factory.d.ts

@@ -2,7 +2,8 @@ import { MenuPath, MenuNode } from '../../common';
 import { Keybinding } from '../../common/keybinding';
 import { PreferenceService } from '../../browser';
 import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
-import { ContextMatcher } from 'src/browser/context-key-service';
+import { ContextMatcher } from '../../browser/context-key-service';
+import { MenuDto, MenuRole } from '../../electron-common/electron-api';
 /**
  * Representation of possible electron menu options.
  */
@@ -33,21 +34,22 @@ export interface ElectronMenuOptions {
  */
 export declare type ElectronMenuItemRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'pasteAndMatchStyle' | 'delete' | 'selectAll' | 'reload' | 'forceReload' | 'toggleDevTools' | 'resetZoom' | 'zoomIn' | 'zoomOut' | 'togglefullscreen' | 'window' | 'minimize' | 'close' | 'help' | 'about' | 'services' | 'hide' | 'hideOthers' | 'unhide' | 'quit' | 'startSpeaking' | 'stopSpeaking' | 'zoom' | 'front' | 'appMenu' | 'fileMenu' | 'editMenu' | 'viewMenu' | 'recentDocuments' | 'toggleTabBar' | 'selectNextTab' | 'selectPreviousTab' | 'mergeAllWindows' | 'clearRecentDocuments' | 'moveTabToNewWindow' | 'windowMenu');
 export declare class ElectronMainMenuFactory extends BrowserMainMenuFactory {
-    protected _menu?: Electron.Menu;
+    protected _menu?: MenuDto[];
     protected _toggledCommands: Set<string>;
     protected preferencesService: PreferenceService;
     postConstruct(): void;
     setMenuBar(): Promise<void>;
-    createElectronMenuBar(): Electron.Menu | null;
-    createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement, contextKeyService?: ContextMatcher): Electron.Menu;
-    protected fillMenuTemplate(parentItems: Electron.MenuItemConstructorOptions[], menu: MenuNode, args: unknown[] | undefined, options: ElectronMenuOptions): Electron.MenuItemConstructorOptions[];
+    createElectronMenuBar(): MenuDto[] | undefined;
+    createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement, contextKeyService?: ContextMatcher): MenuDto[];
+    protected fillMenuTemplate(parentItems: MenuDto[], menu: MenuNode, args: unknown[] | undefined, options: ElectronMenuOptions): MenuDto[];
     protected undefinedOrMatch(contextKeyService: ContextMatcher, expression?: string, context?: HTMLElement): boolean;
     /**
      * Return a user visible representation of a keybinding.
      */
     protected acceleratorFor(keybinding: Keybinding): string;
-    protected roleFor(id: string): ElectronMenuItemRole | undefined;
-    protected execute(command: string, args: any[], menuPath: MenuPath): Promise<void>;
-    protected createOSXMenu(): Electron.MenuItemConstructorOptions;
+    protected roleFor(id: string): MenuRole | undefined;
+    protected execute(cmd: string, args: any[], menuPath: MenuPath): Promise<void>;
+    findMenuById(items: MenuDto[], id: string): MenuDto | undefined;
+    protected createOSXMenu(): MenuDto;
 }
 //# sourceMappingURL=electron-main-menu-factory.d.ts.map

package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAwB,QAAQ,EAAE,QAAQ,EAA2D,MAAM,cAAc,CAAC;AACjI,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAkB,MAAM,eAAe,CAAC;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,cAAc,CAAC;IACnC;;OAEG;IACH,YAAY,EAAE,QAAQ,CAAA;CACzB;AAED;;;GAGG;AACH,oBAAY,oBAAoB,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAC1E,oBAAoB,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,aAAa,GACxE,gBAAgB,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,kBAAkB,GAC1E,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAClD,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,MAAM,GACtD,eAAe,GAAG,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAC/D,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,iBAAiB,GAAG,cAAc,GACzE,eAAe,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,sBAAsB,GAClF,oBAAoB,GAAG,YAAY,CAAC,CAAC;AAEzC,qBACa,uBAAwB,SAAQ,sBAAsB;IAE/D,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC;IAChC,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAGpD,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IAGhD,aAAa,IAAI,IAAI;IAsBf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,qBAAqB,IAAI,QAAQ,CAAC,IAAI,GAAG,IAAI;IAqB7C,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI;IAMrI,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,QAAQ,CAAC,0BAA0B,EAAE,EACzE,IAAI,EAAE,QAAQ,EACd,IAAI,uBAAgB,EACpB,OAAO,EAAE,mBAAmB,GAC7B,QAAQ,CAAC,0BAA0B,EAAE;IAuExC,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO;IAOlH;;OAEG;IACH,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAexD,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;cA2B/C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBxF,SAAS,CAAC,aAAa,IAAI,QAAQ,CAAC,0BAA0B;CAoCjE"}
+{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAwB,QAAQ,EAAE,QAAQ,EAA2D,MAAM,cAAc,CAAC;AACjI,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAkB,MAAM,eAAe,CAAC;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,cAAc,CAAC;IACnC;;OAEG;IACH,YAAY,EAAE,QAAQ,CAAA;CACzB;AAED;;;GAGG;AACH,oBAAY,oBAAoB,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAC1E,oBAAoB,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,aAAa,GACxE,gBAAgB,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,kBAAkB,GAC1E,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAClD,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,MAAM,GACtD,eAAe,GAAG,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAC/D,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,iBAAiB,GAAG,cAAc,GACzE,eAAe,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,sBAAsB,GAClF,oBAAoB,GAAG,YAAY,CAAC,CAAC;AAEzC,qBACa,uBAAwB,SAAQ,sBAAsB;IAE/D,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAC5B,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAGpD,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IAGhD,aAAa,IAAI,IAAI;IAsBf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,qBAAqB,IAAI,OAAO,EAAE,GAAG,SAAS;IAgB9C,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,cAAc,GAAG,OAAO,EAAE;IAKjI,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,EAC7C,IAAI,EAAE,QAAQ,EACd,IAAI,uBAAgB,EACpB,OAAO,EAAE,mBAAmB,GAC7B,OAAO,EAAE;IA2EZ,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO;IAOlH;;OAEG;IACH,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAexD,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;cA2BnC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBpF,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAe/D,SAAS,CAAC,aAAa,IAAI,OAAO;CAoCrC"}

package/lib/electron-browser/menu/electron-main-menu-factory.js

@@ -26,7 +26,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElectronMainMenuFactory = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const electronRemote = require("../../../electron-shared/@electron/remote");
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
 const browser_1 = require("../../browser");
@@ -44,13 +43,13 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
                 this.setMenuBar();
             }
             if (this._menu) {
-                for (const item of this._toggledCommands) {
-                    const menuItem = this._menu.getMenuItemById(item);
+                for (const cmd of this._toggledCommands) {
+                    const menuItem = this.findMenuById(this._menu, cmd);
                     if (menuItem) {
-                        menuItem.checked = this.commandRegistry.isToggled(item);
+                        menuItem.checked = this.commandRegistry.isToggled(cmd);
                     }
                 }
-                electronRemote.getCurrentWindow().setMenu(this._menu);
+                window.electronTheiaCore.setMenu(this._menu);
             }
         }, 10));
         this.keybindingRegistry.onKeybindingsChanged(() => {
@@ -59,39 +58,27 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
     }
     async setMenuBar() {
         await this.preferencesService.ready;
-        if (common_1.isOSX) {
-            const createdMenuBar = this.createElectronMenuBar();
-            electronRemote.Menu.setApplicationMenu(createdMenuBar);
-        }
-        else if (this.preferencesService.get('window.titleBarStyle') === 'native') {
-            const createdMenuBar = this.createElectronMenuBar();
-            electronRemote.getCurrentWindow().setMenu(createdMenuBar);
-        }
+        const createdMenuBar = this.createElectronMenuBar();
+        window.electronTheiaCore.setMenu(createdMenuBar);
     }
     createElectronMenuBar() {
         const preference = this.preferencesService.get('window.menuBarVisibility') || 'classic';
         const maxWidget = document.getElementsByClassName(theia_dock_panel_1.MAXIMIZED_CLASS);
         if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
             const menuModel = this.menuProvider.getMenu(common_1.MAIN_MENU_BAR);
-            const template = this.fillMenuTemplate([], menuModel, [], { rootMenuPath: common_1.MAIN_MENU_BAR });
+            this._menu = this.fillMenuTemplate([], menuModel, [], { rootMenuPath: common_1.MAIN_MENU_BAR });
             if (common_1.isOSX) {
-                template.unshift(this.createOSXMenu());
+                this._menu.unshift(this.createOSXMenu());
             }
-            const menu = electronRemote.Menu.buildFromTemplate(template);
-            if (!menu) {
-                throw new Error('menu is null');
-            }
-            this._menu = menu;
             return this._menu;
         }
         this._menu = undefined;
         // eslint-disable-next-line no-null/no-null
-        return null;
+        return undefined;
     }
     createElectronContextMenu(menuPath, args, context, contextKeyService) {
         const menuModel = this.menuProvider.getMenu(menuPath);
-        const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false, context, rootMenuPath: menuPath, contextKeyService });
-        return electronRemote.Menu.buildFromTemplate(template);
+        return this.fillMenuTemplate([], menuModel, args, { showDisabled: false, context, rootMenuPath: menuPath, contextKeyService });
     }
     fillMenuTemplate(parentItems, menu, args = [], options) {
         var _a, _b;
@@ -144,13 +131,13 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
                 enabled: true,
                 visible: true,
                 accelerator,
-                click: () => this.execute(commandId, args, options.rootMenuPath)
+                execute: () => this.execute(commandId, args, options.rootMenuPath)
             };
             if (common_1.isOSX) {
                 const role = this.roleFor(node.id);
                 if (role) {
                     menuItem.role = role;
-                    delete menuItem.click;
+                    delete menuItem.execute;
                 }
             }
             parentItems.push(menuItem);
@@ -208,18 +195,18 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
         }
         return role;
     }
-    async execute(command, args, menuPath) {
+    async execute(cmd, args, menuPath) {
         try {
             // This is workaround for https://github.com/eclipse-theia/theia/issues/446.
             // Electron menus do not update based on the `isEnabled`, `isVisible` property of the command.
             // We need to check if we can execute it.
-            if (this.menuCommandExecutor.isEnabled(menuPath, command, ...args)) {
-                await this.menuCommandExecutor.executeCommand(menuPath, command, ...args);
-                if (this._menu && this.menuCommandExecutor.isVisible(menuPath, command, ...args)) {
-                    const item = this._menu.getMenuItemById(command);
+            if (this.menuCommandExecutor.isEnabled(menuPath, cmd, ...args)) {
+                await this.menuCommandExecutor.executeCommand(menuPath, cmd, ...args);
+                if (this._menu && this.menuCommandExecutor.isVisible(menuPath, cmd, ...args)) {
+                    const item = this.findMenuById(this._menu, cmd);
                     if (item) {
-                        item.checked = this.menuCommandExecutor.isToggled(menuPath, command, ...args);
-                        electronRemote.getCurrentWindow().setMenu(this._menu);
+                        item.checked = this.menuCommandExecutor.isToggled(menuPath, cmd, ...args);
+                        window.electronTheiaCore.setMenu(this._menu);
                     }
                 }
             }
@@ -228,6 +215,20 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
             // no-op
         }
     }
+    findMenuById(items, id) {
+        for (const item of items) {
+            if (item.id === id) {
+                return item;
+            }
+            if (item.submenu) {
+                const found = this.findMenuById(item.submenu, id);
+                if (found) {
+                    return found;
+                }
+            }
+        }
+        return undefined;
+    }
     createOSXMenu() {
         return {
             label: 'Theia',

package/lib/electron-browser/menu/electron-main-menu-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-menu-factory.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-main-menu-factory.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/menu/electron-menu-contribution.d.ts

@@ -1,4 +1,3 @@
-import * as electron from '../../../electron-shared/electron';
 import { Command, CommandContribution, CommandRegistry, MenuModelRegistry, MenuContribution } from '../../common';
 import { KeybindingContribution, KeybindingRegistry, Widget, FrontendApplication, FrontendApplicationContribution, Message, ApplicationShell } from '../../browser';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
@@ -7,6 +6,7 @@ import { BrowserMenuBarContribution } from '../../browser/menu/browser-menu-plug
 import { WindowService } from '../../browser/window/window-service';
 import { WindowTitleService } from '../../browser/window/window-title-service';
 import '../../../src/electron-browser/menu/electron-menu-style.css';
+import { MenuDto } from '../../electron-common/electron-api';
 export declare namespace ElectronCommands {
     const TOGGLE_DEVELOPER_TOOLS: Command;
     const RELOAD: Command;
@@ -48,17 +48,17 @@ export declare class ElectronMenuContribution extends BrowserMenuBarContribution
      * By default, this method is called on application `onStart`.
      */
     protected hideTopPanel(app: FrontendApplication): void;
-    protected setMenu(app: FrontendApplication, electronMenu?: electron.Menu | null, electronWindow?: electron.BrowserWindow): void;
-    protected createCustomTitleBar(app: FrontendApplication, electronWindow: electron.BrowserWindow): void;
+    protected setMenu(app: FrontendApplication, electronMenu?: MenuDto[] | undefined): void;
+    protected createCustomTitleBar(app: FrontendApplication): void;
     protected createCustomTitleWidget(app: FrontendApplication): void;
-    protected handleWindowControls(electronWindow: electron.BrowserWindow): void;
+    protected handleWindowControls(): void;
     protected createControlButton(id: string, handler: () => void): HTMLElement;
     protected handleRequiredRestart(): Promise<void>;
     registerCommands(registry: CommandRegistry): void;
     registerKeybindings(registry: KeybindingRegistry): void;
     registerMenus(registry: MenuModelRegistry): void;
-    protected toggleFullScreen(currentWindow: electron.BrowserWindow): void;
-    protected handleFullScreen(currentWindow: electron.BrowserWindow, menuBarVisibility: string): void;
+    protected toggleFullScreen(): void;
+    protected handleFullScreen(menuBarVisibility: string): void;
 }
 export declare class CustomTitleWidget extends Widget {
     protected readonly electronMenuContribution: ElectronMenuContribution;

package/lib/electron-browser/menu/electron-menu-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-menu-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-menu-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/menu/electron-menu-contribution.js

@@ -28,15 +28,12 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomTitleWidget = exports.ElectronMenuContribution = exports.CustomTitleWidgetFactory = exports.ElectronMenus = exports.ElectronCommands = void 0;
-const electron = require("../../../electron-shared/electron");
-const electronRemote = require("../../../electron-shared/@electron/remote");
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
 const browser_1 = require("../../browser");
 const electron_main_menu_factory_1 = require("./electron-main-menu-factory");
 const frontend_application_state_1 = require("../../browser/frontend-application-state");
 const frontend_application_config_provider_1 = require("../../browser/frontend-application-config-provider");
-const electron_messages_1 = require("../../electron-common/messaging/electron-messages");
 const electron_window_preferences_1 = require("../window/electron-window-preferences");
 const browser_menu_plugin_1 = require("../../browser/menu/browser-menu-plugin");
 const window_service_1 = require("../../browser/window/window-service");
@@ -120,36 +117,34 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
         // OSX: Recreate the menus when changing windows.
         // OSX only has one menu bar for all windows, so we need to swap
         // between them as the user switches windows.
-        const targetWindow = electronRemote.getCurrentWindow();
-        const callback = () => this.setMenu(app);
-        targetWindow.on('focus', callback);
-        window.addEventListener('unload', () => targetWindow.off('focus', callback));
+        const disposeHandler = window.electronTheiaCore.onWindowEvent('focus', () => {
+            this.setMenu(app);
+        });
+        window.addEventListener('unload', () => disposeHandler.dispose());
     }
     attachMenuBarVisibilityListener() {
         this.preferenceService.onPreferenceChanged(e => {
             if (e.preferenceName === 'window.menuBarVisibility') {
-                const targetWindow = electronRemote.getCurrentWindow();
-                this.handleFullScreen(targetWindow, e.newValue);
+                this.handleFullScreen(e.newValue);
             }
         });
     }
     handleTitleBarStyling(app) {
         this.hideTopPanel(app);
-        electron.ipcRenderer.on(electron_messages_1.TitleBarStyleAtStartup, (_event, style) => {
+        window.electronTheiaCore.getTitleBarStyleAtStartup().then(style => {
             this.titleBarStyle = style;
             this.setMenu(app);
             this.preferenceService.ready.then(() => {
                 this.preferenceService.set('window.titleBarStyle', this.titleBarStyle, browser_1.PreferenceScope.User);
             });
         });
-        electron.ipcRenderer.send(electron_messages_1.RequestTitleBarStyle);
         this.preferenceService.ready.then(() => {
-            electronRemote.getCurrentWindow().setMenuBarVisibility(['classic', 'visible'].includes(this.preferenceService.get('window.menuBarVisibility', 'classic')));
+            window.electronTheiaCore.setMenuBarVisible(['classic', 'visible'].includes(this.preferenceService.get('window.menuBarVisibility', 'classic')));
         });
         this.preferenceService.onPreferenceChanged(change => {
             if (change.preferenceName === 'window.titleBarStyle') {
-                if (this.titleBarStyleChangeFlag && this.titleBarStyle !== change.newValue && electronRemote.getCurrentWindow().isFocused()) {
-                    electron.ipcRenderer.send(electron_messages_1.TitleBarStyleChanged, change.newValue);
+                if (this.titleBarStyleChangeFlag && this.titleBarStyle !== change.newValue) {
+                    window.electronTheiaCore.setTitleBarStyle(change.newValue);
                     this.handleRequiredRestart();
                 }
                 this.titleBarStyleChangeFlag = true;
@@ -182,20 +177,17 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
             }
         }
     }
-    setMenu(app, electronMenu = this.factory.createElectronMenuBar(), electronWindow = electronRemote.getCurrentWindow()) {
-        if (common_1.isOSX) {
-            electronRemote.Menu.setApplicationMenu(electronMenu);
-        }
-        else {
+    setMenu(app, electronMenu = this.factory.createElectronMenuBar()) {
+        if (!common_1.isOSX) {
             this.hideTopPanel(app);
             if (this.titleBarStyle === 'custom' && !this.menuBar) {
-                this.createCustomTitleBar(app, electronWindow);
+                this.createCustomTitleBar(app);
+                return;
             }
-            // Unix/Windows: Set the per-window menus
-            electronWindow.setMenu(electronMenu);
         }
+        window.electronTheiaCore.setMenu(electronMenu);
     }
-    createCustomTitleBar(app, electronWindow) {
+    createCustomTitleBar(app) {
         const dragPanel = new browser_1.Widget();
         dragPanel.id = 'theia-drag-panel';
         app.shell.addWidget(dragPanel, { area: 'top' });
@@ -203,9 +195,9 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
         this.createCustomTitleWidget(app);
         const controls = document.createElement('div');
         controls.id = 'window-controls';
-        controls.append(this.createControlButton('minimize', () => electronWindow.minimize()), this.createControlButton('maximize', () => electronWindow.maximize()), this.createControlButton('restore', () => electronWindow.unmaximize()), this.createControlButton('close', () => electronWindow.close()));
+        controls.append(this.createControlButton('minimize', () => window.electronTheiaCore.minimize()), this.createControlButton('maximize', () => window.electronTheiaCore.maximize()), this.createControlButton('restore', () => window.electronTheiaCore.unMaximize()), this.createControlButton('close', () => window.electronTheiaCore.close()));
         app.shell.topPanel.node.append(controls);
-        this.handleWindowControls(electronWindow);
+        this.handleWindowControls();
     }
     createCustomTitleWidget(app) {
         const titleWidget = this.customTitleWidgetFactory();
@@ -213,12 +205,12 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
             app.shell.addWidget(titleWidget, { area: 'top' });
         }
     }
-    handleWindowControls(electronWindow) {
+    handleWindowControls() {
         toggleControlButtons();
-        electronWindow.on('maximize', toggleControlButtons);
-        electronWindow.on('unmaximize', toggleControlButtons);
+        window.electronTheiaCore.onWindowEvent('maximize', toggleControlButtons);
+        window.electronTheiaCore.onWindowEvent('unmaximize', toggleControlButtons);
         function toggleControlButtons() {
-            if (electronWindow.isMaximized()) {
+            if (window.electronTheiaCore.isMaximized()) {
                 document.body.classList.add('maximized');
             }
             else {
@@ -249,33 +241,26 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
         });
         if (await dialog.open()) {
             this.windowService.setSafeToShutDown();
-            electron.ipcRenderer.send(electron_messages_1.Restart);
+            window.electronTheiaCore.restart();
         }
     }
     registerCommands(registry) {
-        const currentWindow = electronRemote.getCurrentWindow();
         registry.registerCommand(ElectronCommands.TOGGLE_DEVELOPER_TOOLS, {
             execute: () => {
-                const webContent = electronRemote.getCurrentWebContents();
-                if (!webContent.isDevToolsOpened()) {
-                    webContent.openDevTools();
-                }
-                else {
-                    webContent.closeDevTools();
-                }
+                window.electronTheiaCore.toggleDevTools();
             }
         });
         registry.registerCommand(ElectronCommands.RELOAD, {
             execute: () => this.windowService.reload()
         });
         registry.registerCommand(ElectronCommands.CLOSE_WINDOW, {
-            execute: () => currentWindow.close()
+            execute: () => window.electronTheiaCore.close()
         });
         registry.registerCommand(ElectronCommands.ZOOM_IN, {
-            execute: () => {
-                const webContents = currentWindow.webContents;
+            execute: async () => {
+                const curentLevel = await window.electronTheiaCore.getZoomLevel();
                 // When starting at a level that is not a multiple of 0.5, increment by at most 0.5 to reach the next highest multiple of 0.5.
-                let zoomLevel = (Math.floor(webContents.zoomLevel / electron_window_preferences_1.ZoomLevel.VARIATION) * electron_window_preferences_1.ZoomLevel.VARIATION) + electron_window_preferences_1.ZoomLevel.VARIATION;
+                let zoomLevel = (Math.floor(curentLevel / electron_window_preferences_1.ZoomLevel.VARIATION) * electron_window_preferences_1.ZoomLevel.VARIATION) + electron_window_preferences_1.ZoomLevel.VARIATION;
                 if (zoomLevel > electron_window_preferences_1.ZoomLevel.MAX) {
                     zoomLevel = electron_window_preferences_1.ZoomLevel.MAX;
                     return;
@@ -285,10 +270,10 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
             }
         });
         registry.registerCommand(ElectronCommands.ZOOM_OUT, {
-            execute: () => {
-                const webContents = currentWindow.webContents;
+            execute: async () => {
+                const curentLevel = await window.electronTheiaCore.getZoomLevel();
                 // When starting at a level that is not a multiple of 0.5, decrement by at most 0.5 to reach the next lowest multiple of 0.5.
-                let zoomLevel = (Math.ceil(webContents.zoomLevel / electron_window_preferences_1.ZoomLevel.VARIATION) * electron_window_preferences_1.ZoomLevel.VARIATION) - electron_window_preferences_1.ZoomLevel.VARIATION;
+                let zoomLevel = (Math.ceil(curentLevel / electron_window_preferences_1.ZoomLevel.VARIATION) * electron_window_preferences_1.ZoomLevel.VARIATION) - electron_window_preferences_1.ZoomLevel.VARIATION;
                 if (zoomLevel < electron_window_preferences_1.ZoomLevel.MIN) {
                     zoomLevel = electron_window_preferences_1.ZoomLevel.MIN;
                     return;
@@ -301,9 +286,9 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
             execute: () => this.preferenceService.set('window.zoomLevel', electron_window_preferences_1.ZoomLevel.DEFAULT, browser_1.PreferenceScope.User)
         });
         registry.registerCommand(ElectronCommands.TOGGLE_FULL_SCREEN, {
-            isEnabled: () => currentWindow.isFullScreenable(),
-            isVisible: () => currentWindow.isFullScreenable(),
-            execute: () => this.toggleFullScreen(currentWindow)
+            isEnabled: () => window.electronTheiaCore.isFullScreenable(),
+            isVisible: () => window.electronTheiaCore.isFullScreenable(),
+            execute: () => this.toggleFullScreen()
         });
     }
     registerKeybindings(registry) {
@@ -365,15 +350,15 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
             order: '0'
         });
     }
-    toggleFullScreen(currentWindow) {
-        currentWindow.setFullScreen(!currentWindow.isFullScreen());
+    toggleFullScreen() {
+        window.electronTheiaCore.toggleFullScreen();
         const menuBarVisibility = this.preferenceService.get('window.menuBarVisibility', 'classic');
-        this.handleFullScreen(currentWindow, menuBarVisibility);
+        this.handleFullScreen(menuBarVisibility);
     }
-    handleFullScreen(currentWindow, menuBarVisibility) {
-        const shouldShowTop = !currentWindow.isFullScreen() || menuBarVisibility === 'visible';
+    handleFullScreen(menuBarVisibility) {
+        const shouldShowTop = !window.electronTheiaCore.isFullScreen() || menuBarVisibility === 'visible';
         if (this.titleBarStyle === 'native') {
-            currentWindow.menuBarVisible = shouldShowTop;
+            window.electronTheiaCore.setMenuBarVisible(shouldShowTop);
         }
         else if (shouldShowTop) {
             this.shell.topPanel.show();