fix(main): blinking context menu (#345)

antonreshetov · web-flow · commit 23f57c5fabb7 · 2023-02-22T08:01:15.000+03:00
diff --git a/src/main/services/ipc/context-menu.ts b/src/main/services/ipc/context-menu.ts
@@ -183,22 +183,22 @@ export const subscribeToContextMenu = () => {
         if (type === 'folder' || type === 'all' || type === 'inbox') {
           defaultMenu.forEach(i => {
             menu.append(new MenuItem(i))
-            menu.popup({ window: BrowserWindow.getFocusedWindow()! })
           })
+          menu.popup({ window: BrowserWindow.getFocusedWindow()! })
         }
 
         if (type === 'favorites') {
           favoritesMenu.forEach(i => {
             menu.append(new MenuItem(i))
-            menu.popup({ window: BrowserWindow.getFocusedWindow()! })
           })
+          menu.popup({ window: BrowserWindow.getFocusedWindow()! })
         }
 
         if (type === 'trash') {
           trashMenu.forEach(i => {
             menu.append(new MenuItem(i))
-            menu.popup({ window: BrowserWindow.getFocusedWindow()! })
           })
+          menu.popup({ window: BrowserWindow.getFocusedWindow()! })
         }
 
         menu.on('menu-will-close', () => {
@@ -381,22 +381,22 @@ export const subscribeToContextMenu = () => {
         if (type === 'folder') {
           folderMenu.forEach(i => {
             menu.append(new MenuItem(i))
-            menu.popup({ window: BrowserWindow.getFocusedWindow()! })
           })
+          menu.popup({ window: BrowserWindow.getFocusedWindow()! })
         }
 
         if (type === 'tag') {
           tagMenu.forEach(i => {
             menu.append(new MenuItem(i))
-            menu.popup({ window: BrowserWindow.getFocusedWindow()! })
           })
+          menu.popup({ window: BrowserWindow.getFocusedWindow()! })
         }
 
         if (type === 'trash') {
           trashMenu.forEach(i => {
             menu.append(new MenuItem(i))
-            menu.popup({ window: BrowserWindow.getFocusedWindow()! })
           })
+          menu.popup({ window: BrowserWindow.getFocusedWindow()! })
         }
 
         menu.on('menu-will-close', () => {
