-
-
diff --git a/apps/content/src/browser/components/customizableUI/index.ts b/apps/content/src/bookmarks/bookmarks.js
similarity index 100%
rename from apps/content/src/browser/components/customizableUI/index.ts
rename to apps/content/src/bookmarks/bookmarks.js
diff --git a/apps/content/src/bookmarks/bookmarks.ts b/apps/content/src/bookmarks/bookmarks.ts
deleted file mode 100644
index ef5c124..0000000
--- a/apps/content/src/bookmarks/bookmarks.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import 'remixicon/fonts/remixicon.css'
-
-import '@shared/styles/window.css'
-
-import App from './Bookmarks.svelte'
-
-new App({ target: document.body })
diff --git a/apps/content/src/bookmarks/components/BookmarkEditor.svelte b/apps/content/src/bookmarks/components/BookmarkEditor.svelte
deleted file mode 100644
index 97b55cd..0000000
--- a/apps/content/src/bookmarks/components/BookmarkEditor.svelte
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
+ {#each tabs as tab (tab.view.windowBrowserId)}
+
+ {/each}
+
+
+
+
diff --git a/apps/content/src/browser/browser.css b/apps/content/src/browser/browser.css
index 4c1e1bc..ba1defa 100644
--- a/apps/content/src/browser/browser.css
+++ b/apps/content/src/browser/browser.css
@@ -2,7 +2,22 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+* {
+ box-sizing: border-box;
+}
+
+:root {
+ /* These are google's default theme colors, but I like them */
+ --theme-fg: oklch(90% 0.006 270);
+ --theme-bg: oklch(25% 0.006 270);
+ --theme-active: oklch(30% 0.006 270);
+}
+
body {
height: 100vh;
- overflow: hidden;
+ max-height: 100vh;
+ margin: 0;
+
+ display: flex;
+ flex-direction: column;
}
diff --git a/apps/content/src/browser/browser.js b/apps/content/src/browser/browser.js
new file mode 100644
index 0000000..a42b5bd
--- /dev/null
+++ b/apps/content/src/browser/browser.js
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+import BrowserWindow from './BrowserWindow.svelte'
+import './browser.css'
+import { registerEventBus } from './windowApi/eventBus.js'
+
+registerEventBus()
+
+new BrowserWindow({ target: document.body })
diff --git a/apps/content/src/browser/browser.ts b/apps/content/src/browser/browser.ts
deleted file mode 100644
index 2550675..0000000
--- a/apps/content/src/browser/browser.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-///
-import 'remixicon/fonts/remixicon.css'
-
-import '@shared/styles/window.css'
-
-import App from './Browser.svelte'
-import './browser.css'
-import { initializeShortcuts } from './lib/shortcuts'
-import { initializeWindow } from './lib/window'
-import './lib/window/api'
-
-// TODO: WTF is this and do we care
-// This needs setting up before we create the first remote browser.
-// window.docShell.treeOwner
-// .QueryInterface(Ci.nsIInterfaceRequestor)
-// .getInterface(Ci.nsIAppWindow).XULBrowserWindow = window.XULBrowserWindow
-//window.browserDOMWindow = new nsBrowserAccess()
-
-initializeWindow(window.arguments && window.arguments[0])
-
-new App({
- target: document.body,
-})
-
-setTimeout(() => {
- initializeShortcuts()
-}, 1)
diff --git a/apps/content/src/browser/lib/resources.ts b/apps/content/src/browser/browserImports.js
similarity index 61%
rename from apps/content/src/browser/lib/resources.ts
rename to apps/content/src/browser/browserImports.js
index af87056..9bc0499 100644
--- a/apps/content/src/browser/lib/resources.ts
+++ b/apps/content/src/browser/browserImports.js
@@ -1,15 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { lazyESModuleGetters } from '../../shared/TypedImportUtilities'
+// @ts-check
+import { lazyESModuleGetters } from '../shared/lazy.js'
-/*eslint sort-keys: "error"*/
-
-export const resource = lazyESModuleGetters({
+export const browserImports = lazyESModuleGetters({
+ AppConstants: 'resource://gre/modules/AppConstants.sys.mjs',
E10SUtils: 'resource://gre/modules/E10SUtils.sys.mjs',
EPageActions: 'resource://app/modules/EPageActions.sys.mjs',
NetUtil: 'resource://gre/modules/NetUtil.sys.mjs',
PageThumbs: 'resource://gre/modules/PageThumbs.sys.mjs',
- WindowTracker: 'resource://app/modules/BrowserWindowTracker.sys.mjs',
- ZoomStore: 'resource://app/modules/ZoomStore.sys.mjs',
})
diff --git a/apps/content/src/browser/components/Browser.svelte b/apps/content/src/browser/components/Browser.svelte
deleted file mode 100644
index ca5ecd6..0000000
--- a/apps/content/src/browser/components/Browser.svelte
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/content/src/browser/components/HamburgurMenu.svelte b/apps/content/src/browser/components/HamburgurMenu.svelte
new file mode 100644
index 0000000..155ba5d
--- /dev/null
+++ b/apps/content/src/browser/components/HamburgurMenu.svelte
@@ -0,0 +1,76 @@
+
+
+
+
+
+ {#each $windowTabs as tab, index (tab.view.windowBrowserId)}
+
+ {/each}
+
+
+
+
+
+
diff --git a/apps/content/src/browser/components/ToolbarButton.svelte b/apps/content/src/browser/components/ToolbarButton.svelte
new file mode 100644
index 0000000..aa8aa81
--- /dev/null
+++ b/apps/content/src/browser/components/ToolbarButton.svelte
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
diff --git a/apps/content/src/settings/components/pref/CustomizableUI/Components/Browser.svelte b/apps/content/src/browser/components/ToolbarSpacer.svelte
similarity index 71%
rename from apps/content/src/settings/components/pref/CustomizableUI/Components/Browser.svelte
rename to apps/content/src/browser/components/ToolbarSpacer.svelte
index 34222da..a73f688 100644
--- a/apps/content/src/settings/components/pref/CustomizableUI/Components/Browser.svelte
+++ b/apps/content/src/browser/components/ToolbarSpacer.svelte
@@ -2,10 +2,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-
-
diff --git a/apps/content/src/browser/components/menus/HamburgerMenu/HamburgerMenuItem.svelte b/apps/content/src/browser/components/menus/HamburgerMenu/HamburgerMenuItem.svelte
deleted file mode 100644
index 51d2773..0000000
--- a/apps/content/src/browser/components/menus/HamburgerMenu/HamburgerMenuItem.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
diff --git a/apps/content/src/browser/components/menus/index.ts b/apps/content/src/browser/components/menus/index.ts
deleted file mode 100644
index 09cc653..0000000
--- a/apps/content/src/browser/components/menus/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import BrowserContextMenu from './BrowserContextMenu.svelte'
-import HamburgerMenu from './HamburgerMenu/HamburgerMenu.svelte'
-
-/**
- * @param target The target element to open at
- * @param anchor Information about the anchor point {@link https://udn.realityripple.com/docs/Archive/Mozilla/XUL/PopupGuide/Positioning}
- */
-export const openHamburgerMenu = (target: HTMLElement, anchor: string) =>
- (document.getElementById('hamburgerMenu') as XULPanel | null)?.openPopup(
- target,
- anchor,
- )
-
-export { BrowserContextMenu, HamburgerMenu }
diff --git a/apps/content/src/browser/components/omnibox/Bookmarks.svelte b/apps/content/src/browser/components/omnibox/Bookmarks.svelte
deleted file mode 100644
index e9f9271..0000000
--- a/apps/content/src/browser/components/omnibox/Bookmarks.svelte
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-{/if}
-
-
diff --git a/apps/content/src/browser/components/tabs/tabDrag.ts b/apps/content/src/browser/components/tabs/tabDrag.ts
deleted file mode 100644
index 280b4f4..0000000
--- a/apps/content/src/browser/components/tabs/tabDrag.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { waitForEvent } from '@experiment/shared'
-import type { Action } from 'svelte/action'
-import { type Readable, type Writable, get, writable } from 'svelte/store'
-
-import { resource } from '@browser/lib/resources'
-import { spinLock } from '@browser/lib/spinlock'
-import type { Tab } from '@browser/lib/window/tab'
-import {
- ABOUT_BLANK,
- moveTabAfter,
- moveTabBefore,
- openTab,
-} from '@browser/lib/window/tabs'
-import { getWindowById } from '@browser/lib/window/window'
-
-/* eslint listeners/no-missing-remove-event-listener: 'error' */
-
-export const TAB_DATA_TYPE = 'experiment/tab'
-
-const dragOver = (
- tab: Tab,
- dropBefore: Writable,
- dropAfter: Writable,
-) => {
- let lastDragIsBefore: boolean | undefined
-
- return (event: DragEvent) => {
- const currentTarget = event.currentTarget as HTMLDivElement
- const rawDragRepresentation = event.dataTransfer?.getData(TAB_DATA_TYPE)
-
- if (!currentTarget.classList.contains('tab')) return
- if (!rawDragRepresentation) {
- console.warn('No drag representation')
- return
- }
-
- const { windowId, tabId } = JSON.parse(rawDragRepresentation) as ReturnType<
- Tab['getDragRepresentation']
- >
- const sameWindow = windowId === window.windowApi.id
-
- const boundingRect = currentTarget.getBoundingClientRect()
- const xMiddle = boundingRect.x + boundingRect.width / 2
- const isBefore = event.x <= xMiddle
-
- if ((tabId == tab.getId() && sameWindow) || lastDragIsBefore === isBefore)
- return
- lastDragIsBefore = isBefore
-
- // Trigger the drop handler
- if (event.dataTransfer) event.dataTransfer.dropEffect = 'move'
- event.preventDefault()
- event.stopPropagation()
-
- if (!sameWindow) {
- dropBefore.set(isBefore)
- dropAfter.set(!isBefore)
-
- return
- }
-
- dropBefore.set(false)
- dropAfter.set(false)
-
- if (isBefore) moveTabBefore(tabId, tab.getId())
- else moveTabAfter(tabId, tab.getId())
- }
-}
-
-const drop = async (event: DragEvent) => {
- const currentTarget = event.currentTarget as HTMLDivElement
- const rawDragRepresentation = event.dataTransfer?.getData(TAB_DATA_TYPE)
-
- if (!currentTarget.classList.contains('tab')) return
- if (!rawDragRepresentation) {
- console.warn('No drag representation')
- return
- }
-
- const { windowId, tabId } = JSON.parse(rawDragRepresentation) as ReturnType<
- Tab['getDragRepresentation']
- >
- const sameWindow = windowId === window.windowApi.id
-
- if (sameWindow) return
-
- event.preventDefault()
- event.stopPropagation()
-
- const toMoveWindow = getWindowById(windowId)
- if (!toMoveWindow) {
- console.warn('Window not found')
- return
- }
-
- const tabToMove = toMoveWindow.windowApi.tabs.getTabById(tabId)
- if (!tabToMove) {
- console.warn('Tab not found')
- return
- }
-
- // We need to do the following to change a tab between windows:
- // 1. Create a donor tab in our current window
- // 2. Wait for teh donor tab to finish initializing
- // 3. Perform a docshell swap with the donor tab
- // 4. Destroy the tab to move
- // 5. Show the donor tab
-
- const donorTab = openTab(ABOUT_BLANK)
- donorTab.hidden.set(true)
- await donorTab.goToUri(ABOUT_BLANK)
- await spinLock(() => !get(donorTab.loading))
-
- donorTab.swapWithTab(tabToMove)
- donorTab.hidden.set(false)
-
- toMoveWindow.windowApi.tabs.closeTab(tabToMove)
-}
-
-const dragEnd = (tabToMove: Tab) => async (event: DragEvent) => {
- if (event.dataTransfer?.dropEffect != 'none') return
-
- // The next window that is created is going to be for the new tab
- const newWindowPromise = waitForEvent(
- resource.WindowTracker.events,
- 'windowCreated',
- )
-
- // Create the new window
- window.windowApi.window.new({
- initialUrl: 'about:blank',
- })
-
- const newWindow = await newWindowPromise
- const donorTab = newWindow.windowApi.tabs.tabs[0]
- donorTab.hidden.set(true)
- await donorTab.goToUri(ABOUT_BLANK)
- await spinLock(() => !get(donorTab.loading))
-
- donorTab.swapWithTab(tabToMove)
- donorTab.hidden.set(false)
-
- window.windowApi.tabs.closeTab(tabToMove)
-}
-
-export function createTabDrag(tab: Tab) {
- const dropBefore = writable(false)
- const dropAfter = writable(false)
-
- const dragOverEvent = dragOver(tab, dropBefore, dropAfter)
- const setDataTransferEvent = async (event: DragEvent) => {
- event.dataTransfer?.setData(
- TAB_DATA_TYPE,
- JSON.stringify(tab.getDragRepresentation()),
- )
- const canvas = await tab.captureTabToCanvas()
- if (canvas) event.dataTransfer?.setDragImage(canvas, 0, 0)
- }
- const dragLeaveEvent = () => {
- dropBefore.set(false)
- dropAfter.set(false)
- }
- const preventDefault = (event: DragEvent) => event.preventDefault()
- const onDrop = drop
- const onDragEnd = dragEnd(tab)
-
- const tabDrag: Action = (node) => {
- const initialDraggable = node.draggable
- node.draggable = true
-
- node.addEventListener('dragstart', setDataTransferEvent)
- node.addEventListener('dragover', dragOverEvent)
- node.addEventListener('dragleave', dragLeaveEvent)
- node.addEventListener('drop', preventDefault)
- node.addEventListener('drop', onDrop)
- node.addEventListener('dragend', onDragEnd)
-
- return {
- destroy() {
- node.draggable = initialDraggable
-
- node.removeEventListener('dragstart', setDataTransferEvent)
- node.removeEventListener('dragover', dragOverEvent)
- node.removeEventListener('dragleave', dragLeaveEvent)
- node.removeEventListener('drop', preventDefault)
- node.removeEventListener('drop', onDrop)
- node.removeEventListener('dragend', onDragEnd)
- },
- }
- }
-
- return {
- tabDrag,
- drop: {
- before: dropBefore satisfies Readable,
- after: dropAfter satisfies Readable,
- },
- }
-}
diff --git a/apps/content/src/browser/components/tabs__drag.js b/apps/content/src/browser/components/tabs__drag.js
new file mode 100644
index 0000000..b7a3a48
--- /dev/null
+++ b/apps/content/src/browser/components/tabs__drag.js
@@ -0,0 +1,240 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// @ts-check
+import { writable } from '@amadeus-it-group/tansu'
+
+import { browserImports } from '../browserImports.js'
+import {
+ activeTabId,
+ selectedTabIds,
+ windowTabs,
+} from '../windowApi/WindowTabs.js'
+
+const WINDOW_ID_TYPE = 'text/x-fushra-window-id'
+const WINDOW_BROWSER_IDS_TYPE = 'text/x-fushra-window-browser-ids'
+
+/** @type {import('@amadeus-it-group/tansu').WritableSignal} */
+export let dragTabIds = writable([])
+export let dragTabsTranslation = writable(0)
+
+let startEventRelativeY = 0
+let lastScreenY = 0
+let startingIndex = 0
+let expectedIndex = 0
+/** @type {HTMLCanvasElement | null} */
+let dndCanvas = null
+/** @type {XULPanel | null} */
+let linuxDragPanel = null
+
+/**
+ * @param {DragEvent} event
+ */
+export function dragStart(event) {
+ const activeId = activeTabId()
+ const active = windowTabs().find(
+ (tab) => tab.view.windowBrowserId == activeId,
+ )
+ const selectedIds = selectedTabIds()
+
+ dragTabIds.set([activeId, ...selectedIds])
+
+ if (event.dataTransfer) {
+ // TODO: Multiwindow
+ event.dataTransfer.setData(WINDOW_ID_TYPE, '0')
+ event.dataTransfer.setData(WINDOW_BROWSER_IDS_TYPE, dragTabIds().join(','))
+ }
+
+ {
+ /** @type {HTMLButtonElement} */
+ const target = event.target
+ const rect = target.getBoundingClientRect()
+
+ startEventRelativeY = event.screenY - rect.y
+ startingIndex = Number(target.dataset.index)
+ }
+
+ if (dragTabIds().length != 1) {
+ groupDraggedTabs()
+ }
+
+ if (active) {
+ const scale = window.devicePixelRatio
+
+ if (!dndCanvas) {
+ dndCanvas = document.createElement('canvas')
+ dndCanvas.style.width = '100%'
+ dndCanvas.style.height = '100%'
+ dndCanvas.mozOpaque = true
+ }
+
+ dndCanvas.width = 180 * scale
+ dndCanvas.height = 90 * scale
+
+ var context = dndCanvas.getContext('2d')
+ context.fillStyle = 'white'
+ context.fillRect(0, 0, dndCanvas.width, dndCanvas.height)
+
+ /** @type {HTMLElement} */
+ let toDrag = dndCanvas
+ let handleUpdate = () =>
+ event.dataTransfer?.updateDragImage(dndCanvas, -16, -16)
+
+ // The GTK backend does not have support for updateDragImage?? Mozilla's hack is to use a panel
+ // to have the drag image contained, which I don't really like
+ if (browserImports.AppConstants.platform == 'linux') {
+ if (!linuxDragPanel) {
+ linuxDragPanel =
+ /** @type {XULPanel} */ document.createXULElement('panel')
+ linuxDragPanel.className = 'dragfeedback-tab'
+ linuxDragPanel.setAttribute('type', 'drag')
+ linuxDragPanel?.append(dndCanvas)
+ document.documentElement.append(linuxDragPanel)
+ }
+
+ toDrag = linuxDragPanel
+ handleUpdate = () => {}
+ }
+
+ event.dataTransfer?.setDragImage(toDrag, -16, -16)
+
+ browserImports.PageThumbs.captureToCanvas(
+ active.view.browser,
+ dndCanvas,
+ undefined,
+ )
+ .then(handleUpdate)
+ .catch(console.error)
+ }
+}
+
+/**
+ * @param {DragEvent} event
+ */
+export function dragOver(event) {
+ event.preventDefault()
+ event.stopPropagation()
+
+ animateTabMove(event)
+}
+
+/**
+ */
+export function dragEnd() {
+ windowTabs.update((tabs) => {
+ if (dragTabIds().length == 0) {
+ return tabs
+ }
+
+ const targetBrowserId =
+ tabs[Math.min(expectedIndex, tabs.length - 1)].view.windowBrowserId
+ if (dragTabIds()[0] == targetBrowserId) {
+ return tabs
+ }
+
+ const draggingTabs = tabs.filter((tab) =>
+ dragTabIds().includes(tab.view.windowBrowserId),
+ )
+ return tabs
+ .filter((tab) => !dragTabIds().includes(tab.view.windowBrowserId))
+ .flatMap((tab) => {
+ if (tab.view.windowBrowserId == targetBrowserId) {
+ if (expectedIndex < startingIndex) {
+ return [...draggingTabs, tab]
+ }
+
+ return [tab, ...draggingTabs]
+ }
+
+ return tab
+ })
+ })
+
+ dragTabIds.set([])
+ dragTabsTranslation.set(0)
+
+ startEventRelativeY = 0
+ lastScreenY = 0
+
+ document
+ .querySelectorAll("button[role='tab']")
+ .forEach(
+ (/** @type {HTMLButtonElement} */ tab) => void (tab.style.transform = ''),
+ )
+}
+
+function groupDraggedTabs() {
+ if (dragTabIds().length == 0) {
+ console.warn('Tab drag improperly initialized')
+ return
+ }
+
+ windowTabs.update((tabs) => {
+ if (dragTabIds().length == 0) {
+ return tabs
+ }
+
+ const headId = dragTabIds()[0]
+ const rest = tabs.filter(
+ (tab) =>
+ dragTabIds().includes(tab.view.windowBrowserId) &&
+ tab.view.windowBrowserId != headId,
+ )
+
+ // TODO: Drag animations of some sort
+ return tabs
+ .filter(
+ (tab) =>
+ !dragTabIds().includes(tab.view.windowBrowserId) ||
+ tab.view.windowBrowserId == headId,
+ )
+ .flatMap((tab) => {
+ if (tab.view.windowBrowserId == headId) {
+ return [tab, ...rest]
+ }
+
+ return tab
+ })
+ })
+}
+
+/**
+ * @param {DragEvent} event
+ */
+function animateTabMove(event) {
+ if (!event.dataTransfer) {
+ console.warn("Tab drag events didn't have a dataTransfer property")
+ return
+ }
+
+ if (lastScreenY == event.screenY) {
+ return
+ }
+
+ /** @type {HTMLButtonElement} */
+ const firstDraggingTab = document.getElementById(`tab-${dragTabIds()[0]}`)
+ /** @type {HTMLLIElement} */
+ const firstPresentation = firstDraggingTab?.parentElement
+ const presentationBox = firstPresentation.getBoundingClientRect()
+
+ dragTabsTranslation.set(
+ event.screenY - presentationBox.y - startEventRelativeY,
+ )
+
+ expectedIndex = Math.floor(event.screenY / presentationBox.height)
+ const translateAmount = presentationBox.height * dragTabIds().length
+
+ document
+ .querySelectorAll("button[role='tab'][data-dragging='false']")
+ .forEach((/** @type {HTMLButtonElement} */ tab) => {
+ const index = Number(tab.dataset.index)
+ if (index <= expectedIndex && index >= startingIndex) {
+ tab.style.transform = `translateY(-${translateAmount}px)`
+ } else if (index >= expectedIndex && index <= startingIndex) {
+ tab.style.transform = `translateY(${translateAmount}px)`
+ } else {
+ tab.style.transform = ''
+ }
+ })
+}
diff --git a/apps/content/src/browser/components/urlBox.js b/apps/content/src/browser/components/urlBox.js
new file mode 100644
index 0000000..46760cc
--- /dev/null
+++ b/apps/content/src/browser/components/urlBox.js
@@ -0,0 +1,282 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+import { derived } from 'svelte/store'
+
+import tld from '../data/tld.txt'
+
+/**
+ * @typedef {object} AutocompleteResult
+ * @property {string} display
+ * @property {string} url
+ */
+
+/**
+ * @typedef {'insecure' | 'broken' | 'secure' | 'blocked-mixed-active' | 'loaded-mixed-active' | 'blocked-mixed-display' | 'loaded-mixed-display' | 'ssl-3' | 'week-cert' | 'user-overridden'} SecurityState
+ */
+
+/**
+ * @param {import('svelte/store').Readable} store
+ */
+export function humanSecurityInfo(store) {
+ return derived(store, (store) => {
+ /** @type {Set} */
+ const status = new Set()
+
+ if (store & Ci.nsIWebProgressListener.STATE_IS_INSECURE) {
+ status.add('insecure')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_IS_BROKEN) {
+ status.add('broken')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_IS_SECURE) {
+ status.add('secure')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT) {
+ status.add('blocked-mixed-active')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT) {
+ status.add('loaded-mixed-active')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_BLOCKED_MIXED_DISPLAY_CONTENT) {
+ status.add('blocked-mixed-display')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_LOADED_MIXED_DISPLAY_CONTENT) {
+ status.add('loaded-mixed-display')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_USES_SSL_3) {
+ status.add('ssl-3')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_USES_WEAK_CRYPTO) {
+ status.add('week-cert')
+ }
+ if (store & Ci.nsIWebProgressListener.STATE_CERT_USER_OVERRIDDEN) {
+ status.add('user-overridden')
+ }
+
+ return status
+ })
+}
+
+/**
+ * Autocomplete that should take under a milisecond to evaluate. There will be
+ * no debouncing on the user's input
+ *
+ * @param {string} input
+ */
+export function getFastAutocomplete(input) {
+ if (input == '') return []
+
+ return [...getUrlResults(input), ...getFastSearchResults(input)]
+}
+
+/**
+ * @param {import('svelte/store').Readable} input
+ * @returns {import('svelte/store').Readable}
+ */
+export function debouncedSlowAutocomplete(input) {
+ let timeout
+ return derived(
+ input,
+ (input, set) => {
+ if (input == '') {
+ return set([])
+ }
+
+ if (timeout) {
+ clearTimeout(timeout)
+ }
+
+ timeout = setTimeout(async () => {
+ let /** @type {AutocompleteResult[]} */ output = []
+
+ slowAutocomplete(input).map((completions) =>
+ completions.then((completions) => {
+ output.push(...completions)
+ set(output)
+ }),
+ )
+ }, 100)
+ },
+ [],
+ )
+}
+
+/**
+ * @param {string} input
+ * @returns {Promise[]}
+ */
+function slowAutocomplete(input) {
+ return [duckduckgoAutocomplete(input)]
+}
+
+/**
+ * Uses `nsIEditor` to reduce the emphisis of schema and path
+ * bits and bobs. Heavily based on mozilla's code. I did not
+ * come up with these shenanagans
+ *
+ * @param {HTMLInputElement?} inputElement
+ */
+export function performCursedUrlStyling(inputElement) {
+ /**
+ * Manual currying!
+ */
+ return () => {
+ try {
+ if (!inputElement) return
+
+ // @ts-expect-error - shenanagans !== type checking :(
+ const /** @type {nsIEditorType} */ editor = inputElement.editor
+ const /** @type {nsISelectionControllerType} */ controller =
+ editor?.selectionController
+
+ if (!editor || !controller) {
+ console.debug('Editor and selection controller not available :(')
+ return
+ }
+
+ const textNode = editor.rootElement.firstChild
+ let startIndex = 0,
+ currentIndex = 0
+
+ const strikeOut = controller.getSelection(
+ controller.SELECTION_URLSTRIKEOUT,
+ )
+ const secondary = controller.getSelection(
+ controller.SELECTION_URLSECONDARY,
+ )
+
+ if (!textNode) {
+ return
+ }
+
+ // Consume the url scheme. No, that doesn't consume the third strike
+ // of resource:///, because the third strike has semantic meaning!
+ if (!inputElement.value.includes('://')) {
+ return
+ }
+ {
+ const isHttp = inputElement.value.startsWith('http://')
+
+ while (inputElement.value[currentIndex] != ':') {
+ currentIndex += 1
+ }
+
+ currentIndex += 3
+
+ const range = document.createRange()
+ range.setStart(textNode, startIndex)
+ range.setEnd(textNode, currentIndex)
+ secondary.addRange(range)
+
+ if (isHttp) {
+ const range = document.createRange()
+ range.setStart(textNode, startIndex)
+ range.setEnd(textNode, currentIndex - 3)
+ strikeOut.addRange(range)
+ }
+
+ startIndex = currentIndex
+ }
+
+ if (!inputElement.value.includes('://www.')) {
+ return
+ }
+ {
+ currentIndex += 4
+
+ const range = document.createRange()
+ range.setStart(textNode, startIndex)
+ range.setEnd(textNode, currentIndex)
+
+ secondary.addRange(range)
+ startIndex = currentIndex
+ }
+
+ // Consume path
+ if (!inputElement.value.substring(startIndex).includes('/')) {
+ return
+ }
+ {
+ while (inputElement.value[startIndex] != '/') {
+ startIndex += 1
+ }
+
+ const range = document.createRange()
+ range.setStart(textNode, startIndex)
+ range.setEnd(textNode, inputElement.value.length)
+ secondary.addRange(range)
+ }
+ } catch (e) {
+ console.debug('Error performing url styling', e)
+ }
+ }
+}
+
+/**
+ * @param {string} input
+ * @returns {Promise}
+ */
+async function duckduckgoAutocomplete(input) {
+ const response = await fetch(
+ `https://ac.duckduckgo.com/ac/?q=${input}&type=list&callback=jsonCallback`,
+ )
+ const /** @type {[string, string[]]} */ json = await response.json()
+ const completions = json[1]
+
+ if (!completions) {
+ console.warn('DuckDuckGo completions did not return correctly', json)
+ return []
+ }
+
+ return completions
+ .filter((comp) => comp != input)
+ .map((comp) => ({
+ display: comp,
+ url: `https://duckduckgo.com/?q=${comp}`,
+ }))
+}
+
+const HTTPS_REGEX =
+ /^(?https?:\/\/)?(?(\w+\.)+(?\w+))(?\/.*)?$/m
+const EXTENSION_REGEX = /^moz-extension:\/\/.+$/m
+const CHROME_REGEX = /^chrome:\/\/.+$/m
+const ABOUT_REGEX = /^about:.+$/m
+const tlds = tld
+ .split('\n')
+ .filter((/** @type {string} */ tld) => tld.length > 0 && !tld.startsWith('#'))
+
+/**
+ * @param {string} input
+ * @returns {AutocompleteResult[]}
+ */
+function getUrlResults(input) {
+ // If it is an exact match against an internal url
+ if (
+ EXTENSION_REGEX.test(input) ||
+ CHROME_REGEX.test(input) ||
+ ABOUT_REGEX.test(input)
+ ) {
+ return [{ display: input, url: input }]
+ }
+
+ const match = HTTPS_REGEX.exec(input)
+ if (match === null) return []
+
+ const { protocol, domain, tld, path } = match.groups || {}
+ const uri = `${protocol || 'https://'}${domain}${path || ''}`
+
+ // If it is not a valid tld, don't show it
+ if (!tlds.includes(tld.toUpperCase())) return []
+
+ return [{ display: uri, url: uri }]
+}
+
+/**
+ * @param {string} input
+ * @returns {AutocompleteResult[]}
+ */
+function getFastSearchResults(input) {
+ return [{ display: input, url: `https://duckduckgo.com/?q=${input}` }]
+}
diff --git a/apps/content/src/shared/search/providers/data/tld.txt b/apps/content/src/browser/data/tld.txt
similarity index 98%
rename from apps/content/src/shared/search/providers/data/tld.txt
rename to apps/content/src/browser/data/tld.txt
index 225b529..31b7abe 100644
--- a/apps/content/src/shared/search/providers/data/tld.txt
+++ b/apps/content/src/browser/data/tld.txt
@@ -1,4 +1,4 @@
-# Version 2023123101, Last Updated Mon Jan 1 07:07:01 2024 UTC
+# Version 2024031700, Last Updated Sun Mar 17 07:07:02 2024 UTC
AAA
AARP
ABB
@@ -96,7 +96,6 @@ BA
BABY
BAIDU
BANAMEX
-BANANAREPUBLIC
BAND
BANK
BAR
@@ -261,7 +260,6 @@ COFFEE
COLLEGE
COLOGNE
COM
-COMCAST
COMMBANK
COMMUNITY
COMPANY
@@ -512,7 +510,6 @@ GROUP
GS
GT
GU
-GUARDIAN
GUCCI
GUGE
GUIDE
@@ -855,7 +852,6 @@ OFFICE
OKINAWA
OLAYAN
OLAYANGROUP
-OLDNAVY
OLLO
OM
OMEGA
@@ -1276,7 +1272,6 @@ WTC
WTF
XBOX
XEROX
-XFINITY
XIHUAN
XIN
XN--11B4C3D
diff --git a/apps/content/src/browser/lib/binaryEnums.ts b/apps/content/src/browser/lib/binaryEnums.ts
deleted file mode 100644
index 304bbc1..0000000
--- a/apps/content/src/browser/lib/binaryEnums.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { curry } from 'fnts'
-
-export const isBitSet = curry((bit: number, num: number) => (num & bit) !== 0)
-export const isBitSetFast = curry((bit: number, num: number) => num & bit)
diff --git a/apps/content/src/browser/lib/devtools.ts b/apps/content/src/browser/lib/devtools.ts
deleted file mode 100644
index 7b6eb6e..0000000
--- a/apps/content/src/browser/lib/devtools.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-const lazy: any = {}
-;(ChromeUtils as any).defineESModuleGetters(lazy, {
- BrowserToolboxLauncher:
- 'resource://devtools/client/framework/browser-toolbox/Launcher.sys.mjs',
-})
-
-export const initDevTools = lazy.BrowserToolboxLauncher.init
diff --git a/apps/content/src/browser/lib/fp.ts b/apps/content/src/browser/lib/fp.ts
deleted file mode 100644
index 1503470..0000000
--- a/apps/content/src/browser/lib/fp.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-type ResultInner =
- | { _type: 'value'; inner: Value }
- | { _type: 'error'; inner: Error }
-export class Result {
- inner: ResultInner
-
- private constructor(inner: ResultInner) {
- this.inner = inner
- }
-
- static ok(value: V): Result {
- return new Result({ _type: 'value', inner: value })
- }
-
- static err(error: E): Result {
- return new Result({ _type: 'error', inner: error })
- }
-
- /**
- * Returns the value or throws the error if it exists. You should only use this in testing code
- * @deprecated
- */
- unwrap(): Value {
- if (this.inner._type === 'error') {
- throw this.inner.inner
- }
-
- return this.inner.inner
- }
-}
diff --git a/apps/content/src/browser/lib/keybinds.ts b/apps/content/src/browser/lib/keybinds.ts
deleted file mode 100644
index 1a4c3dc..0000000
--- a/apps/content/src/browser/lib/keybinds.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { Result } from './fp'
-
-export type ModifierType = (typeof modifiers)[number]
-const modifiers = ['shift', 'control', 'alt', 'meta', 'accel'] as const
-
-export type KeyCodeType = (typeof keycodes)[number]
-const keycodes = [
- 'VK_CANCEL',
- 'VK_BACK',
- 'VK_TAB',
- 'VK_CLEAR',
- 'VK_RETURN',
- 'VK_ENTER',
- 'VK_SHIFT',
- 'VK_CONTROL',
- 'VK_ALT',
- 'VK_PAUSE',
- 'VK_CAPS_LOCK',
- 'VK_ESCAPE',
- 'VK_SPACE',
- 'VK_PAGE_UP',
- 'VK_PAGE_DOWN',
- 'VK_END',
- 'VK_HOME',
- 'VK_LEFT',
- 'VK_UP',
- 'VK_RIGHT',
- 'VK_DOWN',
- 'VK_PRINTSCREEN',
- 'VK_INSERT',
- 'VK_DELETE',
- 'VK_0',
- 'VK_1',
- 'VK_2',
- 'VK_3',
- 'VK_4',
- 'VK_5',
- 'VK_6',
- 'VK_7',
- 'VK_8',
- 'VK_9',
- 'VK_SEMICOLON',
- 'VK_EQUALS',
- 'VK_A',
- 'VK_B',
- 'VK_C',
- 'VK_D',
- 'VK_E',
- 'VK_F',
- 'VK_G',
- 'VK_H',
- 'VK_I',
- 'VK_J',
- 'VK_K',
- 'VK_L',
- 'VK_M',
- 'VK_N',
- 'VK_O',
- 'VK_P',
- 'VK_Q',
- 'VK_R',
- 'VK_S',
- 'VK_T',
- 'VK_U',
- 'VK_V',
- 'VK_W',
- 'VK_X',
- 'VK_Y',
- 'VK_Z',
- 'VK_NUMPAD0',
- 'VK_NUMPAD1',
- 'VK_NUMPAD2',
- 'VK_NUMPAD3',
- 'VK_NUMPAD4',
- 'VK_NUMPAD5',
- 'VK_NUMPAD6',
- 'VK_NUMPAD7',
- 'VK_NUMPAD8',
- 'VK_NUMPAD9',
- 'VK_MULTIPLY',
- 'VK_ADD',
- 'VK_SEPARATOR',
- 'VK_SUBTRACT',
- 'VK_DECIMAL',
- 'VK_DIVIDE',
- 'VK_F1',
- 'VK_F2',
- 'VK_F3',
- 'VK_F4',
- 'VK_F5',
- 'VK_F6',
- 'VK_F7',
- 'VK_F8',
- 'VK_F9',
- 'VK_F10',
- 'VK_F11',
- 'VK_F12',
- 'VK_F13',
- 'VK_F14',
- 'VK_F15',
- 'VK_F16',
- 'VK_F17',
- 'VK_F18',
- 'VK_F19',
- 'VK_F20',
- 'VK_F21',
- 'VK_F22',
- 'VK_F23',
- 'VK_F24',
- 'VK_NUM_LOCK',
- 'VK_SCROLL_LOCK',
- 'VK_COMMA',
- 'VK_PERIOD',
- 'VK_SLASH',
- 'VK_BACK_QUOTE',
- 'VK_OPEN_BRACKET',
- 'VK_BACK_SLASH',
- 'VK_CLOSE_BRACKET',
- 'VK_QUOTE',
- 'VK_HELP',
-] as const
-
-export interface Keybind {
- modifiers: ModifierType[]
- key?: string
- keycode?: KeyCodeType
-}
-
-export type KeybindingParsingErrors = { error: 'invlidModifier'; value: string }
-
-export const keybindFromString = (
- str: string,
-): Result => {
- const items = str.split('+')
-
- const key = items.pop()
- const isKeyCode = keycodes.includes(key as KeyCodeType)
-
- // Validate all of the modifiers
- for (const modifier of items) {
- if (!modifiers.includes(modifier as ModifierType))
- return Result.err({ error: 'invlidModifier', value: modifier })
- }
-
- if (isKeyCode) {
- return Result.ok({
- modifiers: items as ModifierType[],
- keycode: key as KeyCodeType,
- })
- } else {
- return Result.ok({
- modifiers: items as ModifierType[],
- key,
- })
- }
-}
diff --git a/apps/content/src/browser/lib/modules/EPageActionsBindings.ts b/apps/content/src/browser/lib/modules/EPageActionsBindings.ts
deleted file mode 100644
index ff22c67..0000000
--- a/apps/content/src/browser/lib/modules/EPageActionsBindings.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { readable } from 'svelte/store'
-
-import type { PageActionImpl } from 'resource://app/modules/EPageActions.sys.mjs'
-
-import { resource } from '../resources'
-
-/**
- * @todo lazy loading store
- */
-export const pageActions = readable(
- [...resource.EPageActions.pageActions.entries()],
- (set) => {
- const update = () => set([...resource.EPageActions.pageActions.entries()])
- resource.EPageActions.events.on('*', update)
- return () => resource.EPageActions.events.off('*', update)
- },
-)
-
-export const pageActionIcons = (pageAction: PageActionImpl) =>
- readable | undefined>(pageAction.icons, (set) =>
- pageAction.events.on('updateIcon', set),
- )
-
-export function getIconUrlForPreferredSize(
- icon: Record,
- preferredSize: number,
-) {
- let bestSize
-
- if (icon[preferredSize]) {
- bestSize = preferredSize
- } else if (icon[preferredSize * 2]) {
- bestSize = preferredSize * 2
- } else {
- const sizes = Object.keys(icon)
- .map((key) => parseInt(key, 10))
- .sort((a, b) => a - b)
- bestSize =
- sizes.find((candidate) => candidate > preferredSize) || sizes.pop()!
- }
-
- return icon[bestSize]
-}
diff --git a/apps/content/src/browser/lib/shortcuts.ts b/apps/content/src/browser/lib/shortcuts.ts
deleted file mode 100644
index 2fd74a3..0000000
--- a/apps/content/src/browser/lib/shortcuts.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { runOnCurrentTab } from './window/tabs'
-
-interface AppCommandEvent extends Event {
- command:
- | 'Back'
- | 'Forward'
- | 'Reload'
- | 'Stop'
- | 'Search'
- | 'Bookmarks'
- | 'Home'
- | 'New'
- | 'Close'
- | 'Find'
- | 'Help'
- | 'Open'
- | 'Print'
- | 'Save'
- | 'SendMail'
-}
-
-export function initializeShortcuts() {
- document.addEventListener('AppCommand', (untypedEvent) => {
- const event = untypedEvent as AppCommandEvent
- switch (event.command) {
- case 'Back':
- runOnCurrentTab((tab) => tab.goBack())
- break
- case 'Forward':
- runOnCurrentTab((tab) => tab.goForward())
- break
- default:
- console.warn('Unknown event', event)
- }
- })
-}
diff --git a/apps/content/src/browser/lib/spinlock.ts b/apps/content/src/browser/lib/spinlock.ts
deleted file mode 100644
index d805fc0..0000000
--- a/apps/content/src/browser/lib/spinlock.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-export function sleep(duration: number): Promise {
- return new Promise((res) => setTimeout(res, duration))
-}
-
-export async function spinLock(predicate: () => boolean): Promise {
- while (!predicate()) {
- await sleep(1)
- }
-}
diff --git a/apps/content/src/browser/lib/window/api.ts b/apps/content/src/browser/lib/window/api.ts
deleted file mode 100644
index db784dd..0000000
--- a/apps/content/src/browser/lib/window/api.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import mitt from 'mitt'
-
-import type { WindowArguments } from '.'
-import {
- browserContextMenuInfo,
- setContextMenuParentActor,
-} from './contextMenu'
-import {
- closeTab,
- getCurrentTab,
- getTabById,
- openTab,
- runOnCurrentTab,
- setCurrentTab,
- tabs,
-} from './tabs'
-import { id, setId } from './window'
-
-export const windowApi: WindowApi = {
- id,
-
- setId,
-
- windowTriggers: mitt(),
- window: {
- /**
- * @todo Move this into BrowserWindowTracker
- */
- 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,
- getCurrentTab,
- getTabById,
- get tabs() {
- return tabs.readOnce()
- },
- setIcon: (browser: XULBrowserElement, iconURL: string) =>
- tabs
- .readOnce()
- .find((tab) => tab.getTabId() == browser.browserId)
- ?.icon.set(iconURL),
- },
- contextMenu: {
- showContextMenu: (
- menuInfo: ContextMenuInfo,
- actor: JSWindowActorParent,
- ) => {
- browserContextMenuInfo.set(menuInfo)
- setContextMenuParentActor(actor)
-
- requestAnimationFrame(() => {
- const contextMenu = document.getElementById(
- 'browser_context_menu',
- ) as XULMenuPopup
- contextMenu.openPopupAtScreen(
- menuInfo.position.screenX,
- menuInfo.position.screenY,
- true,
- )
- })
- },
- },
-}
-
-window.windowApi = windowApi
diff --git a/apps/content/src/browser/lib/window/arguments.ts b/apps/content/src/browser/lib/window/arguments.ts
deleted file mode 100644
index 0c0fa4d..0000000
--- a/apps/content/src/browser/lib/window/arguments.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const defaultWindowConfiguration: WindowConfiguration = {
- initialUrl: Services.prefs.getStringPref(
- 'browser.newwindow.default',
- 'about:blank',
- ),
-}
-
-/**
- * These are the arguments that we want to pass between windows.
- */
-export type WindowArguments = Partial
-
-export function getFullWindowConfiguration(
- args: WindowArguments,
-): WindowConfiguration {
- return {
- ...defaultWindowConfiguration,
- ...args,
- }
-}
-
-export function nsISupportsWinArgs(
- args: WindowArguments,
-): WindowArguments & nsISupportsType {
- return args as unknown as WindowArguments & nsISupportsType
-}
diff --git a/apps/content/src/browser/lib/window/contextMenu.ts b/apps/content/src/browser/lib/window/contextMenu.ts
deleted file mode 100644
index 67ae667..0000000
--- a/apps/content/src/browser/lib/window/contextMenu.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { writable } from 'svelte/store'
-
-export let contextMenuParentActor: JSWindowActorParent
-export const browserContextMenuInfo = writable({
- position: { screenX: 0, screenY: 0, inputSource: 0 },
- context: {},
-})
-
-export function setContextMenuParentActor(actor: JSWindowActorParent) {
- contextMenuParentActor = actor
-}
diff --git a/apps/content/src/browser/lib/window/index.ts b/apps/content/src/browser/lib/window/index.ts
deleted file mode 100644
index 025bc9a..0000000
--- a/apps/content/src/browser/lib/window/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-export * from './arguments'
-export * from './initialize'
diff --git a/apps/content/src/browser/lib/window/initialize.ts b/apps/content/src/browser/lib/window/initialize.ts
deleted file mode 100644
index 2ddbfc5..0000000
--- a/apps/content/src/browser/lib/window/initialize.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { resource } from '../resources'
-import { type WindowArguments, getFullWindowConfiguration } from './arguments'
-import { openTab } from './tabs'
-import {
- initializeWindowDragOverHandler,
- registerWithWindowTracker,
-} from './window'
-
-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
- openTab(resource.NetUtil.newURI(configuration.initialUrl))
-
- initializeWindowDragOverHandler()
- registerWithWindowTracker()
-}
diff --git a/apps/content/src/browser/lib/window/tab.ts b/apps/content/src/browser/lib/window/tab.ts
deleted file mode 100644
index 8906a8a..0000000
--- a/apps/content/src/browser/lib/window/tab.ts
+++ /dev/null
@@ -1,465 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { type ViewableWritable, viewableWritable } from '@experiment/shared'
-import mitt from 'mitt'
-import { type Writable, get, writable } from 'svelte/store'
-
-import type { ZoomStoreEvents } from 'resource://app/modules/ZoomStore.sys.mjs'
-
-import { type BookmarkTreeNode, search } from '@shared/ExtBookmarkAPI'
-
-import { resource } from '../resources'
-import { spinLock } from '../spinlock'
-import { createBrowser, getBrowserRemoteType, setURI } from '../xul/browser'
-import { domContentLoaded } from '../xul/domevents'
-
-export const lastTabAction = { id: -1, before: false }
-
-let localTabId = 0
-
-/**
- * This provides a consistent internal representation of a tab, including the
- * browser elements it contains & information derived from listeners about its current state
- */
-export class Tab {
- private _id: number = ++localTabId
- private tabId: number | undefined
-
- private browserElement: XULBrowserElement
- private progressListener = new TabProgressListener()
-
- // Publicly available data. Even though these are writable, updating them will not change
- // the state of the browser element
- public title = writable('')
- public icon: ViewableWritable = viewableWritable(null)
- public uri: ViewableWritable
- public bookmarkInfo: Writable = writable(null)
-
- public findbar: ViewableWritable =
- viewableWritable(undefined)
-
- public canGoBack = writable(false)
- public canGoForward = writable(false)
-
- public loading = writable(false)
- public loadingProgress = writable(0)
-
- public zoom = writable(1)
-
- public focusedOmnibox = writable(true)
- public hidden = writable(false)
-
- constructor(uri: nsIURIType) {
- this.browserElement = createBrowser({
- remoteType: getBrowserRemoteType(uri),
- })
-
- this.uri = viewableWritable(uri)
- this.goToUri(uri)
- this.title.set(uri.asciiHost)
-
- this.zoom.subscribe((newZoom) => {
- if (
- !this.browserElement.browsingContext ||
- this.browserElement.fullZoom === newZoom
- ) {
- return
- }
-
- this.browserElement.fullZoom = newZoom
- resource.ZoomStore.setZoomForUri(this.uri.readOnce(), newZoom)
- })
- this.uri.subscribe(async (uri) =>
- this.bookmarkInfo.set(
- await search({ url: uri.spec }).then((r) =>
- r.length > 0 ? (r[0] as BookmarkTreeNode) : null,
- ),
- ),
- )
-
- // Remember to unsubscribe from any listeners you register here!
- resource.ZoomStore.events.on('setZoom', this.zoomChange)
- }
-
- public getId(): number {
- return this._id
- }
-
- /**
- * Gecko's internal tab/browser id. Note that this is not always ready on first render, so
- * you should use {@link this.getId()} for keys etc
- */
- public getTabId(): number {
- return this.tabId || 0
- }
-
- public getBrowserElement() {
- return this.browserElement
- }
-
- public getDragRepresentation() {
- return {
- windowId: window.windowApi.id,
- tabId: this.getId(),
- }
- }
-
- _initialized: Promise | undefined
- public get initialized() {
- if (this._initialized) return this._initialized
- // Force fetching the docshell
- this.browserElement.docShell
- return (this._initialized = spinLock(
- () => this.browserElement.mInitialized,
- ))
- }
-
- // ===========================================================================
- // Event listeners
-
- protected useEventListeners() {
- this.browserElement.addEventListener(
- 'pagetitlechanged',
- this.onPageTitleChanged.bind(this),
- )
-
- this.browserElement.addEventListener(
- 'DidChangeBrowserRemoteness',
- this.onDidChangeBrowserRemoteness.bind(this),
- )
-
- // Set up progress notifications. These are used for listening on location change etc
- this.progressListener.setup(this.browserElement)
- this.useProgressListener()
- }
-
- protected removeEventListeners() {
- this.browserElement.removeEventListener(
- 'pagetitlechanged',
- this.onPageTitleChanged.bind(this),
- )
- this.browserElement.removeEventListener(
- 'DidChangeBrowserRemoteness',
- this.onDidChangeBrowserRemoteness.bind(this),
- )
- }
-
- protected onPageTitleChanged() {
- this.title.set(this.browserElement.contentTitle)
- }
-
- protected onDidChangeBrowserRemoteness(e: Event) {
- const browser = e.target as XULBrowserElement
- // TODO: Does this leak memory?
- this.progressListener.remove(browser)
- this.progressListener = new TabProgressListener()
- this.progressListener.setup(browser)
- this.useProgressListener()
- }
-
- zoomChange = (event: ZoomStoreEvents['setZoom']) => {
- if (this.uri.readOnce().asciiHost != event.host) return
- this.zoom.set(event.zoom)
- }
-
- protected useProgressListener() {
- this.progressListener.events.on('locationChange', (event) => {
- if (!event.aWebProgress.isTopLevel) return
-
- const sameLocation =
- event.aFlags & 0x01 /* LOCATION_CHANGE_SAME_DOCUMENT */
- if (!sameLocation) {
- this.icon.set(null)
- }
-
- this.uri.set(event.aLocation)
- this.canGoBack.set(this.browserElement.canGoBack)
- this.canGoForward.set(this.browserElement.canGoForward)
-
- this.zoom.set(resource.ZoomStore.getZoomForUri(event.aLocation))
- })
-
- this.progressListener.events.on('progressPercent', this.loadingProgress.set)
- this.progressListener.events.on('loadingChange', this.loading.set)
- }
-
- public async setContainer(container: HTMLElement) {
- container.appendChild(this.browserElement)
- this.tabId = this.browserElement.browserId
-
- this.useEventListeners()
- }
-
- public async goToUri(uri: nsIURIType) {
- // Load the URI once we are sure that the dom has fully loaded
- await domContentLoaded.promise
- // Wait for browser to initialize
- await this.initialized
- setURI(this.browserElement, uri)
- }
-
- public destroy() {
- resource.ZoomStore.events.off('setZoom', this.zoomChange)
- this.browserElement.remove()
- }
-
- public goBack() {
- this.browserElement.goBack()
- }
-
- public goForward() {
- this.browserElement.goForward()
- }
-
- public reload() {
- this.browserElement.reload()
- }
-
- public showFindBar() {
- if (!this.browserElement) {
- throw new Error('Browser not initialized when adding findbar')
- }
-
- const findbar = this.findbar.readOnce()
- if (findbar) {
- findbar.onFindCommand()
- return
- }
-
- this.findbar.update(() => document.createXULElement('findbar'))
- }
-
- public async setupFindbar(
- container: HTMLElement,
- findbar: XULFindBarElement,
- ) {
- container.append(findbar)
-
- await new Promise((r) => requestAnimationFrame(r))
- findbar.browser = this.browserElement
- this.showFindBar()
- }
-
- public swapWithTab(tab: Tab) {
- this.removeEventListeners()
- tab.removeEventListeners()
-
- this.browserElement.swapDocShells(tab.browserElement)
-
- this.useEventListeners()
- tab.useEventListeners()
-
- if (this.browserElement.id) this.tabId = this.browserElement.browserId
- if (tab.browserElement.id) tab.tabId = tab.browserElement.browserId
-
- const otherTitle = get(tab.title)
- const otherIcon = get(tab.icon)
- const otherUri = get(tab.uri)
- const otherBookmarkInfo = get(tab.bookmarkInfo)
-
- tab.title.set(get(this.title))
- tab.icon.set(get(this.icon))
- tab.uri.set(get(this.uri))
- tab.bookmarkInfo.set(get(this.bookmarkInfo))
-
- this.title.set(otherTitle)
- this.icon.set(otherIcon)
- this.uri.set(otherUri)
- this.bookmarkInfo.set(otherBookmarkInfo)
-
- const thisFindbar = get(this.findbar)
- thisFindbar?.remove()
- this.findbar.set(undefined)
-
- const otherFindbar = get(tab.findbar)
- otherFindbar?.remove()
- tab.findbar.set(undefined)
- }
-
- public async captureTabToCanvas(
- canvas: HTMLCanvasElement | null = resource.PageThumbs.createCanvas(window),
- ) {
- try {
- await resource.PageThumbs.captureToCanvas(
- this.browserElement,
- canvas,
- undefined,
- )
- } catch (e) {
- console.error(e)
- canvas = null
- }
-
- return canvas
- }
-}
-
-type TabProgressListenerEventDefaults = {
- aWebProgress: nsIWebProgressType
- aRequest: nsIRequestType
- id: number
-}
-
-type TabProgressListenerEvent = {
- locationChange: {
- aLocation: nsIURIType
- aFlags: number
- } & TabProgressListenerEventDefaults
- progressPercent: number
- loadingChange: boolean
-}
-
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-let progressListenerCounter = 0
-class TabProgressListener
- implements
- Partial,
- Partial
-{
- id = progressListenerCounter++
-
- events = mitt()
- browser: XULBrowserElement | undefined
-
- filter: (nsIWebProgressListenerType & nsIWebProgressType) | undefined
-
- setup(browser: XULBrowserElement) {
- this.browser = browser
-
- this.filter = Cc[
- '@mozilla.org/appshell/component/browser-status-filter;1'
- ].createInstance(Ci.nsIWebProgress) as nsIWebProgressListenerType &
- nsIWebProgressType
- this.filter.addProgressListener(
- this as unknown as nsIWebProgressListenerType,
- Ci.nsIWebProgress.NOTIFY_ALL,
- )
- browser.webProgress.addProgressListener(
- this.filter,
- Ci.nsIWebProgress.NOTIFY_ALL,
- )
- }
-
- remove(browser: XULBrowserElement) {
- browser.webProgress.removeProgressListener(
- this.filter as nsIWebProgressListenerType,
- )
- // @ts-expect-error Incorrect type generation
- this.filter?.removeProgressListener(this)
-
- this.filter = undefined
- }
-
- /**
- * This request is identical to {@link onProgressChange64}. The only
- * difference is that the c++ impl uses `long long`s instead of `long`s
- */
- onProgressChange64(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aCurSelfProgress: number,
- aMaxSelfProgress: number,
- aCurTotalProgress: number,
- aMaxTotalProgress: number,
- ): void {
- return this.onProgressChange(
- aWebProgress,
- aRequest,
- aCurSelfProgress,
- aMaxSelfProgress,
- aCurTotalProgress,
- aMaxTotalProgress,
- )
- }
-
- onRefreshAttempted(
- _aWebProgress: nsIWebProgressType,
- _aRefreshURI: nsIURIType,
- _aMillis: number,
- _aSameURI: boolean,
- ): boolean {
- // TODO: There is special functionality that should probibly go here
- return true
- }
- onStateChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aStateFlags: number,
- aStatus: number,
- ): void {
- if (!aWebProgress.isTopLevel) return
- if (
- aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
- aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK
- ) {
- this.events.emit('loadingChange', true)
- }
-
- if (
- aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
- aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK
- ) {
- this.events.emit('loadingChange', false)
- }
- }
-
- onProgressChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aCurSelfProgress: number,
- aMaxSelfProgress: number,
- aCurTotalProgress: number,
- aMaxTotalProgress: number,
- ): void {
- if (!aWebProgress || !aWebProgress.isTopLevel) return
- this.events.emit(
- 'progressPercent',
- aMaxTotalProgress !== 0 ? aCurTotalProgress / aMaxTotalProgress : 0,
- )
- }
-
- onLocationChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aLocation: nsIURIType,
- aFlags: number,
- ): void {
- this.events.emit('locationChange', {
- aWebProgress,
- aRequest,
- aLocation,
- aFlags,
- id: this.id,
- })
- }
- onStatusChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aStatus: number,
- aMessage: string,
- ): void {
- // console.log('onStatusChange')
- }
- onSecurityChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aState: number,
- ): void {
- // console.log('onSecurityChange')
- }
- onContentBlockingEvent(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aEvent: number,
- ): void {
- // console.log('onContentBlockingEvent')
- }
-
- QueryInterface = ChromeUtils.generateQI([
- 'nsIWebProgressListener',
- 'nsIWebProgressListener2',
- 'nsISupportsWeakReference',
- ])
-}
diff --git a/apps/content/src/browser/lib/window/tabs.ts b/apps/content/src/browser/lib/window/tabs.ts
deleted file mode 100644
index de8b9d7..0000000
--- a/apps/content/src/browser/lib/window/tabs.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { Ring, not, viewableWritable } from '@experiment/shared'
-
-import { resource } from '../resources'
-import { Tab } from './tab'
-
-const tabHistory = new Ring(10)
-export const selectedTabId = viewableWritable(-1)
-selectedTabId.subscribe((id) => tabHistory.next(id))
-
-const uriPref = (pref: string) => (): nsIURIType =>
- resource.NetUtil.newURI(Services.prefs.getStringPref(pref, 'about:blank'))
-const newTabUri = uriPref('browser.newtab.default')
-export const ABOUT_BLANK = resource.NetUtil.newURI('about:blank')
-
-export const tabs = viewableWritable([])
-
-const matchTab = (id: number) => (tab: Tab) => tab.getId() === id
-
-export function openTab(uri: nsIURIType = newTabUri()) {
- const newTab = new Tab(uri)
-
- // We only want to focus the omnibox on new tab pages
- if (uri.asciiSpec != newTabUri().asciiSpec) {
- newTab.focusedOmnibox.set(false)
- }
-
- tabs.update((tabs) => {
- selectedTabId.set(newTab.getId())
- return [...tabs, newTab]
- })
- return newTab
-}
-
-export function closeTab(tab: Tab) {
- tabs.update((tabs) => {
- const tabIndex = tabs.findIndex(matchTab(tab.getId()))
- const filtered = tabs.filter(not(matchTab(tab.getId())))
-
- if (filtered.length == 0) {
- window.close()
- return []
- }
-
- const lastTabId = tabHistory.prev()
- const hasLastTab = filtered.some(matchTab(lastTabId))
- if (hasLastTab) {
- selectedTabId.set(lastTabId)
- } else {
- if (filtered[tabIndex]) {
- selectedTabId.set(filtered[tabIndex].getId())
- } else {
- selectedTabId.set(filtered[tabIndex - 1].getId())
- }
- }
-
- tab.destroy()
- return filtered
- })
-}
-
-export function getTabById(id: number): Tab | undefined {
- return tabs.readOnce().find(matchTab(id))
-}
-
-export function getCurrentTab(): Tab | undefined {
- return getTabById(selectedTabId.readOnce())
-}
-
-export function setCurrentTab(tab: Tab) {
- const index = tabs.readOnce().findIndex(matchTab(tab.getId()))
- setCurrentTabIndex(index)
-}
-
-export function runOnCurrentTab(method: (tab: Tab) => R): R | undefined {
- const currentTab = getCurrentTab()
- if (currentTab) return method(currentTab)
-}
-
-export function getCurrentTabIndex(): number {
- return tabs.readOnce().findIndex(matchTab(selectedTabId.readOnce()))
-}
-
-export function setCurrentTabIndex(index: number) {
- const allTabs = tabs.readOnce()
-
- // Wrap the index
- if (index < 0) index = allTabs.length - 1
- if (index >= allTabs.length) index = 0
-
- const tabId = allTabs[index].getId()
- selectedTabId.set(tabId)
-}
-
-export function moveTabBefore(toMoveId: number, targetId: number) {
- tabs.update((tabs) => {
- const toMoveIndex = tabs.findIndex(matchTab(toMoveId))
- const targetIndex = Math.max(tabs.findIndex(matchTab(targetId)) - 1, 0)
-
- // If we do in-place modifications with tabs, svelte won't notice the
- // change
- const newTabs = [...tabs]
- insertAndShift(newTabs, toMoveIndex, targetIndex)
- return newTabs
- })
-}
-
-export function moveTabAfter(toMoveId: number, targetId: number) {
- tabs.update((tabs) => {
- const toMoveIndex = tabs.findIndex(matchTab(toMoveId))
- const targetIndex = tabs.findIndex(matchTab(targetId))
-
- // If we do in-place modifications with tabs, svelte won't notice the
- // change
- const newTabs = [...tabs]
- insertAndShift(newTabs, toMoveIndex, targetIndex)
- return newTabs
- })
-}
-
-function insertAndShift(arr: T[], from: number, to: number) {
- const cutOut = arr.splice(from, 1)[0]
- arr.splice(to, 0, cutOut)
-}
diff --git a/apps/content/src/browser/lib/window/window.ts b/apps/content/src/browser/lib/window/window.ts
deleted file mode 100644
index fe69bf9..0000000
--- a/apps/content/src/browser/lib/window/window.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { TAB_DATA_TYPE } from '@browser/components/tabs/tabDrag'
-
-import { resource } from '../resources'
-
-export let id = -1
-export const setId = (newId: number) => (id = newId)
-
-export const getWindowById = (id: number) =>
- resource.WindowTracker.getWindowById(id)
-
-/**
- * If we want to detect drops outside of the window, we need to ensure that all
- * drops **within** a browser window are handled.
- *
- * This listens for all events with a type equivalent to {@link TAB_DATA_TYPE}
- * and makes sure they have an attached drop type.
- */
-export function initializeWindowDragOverHandler() {
- const handleDragEvent = (event: DragEvent) => {
- const rawDragRepresentation = event.dataTransfer?.getData(TAB_DATA_TYPE)
- if (!rawDragRepresentation) return
-
- // Set this to some drop event other than 'none' so we can detect drops
- // outside of the window in the tab's drag handler
- if (event.dataTransfer) event.dataTransfer.dropEffect = 'link'
- event.preventDefault()
- }
-
- window.addEventListener('dragover', handleDragEvent)
- window.addEventListener('drop', handleDragEvent)
-}
-
-/**
- * Ensures that the window tracker is aware of this window & that when it is
- * closed, the correct cleanup is performed.
- */
-export function registerWithWindowTracker() {
- resource.WindowTracker.registerWindow(window)
- window.addEventListener('unload', () =>
- resource.WindowTracker.removeWindow(window),
- )
-
- window.addEventListener('focus', () => resource.WindowTracker.focusWindow(id))
-}
diff --git a/apps/content/src/browser/lib/xul/NSBrowserAccess.ts b/apps/content/src/browser/lib/xul/NSBrowserAccess.ts
deleted file mode 100644
index 201f9e1..0000000
--- a/apps/content/src/browser/lib/xul/NSBrowserAccess.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-export enum OpenWhere {
- DefaultWindow = 0,
- CurrentWindow = 1,
- NewWindow = 2,
- NewTab = 3,
- PrintBrowser = 4,
-}
-
-export enum OpenFlags {
- New = 0x0,
- /** Open was triggered by a thirdparty application */
- External = 0x1,
- NoOpener = 0x4,
- NoReferer = 0x8,
-}
-
-export class NSBrowserAccess {
- createContentWindow(
- aURI: nsIURIType,
- aOpenWindowInfo: nsIOpenWindowInfoType,
- aWhere: number,
- aFlags: number,
- aTriggeringPrincipal: nsIPrincipalType,
- aCsp: nsIContentSecurityPolicyType,
- ) {
- throw new Error('Method not implemented.')
- }
-
- createContentWindowInFrame(
- aURI: nsIURIType,
- params: nsIOpenURIInFrameParamsType,
- aWhere: number,
- ): Element | null {
- if (aWhere !== OpenWhere.NewTab) {
- console.warn('NSBrowserAccess: Only OpenWhere.NewTab is supported')
- return null
- }
-
- // TODO: Handle params
- // TODO: Handle unhandled arguments (see nsIBrowserDOMWindow)
- const tab = window.windowApi.tabs.openTab(aURI)
- const browser = tab.getBrowserElement()
- return browser
- }
-
- openURI(
- aURI: nsIURIType,
- aOpenWindowInfo: nsIOpenWindowInfoType,
- aWhere: number,
- aFlags: number,
- aTriggeringPrincipal: nsIPrincipalType,
- aCsp: nsIContentSecurityPolicyType,
- ) {
- throw new Error('Method not implemented.')
- }
- openURIInFrame(
- aURI: nsIURIType,
- params: nsIOpenURIInFrameParamsType,
- aWhere: number,
- aFlags: number,
- aName: string,
- ): Element {
- throw new Error('Method not implemented.')
- }
- canClose(): boolean {
- // TODO: Logic
- return true
- }
- tabCount: number = 0
-
- QueryInterface = ChromeUtils.generateQI(['nsIBrowserDOMWindow'])
-}
diff --git a/apps/content/src/browser/lib/xul/XULBrowserWindow.ts b/apps/content/src/browser/lib/xul/XULBrowserWindow.ts
deleted file mode 100644
index 30c87d1..0000000
--- a/apps/content/src/browser/lib/xul/XULBrowserWindow.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-export class XULBrowserWindow {
- QueryInterface = ChromeUtils.generateQI([
- 'nsIWebProgressListener',
- 'nsIWebProgressListener2',
- 'nsISupportsWeakReference',
- 'nsIXULBrowserWindow',
- ])
-
- setOverLink(link: string): void {
- // TODO: Do something with information about link hover
- }
- onBeforeLinkTraversal(
- originalTarget: string,
- linkURI: nsIURIType,
- linkNode: Node,
- isAppTab: boolean,
- ): string {
- throw new Error('Method not implemented.')
- }
- showTooltip(
- x: number,
- y: number,
- tooltip: string,
- direction: string,
- browser: Element,
- ): void {
- // TODO: Implement link tooltips
- }
- hideTooltip(): void {
- // TODO: Implment link tooltips
- }
- getTabCount() {
- throw new Error('Method not implemented.')
- }
- onProgressChange64(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aCurSelfProgress: number,
- aMaxSelfProgress: number,
- aCurTotalProgress: number,
- aMaxTotalProgress: number,
- ): void {
- throw new Error('Method not implemented.')
- }
- onRefreshAttempted(
- aWebProgress: nsIWebProgressType,
- aRefreshURI: nsIURIType,
- aMillis: number,
- aSameURI: boolean,
- ): boolean {
- throw new Error('Method not implemented.')
- }
- onStateChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aStateFlags: number,
- aStatus: number,
- ): void {
- throw new Error('Method not implemented.')
- }
- onProgressChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aCurSelfProgress: number,
- aMaxSelfProgress: number,
- aCurTotalProgress: number,
- aMaxTotalProgress: number,
- ): void {
- throw new Error('Method not implemented.')
- }
- onLocationChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aLocation: nsIURIType,
- aFlags: number,
- ): void {
- throw new Error('Method not implemented.')
- }
- onStatusChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aStatus: number,
- aMessage: string,
- ): void {
- throw new Error('Method not implemented.')
- }
- onSecurityChange(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aState: number,
- ): void {
- throw new Error('Method not implemented.')
- }
- onContentBlockingEvent(
- aWebProgress: nsIWebProgressType,
- aRequest: nsIRequestType,
- aEvent: number,
- ): void {
- throw new Error('Method not implemented.')
- }
-}
-
-export const globalXULBrowserWindow = new XULBrowserWindow()
diff --git a/apps/content/src/browser/lib/xul/browser.ts b/apps/content/src/browser/lib/xul/browser.ts
deleted file mode 100644
index d2b05f0..0000000
--- a/apps/content/src/browser/lib/xul/browser.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { resource } from '../resources'
-
-const { useRemoteTabs, useRemoteSubframe } = window.docShell.QueryInterface(
- Ci.nsILoadContext,
-)
-
-const DEFAULT_BROWSER_ATTRIBUTES = {
- message: 'true',
- messagemanagergroup: 'browsers',
- type: 'content',
- contextmenu: 'browser_context_menu',
-} as const
-
-export function setURI(browser: XULBrowserElement, uri: nsIURIType) {
- browser.source = uri.spec
- try {
- browser.loadURI(uri, {
- triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
- // remoteTypeOverride: getBrowserRemoteType(uri),
- })
- } catch (e) {
- console.log(browser, uri)
- console.error(e)
- }
-}
-
-export function getBrowserRemoteType(uri: nsIURIType) {
- const oa = resource.E10SUtils.predictOriginAttributes({ window })
- return resource.E10SUtils.getRemoteTypeForURI(
- uri.spec,
- useRemoteTabs,
- useRemoteSubframe,
- resource.E10SUtils.DEFAULT_REMOTE_TYPE,
- uri,
- oa,
- )
-}
-
-export function createBrowser({
- remoteType,
- attributes,
-}: {
- remoteType?: string
- attributes?: {
- disableglobalhistory?: string
- messagemanagergroup?: string
- ['webextension-view-type']?: string
- }
-} = {}): XULBrowserElement {
- const browser = document.createXULElement('browser')
- if (remoteType) {
- browser.setAttribute('remoteType', remoteType)
- browser.setAttribute('remote', true)
- }
-
- const mergedAttributes = {
- ...DEFAULT_BROWSER_ATTRIBUTES,
- ...(attributes || {}),
- }
-
- for (const attribute in mergedAttributes)
- browser.setAttribute(
- attribute,
- mergedAttributes[attribute as keyof typeof mergedAttributes],
- )
-
- if (useRemoteTabs) browser.setAttribute('maychangeremoteness', 'true')
-
- return browser
-}
diff --git a/apps/content/src/browser/lib/xul/ccWrapper.ts b/apps/content/src/browser/lib/xul/ccWrapper.ts
deleted file mode 100644
index 242f348..0000000
--- a/apps/content/src/browser/lib/xul/ccWrapper.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-export function getClipboardHelper(): nsIClipboardHelperType {
- return (Cc['@mozilla.org/widget/clipboardhelper;1'] as any).getService(
- Ci.nsIClipboardHelper,
- )
-}
diff --git a/apps/content/src/browser/lib/xul/domevents.ts b/apps/content/src/browser/lib/xul/domevents.ts
deleted file mode 100644
index 9ac030b..0000000
--- a/apps/content/src/browser/lib/xul/domevents.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { Deferred } from '@experiment/shared'
-
-import { NSBrowserAccess } from './NSBrowserAccess'
-import { globalXULBrowserWindow } from './XULBrowserWindow'
-
-export const domContentLoaded: Deferred = new Deferred()
-window.addEventListener(
- 'load',
- () => {
- // This code needs to be run before the first remote browser is created
- window.docShell.treeOwner
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIAppWindow).XULBrowserWindow = globalXULBrowserWindow
- window.browserDOMWindow =
- new NSBrowserAccess() as unknown as nsIBrowserDOMWindowType
-
- domContentLoaded.resolve && domContentLoaded.resolve(null)
- },
- {
- once: true,
- },
-)
diff --git a/apps/content/src/browser/utils/browserElement.js b/apps/content/src/browser/utils/browserElement.js
new file mode 100644
index 0000000..eb1d125
--- /dev/null
+++ b/apps/content/src/browser/utils/browserElement.js
@@ -0,0 +1,54 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+import { browserImports } from '../browserImports.js'
+
+const { useRemoteTabs, useRemoteSubframe } = window.docShell.QueryInterface(
+ Ci.nsILoadContext,
+)
+
+const DEFAULT_BROWSER_ATTRIBUTES = {
+ message: 'true',
+ messagemanagergroup: 'browsers',
+ type: 'content',
+ contextmenu: 'browser_context_menu',
+}
+
+/**
+ * @param {nsIURIType} uri
+ * @param {Record} [attributes={}]
+ */
+export function createBrowser(uri, attributes = {}) {
+ let originAttributes = browserImports.E10SUtils.predictOriginAttributes({
+ window,
+ })
+ const remoteType = browserImports.E10SUtils.getRemoteTypeForURI(
+ uri.spec,
+ useRemoteTabs,
+ useRemoteSubframe,
+ browserImports.E10SUtils.DEFAULT_REMOTE_TYPE,
+ uri,
+ originAttributes,
+ )
+
+ const browser = document.createXULElement('browser')
+ if (remoteType) {
+ browser.setAttribute('remoteType', remoteType)
+ browser.setAttribute('remote', true)
+ }
+
+ for (const attribute in DEFAULT_BROWSER_ATTRIBUTES) {
+ browser.setAttribute(attribute, DEFAULT_BROWSER_ATTRIBUTES[attribute])
+ }
+
+ for (const attribute in attributes) {
+ browser.setAttribute(attribute, attributes[attribute])
+ }
+
+ if (useRemoteTabs) {
+ browser.setAttribute('maychangeremoteness', 'true')
+ }
+
+ return browser
+}
diff --git a/apps/content/src/browser/windowApi/WebsiteTheme.js b/apps/content/src/browser/windowApi/WebsiteTheme.js
new file mode 100644
index 0000000..f8bc568
--- /dev/null
+++ b/apps/content/src/browser/windowApi/WebsiteTheme.js
@@ -0,0 +1,71 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+import Color from 'colorjs.io'
+
+import { eventBus } from './eventBus.js'
+
+/**
+ * @param {WebsiteView} view
+ */
+export function registerViewThemeListener(view) {
+ eventBus.on('themeUpdate', (theme) => {
+ if (theme.browserId != view.browserId) {
+ return
+ }
+
+ applyTheme(view, theme)
+ })
+}
+
+/**
+ * @param {WebsiteView} view
+ * @param {import('@browser/event-bus').ThemeUpdate} theme
+ */
+export function applyTheme(view, theme) {
+ const themeColor = theme.meta || theme.body
+
+ if (!themeColor) {
+ return
+ }
+
+ try {
+ const colorObject = new Color(themeColor)
+ let hue = colorObject.oklch[2]
+ let lightness = colorObject.oklch[0] * 100
+ let chroma = colorObject.oklch[1]
+
+ if (Number.isNaN(hue)) {
+ hue = 0
+ chroma = 0
+ }
+
+ const isLight = lightness > 50
+ const withinSpec = isLight ? lightness >= 75 : lightness <= 25
+
+ if (!withinSpec) {
+ lightness = isLight ? 75 : 25
+ if (chroma === 0) {
+ chroma = 0
+ } else {
+ chroma = isLight ? 0.12 : 0.04
+ }
+ }
+
+ const activeLightness = lightness + (isLight ? -5 : 5)
+ const foregroundLightness = isLight ? 10 : 90
+
+ const background = { lightness, chroma }
+ const active = { lightness: activeLightness, chroma }
+ const foreground = {
+ lightness: foregroundLightness,
+ chroma,
+ }
+
+ view.theme = { hue, background, foreground, active }
+ view.events.emit('themeChange', view.theme)
+ } catch (e) {
+ console.warn('Theme generation failed', e)
+ }
+}
diff --git a/apps/content/src/browser/windowApi/WebsiteView.js b/apps/content/src/browser/windowApi/WebsiteView.js
new file mode 100644
index 0000000..8ca47aa
--- /dev/null
+++ b/apps/content/src/browser/windowApi/WebsiteView.js
@@ -0,0 +1,344 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+///
+///
+import mitt from 'mitt'
+import { readable } from 'svelte/store'
+
+import { createBrowser } from '../utils/browserElement.js'
+import { eventBus } from './eventBus.js'
+
+let nextWindowBrowserId = 0
+
+/**
+ * @param {() => boolean} predicate
+ * @param {number} [timing=10]
+ */
+async function spinlock(predicate, timing = 10) {
+ while (!predicate()) {
+ await new Promise((res) => setTimeout(res, timing))
+ }
+}
+
+/**
+ * @param {nsIURIType} uri
+ * @returns {WebsiteView}
+ */
+export function create(uri) {
+ /** @type {WebsiteView} */
+ const view = {
+ windowBrowserId: nextWindowBrowserId++,
+ browser: createBrowser(uri),
+
+ /** @type {import('mitt').Emitter} */
+ events: mitt(),
+ tabProgressListener: null,
+ }
+
+ goTo(view, uri)
+
+ queueMicrotask(async () => {
+ await initialized(view)
+ view.browserId = view.browser.browserId
+ registerListeners(view)
+ })
+ queueMicrotask(async () => {
+ const { registerViewThemeListener } = await import('./WebsiteTheme.js')
+ registerViewThemeListener(view)
+ })
+
+ eventBus.on('iconUpdate', ({ browserId, iconUrl }) => {
+ if (view.browser.browserId === browserId) {
+ view.iconUrl = iconUrl
+ view.events.emit('changeIcon', iconUrl)
+ }
+ })
+
+ return view
+}
+
+/**
+ * @param {WebsiteView} view
+ */
+function initialized(view) {
+ view.browser.docShell
+ return spinlock(() => view.browser.mInitialized)
+}
+
+/**
+ * @todo
+ */
+//function cleanup() {
+// TODO: Cleanup listeners created in WebsiteTheme.js
+// TODO: Cleanup icon listener
+//}
+
+/**
+ * @param {WebsiteView} view
+ * @param {nsIURIType} uri
+ */
+export async function goTo(view, uri) {
+ await initialized(view)
+
+ view.browser.source = uri.spec
+ try {
+ view.browser.loadURI(uri, {
+ triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+ })
+ } catch (e) {
+ console.debug('Debug info for changing url')
+ console.debug(view, uri)
+ console.error(e)
+ }
+}
+
+/**
+ * @template T
+ * @param {WebsiteView} view
+ * @param {(browser: XULBrowserElement, event: WebsiteViewLocationChangeProperties) => T} getter
+ * @param {T} defaultValue
+ */
+export function locationProperty(view, getter, defaultValue) {
+ return readable(defaultValue, (set) => {
+ const updater = (
+ /** @type {WebsiteViewLocationChangeProperties} */ event,
+ ) => event.aWebProgress.isTopLevel && set(getter(view.browser, event))
+
+ view.events.on('locationChange', updater)
+ return () => view.events.off('locationChange', updater)
+ })
+}
+
+// ==========================================================================
+// Handle wacky event registration
+
+/**
+ * @param {WebsiteView} view
+ */
+function registerListeners(view) {
+ view.browser.addEventListener(
+ 'DidChangeBrowserRemoteness',
+ didChangeBrowserRemoteness.bind(view),
+ )
+ view.browser.addEventListener('pagetitlechanged', () => {
+ view.title = view.browser.contentTitle
+ view.events.emit('changeTitle', view.title)
+ })
+
+ registerTabProgressListener(view)
+}
+
+/**
+ * @param {WebsiteView} view
+ */
+function registerTabProgressListener(view) {
+ if (view.tabProgressListener) {
+ view.tabProgressListener.remove(view.browser)
+ view.tabProgressListener = null
+ }
+
+ view.tabProgressListener = new TabProgressListener(view)
+}
+
+/**
+ * @this {WebsiteView}
+ */
+function didChangeBrowserRemoteness() {
+ registerTabProgressListener(this)
+}
+
+// =======================================================================
+// Horrible class incoming!
+//
+/* eslint-disable no-unused-vars */
+
+let progressListenerCounter = 0
+class TabProgressListener {
+ id = progressListenerCounter++
+
+ /** @type {WebsiteView} */
+ view
+
+ /**
+ * @type {nsIWebProgressListenerType & nsIWebProgressType} filter
+ */
+ filter
+
+ /**
+ * @param {WebsiteView} view
+ */
+ constructor(view) {
+ this.view = view
+
+ this.filter = Cc[
+ '@mozilla.org/appshell/component/browser-status-filter;1'
+ ].createInstance(Ci.nsIWebProgress)
+ this.filter.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_ALL)
+ view.browser.webProgress.addProgressListener(
+ this.filter,
+ Ci.nsIWebProgress.NOTIFY_ALL,
+ )
+ }
+
+ /**
+ * @param {XULBrowserElement} browser
+ */
+ remove(browser) {
+ browser.webProgress.removeProgressListener(this.filter)
+ // @ts-expect-error Incorrect type generation
+ this.filter?.removeProgressListener(this)
+
+ this.filter = undefined
+ }
+
+ /**
+ * This request is identical to {@link onProgressChange64}. The only
+ * difference is that the c++ impl uses `long long`s instead of `long`s
+ * @param {nsIWebProgressType} aWebProgress - The web progress type
+ * @param {nsIRequestType} aRequest - The request type
+ * @param {number} aCurSelfProgress - The current self progress
+ * @param {number} aMaxSelfProgress - The maximum self progress
+ * @param {number} aCurTotalProgress - The current total progress
+ * @param {number} aMaxTotalProgress - The maximum total progress
+ * @returns {void}
+ */
+ onProgressChange64(
+ aWebProgress,
+ aRequest,
+ aCurSelfProgress,
+ aMaxSelfProgress,
+ aCurTotalProgress,
+ aMaxTotalProgress,
+ ) {
+ return this.onProgressChange(
+ aWebProgress,
+ aRequest,
+ aCurSelfProgress,
+ aMaxSelfProgress,
+ aCurTotalProgress,
+ aMaxTotalProgress,
+ )
+ }
+
+ /**
+ * Handles the event when a refresh is attempted.
+ * @param {nsIWebProgressType} _aWebProgress - The web progress type
+ * @param {nsIURIType} _aRefreshURI - The URI to refresh
+ * @param {number} _aMillis - The number of milliseconds to wait before refreshing
+ * @param {boolean} _aSameURI - Whether the refresh URI is the same as the current URI
+ * @returns {boolean} - Returns true
+ */
+ onRefreshAttempted(_aWebProgress, _aRefreshURI, _aMillis, _aSameURI) {
+ // TODO: There is special functionality that should probably go here
+ return true
+ }
+ /**
+ * Handles the state change event.
+ * @param {nsIWebProgressType} aWebProgress - The web progress type
+ * @param {nsIRequestType} aRequest - The request type
+ * @param {number} aStateFlags - The state flags
+ * @param {number} aStatus - The status
+ * @returns {void}
+ */
+ onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
+ if (!aWebProgress.isTopLevel) return
+ if (
+ aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
+ aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK
+ ) {
+ this.view.events.emit('loadingChange', true)
+ }
+
+ if (
+ aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
+ aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK
+ ) {
+ this.view.events.emit('loadingChange', false)
+ }
+ }
+
+ /**
+ * Handles the progress change event.
+ * @param {nsIWebProgressType} aWebProgress - The web progress type
+ * @param {nsIRequestType} aRequest - The request type
+ * @param {number} aCurSelfProgress - The current self progress
+ * @param {number} aMaxSelfProgress - The maximum self progress
+ * @param {number} aCurTotalProgress - The current total progress
+ * @param {number} aMaxTotalProgress - The maximum total progress
+ * @returns {void}
+ */
+ onProgressChange(
+ aWebProgress,
+ aRequest,
+ aCurSelfProgress,
+ aMaxSelfProgress,
+ aCurTotalProgress,
+ aMaxTotalProgress,
+ ) {
+ if (!aWebProgress || !aWebProgress.isTopLevel) return
+ this.view.events.emit(
+ 'progressPercent',
+ aMaxTotalProgress !== 0 ? aCurTotalProgress / aMaxTotalProgress : 0,
+ )
+ }
+
+ /**
+ * Handles the location change event.
+ * @param {nsIWebProgressType} aWebProgress - The web progress type
+ * @param {nsIRequestType} aRequest - The request type
+ * @param {nsIURIType} aLocation - The location URI
+ * @param {number} aFlags - The flags
+ * @returns {void}
+ */
+ onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
+ this.view.events.emit('locationChange', {
+ aWebProgress,
+ aRequest,
+ aLocation,
+ aFlags,
+ id: this.id,
+ })
+ }
+
+ /**
+ * Handles the status change event.
+ * @param {nsIWebProgressType} aWebProgress - The web progress type
+ * @param {nsIRequestType} aRequest - The request type
+ * @param {number} aStatus - The status
+ * @param {string} aMessage - The message
+ * @returns {void}
+ */
+ onStatusChange(aWebProgress, aRequest, aStatus, aMessage) {
+ // console.log('onStatusChange')
+ }
+
+ /**
+ * Handles the security change event.
+ * @param {nsIWebProgressType} aWebProgress - The web progress type
+ * @param {nsIRequestType} aRequest - The request type
+ * @param {number} aState - The state
+ * @returns {void}
+ */
+ onSecurityChange(aWebProgress, aRequest, aState) {
+ this.view.events.emit('securityChange', aState)
+ }
+
+ /**
+ * Handles the content blocking event.
+ * @param {nsIWebProgressType} aWebProgress - The web progress type
+ * @param {nsIRequestType} aRequest - The request type
+ * @param {number} aEvent - The event
+ * @returns {void}
+ */
+ onContentBlockingEvent(aWebProgress, aRequest, aEvent) {
+ // console.log('onContentBlockingEvent')
+ }
+
+ QueryInterface = ChromeUtils.generateQI([
+ 'nsIWebProgressListener',
+ 'nsIWebProgressListener2',
+ 'nsISupportsWeakReference',
+ ])
+}
diff --git a/apps/content/src/browser/windowApi/WindowTabs.js b/apps/content/src/browser/windowApi/WindowTabs.js
new file mode 100644
index 0000000..ca204f0
--- /dev/null
+++ b/apps/content/src/browser/windowApi/WindowTabs.js
@@ -0,0 +1,79 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+import { writable } from '@amadeus-it-group/tansu'
+import { derived } from 'svelte/store'
+
+import { browserImports } from '../browserImports.js'
+import * as WebsiteViewApi from './WebsiteView.js'
+
+/**
+ * @typedef {object} WebsiteTab
+ * @property {'website'} kind
+ * @property {WebsiteView} view
+ */
+
+export const activeTabId = writable(0)
+
+/**
+ * This is an an array of "selected" tabs. The tab that is in {@link activeTabId} should never be in this variable. There is an subscriber responsible for handling that
+ *
+ * @type {import('@amadeus-it-group/tansu').WritableSignal}
+ */
+export const selectedTabIds = writable([])
+
+/**
+ * @param {number[]} ids
+ */
+export function addSelectedTabs(ids) {
+ selectedTabIds.update((selected) => {
+ for (const id of ids) {
+ if (!selected.includes(id)) {
+ selected = [...selected, id]
+ }
+ }
+
+ return selected
+ })
+}
+
+selectedTabIds.subscribe((ids) => {
+ const activeId = activeTabId()
+ if (ids.includes(activeId)) {
+ selectedTabIds.set(ids.filter((id) => id != activeId))
+ }
+})
+
+activeTabId.subscribe((activeId) => {
+ const ids = selectedTabIds()
+ if (ids.includes(activeId)) {
+ selectedTabIds.set(ids.filter((id) => id != activeId))
+ }
+})
+
+/**
+ * @type {import('@amadeus-it-group/tansu').WritableSignal}
+ */
+export const windowTabs = writable([
+ {
+ kind: 'website',
+ view: WebsiteViewApi.create(
+ browserImports.NetUtil.newURI('https://google.com'),
+ ),
+ },
+ {
+ kind: 'website',
+ view: WebsiteViewApi.create(
+ browserImports.NetUtil.newURI('https://svelte.dev'),
+ ),
+ },
+])
+
+export const activeTab = derived(
+ [activeTabId, windowTabs],
+ ([$activeTabId, $windowTabs]) =>
+ $windowTabs.find((tab) => tab.view.windowBrowserId === $activeTabId),
+)
+
+activeTabId.set(windowTabs()[0].view.windowBrowserId)
diff --git a/apps/content/src/browser/windowApi/eventBus.js b/apps/content/src/browser/windowApi/eventBus.js
new file mode 100644
index 0000000..060ff86
--- /dev/null
+++ b/apps/content/src/browser/windowApi/eventBus.js
@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// @ts-check
+import mitt from 'mitt'
+
+/**
+ * @type {import('@browser/event-bus').EventBus}
+ */
+export const eventBus = mitt()
+eventBus.on('*', console.debug)
+
+export function registerEventBus() {
+ window.eventBus = eventBus
+}
diff --git a/apps/content/src/credits/credits.ts b/apps/content/src/credits/credits.js
similarity index 88%
rename from apps/content/src/credits/credits.ts
rename to apps/content/src/credits/credits.js
index cf28646..9b19a18 100644
--- a/apps/content/src/credits/credits.ts
+++ b/apps/content/src/credits/credits.js
@@ -1,8 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import '@shared/styles/global.css'
-
import Credits from './Credits.svelte'
new Credits({ target: document.body })
diff --git a/apps/content/src/history/History.svelte b/apps/content/src/history/History.svelte
deleted file mode 100644
index 5faef98..0000000
--- a/apps/content/src/history/History.svelte
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- {#if $model.root}
-
- {#each children as child}
-
- {/each}
-
- {/if}
-
-
-
diff --git a/apps/content/src/history/component/Entry.svelte b/apps/content/src/history/component/Entry.svelte
deleted file mode 100644
index 03f31d7..0000000
--- a/apps/content/src/history/component/Entry.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/apps/content/src/history/component/HistoryContainerNode.svelte b/apps/content/src/history/component/HistoryContainerNode.svelte
deleted file mode 100644
index 6f71ff2..0000000
--- a/apps/content/src/history/component/HistoryContainerNode.svelte
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
- {#if open}
-
- {:else}
-
- {/if}
-
-
-
- {#if open}
- {#each children as node}
-
- {/each}
- {/if}
-
-
-
-
diff --git a/apps/content/src/history/component/HistoryItemNode.svelte b/apps/content/src/history/component/HistoryItemNode.svelte
deleted file mode 100644
index e240430..0000000
--- a/apps/content/src/history/component/HistoryItemNode.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/content/src/history/component/HistoryNode.svelte b/apps/content/src/history/component/HistoryNode.svelte
deleted file mode 100644
index f04f6a0..0000000
--- a/apps/content/src/history/component/HistoryNode.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-{#if isContainer}
-
-{:else}
-
-{/if}
diff --git a/apps/content/src/bookmarks/bookmarks.css b/apps/content/src/history/history.js
similarity index 88%
rename from apps/content/src/bookmarks/bookmarks.css
rename to apps/content/src/history/history.js
index 0b0c756..e003224 100644
--- a/apps/content/src/bookmarks/bookmarks.css
+++ b/apps/content/src/history/history.js
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-body {
- height: 100vh;
-}
diff --git a/apps/content/src/history/history.ts b/apps/content/src/history/history.ts
deleted file mode 100644
index ccf360b..0000000
--- a/apps/content/src/history/history.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import 'remixicon/fonts/remixicon.css'
-
-import '@shared/styles/window.css'
-
-import History from './History.svelte'
-
-new History({
- target: document.body,
-})
diff --git a/apps/content/src/settings/Settings.svelte b/apps/content/src/settings/Settings.svelte
deleted file mode 100644
index 549c11a..0000000
--- a/apps/content/src/settings/Settings.svelte
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
-
-
- Window page
- New tab page
-
-
-
-
-
- {#await searchEngines then searchEngines}
- ({
- value: engine._extensionID,
- label: engine._name,
- icon: engine.iconURI.spec,
- }))}
- pref={SEARCH_ENGINE_PREF}
- defaultValue={DEFAULT_SEARCH_ENGINE}>Default search engine
- {/await}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Open browser toolbox
-
-
- Reload browser chrome
-
-
-
-
- New Window
- New Tab
- Refresh Tab
- Close Active Tab
- Next tab
- Previous Tab
-
- Zoom in
- Zoom out
- Reset Zoom
-
- {#each [1, 2, 3, 4, 5, 6, 7, 8] as tabNum}
- Jump to tab {tabNum}
- {/each}
- Find In Page
-
-
-
-
-
-
-
-
diff --git a/apps/content/src/settings/components/pref/ContextMenuPref/index.ts b/apps/content/src/settings/components/pref/ContextMenuPref/index.ts
deleted file mode 100644
index f47c7be..0000000
--- a/apps/content/src/settings/components/pref/ContextMenuPref/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import ContextMenuPref from './ContextMenuPref.svelte'
-
-export { ContextMenuPref }
diff --git a/apps/content/src/settings/components/pref/ContextMenuPref/prefWrapper.ts b/apps/content/src/settings/components/pref/ContextMenuPref/prefWrapper.ts
deleted file mode 100644
index 5f12630..0000000
--- a/apps/content/src/settings/components/pref/ContextMenuPref/prefWrapper.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import { writable } from 'svelte/store'
-
-import { type MenuItem, fromIdString, toIdString } from '@shared/contextMenus'
-
-export function contextMenuPrefWrapper(pref: string) {
- const store = writable([])
-
- {
- const prefValue = Services.prefs.getStringPref(pref, '')
- store.set(fromIdString(prefValue))
- }
-
- store.subscribe((value) => {
- Services.prefs.setStringPref(pref, toIdString(value))
- })
-
- return store
-}
diff --git a/apps/content/src/settings/components/pref/CustomizableUI/Component.svelte b/apps/content/src/settings/components/pref/CustomizableUI/Component.svelte
deleted file mode 100644
index 29f5707..0000000
--- a/apps/content/src/settings/components/pref/CustomizableUI/Component.svelte
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
-{#if !isRoot}
-
-{/if}
-
-
-
-
diff --git a/apps/content/src/settings/components/pref/CustomizableUI/Components/index.ts b/apps/content/src/settings/components/pref/CustomizableUI/Components/index.ts
deleted file mode 100644
index 8e9cd19..0000000
--- a/apps/content/src/settings/components/pref/CustomizableUI/Components/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import Block from './Block.svelte'
-import Browser from './Browser.svelte'
-import IconButton from './IconButton.svelte'
-import Omnibox from './Omnibox.svelte'
-import Spacer from './Spacer.svelte'
-import Tabs from './Tabs.svelte'
-import TempDropTarget from './TempDropTarget.svelte'
-
-export { Block, Browser, IconButton, Omnibox, Spacer, Tabs, TempDropTarget }
diff --git a/apps/content/src/settings/components/pref/CustomizableUI/Configure.svelte b/apps/content/src/settings/components/pref/CustomizableUI/Configure.svelte
deleted file mode 100644
index c26bb54..0000000
--- a/apps/content/src/settings/components/pref/CustomizableUI/Configure.svelte
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-{#if selectedComponent && selectedPrefs}
- {#each selectedPrefs as pref}
-
-
-
diff --git a/apps/content/src/settings/components/pref/CustomizableUI/index.ts b/apps/content/src/settings/components/pref/CustomizableUI/index.ts
deleted file mode 100644
index 925ef56..0000000
--- a/apps/content/src/settings/components/pref/CustomizableUI/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import CustomizableUiPref from './CustomizableUIPref.svelte'
-
-export { CustomizableUiPref }
diff --git a/apps/content/src/settings/components/pref/SelectPref.svelte b/apps/content/src/settings/components/pref/SelectPref.svelte
deleted file mode 100644
index b55c49f..0000000
--- a/apps/content/src/settings/components/pref/SelectPref.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/content/src/settings/components/pref/index.ts b/apps/content/src/settings/components/pref/index.ts
deleted file mode 100644
index 20e0020..0000000
--- a/apps/content/src/settings/components/pref/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import SelectPref from './SelectPref.svelte'
-import StringPref from './StringPref.svelte'
-
-export * from './ContextMenuPref'
-export * from './CustomizableUI'
-
-export { StringPref, SelectPref }
diff --git a/apps/content/src/settings/components/sidebar/Sidebar.svelte b/apps/content/src/settings/components/sidebar/Sidebar.svelte
deleted file mode 100644
index 4a1d8cd..0000000
--- a/apps/content/src/settings/components/sidebar/Sidebar.svelte
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/apps/content/src/settings/components/sidebar/index.ts b/apps/content/src/settings/components/sidebar/index.ts
deleted file mode 100644
index b3650e5..0000000
--- a/apps/content/src/settings/components/sidebar/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import Sidebar from './Sidebar.svelte'
-
-export * from './sidebar'
-export { Sidebar }
diff --git a/apps/content/src/settings/components/sidebar/sidebar.ts b/apps/content/src/settings/components/sidebar/sidebar.ts
deleted file mode 100644
index b7511ed..0000000
--- a/apps/content/src/settings/components/sidebar/sidebar.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-let sidebarItemCounter = 0
-
-export class SidebarItemData {
- counter = sidebarItemCounter++
-
- container: HTMLDivElement
- title: string
- id: string
-
- hasObserver = false
-
- constructor(container: HTMLDivElement, title: string) {
- this.container = container
- this.title = title
-
- this.id = this.title.replace(/\s/g, '_')
- this.container.setAttribute('id', this.id)
- }
-
- addObserver(observer: IntersectionObserver | undefined) {
- if (this.hasObserver || !observer) return
- observer.observe(this.container)
- this.hasObserver = true
- }
-}
diff --git a/apps/content/src/settings/settings.css b/apps/content/src/settings/settings.js
similarity index 84%
rename from apps/content/src/settings/settings.css
rename to apps/content/src/settings/settings.js
index d20f0d3..e003224 100644
--- a/apps/content/src/settings/settings.css
+++ b/apps/content/src/settings/settings.js
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-html {
- scroll-behavior: smooth;
-}
diff --git a/apps/content/src/settings/settings.ts b/apps/content/src/settings/settings.ts
deleted file mode 100644
index 750dc07..0000000
--- a/apps/content/src/settings/settings.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import 'remixicon/fonts/remixicon.css'
-
-import '@shared/styles/global.css'
-
-import Settings from './Settings.svelte'
-import './settings.css'
-
-new Settings({
- target: document.body,
-})
diff --git a/apps/content/src/shared/ExtBookmarkAPI.ts b/apps/content/src/shared/ExtBookmarkAPI.ts
deleted file mode 100644
index 762c964..0000000
--- a/apps/content/src/shared/ExtBookmarkAPI.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { lazy } from '@experiment/shared'
-
-/**
- * @fileoverview
- * A helper for interacting with bookmarks with a similar target API to the webextention
- * api
- */
-
-const { TYPE_BOOKMARK, TYPE_FOLDER, TYPE_SEPARATOR } = lazy.Bookmarks
-
-const BOOKMARK_SEPERATOR_URL = 'data:' as const
-const BOOKMARKS_TYPES_TO_API_TYPES_MAP = new Map([
- [TYPE_BOOKMARK, 'bookmark'],
- [TYPE_FOLDER, 'folder'],
- [TYPE_SEPARATOR, 'separator'],
-])
-
-const API_TYPES_TO_BOOKMARKS_TYPES_MAP = new Map(
- [...BOOKMARKS_TYPES_TO_API_TYPES_MAP.entries()].map(([k, v]) => [v, k]),
-)
-
-export type BookmarkType = 'bookmark' | 'folder' | 'separator'
-
-interface TreeNodeBase {
- id: string
-
- title: string
- index: number
- dateAdded: number
-}
-
-export interface BookmarkTreeNode extends TreeNodeBase {
- type: 'bookmark'
- parentId: string
- url: string
-}
-
-export interface FolderTreeNode extends TreeNodeBase {
- type: 'folder'
- parentId?: string
- children?: TreeNode[]
- dateGroupModified: number
-}
-
-export interface SeparatorTreeNode extends TreeNodeBase {
- type: 'separator'
- parentId: string
- url: typeof BOOKMARK_SEPERATOR_URL
-}
-
-export type TreeNode = BookmarkTreeNode | FolderTreeNode | SeparatorTreeNode
-
-export async function getTree(
- rootGuid: string,
- onlyChildren: boolean,
-): Promise {
- const convert =
- (parent: PlacesBookmarkTreeNode | null) =>
- (node: PlacesBookmarkTreeNode): TreeNode => {
- const bookmark = convertBookmarks(node)
-
- if (parent) bookmark.parentId = parent.guid
- if (bookmark.type === 'folder' && !onlyChildren)
- bookmark.children = node.children?.map(convert(node)) || []
-
- return bookmark
- }
-
- const root = await lazy.PlacesUtils.promiseBookmarksTree(rootGuid, undefined)
-
- if (onlyChildren) {
- const children = root.children || []
- return children.map(convert(root))
- }
-
- const treenode = convert(null)(root)
- treenode.parentId = root.parentGuid
- return [treenode]
-}
-
-const convertBookmarks = (result: PlacesBookmarkTreeNode): TreeNode => {
- const type = BOOKMARKS_TYPES_TO_API_TYPES_MAP.get(
- result.typeCode || result.type || TYPE_BOOKMARK,
- )
- const treeNode: TreeNodeBase = {
- id: result.guid,
- title: lazy.Bookmarks.getLocalizedTitle(result) || '',
- index: result.index,
- dateAdded: result.dateAdded / 1000,
- }
-
- if (!type) {
- throw new Error('Invalid bookmark type')
- }
-
- if (type == 'bookmark') {
- const bookmark: BookmarkTreeNode = {
- ...treeNode,
- type: 'bookmark',
- parentId: result.parentGuid as string,
- url: result.url ? result.url.href : result.uri || '',
- }
- return bookmark
- }
-
- if (type == 'folder') {
- const folder: FolderTreeNode = {
- ...treeNode,
- type: 'folder',
- parentId: result.parentGuid,
- dateGroupModified: result.lastModified / 1000,
- }
- return folder
- }
-
- const separator: SeparatorTreeNode = {
- ...treeNode,
- type: 'separator',
- parentId: result.parentGuid!,
- url: 'data:',
- }
- return separator
-}
-
-export async function getChildren(rootGuid: string): Promise {
- const [treenode] = await getTree(rootGuid, false)
- return (treenode as FolderTreeNode).children || []
-}
-
-export const getFullTree = () => getChildren(lazy.Bookmarks.rootGuid)
-
-export const search = (
- query: string | Partial<{ query: string; url: string; title: string }>,
-) =>
- (lazy.Bookmarks.search(query) as Promise).then(
- (results) => results.map(convertBookmarks),
- )
-
-export interface CreateDetails {
- index: number
- parentId: string
- title: string
- type: BookmarkType
- url: string
-}
-
-export const ensureNotRoot = (id: string): string => {
- if (id === lazy.Bookmarks.rootGuid)
- throw new Error('The root bookmark cannot be modified')
-
- return id
-}
-
-export function create(options: Partial): Promise {
- const info: Partial = {
- title: options.title,
- index: options.index,
- parentGuid: options.parentId
- ? ensureNotRoot(options.parentId)
- : lazy.Bookmarks.unfiledGuid,
- type: options.type
- ? API_TYPES_TO_BOOKMARKS_TYPES_MAP.get(options.type)
- : options.url
- ? TYPE_BOOKMARK
- : TYPE_FOLDER,
- }
-
- if (info.type === TYPE_BOOKMARK) info.url = new URL(options.url || '')
-
- return lazy.Bookmarks.insert(info).then(convertBookmarks)
-}
-
-export function get(id: string): Promise {
- return lazy.Bookmarks.fetch(id).then(convertBookmarks)
-}
-
-export const update = (
- id: string,
- changes: Partial<{ title: string; url: string }>,
-): Promise =>
- lazy.Bookmarks.update({
- guid: ensureNotRoot(id),
- title: changes.title,
- url: changes.url,
- }).then(convertBookmarks)
-
-export const remove = (
- id: string,
- removeNonEmptyFolders = false,
-): Promise =>
- lazy.Bookmarks.remove(
- { guid: ensureNotRoot(id) },
- { preventRemovalOfNonEmptyFolders: !removeNonEmptyFolders },
- )
diff --git a/apps/content/src/shared/ExtHistoryAPI.ts b/apps/content/src/shared/ExtHistoryAPI.ts
deleted file mode 100644
index 4339fa1..0000000
--- a/apps/content/src/shared/ExtHistoryAPI.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { lazy } from '@experiment/shared'
-
-const DAY_MS = 24 * 60 * 60 * 1000
-
-/**
- * @linkcode https://searchfox.org/mozilla-central/source/browser/components/extensions/parent/ext-history.js#253
- */
-const executeAsyncQuery = (
- historyQuery: nsINavHistoryQueryType,
- options: nsINavHistoryQueryOptionsType,
- resultConvertor: (result: mozIStorageRowType) => T,
-): Promise =>
- new Promise((resolve, reject) => {
- const results: T[] = []
- lazy.PlacesUtils.history.asyncExecuteLegacyQuery(historyQuery, options, {
- handleResult: (result: mozIStorageResultSetType) => {
- let row
- while ((row = result.getNextRow())) results.push(resultConvertor(row))
- },
- handleError: (error: mozIStorageErrorType) =>
- reject(
- new Error(
- `Async execution error (${error.result}): ${error.message}`,
- ),
- ),
- handleCompletion: () => resolve(results),
- // The generated types still include constants in the definition of this
- // interface, which we don't need to include here
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- } as any)
- })
-
-/*
- * Converts a mozIStorageRow into a HistoryItem
- */
-const convertRowToHistoryItem = (row: mozIStorageRowType): HistoryItem => ({
- id: row.getResultByName('guid'),
- url: row.getResultByName('url'),
- title: row.getResultByName('page_title'),
- lastVisitTime: lazy.PlacesUtils.toDate(
- row.getResultByName('last_visit_date'),
- ).getTime(),
- visitCount: row.getResultByName('visit_count'),
-})
-
-export function search({
- text,
- startTime = Date.now() - DAY_MS,
- endTime = Number.MAX_SAFE_INTEGER,
- maxResults = 100,
-}: {
- text?: string
- startTime?: number
- endTime?: number
- maxResults?: number
-}): Promise {
- if (startTime > endTime) {
- throw new Error('startTime cannot be greater than endTime')
- }
-
- // Converts to PRTime (microseconds since epoch)
- const beginTimePR = lazy.PlacesUtils.toPRTime(startTime)
- const endTimePR = lazy.PlacesUtils.toPRTime(endTime)
-
- const options = lazy.PlacesUtils.history.getNewQueryOptions()
- options.includeHidden = true
- options.maxResults = maxResults
- options.sortingMode = options.SORT_BY_DATE_DESCENDING
-
- const query = lazy.PlacesUtils.history.getNewQuery()
- if (text) query.searchTerms = text
- query.beginTime = beginTimePR
- query.endTime = endTimePR
-
- return executeAsyncQuery(query, options, convertRowToHistoryItem)
-}
-
-export function getVisits() {}
-
-export function addUrl() {}
-
-export function deleteUrl() {}
-
-export function deleteRange() {}
-
-export function deleteAll() {}
-
-export const onTitleChanged = null
-export const onVisited = null
-export const onVisitRemoved = null
-
-// =============================================================================
-// Extension types
-
-/**
- * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/history/TransitionType}
- */
-export type TransitionType =
- | 'link'
- | 'typed'
- | 'auto_bookmark'
- | 'auto_subframe'
- | 'manual_subframe'
- | 'generated'
- | 'auto_toplevel'
- | 'form_submit'
- | 'reload'
- | 'keyword'
- | 'keyword_generated'
-
-/**
- * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/history/HistoryItem}
- */
-export interface HistoryItem {
- id: string
- url?: string
- title?: string
- lastVisitTime?: number
- visitCount?: number
- /** @deprecated - unimplemented in Gecko */
- typedCount?: number
-}
-
-/**
- * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/history/VisitItem}
- */
-export interface VisitItem {
- /**
- * This is the identifier of {@link HistoryItem}
- */
- id: string
- visitId: string
- visitTime?: number
- referringVisitId: string
- transition: TransitionType
-}
-
-// =============================================================================
-// Gecko types
-
-// interface GeckoVisitInfo {
-// date: Date
-// transition: number
-// referrer?: URL | nsIURIType | string
-// }
-
-// interface GeckoPageInfo {
-// guid: string
-// url: URL | nsIURIType | string
-// title?: string
-// description?: string
-// previewImageURL?: URL | nsIURIType | string
-// frequency?: number
-// visits?: GeckoVisitInfo[]
-// annotations?: Map
-// }
diff --git a/apps/content/src/shared/TypedImportUtilities.ts b/apps/content/src/shared/TypedImportUtilities.ts
deleted file mode 100644
index 466f173..0000000
--- a/apps/content/src/shared/TypedImportUtilities.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * @deprecated You should add your lazy imports to file://./lazy.ts
- */
-export function lazyESModuleGetters>(
- modules: Modules,
- // @ts-expect-error - Cannot guarantee overlapping key type
-): { [Key in keyof Modules]: MozESMExportType[Key] } {
- // @ts-expect-error - Cannot guarantee overlapping key type
- const lazy = {} as { [Key in keyof Modules]: MozESMExportType[Key] }
-
- ChromeUtils.defineESModuleGetters(lazy, modules)
-
- return lazy
-}
diff --git a/apps/content/src/shared/components/Button.svelte b/apps/content/src/shared/components/Button.svelte
deleted file mode 100644
index 1084b5e..0000000
--- a/apps/content/src/shared/components/Button.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/content/src/shared/components/FancySelect.svelte b/apps/content/src/shared/components/FancySelect.svelte
deleted file mode 100644
index 4e96850..0000000
--- a/apps/content/src/shared/components/FancySelect.svelte
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
- {
- selected = e.target.value
- }}
->
-
- {#each items as item}
-
- {/each}
-
-
-
-
diff --git a/apps/content/src/shared/components/Spinner.svelte b/apps/content/src/shared/components/Spinner.svelte
deleted file mode 100644
index a54743b..0000000
--- a/apps/content/src/shared/components/Spinner.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
diff --git a/apps/content/src/shared/components/TextInput.svelte b/apps/content/src/shared/components/TextInput.svelte
deleted file mode 100644
index e6aae83..0000000
--- a/apps/content/src/shared/components/TextInput.svelte
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-