fix: search for base and browser windows

Author: samuelmaddock

packages/electron-chrome-extensions/src/browser/api/common.ts

@@ -1,6 +1,6 @@
 import { promises as fs } from 'node:fs'
 import * as path from 'node:path'
-import { nativeImage } from 'electron'
+import { BaseWindow, BrowserWindow, nativeImage } from 'electron'
 
 export interface TabContents extends Electron.WebContents {
   favicon?: string
@@ -120,3 +120,5 @@ export const matchesTitlePattern = (pattern: string, title: string) => {
   const regexp = new RegExp(`^${pattern.split('*').map(escapePattern).join('.*')}$`)
   return title.match(regexp)
 }
+
+export const getAllWindows = () => [...BaseWindow.getAllWindows(), ...BrowserWindow.getAllWindows()]

packages/electron-chrome-extensions/src/browser/api/tabs.ts

@@ -1,7 +1,6 @@
-import { BrowserWindow } from 'electron'
 import { ExtensionContext } from '../context'
 import { ExtensionEvent } from '../router'
-import { matchesPattern, matchesTitlePattern, TabContents } from './common'
+import { getAllWindows, matchesPattern, matchesTitlePattern, TabContents } from './common'
 import { WindowsAPI } from './windows'
 
 const debug = require('debug')('electron-chrome-extensions:tabs')
@@ -357,7 +356,7 @@ export class TabsAPI {
     const windowId = details ? details.windowId : WindowsAPI.WINDOW_ID_NONE
     const win =
       typeof windowId !== 'undefined' && windowId > -1
-        ? BrowserWindow.getAllWindows().find((win) => win.id === windowId)
+        ? getAllWindows().find((win) => win.id === windowId)
         : null
 
     this.ctx.router.broadcastEvent('tabs.onRemoved', tabId, {

packages/electron-chrome-extensions/src/browser/popup.ts

@@ -1,4 +1,5 @@
-import { BrowserWindow, Session } from 'electron'
+import { BaseWindow, BrowserWindow, Session } from 'electron'
+import { getAllWindows } from './api/common'
 
 const debug = require('debug')('electron-chrome-extensions:popup')
 
@@ -185,7 +186,7 @@ export class PopupView {
     // For extension popups with a login form, the user may need to access a
     // program outside of the app. Closing the popup would then add
     // inconvenience.
-    if (!BrowserWindow.getFocusedWindow()) {
+    if (!getAllWindows().some((win) => win.isFocused())) {
       debug('preventing close due to focus residing outside of the app')
       return
     }