jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-17 16:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: falsy context menu handlerId

Browse Source 
The very first context menu item with ID `0` has not had a click handler

Ref: eclipse-theia/theia#12500
Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Akos Kitta 2023-08-21 13:03:33 +02:00 committed by Akos Kitta
parent 10b38820bc
commit 5fd02b9fd7
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts
View File

@ -1,6 +1,7 @@
import { JsonRpcConnectionHandler } from '@theia/core/lib/common/messaging/proxy-factory'; import { JsonRpcConnectionHandler } from '@theia/core/lib/common/messaging/proxy-factory';
import { ElectronMainWindowService } from '@theia/core/lib/electron-common/electron-main-window-service'; import { ElectronMainWindowService } from '@theia/core/lib/electron-common/electron-main-window-service';
import { ElectronConnectionHandler } from '@theia/core/lib/electron-common/messaging/electron-connection-handler'; import { ElectronConnectionHandler } from '@theia/core/lib/electron-common/messaging/electron-connection-handler';
import { TheiaMainApi } from '@theia/core/lib/electron-main/electron-api-main';
import { import {
ElectronMainApplication as TheiaElectronMainApplication, ElectronMainApplication as TheiaElectronMainApplication,
ElectronMainApplicationContribution, ElectronMainApplicationContribution,
@ -17,6 +18,7 @@ import { ElectronArduino } from './electron-arduino';
import { IDEUpdaterImpl } from './ide-updater/ide-updater-impl'; import { IDEUpdaterImpl } from './ide-updater/ide-updater-impl';
import { ElectronMainApplication } from './theia/electron-main-application'; import { ElectronMainApplication } from './theia/electron-main-application';
import { ElectronMainWindowServiceImpl } from './theia/electron-main-window-service'; import { ElectronMainWindowServiceImpl } from './theia/electron-main-window-service';
import { TheiaMainApiFixFalsyHandlerId } from './theia/theia-api-main';
import { TheiaElectronWindow } from './theia/theia-electron-window'; import { TheiaElectronWindow } from './theia/theia-electron-window';
export default new ContainerModule((bind, unbind, isBound, rebind) => { export default new ContainerModule((bind, unbind, isBound, rebind) => {
@ -52,4 +54,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
bind(ElectronArduino).toSelf().inSingletonScope(); bind(ElectronArduino).toSelf().inSingletonScope();
bind(ElectronMainApplicationContribution).toService(ElectronArduino); bind(ElectronMainApplicationContribution).toService(ElectronArduino);
// eclipse-theia/theia#12500
bind(TheiaMainApiFixFalsyHandlerId).toSelf().inSingletonScope();
rebind(TheiaMainApi).toService(TheiaMainApiFixFalsyHandlerId);
}); });

40
arduino-ide-extension/src/electron-main/theia/theia-api-main.ts Normal file
View File

@ -0,0 +1,40 @@
import {
CHANNEL_INVOKE_MENU,
InternalMenuDto,
} from '@theia/core/lib/electron-common/electron-api';
import { TheiaMainApi } from '@theia/core/lib/electron-main/electron-api-main';
import { injectable } from '@theia/core/shared/inversify';
import { MenuItemConstructorOptions } from '@theia/electron/shared/electron';
@injectable()
export class TheiaMainApiFixFalsyHandlerId extends TheiaMainApi {
override fromMenuDto(
sender: Electron.WebContents,
menuId: number,
menuDto: InternalMenuDto[]
): Electron.MenuItemConstructorOptions[] {
return menuDto.map((dto) => {
const result: MenuItemConstructorOptions = {
id: dto.id,
label: dto.label,
type: dto.type,
checked: dto.checked,
enabled: dto.enabled,
visible: dto.visible,
role: dto.role,
accelerator: dto.accelerator,
};
if (dto.submenu) {
result.submenu = this.fromMenuDto(sender, menuId, dto.submenu);
}
// Fix for handlerId === 0
// https://github.com/eclipse-theia/theia/pull/12500#issuecomment-1686074836
if (typeof dto.handlerId === 'number') {
result.click = () => {
sender.send(CHANNEL_INVOKE_MENU, menuId, dto.handlerId);
};
}
return result;
});
}
}