3 files changed, 95 insertions, 99 deletions

diff --git a/src/webview/contextMenuBuilder.ts b/src/webview/contextMenuBuilder.ts
index 0a8b9c57b..d68605963 100644
--- a/src/webview/contextMenuBuilder.ts
+++ b/src/webview/contextMenuBuilder.ts
@@ -130,8 +130,8 @@ interface ContextMenuStringTable {
     translatorLanguage: string;
   }) => string;
   openLinkUrl: () => string;
-  openLinkInFerdiumUrl: () => string;
   openInBrowser: () => string;
+  openInFerdium: () => string;
   copyLinkUrl: () => string;
   copyImageUrl: () => string;
   copyImage: () => string;
@@ -158,8 +158,8 @@ const contextMenuStringTable: ContextMenuStringTable = {
     `Translate to ${translatorLanguage}`,
   translateLanguage: ({ translatorLanguage }) => `${translatorLanguage}`,
   openLinkUrl: () => 'Open Link',
-  openLinkInFerdiumUrl: () => 'Open Link in Ferdium',
   openInBrowser: () => 'Open in Browser',
+  openInFerdium: () => 'Open in Ferdium',
   copyLinkUrl: () => 'Copy Link',
   copyImageUrl: () => 'Copy Image Address',
   copyImage: () => 'Copy Image',
@@ -299,10 +299,13 @@ export class ContextMenuBuilder {
     this.addPastePlain(menu, menuInfo);
     this.addInspectElement(menu, menuInfo);
     this.processMenu(menu);
-
+    this.addSeparator(menu);
     this.copyPageUrl(menu, menuInfo);
-    this.goToHomePage(menu, menuInfo);
+    this.addSeparator(menu);
     this.openInBrowser(menu, menuInfo);
+    this.openInFerdium(menu, menuInfo);
+    this.addSeparator(menu);
+    this.goToHomePage(menu, menuInfo);
 
     return menu;
   }
@@ -340,16 +343,8 @@ export class ContextMenuBuilder {
       },
     });
 
-    const openInFerdiumLink = new MenuItem({
-      label: this.stringTable.openLinkInFerdiumUrl(),
-      click: () => {
-        window.location.href = menuInfo.linkURL;
-      },
-    });
-
     menu.append(copyLink);
     menu.append(openLink);
-    menu.append(openInFerdiumLink);
 
     if (this.isSrcUrlValid(menuInfo)) {
       this.addSeparator(menu);
@@ -358,13 +353,15 @@ export class ContextMenuBuilder {
 
     this.addInspectElement(menu, menuInfo);
     this.processMenu(menu);
-
     this.addSeparator(menu);
     this.goBack(menu);
     this.goForward(menu);
     this.copyPageUrl(menu, menuInfo);
-    this.goToHomePage(menu, menuInfo);
+    this.addSeparator(menu);
     this.openInBrowser(menu, menuInfo);
+    this.openInFerdium(menu, menuInfo);
+    this.addSeparator(menu);
+    this.goToHomePage(menu, menuInfo);
 
     return menu;
   }
@@ -384,16 +381,19 @@ export class ContextMenuBuilder {
       this.addTranslateItems(menu, menuInfo);
     }
     this.addCopy(menu, menuInfo);
-    this.addInspectElement(menu, menuInfo);
-    // @ts-expect-error Expected 1 arguments, but got 2.
-    this.processMenu(menu, menuInfo);
 
+    this.addInspectElement(menu, menuInfo);
+    this.processMenu(menu);
     this.addSeparator(menu);
     this.goBack(menu);
     this.goForward(menu);
+    this.addSeparator(menu);
     this.copyPageUrl(menu, menuInfo);
-    this.goToHomePage(menu, menuInfo);
+    this.addSeparator(menu);
     this.openInBrowser(menu, menuInfo);
+    this.openInFerdium(menu, menuInfo);
+    this.addSeparator(menu);
+    this.goToHomePage(menu, menuInfo);
 
     return menu;
   }
@@ -412,8 +412,7 @@ export class ContextMenuBuilder {
       this.addImageItems(menu, menuInfo);
     }
     this.addInspectElement(menu, menuInfo);
-    // @ts-expect-error Expected 1 arguments, but got 2.
-    this.processMenu(menu, menuInfo);
+    this.processMenu(menu);
 
     return menu;
   }
