Browse Source

fix: Automa shortcut triggering browser shortcut

Ahmad Kholid 3 years ago
parent
commit
4c15d45b8c
2 changed files with 5 additions and 3 deletions
  1. 1 1
      src/background/index.js
  2. 4 2
      src/composable/shortcut.js

+ 1 - 1
src/background/index.js

@@ -315,7 +315,7 @@ browser.alarms.onAlarm.addListener(async ({ name }) => {
   }
 });
 
-if (browser.contextMenus?.onClicked) {
+if (browser.contextMenus && browser.contextMenus.onClicked) {
   browser.contextMenus.onClicked.addListener(
     async ({ parentMenuItemId, menuItemId }, tab) => {
       try {

+ 4 - 2
src/composable/shortcut.js

@@ -99,10 +99,12 @@ export function useShortcut(shortcuts, handler) {
       ...extractedShortcuts.data[shortcutId],
     };
 
+    if (shortcutId) event.preventDefault();
+
     if (typeof params.data === 'function') {
       params.data(params);
-    } else {
-      handler?.(params);
+    } else if (handler) {
+      handler(params);
     }
   };
   const addShortcutData = ({ combo, id, readable, ...rest }) => {