diff --git a/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts b/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts index 56aa16c3e6..1341ec18d7 100644 --- a/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts +++ b/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts @@ -23,12 +23,12 @@ import { getNativeColorTheme } from "../../native-theme"; import { getNativeThemeChannel } from "../../../common/ipc/native-theme"; import type { GetAbsolutePath } from "../../../common/path/get-absolute-path.injectable"; import type { IComputedValue } from "mobx"; -import type { MenuItemsOpts } from "../../menu/application-menu-items.injectable"; +import type { MenuItemOpts } from "../../menu/application-menu-items.injectable"; interface Dependencies { directoryForLensLocalStorage: string; getAbsolutePath: GetAbsolutePath; - applicationMenuItems: IComputedValue; + applicationMenuItems: IComputedValue; } export const initIpcMainHandlers = ({ applicationMenuItems, directoryForLensLocalStorage, getAbsolutePath }: Dependencies) => () => { diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index c0370285b8..5961d2121b 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -32,7 +32,7 @@ function ignoreIf(check: boolean, menuItems: MenuItemConstructorOptions[]) { return check ? [] : menuItems; } -export interface MenuItemsOpts extends MenuItemConstructorOptions { +export interface MenuItemOpts extends MenuItemConstructorOptions { submenu?: MenuItemConstructorOptions[]; } @@ -46,7 +46,7 @@ const applicationMenuItemsInjectable = getInjectable({ const isAutoUpdateEnabled = di.inject(isAutoUpdateEnabledInjectable); const electronMenuItems = di.inject(electronMenuItemsInjectable); - return computed((): MenuItemsOpts[] => { + return computed((): MenuItemOpts[] => { // TODO: These injects should happen outside of the computed. // TODO: Remove temporal dependencies in WindowManager to make sure timing is correct. @@ -61,7 +61,7 @@ const applicationMenuItemsInjectable = getInjectable({ logger.info(`[MENU]: autoUpdateDisabled=${autoUpdateDisabled}`); - const macAppMenu: MenuItemsOpts = { + const macAppMenu: MenuItemOpts = { label: appName, id: "root", submenu: [ @@ -114,7 +114,7 @@ const applicationMenuItemsInjectable = getInjectable({ }, ], }; - const fileMenu: MenuItemsOpts = { + const fileMenu: MenuItemOpts = { label: "File", id: "file", submenu: [ @@ -169,7 +169,7 @@ const applicationMenuItemsInjectable = getInjectable({ ]), ], }; - const editMenu: MenuItemsOpts = { + const editMenu: MenuItemOpts = { label: "Edit", id: "edit", submenu: [ @@ -184,7 +184,7 @@ const applicationMenuItemsInjectable = getInjectable({ { role: "selectAll" }, ], }; - const viewMenu: MenuItemsOpts = { + const viewMenu: MenuItemOpts = { label: "View", id: "view", submenu: [ @@ -252,7 +252,7 @@ const applicationMenuItemsInjectable = getInjectable({ { role: "togglefullscreen" }, ], }; - const helpMenu: MenuItemsOpts = { + const helpMenu: MenuItemOpts = { role: "help", id: "help", submenu: [ diff --git a/src/main/menu/menu.ts b/src/main/menu/menu.ts index e0c408dfb5..03f31ecec7 100644 --- a/src/main/menu/menu.ts +++ b/src/main/menu/menu.ts @@ -6,12 +6,12 @@ import { app, BrowserWindow, dialog, Menu } from "electron"; import { autorun, IComputedValue } from "mobx"; import { appName, isWindows, productName } from "../../common/vars"; import packageJson from "../../../package.json"; -import type { MenuItemsOpts } from "./application-menu-items.injectable"; +import type { MenuItemOpts } from "./application-menu-items.injectable"; export type MenuTopId = "mac" | "file" | "edit" | "view" | "help"; export function initMenu( - applicationMenuItems: IComputedValue, + applicationMenuItems: IComputedValue, ) { return autorun(() => buildMenu(applicationMenuItems.get()), { delay: 100, @@ -37,7 +37,7 @@ export function showAbout(browserWindow: BrowserWindow) { } export function buildMenu( - applicationMenuItems: MenuItemsOpts[], + applicationMenuItems: MenuItemOpts[], ) { Menu.setApplicationMenu( Menu.buildFromTemplate(applicationMenuItems), diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index bcc4b2338b..ef0fbdafb2 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -29,7 +29,7 @@ import { pipeline } from "@ogre-tools/fp"; import { flatMap, compact, join, get, filter } from "lodash/fp"; import preferenceNavigationItemsInjectable from "../+preferences/preferences-navigation/preference-navigation-items.injectable"; import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable"; -import applicationMenuItemsInjectable, { MenuItemsOpts } from "../../../main/menu/application-menu-items.injectable"; +import applicationMenuItemsInjectable, { MenuItemOpts } from "../../../main/menu/application-menu-items.injectable"; type Callback = (dis: DiContainers) => void | Promise; @@ -304,7 +304,7 @@ const toFlatChildren = ({ submenu = [], ...menuItem - }: MenuItemsOpts): (MenuItemsOpts & { path: string })[] => + }: MenuItemOpts): (MenuItemOpts & { path: string })[] => [ { ...menuItem,