@@ -644,7 +643,7 @@ export class ContextMenuBuilder {
   addImageItems(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     const copyImage = new MenuItem({
       label: this.stringTable.copyImage(),
       click: () => {
@@ -719,8 +718,6 @@ export class ContextMenuBuilder {
 
       menu.append(downloadImage);
     }
-
-    return menu;
   }
 
   /**
@@ -729,7 +726,7 @@ export class ContextMenuBuilder {
   addCut(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     const webContents = this.getWebContents();
     menu.append(
       new MenuItem({
@@ -739,8 +736,6 @@ export class ContextMenuBuilder {
         click: () => webContents.cut(),
       }),
     );
-
-    return menu;
   }
 
   /**
@@ -749,7 +744,7 @@ export class ContextMenuBuilder {
   addCopy(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     const webContents = this.getWebContents();
     menu.append(
       new MenuItem({
@@ -759,8 +754,6 @@ export class ContextMenuBuilder {
         click: () => webContents.copy(),
       }),
     );
-
-    return menu;
   }
 
   /**
@@ -769,7 +762,7 @@ export class ContextMenuBuilder {
   addPaste(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     const webContents = this.getWebContents();
     menu.append(
       new MenuItem({
@@ -779,14 +772,12 @@ export class ContextMenuBuilder {
         click: () => webContents.paste(),
       }),
     );
-
-    return menu;
   }
 
   addPastePlain(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     if (
       menuInfo.editFlags.canPaste &&
       !menuInfo.linkText &&
@@ -806,9 +797,8 @@ export class ContextMenuBuilder {
   /**
    * Adds a separator item.
    */
-  addSeparator(menu: Electron.CrossProcessExports.Menu) {
+  addSeparator(menu: Electron.CrossProcessExports.Menu): void {
     menu.append(new MenuItem({ type: 'separator' }));
-    return menu;
   }
 
   /**
@@ -818,18 +808,17 @@ export class ContextMenuBuilder {
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
     needsSeparator = true,
-  ) {
+  ): void {
     const webContents = this.getWebContents();
-    if (!this.debugMode) return menu;
+    if (!this.debugMode) return;
     if (needsSeparator) this.addSeparator(menu);
 
-    const inspect = new MenuItem({
-      label: this.stringTable.inspectElement(),
-      click: () => webContents.inspectElement(menuInfo.x, menuInfo.y),
-    });
-
-    menu.append(inspect);
-    return menu;
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.inspectElement(),
+        click: () => webContents.inspectElement(menuInfo.x, menuInfo.y),
+      }),
+    );
   }
 
   /**
@@ -847,7 +836,7 @@ export class ContextMenuBuilder {
       (arg0: string): void;
     },
     outputFormat: string = 'image/png',
-  ) {
+  ): void {
     let canvas: HTMLCanvasElement | null = document.createElement('canvas');
     const ctx = canvas.getContext('2d');
     const img = new Image();
@@ -871,7 +860,7 @@ export class ContextMenuBuilder {
   /**
    * Adds the 'go back' menu item
    */
-  goBack(menu: Electron.CrossProcessExports.Menu) {
+  goBack(menu: Electron.CrossProcessExports.Menu): void {
     const webContents = this.getWebContents();
 
     menu.append(
@@ -882,14 +871,12 @@ export class ContextMenuBuilder {
         click: () => webContents.goBack(),
       }),
     );
-
-    return menu;
   }
 
   /**
    * Adds the 'go forward' menu item
    */
-  goForward(menu: Electron.CrossProcessExports.Menu) {
+  goForward(menu: Electron.CrossProcessExports.Menu): void {
     const webContents = this.getWebContents();
     menu.append(
       new MenuItem({
@@ -899,8 +886,6 @@ export class ContextMenuBuilder {
         click: () => webContents.goForward(),
       }),
     );
-
-    return menu;
   }
 
   /**
@@ -909,7 +894,7 @@ export class ContextMenuBuilder {
   copyPageUrl(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     menu.append(
       new MenuItem({
         label: this.stringTable.copyPageUrl(),
@@ -923,8 +908,6 @@ export class ContextMenuBuilder {
         },
       }),
     );
-
-    return menu;
   }
 
   /**
@@ -933,7 +916,7 @@ export class ContextMenuBuilder {
   goToHomePage(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     const baseURL = new window.URL(menuInfo.pageURL);
     menu.append(
       new MenuItem({
@@ -946,8 +929,6 @@ export class ContextMenuBuilder {
         },
       }),
     );
-
-    return menu;
   }
 
   /**
@@ -956,7 +937,7 @@ export class ContextMenuBuilder {
   openInBrowser(
     menu: Electron.CrossProcessExports.Menu,
     menuInfo: IContextMenuParams,
-  ) {
+  ): void {
     menu.append(
       new MenuItem({
         label: this.stringTable.openInBrowser(),
@@ -966,14 +947,30 @@ export class ContextMenuBuilder {
         },
       }),
     );
+  }
 
-    return menu;
+  /**
+   * Adds the 'open in ferdium' menu item.
+   */
+  openInFerdium(
+    menu: Electron.CrossProcessExports.Menu,
+    menuInfo: IContextMenuParams,
+  ): void {
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.openInFerdium(),
+        enabled: true,
+        click: () => {
+          window.location.href = menuInfo.linkURL;
+        },
+      }),
+    );
   }
 
   _sendNotificationOnClipboardEvent(
     isDisabled: boolean,
     notificationText: () => string,
-  ) {
+  ): void {
     if (isDisabled) {
       return;
     }
diff --git a/src/webview/notifications.ts b/src/webview/notifications.ts
index e4401ab6e..0da86fbba 100644
--- a/src/webview/notifications.ts
+++ b/src/webview/notifications.ts
@@ -31,52 +31,51 @@ export class NotificationsHandler {
 }
 
 export const notificationsClassDefinition = `(() => {
-  class Notification {
-    static permission = 'granted';
-
-    constructor(title = '', options = {}) {
-      this.title = title;
-      this.options = options;
-      try {
-        window.ferdium.displayNotification(title, options)
-          .then(() => {
-            if (typeof (this.onClick) === 'function') {
-              this.onClick();
-            }
-          });
-      } catch(error) {
-                this.options.onClick = null;
-          window.ferdium.displayNotification(title, options)
-            .then(() => {
-              if (typeof (this.onClick) === 'function') {
-                this.onClick();
-              }
-            });
-      }
-    }
+class Notification {
+  static permission = 'granted';
 
-    static requestPermission(cb = null) {
-      if (!cb) {
-        return new Promise((resolve) => {
-          resolve(Notification.permission);
-        });
-      }
+  static _notification;
 
-      if (typeof (cb) === 'function') {
-        return cb(Notification.permission);
-      }
+  constructor(title = '', options = {}) {
+    Notification._displayNotification(title, options);
+  }
 
-      return Notification.permission;
-    }
+  static _displayNotification(title, options) {
+    Notification._notification = window.ferdium
+      .displayNotification(title, options)
+      .then(() => {
+        // TODO: After several tries, we couldn't find a way to trigger the native notification onclick event.
+        // This was needed so that user could go to the specific context when clicking on the notification (it only goes to the service now).
+        // For now, we don't do anything here
+      });
+  }
 
-    onNotify(data) {
-      return data;
+  static requestPermission(cb) {
+    if (typeof cb === 'function') {
+      cb(Notification.permission);
     }
 
-    onClick() {}
+    return Promise.resolve(Notification.permission);
+  }
+
+  onNotify(data) {
+    return data;
+  }
 
-    close() {}
+  close() {
+    if (Notification._notification) {
+      Notification._notification = null;
+    }
   }
 
+  onclick() {}
+
+  onclose() {}
+
+  onerror() {}
+
+  onshow() {}
+}
+
   window.Notification = Notification;
 })();`;
diff --git a/src/webview/recipe.ts b/src/webview/recipe.ts
index a35a99699..ad2215ffd 100644
--- a/src/webview/recipe.ts
+++ b/src/webview/recipe.ts
@@ -121,7 +121,7 @@ contextBridge.exposeInMainWorld('ferdium', {
   setDialogTitle: (title: string | null | undefined) =>
     dialogTitleHandler.setDialogTitle(title),
   displayNotification: (title: string, options: any) => {
-    notificationsHandler.displayNotification(
+    return notificationsHandler.displayNotification(
       title,
       // The following line is needed so that a proper clone of the "options" object is made.
       // This line was causing issues with some services.