fix(desktop): open Folder Access from a focused utility window

Author: waleedlatif1

apps/desktop/src/main/menu.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest'
 
 vi.mock('electron', () => import('@/test/electron-mock'))
 
-import type { MenuItemConstructorOptions } from 'electron'
+import { BrowserWindow, type MenuItemConstructorOptions } from 'electron'
 import type { ConfigStore } from '@/main/config'
 import { buildMenuTemplate, type MenuDeps } from '@/main/menu'
 
@@ -45,4 +45,15 @@ describe('buildMenuTemplate', () => {
     const view = submenu(buildMenuTemplate(makeDeps()), 'View')
     expect(view.some((item) => item.role === 'toggleDevTools')).toBe(false)
   })
+
+  it('anchors Folder Access to a focused utility window instead of dropping the action', () => {
+    const deps = makeDeps()
+    const utilityWindow = new BrowserWindow()
+    vi.mocked(deps.isMainWindow).mockReturnValue(false)
+    const folderAccess = submenu(buildMenuTemplate(deps), 'File').find(
+      (item) => item.label === 'Folder Access…'
+    )
+    folderAccess?.click?.({} as never, utilityWindow, {} as never)
+    expect(deps.openFolderAccess).toHaveBeenCalledWith(utilityWindow)
+  })
 })

apps/desktop/src/main/menu.ts

@@ -216,7 +216,7 @@ export function buildMenuTemplate(deps: MenuDeps): MenuItemConstructorOptions[]
         {
           label: 'Folder Access…',
           click: (_item, focusedWindow) => {
-            const win = focusedMainOrFallback(focusedWindow)
+            const win = focusedWindowOrMain(focusedWindow)
             if (win) deps.openFolderAccess(win)
           },
         },