Fix approach for loading window minimization on mac

ZIMkaRU · Jan 17, 2025 · ae8fbd6 · ae8fbd6
1 parent 524b0d9
commit ae8fbd6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/window-creators/layouts/app-init.html b/src/window-creators/layouts/app-init.html
@@ -255,7 +255,7 @@
 
     minBtnElem.onclick = async () => {
       try {
-        await window.bfxReportElectronApi?.minimizeLoadingWin()
+        await window.bfxReportElectronApi?.hideLoadingWindow()
       } catch (err) {
         console.error(err)
       }

diff --git a/src/window-creators/main-renderer-ipc-bridge/general-ipc-channel-handlers.js b/src/window-creators/main-renderer-ipc-bridge/general-ipc-channel-handlers.js
@@ -6,12 +6,23 @@ const wins = require('../windows')
 const IpcChannelHandlers = require('./ipc.channel.handlers')
 
 class GeneralIpcChannelHandlers extends IpcChannelHandlers {
+  #hideLoadingWindow = null
+
+  constructor (...args) {
+    super(...args)
+
+    // Resolve circular dependency issue
+    this.#hideLoadingWindow = require(
+      '../change-loading-win-visibility-state'
+    ).hideLoadingWindow
+  }
+
   async exitHandler (event, args) {
     return app.exit(args?.code ?? 0)
   }
 
-  async minimizeLoadingWinHandler (event, args) {
-    return wins.loadingWindow?.minimize()
+  async hideLoadingWindowHandler (event, args) {
+    await this.#hideLoadingWindow()
   }
 
   async getTitleHandler (event, args) {

diff --git a/src/window-creators/main-renderer-ipc-bridge/preload.js b/src/window-creators/main-renderer-ipc-bridge/preload.js
@@ -11,7 +11,7 @@ const CHANNEL_NAMES = {
 
 const GENERAL_INVOKE_METHOD_NAMES = {
   EXIT: 'exit',
-  MINIMIZE_LOADING_WIN: 'minimizeLoadingWin',
+  HIDE_LOADING_WINDOW: 'hideLoadingWindow',
   GET_TITLE: 'getTitle'
 }
 const GENERAL_EVENT_METHOD_NAMES = {