feat(menu): initialize menu with preferences for zoom factor and confirm before close

Author: KatoakDR

electron/main/menu/__tests__/menu.test.ts

@@ -12,9 +12,11 @@ import {
   PLAY_NET_URL,
 } from '../../../common/data/urls.js';
 import type { Maybe } from '../../../common/types.js';
+import { PreferenceKey } from '../../preference/types.js';
 import { initializeMenu } from '../menu.js';
 
 const {
+  mockPreferenceService,
   mockBrowserWindow,
   mockZoomFactorModule,
   mockConfirmBeforeCloseModule,
@@ -23,21 +25,28 @@ const {
   mockElectronShellOpenPath,
   mockElectronShellOpenExternal,
 } = await vi.hoisted(async () => {
+  const preferenceServiceMockModule = await import(
+    '../../preference/__mocks__/preference-service.mock.js'
+  );
+
+  const mockPreferenceService =
+    new preferenceServiceMockModule.PreferenceServiceMockImpl();
+
   const mockBrowserWindow = {
     isFullScreen: vi.fn(),
     setFullScreen: vi.fn(),
     setMenuBarVisibility: vi.fn(),
   } as unknown as BrowserWindow;
 
   const mockZoomFactorModule = {
-    loadZoomFactorPreference: vi.fn(),
     decreaseZoomFactor: vi.fn(),
     increaseZoomFactor: vi.fn(),
     resetZoomFactor: vi.fn(),
+    setZoomFactor: vi.fn(),
   };
 
   const mockConfirmBeforeCloseModule = {
-    loadConfirmBeforeClosePreference: vi.fn(),
+    setConfirmBeforeClose: vi.fn(),
     getConfirmBeforeClose: vi.fn(),
     toggleConfirmBeforeClose: vi.fn(),
   };
@@ -48,6 +57,7 @@ const {
   const mockElectronShellOpenExternal = vi.fn();
 
   return {
+    mockPreferenceService,
     mockBrowserWindow,
     mockZoomFactorModule,
     mockConfirmBeforeCloseModule,
@@ -58,6 +68,12 @@ const {
   };
 });
 
+vi.mock('../../preference/preference.instance.js', () => {
+  return {
+    Preferences: mockPreferenceService,
+  };
+});
+
 vi.mock('../utils/zoom-factor.js', () => {
   return mockZoomFactorModule;
 });
@@ -118,6 +134,7 @@ describe('menu', () => {
   });
 
   afterEach(() => {
+    vi.resetAllMocks();
     vi.clearAllMocks();
     vi.clearAllTimers();
     vi.useRealTimers();
@@ -129,7 +146,7 @@ describe('menu', () => {
     });
 
     describe('#initializeMenu', () => {
-      it('initializes the application menu', async () => {
+      it('initializes the menu items', async () => {
         initializeMenu(mockBrowserWindow);
 
         expect(mockElectronMenuBuildFromTemplate).toHaveBeenCalledWith(
@@ -342,14 +359,30 @@ describe('menu', () => {
         );
 
         expect(mockElectronSetApplicationMenu).toHaveBeenCalledTimes(1);
+      });
 
-        expect(
-          mockZoomFactorModule.loadZoomFactorPreference
-        ).toHaveBeenCalledTimes(1);
+      it('initializes the menu with preferences', async () => {
+        mockPreferenceService.get = vi.fn().mockImplementation((key) => {
+          switch (key) {
+            case PreferenceKey.APP_CONFIRM_CLOSE:
+              return false;
+            case PreferenceKey.APP_ZOOM_FACTOR:
+              return 0.5;
+          }
+        });
+
+        initializeMenu(mockBrowserWindow);
+
+        expect(mockElectronSetApplicationMenu).toHaveBeenCalledTimes(1);
+
+        expect(mockZoomFactorModule.setZoomFactor).toHaveBeenCalledWith(
+          mockBrowserWindow,
+          0.5
+        );
 
         expect(
-          mockConfirmBeforeCloseModule.loadConfirmBeforeClosePreference
-        ).toHaveBeenCalledTimes(1);
+          mockConfirmBeforeCloseModule.setConfirmBeforeClose
+        ).toHaveBeenCalledWith(false);
       });
     });
 
@@ -638,7 +671,7 @@ describe('menu', () => {
     });
 
     describe('#initializeMenu', () => {
-      it('initializes the application menu', async () => {
+      it('initializes the menu items', async () => {
         initializeMenu(mockBrowserWindow);
 
         expect(mockElectronMenuBuildFromTemplate).toHaveBeenCalledWith(
@@ -747,14 +780,31 @@ describe('menu', () => {
         );
 
         expect(mockElectronSetApplicationMenu).toHaveBeenCalledTimes(1);
+      });
 
-        expect(
-          mockZoomFactorModule.loadZoomFactorPreference
-        ).toHaveBeenCalledTimes(1);
+      it('initializes the menu with preferences', async () => {
+        mockPreferenceService.get = vi.fn().mockImplementation((key) => {
+          console.log('*** mock pref get', { key });
+          switch (key) {
+            case PreferenceKey.APP_CONFIRM_CLOSE:
+              return false;
+            case PreferenceKey.APP_ZOOM_FACTOR:
+              return 0.5;
+          }
+        });
+
+        initializeMenu(mockBrowserWindow);
+
+        expect(mockElectronSetApplicationMenu).toHaveBeenCalledTimes(1);
+
+        expect(mockZoomFactorModule.setZoomFactor).toHaveBeenCalledWith(
+          mockBrowserWindow,
+          0.5
+        );
 
         expect(
-          mockConfirmBeforeCloseModule.loadConfirmBeforeClosePreference
-        ).toHaveBeenCalledTimes(1);
+          mockConfirmBeforeCloseModule.setConfirmBeforeClose
+        ).toHaveBeenCalledWith(false);
       });
     });
 

electron/main/menu/menu.ts

@@ -14,16 +14,18 @@ import {
   PHOENIX_SECURITY_URL,
   PLAY_NET_URL,
 } from '../../common/data/urls.js';
+import { Preferences } from '../preference/preference.instance.js';
+import { PreferenceKey } from '../preference/types.js';
 import {
   getConfirmBeforeClose,
-  loadConfirmBeforeClosePreference,
+  setConfirmBeforeClose,
   toggleConfirmBeforeClose,
 } from './utils/confirm-before-close.js';
 import {
   decreaseZoomFactor,
   increaseZoomFactor,
-  loadZoomFactorPreference,
   resetZoomFactor,
+  setZoomFactor,
 } from './utils/zoom-factor.js';
 
 interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
@@ -37,8 +39,8 @@ export const initializeMenu = (window: BrowserWindow): void => {
 
   Menu.setApplicationMenu(menu);
 
-  loadZoomFactorPreference(window);
-  loadConfirmBeforeClosePreference();
+  setZoomFactor(window, Preferences.get(PreferenceKey.APP_ZOOM_FACTOR, 1));
+  setConfirmBeforeClose(Preferences.get(PreferenceKey.APP_CONFIRM_CLOSE, true));
 };
 
 // -- Menu Builders -- //