fix: checked is not updated

tiddly-gittly · Jun 23, 2021 · caf26cd · caf26cd
1 parent c3b2e62
commit caf26cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/services/menu/index.ts b/src/services/menu/index.ts
@@ -83,6 +83,7 @@ export class MenuService implements IMenuService {
       submenu.map(async (item) => ({
         ...item,
         label: typeof item.label === 'function' ? item.label() : item.label,
+        checked: typeof item.checked === 'function' ? await item.checked() : item.checked,
         enabled: typeof item.enabled === 'function' ? await item.enabled() : item.enabled,
         submenu:
           item.submenu instanceof Menu || item.submenu === undefined ? item.submenu : await this.getCurrentMenuItemConstructorOptions(compact(item.submenu)),

diff --git a/src/services/menu/interface.ts b/src/services/menu/interface.ts
@@ -9,9 +9,10 @@ import type { IpcSafeMenuItem } from './rendererMenuItemProxy';
  * MenuItemConstructorOptions that allows properties like "label", "enabled", "submenu" to be () => xxx
  * So these value can be determined at every build time (menu will be rebuilt every time the preferences change)
  */
-export interface DeferredMenuItemConstructorOptions extends Omit<MenuItemConstructorOptions, 'label' | 'enabled' | 'submenu'> {
+export interface DeferredMenuItemConstructorOptions extends Omit<MenuItemConstructorOptions, 'label' | 'enabled' | 'checked' | 'submenu'> {
   label?: (() => string) | string;
   enabled?: (() => boolean) | (() => Promise<boolean>) | boolean;
+  checked?: (() => boolean) | (() => Promise<boolean>) | boolean;
   submenu?: Array<MenuItemConstructorOptions | DeferredMenuItemConstructorOptions>;
 }
 

diff --git a/src/services/workspaces/index.ts b/src/services/workspaces/index.ts
@@ -114,10 +114,10 @@ export class Workspace implements IWorkspaceService {
     const newMenuItems = (await this.getWorkspacesAsList()).flatMap((workspace, index) => [
       {
         // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-        label: () => workspace.name || `Workspace ${index + 1}`,
+        label: (): string => workspace.name || `Workspace ${index + 1}`,
         id: workspace.id,
         type: 'checkbox' as const,
-        checked: workspace.active,
+        checked: () => workspace.active,
         click: async () => {
           await this.workspaceViewService.setActiveWorkspaceView(workspace.id);
           // manually update menu since we have alter the active workspace