OpenNewTab: Support Vivaldi (#89)

Co-authored-by: Simon Lydell <[email protected]>
lydell · Aug 17, 2024 · 8ea1b53 · 8ea1b53
1 parent cfc03d9
commit 8ea1b53
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 14 deletions.
diff --git a/@types/globals.d.ts b/@types/globals.d.ts
@@ -69,6 +69,13 @@ interface Navigator {
   } | null;
 }
 
+// This is used to identify the Vivaldi browser.
+declare namespace browser.tabs {
+  export interface Tab {
+    vivExtData?: unknown;
+  }
+}
+
 interface ShadowRoot {
   elementFromPoint: Document["elementFromPoint"];
   elementsFromPoint: Document["elementsFromPoint"];

diff --git a/src/background/Program.ts b/src/background/Program.ts
@@ -33,6 +33,7 @@ import {
   splitEnteredText,
 } from "../shared/main";
 import type {
+  ChromiumVariant,
   FromBackground,
   FromOptions,
   FromPopup,
@@ -1214,13 +1215,19 @@ export default class BackgroundProgram {
         url
       );
     } else if (BROWSER === "chrome") {
-      this.sendWorkerMessage(
-        {
-          type: "OpenNewTab",
-          url,
-          foreground,
-        },
-        { tabId, frameId: TOP_FRAME_ID }
+      fireAndForget(
+        getChromiumVariant().then((chromiumVariant) => {
+          this.sendWorkerMessage(
+            {
+              type: "OpenNewTab",
+              url,
+              foreground,
+              chromiumVariant,
+            },
+            { tabId, frameId: TOP_FRAME_ID }
+          );
+        }),
+        "BackgroundProgram#openNewTab->getChromiumVariant"
       );
     } else {
       fireAndForget(
@@ -2315,6 +2322,15 @@ export default class BackgroundProgram {
   }
 }
 
+// Copied from: https://stackoverflow.com/a/77047611
+async function getChromiumVariant(): Promise<ChromiumVariant> {
+  const tabs = await browser.tabs.query({
+    active: true,
+    currentWindow: true,
+  });
+  return tabs[0]?.vivExtData !== undefined ? "vivaldi" : "chrome";
+}
+
 function makeEmptyTabState(tabId: number | undefined): TabState {
   const tabState: TabState = {
     hintsState: {

diff --git a/src/shared/messages.ts b/src/shared/messages.ts
@@ -104,6 +104,8 @@ export type FromWorker =
       type: "WorkerScriptAdded";
     };
 
+export type ChromiumVariant = "chrome" | "vivaldi";
+
 export type ToWorker =
   | {
       type: "ClickElement";
@@ -129,6 +131,7 @@ export type ToWorker =
       type: "OpenNewTab";
       url: string;
       foreground: boolean;
+      chromiumVariant: ChromiumVariant;
     }
   | {
       type: "ReverseSelection";

diff --git a/src/worker/Program.ts b/src/worker/Program.ts
@@ -30,6 +30,7 @@ import {
   walkTextNodes,
 } from "../shared/main";
 import type {
+  ChromiumVariant,
   FromBackground,
   FromWorker,
   ToBackground,
@@ -458,15 +459,10 @@ export default class WorkerProgram {
       // This technique does not seem to work in Firefox, but it's not needed
       // there anyway (see background/Program.ts).
       case "OpenNewTab": {
-        const { url, foreground } = message;
         const link = document.createElement("a");
-        link.href = url;
+        link.href = message.url;
         link.dispatchEvent(
-          new MouseEvent("click", {
-            ctrlKey: true,
-            metaKey: true,
-            shiftKey: foreground,
-          })
+          new MouseEvent("click", getOpenNewTabModifiers(message))
         );
         break;
       }
@@ -1862,3 +1858,26 @@ function temporarilySetFilter(
     },
   };
 }
+
+function getOpenNewTabModifiers({
+  chromiumVariant,
+  foreground,
+}: {
+  chromiumVariant: ChromiumVariant;
+  foreground: boolean;
+}): MouseEventInit {
+  switch (chromiumVariant) {
+    case "chrome":
+      return {
+        ctrlKey: true,
+        metaKey: true,
+        shiftKey: foreground,
+      };
+    case "vivaldi":
+      return {
+        ctrlKey: !foreground,
+        metaKey: true,
+        shiftKey: foreground,
+      };
+  }
+}