use radio menu instead of checkbox for themes on mac

microsoft · Feb 1, 2019 · 2c68609 · 2c68609
1 parent 56c55df
commit 2c68609
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/app/main/src/appMenuBuilder.spec.ts b/packages/app/main/src/appMenuBuilder.spec.ts
@@ -234,7 +234,7 @@ describe('AppMenuBuilder', () => {
   });
 
   it('should update the recent bots list', () => {
-    mockRemoteCall = jest.fn((..._args) => Promise.resolve(null));
+    mockRemoteCall = jest.fn(() => Promise.resolve(null));
     const mockBotPath = join('path', 'to', 'bot');
     const mockRecentBots = [
       { displayName: 'bot1', path: mockBotPath },
@@ -308,7 +308,7 @@ describe('AppMenuBuilder', () => {
       },
     };
     mockRemoteCall = jest.fn(commandName => {
-      if ((commandName = SharedConstants.Commands.Misc.GetStoreState)) {
+      if (commandName === SharedConstants.Commands.Misc.GetStoreState) {
         return Promise.resolve(mockState);
       } else {
         return Promise.resolve({});
@@ -331,6 +331,7 @@ describe('AppMenuBuilder', () => {
     const themeMenu = fileMenuTemplate[11];
     expect(themeMenu.label).toBe('Themes');
     expect(themeMenu.submenu).toHaveLength(3); // light, dark, midnight
+    expect(themeMenu.submenu[2].type).toBe('checkbox');
     expect(themeMenu.submenu[2].label).toBe('midnight');
     expect(themeMenu.submenu[2].checked).toBe(true);
 
@@ -382,7 +383,7 @@ describe('AppMenuBuilder', () => {
       },
     };
     mockRemoteCall = jest.fn(commandName => {
-      if ((commandName = SharedConstants.Commands.Misc.GetStoreState)) {
+      if (commandName === SharedConstants.Commands.Misc.GetStoreState) {
         return Promise.resolve(mockState);
       } else {
         return Promise.resolve({});
@@ -399,5 +400,10 @@ describe('AppMenuBuilder', () => {
 
     const windowMenuTemplate = appMenuTemplate[4].submenu;
     expect(windowMenuTemplate).toHaveLength(5);
+
+    // should set the theme menu type to radio
+    const fileMenuTemplate = appMenuTemplate[1].submenu;
+    const themeMenu = fileMenuTemplate[11];
+    expect(themeMenu.submenu[0].type).toBe('radio');
   });
 });
diff --git a/packages/app/main/src/appMenuBuilder.ts b/packages/app/main/src/appMenuBuilder.ts
@@ -247,7 +247,7 @@ export class AppMenuBuilder {
         label: 'Themes',
         submenu: availableThemes.map(t => ({
           label: t.name,
-          type: 'checkbox',
+          type: isMac() ? 'radio' : 'checkbox',
           checked: theme === t.name,
           click: async () => {
             settingsStore.dispatch(rememberTheme(t.name));