Fix menuitem listeners in MacOS (#55)

aminought · web-flow · commit 8b6d1e302165 · 2025-02-03T01:26:09.000+05:00
diff --git a/src/second_sidebar/controllers/sidebar_main.mjs b/src/second_sidebar/controllers/sidebar_main.mjs
@@ -4,6 +4,7 @@ import { SidebarMain } from "../xul/sidebar_main.mjs";
 import { SidebarMainMenuPopup } from "../xul/sidebar_main_menupopup.mjs";
 import { SidebarMainSettingsController } from "./sidebar_main_settings.mjs";
 import { XULElement } from "../xul/base/xul_element.mjs";
+import { isRightMouseButton } from "../utils/buttons.mjs";
 /* eslint-enable no-unused-vars */
 
 export class SidebarMainController {
@@ -32,11 +33,15 @@ export class SidebarMainController {
   }
 
   #setupListeners() {
-    this.sidebarMainMenuPopup.listenSettingsItemClick((event) => {
-      this.sidebarMainSettingsController.openPopup(
-        event.screenX,
-        event.screenY,
-      );
+    this.sidebarMain.addEventListener("mousedown", (event) => {
+      if (isRightMouseButton(event)) {
+        this.mouseX = event.clientX;
+        this.mouseY = event.clientY;
+      }
+    });
+
+    this.sidebarMainMenuPopup.listenSettingsItemClick(() => {
+      this.sidebarMainSettingsController.openPopup(this.mouseX, this.mouseY);
     });
 
     this.sidebarMainMenuPopup.listenCustomizeItemClick(() => {
diff --git a/src/second_sidebar/xul/sidebar_main_menupopup.mjs b/src/second_sidebar/xul/sidebar_main_menupopup.mjs
@@ -11,6 +11,10 @@ export class SidebarMainMenuPopup extends MenuPopup {
 
     this.settingsItem = new MenuItem().setLabel("Sidebar settings");
     this.customizeItem = new MenuItem().setLabel("Customize Toolbar...");
+    this.#compose();
+  }
+
+  #compose() {
     this.appendChildren(
       this.settingsItem,
       new MenuSeparator(),
@@ -23,8 +27,8 @@ export class SidebarMainMenuPopup extends MenuPopup {
    * @param {function(MouseEvent):void} callback
    */
   listenSettingsItemClick(callback) {
-    this.settingsItem.addEventListener("click", (event) => {
-      callback(event);
+    this.settingsItem.addEventListener("command", () => {
+      callback();
     });
   }
 
@@ -33,7 +37,7 @@ export class SidebarMainMenuPopup extends MenuPopup {
    * @param {function(MouseEvent):void} callback
    */
   listenCustomizeItemClick(callback) {
-    this.customizeItem.addEventListener("click", (event) => {
+    this.customizeItem.addEventListener("command", (event) => {
       callback(event);
     });
   }
diff --git a/src/second_sidebar/xul/web_panel_button_menupopup.mjs b/src/second_sidebar/xul/web_panel_button_menupopup.mjs
@@ -49,7 +49,7 @@ export class WebPanelButtonMenuPopup extends MenuPopup {
    * @param {WebPanelsController} webPanelsController
    */
   listenUnloadItemClick(callback) {
-    this.unloadItem.addEventListener("click", () => {
+    this.unloadItem.addEventListener("command", () => {
       callback(this.webPanelController);
     });
   }
@@ -59,7 +59,7 @@ export class WebPanelButtonMenuPopup extends MenuPopup {
    * @param {WebPanelsController} webPanelsController
    */
   listenEditItemClick(callback) {
-    this.editItem.addEventListener("click", () => {
+    this.editItem.addEventListener("command", () => {
       callback(this.webPanelController);
     });
   }
@@ -69,7 +69,7 @@ export class WebPanelButtonMenuPopup extends MenuPopup {
    * @param {WebPanelsController} webPanelsController
    */
   listenDeleteItemClick(callback) {
-    this.deleteItem.addEventListener("click", () => {
+    this.deleteItem.addEventListener("command", () => {
       callback(this.webPanelController);
     });
   }
@@ -79,7 +79,7 @@ export class WebPanelButtonMenuPopup extends MenuPopup {
    * @param {function(MouseEvent):void} callback
    */
   listenCustomizeItemClick(callback) {
-    this.customizeItem.addEventListener("click", (event) => {
+    this.customizeItem.addEventListener("command", (event) => {
       callback(event);
     });
   }
