✨ Right click -> Open in new window

pulse-browser · Dec 8, 2023 · 7e11222 · 7e11222
1 parent 69b7d78
commit 7e11222
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 24 deletions.
diff --git a/src/content/browser/browser.ts b/src/content/browser/browser.ts
@@ -18,7 +18,7 @@ import './lib/window/api'
 //  .getInterface(Ci.nsIAppWindow).XULBrowserWindow = window.XULBrowserWindow
 //window.browserDOMWindow = new nsBrowserAccess()
 
-initializeWindow(window.arguments)
+initializeWindow(window.arguments && window.arguments[0])
 
 new App({
   target: document.body,

diff --git a/src/content/browser/components/menus/HamburgerMenu/HamburgerMenu.svelte b/src/content/browser/components/menus/HamburgerMenu/HamburgerMenu.svelte
@@ -8,21 +8,15 @@
 
   import HamburgerMenuItem from './HamburgerMenuItem.svelte'
   import { openTab } from '@browser/lib/window/tabs'
+  import { windowApi } from '@browser/lib/window/api'
 
   const openDialogWindowAction = (url: string) => () =>
     Services.ww.openWindow(window, url, '_blank', 'chrome,dialog=yes,all', null)
-
-  const openChromeWindowAction = (url: string) => () =>
-    Services.ww.openWindow(null, url, '_blank', 'chrome,dialog=no,all', null)
 </script>
 
 <xul:panel class="panel" id="hamburgerMenu">
   <div class="panel__container">
-    <HamburgerMenuItem
-      on:click={openChromeWindowAction(
-        Services.prefs.getStringPref('app.content'),
-      )}
-    >
+    <HamburgerMenuItem on:click={() => windowApi.window.new()}>
       New Window
     </HamburgerMenuItem>
 

diff --git a/src/content/browser/lib/window/api.ts b/src/content/browser/lib/window/api.ts
@@ -3,22 +3,36 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 import mitt from 'mitt'
 
+import type { WindowArguments } from '.'
 import type { ContextMenuInfo } from '../../../../actors/ContextMenu.types'
 import {
   browserContextMenuInfo,
   setContextMenuParentActor,
 } from './contextMenu'
-import { closeTab, openTab, tabs } from './tabs'
+import { closeTab, openTab, runOnCurrentTab, setCurrentTab, tabs } from './tabs'
 
 export type WindowTriggers = {
   bookmarkCurrentPage: undefined
 }
 
 export const windowApi = {
   windowTriggers: mitt<WindowTriggers>(),
+  window: {
+    new: (args?: WindowArguments) =>
+      Services.ww.openWindow(
+        // @ts-expect-error Incorrect type generation
+        null,
+        Services.prefs.getStringPref('app.content'),
+        '_blank',
+        'chrome,dialog=no,all',
+        args,
+      ),
+  },
   tabs: {
     closeTab,
     openTab,
+    runOnCurrentTab,
+    setCurrentTab,
     get tabs() {
       return tabs.readOnce()
     },

diff --git a/src/content/browser/lib/window/initialize.ts b/src/content/browser/lib/window/initialize.ts
@@ -6,6 +6,16 @@ import { type WindowArguments, getFullWindowConfiguration } from './arguments'
 import { openTab } from './tabs'
 
 export function initializeWindow(args: WindowArguments | undefined) {
+  // When opened via nsIWindowWatcher.openWindow, the arguments are
+  // passed through C++, and they arrive to us wrapped as an XPCOM
+  // object. We use wrappedJSObject to get at the underlying JS
+  // object.
+  // @ts-expect-error Incorrect type generation
+  if (args instanceof Ci.nsISupports) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    args = (args as any).wrappedJSObject as WindowArguments
+  }
+
   const configuration = getFullWindowConfiguration(args || {})
 
   // Setup tabs

diff --git a/src/content/shared/contextMenus/menuItems.ts b/src/content/shared/contextMenus/menuItems.ts
@@ -8,11 +8,6 @@ import {
   type ContextMenuInfo,
   contextMenuParentActor,
 } from '@browser/lib/window/contextMenu'
-import {
-  openTab,
-  runOnCurrentTab,
-  setCurrentTab,
-} from '@browser/lib/window/tabs'
 import { getClipboardHelper } from '@browser/lib/xul/ccWrapper'
 
 import type { MenuItemAction, VisibilityCheck } from '.'
@@ -41,15 +36,17 @@ const copyProp = onStringValue((value) => {
 })
 
 const openInNewTab = onStringValue((value) => {
-  const tab = openTab(resource.NetUtil.newURI(value))
+  const tab = window.windowApi.tabs.openTab(resource.NetUtil.newURI(value))
   if (Services.prefs.getBoolPref('browser.tabs.newTabFocus')) {
-    queueMicrotask(() => setCurrentTab(tab))
+    queueMicrotask(() => window.windowApi.tabs.setCurrentTab(tab))
   }
 })
 
-const openInNewWindow = onStringValue(() => {
-  // TODO
-})
+const openInNewWindow = onStringValue((initialUrl) =>
+  window.windowApi.window.new({
+    initialUrl: initialUrl,
+  }),
+)
 
 const saveImageUrl = onStringValue((value, info) => {
   if (!info.context.principal)
@@ -114,21 +111,24 @@ export const MENU_ITEM_ACTIONS: MenuItemAction[] = (
       title: 'Back',
 
       visible: ALWAYS,
-      action: () => runOnCurrentTab((tab) => tab.goBack()),
+      action: () =>
+        window.windowApi.tabs.runOnCurrentTab((tab) => tab.goBack()),
     },
     {
       id: 'navigation__forward',
       title: 'Forward',
 
       visible: ALWAYS,
-      action: () => runOnCurrentTab((tab) => tab.goForward()),
+      action: () =>
+        window.windowApi.tabs.runOnCurrentTab((tab) => tab.goForward()),
     },
     {
       id: 'navigation__reload',
       title: 'Reload',
 
       visible: ALWAYS,
-      action: () => runOnCurrentTab((tab) => tab.reload()),
+      action: () =>
+        window.windowApi.tabs.runOnCurrentTab((tab) => tab.reload()),
     },
     {
       id: 'navigation__bookmark',

diff --git a/src/content/types.d.ts b/src/content/types.d.ts
@@ -20,7 +20,7 @@ declare interface Window {
    *
    * @see {@link file://./browser/lib/window/arguments.ts}
    */
-  arguments?: import('./browser/lib/window/arguments').WindowArguments
+  arguments?: [import('./browser/lib/window/arguments').WindowArguments]
 }
 
 declare interface NodeModule {