coding-coding-coding
diff --git a/‎src/background/extension.ts‎
Lines changed: 8 additions & 12 deletions b/‎src/background/extension.ts‎
Lines changed: 8 additions & 12 deletions
diff --git a/‎src/background/index.ts‎
Lines changed: 2 additions & 2 deletions b/‎src/background/index.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/definitions.d.ts‎
Lines changed: 3 additions & 0 deletions b/‎src/definitions.d.ts‎
Lines changed: 3 additions & 0 deletions
@@ -15,7 +15,7 @@ import createCSSFilterStylesheet from '../generators/css-filter';
 import {getDynamicThemeFixesFor} from '../generators/dynamic-theme';
 import createStaticStylesheet from '../generators/static-theme';
 import {createSVGFilterStylesheet, getSVGFilterMatrixValue, getSVGReverseFilterMatrixValue} from '../generators/svg-filter';
-import type {ExtensionData, FilterConfig, News, Shortcuts, UserSettings, TabInfo, TabData} from '../definitions';
+import type {ExtensionData, FilterConfig, News, Shortcuts, UserSettings, TabInfo, TabData, Command} from '../definitions';
 import {isSystemDarkModeEnabled} from '../utils/media-query';
 import {isFirefox, isThunderbird} from '../utils/platform';
 import {MessageType} from '../utils/message';
@@ -88,7 +88,7 @@ export class Extension {
                 // As far as we know, this code is never actually run because there
                 // is no browser UI for removing 'contextMenus' permission.
                 // This code exists for future-proofing in case browsers ever add such UI.
-                if (!permissions.permissions.includes('contextMenus')) {
+                if (!permissions?.permissions?.includes('contextMenus')) {
                     this.registeredContextMenus = false;
                 }
             });
@@ -244,7 +244,7 @@ export class Extension {
         };
     }
 
-    private onCommandInternal = async (command: string, frameURL?: string) => {
+    private onCommandInternal = async (command: Command, frameURL?: string) => {
         if (this.startBarrier.isPending()) {
             await this.startBarrier.entry();
         }
@@ -283,9 +283,8 @@ export class Extension {
     onCommand = debounce(75, this.onCommandInternal);
 
     private registerContextMenus() {
-        const onCommandToggle = async () => this.onCommand('toggle');
-        const onCommandAddSite = async (data: chrome.contextMenus.OnClickData) => this.onCommand('addSite', data.frameUrl);
-        const onCommandSwitchEngine = async () => this.onCommand('switchEngine');
+        chrome.contextMenus.onClicked.addListener(async ({menuItemId, frameUrl, pageUrl}) =>
+            this.onCommand(menuItemId as Command, frameUrl || pageUrl));
         chrome.contextMenus.removeAll(() => {
             this.registeredContextMenus = false;
             chrome.contextMenus.create({
@@ -300,22 +299,19 @@ export class Extension {
                 const msgAddSite = chrome.i18n.getMessage('toggle_current_site');
                 const msgSwitchEngine = chrome.i18n.getMessage('theme_generation_mode');
                 chrome.contextMenus.create({
-                    id: 'DarkReader-toggle',
+                    id: 'toggle',
                     parentId: 'DarkReader-top',
                     title: msgToggle || 'Toggle everywhere',
-                    onclick: onCommandToggle,
                 });
                 chrome.contextMenus.create({
-                    id: 'DarkReader-addSite',
+                    id: 'addSite',
                     parentId: 'DarkReader-top',
                     title: msgAddSite || 'Toggle for current site',
-                    onclick: onCommandAddSite,
                 });
                 chrome.contextMenus.create({
-                    id: 'DarkReader-switchEngine',
+                    id: 'switchEngine',
                     parentId: 'DarkReader-top',
                     title: msgSwitchEngine || 'Switch engine',
-                    onclick: onCommandSwitchEngine,
                 });
                 this.registeredContextMenus = true;
             });
 
@@ -1,7 +1,7 @@
 import {Extension} from './extension';
 import {getHelpURL, UNINSTALL_URL} from '../utils/links';
 import {canInjectScript} from '../background/utils/extension-api';
-import type {ExtensionData, Message, UserSettings} from '../definitions';
+import type {Command, ExtensionData, Message, UserSettings} from '../definitions';
 import {MessageType} from '../utils/message';
 import {makeChromiumHappy} from './make-chromium-happy';
 import {logInfo} from '../utils/log';
@@ -11,7 +11,7 @@ const extension = new Extension();
 extension.start();
 if (chrome.commands) {
     // Firefox Android does not support chrome.commands
-    chrome.commands.onCommand.addListener(async (command) => extension.onCommand(command));
+    chrome.commands.onCommand.addListener(async (command) => extension.onCommand(command as Command));
 }
 
 const welcome = `  /''''\\
 
@@ -198,3 +198,6 @@ export interface News {
     badge?: string;
     icon?: string;
 }
+
+// These values need to match those in Manifest
+export type Command = 'toggle' | 'addSite' | 'switchEngine';
Original file line number	Diff line number	Diff line change
`@@ -198,3 +198,6 @@ export interface News {`
`198`	`198`	`badge?: string;`
`199`	`199`	`icon?: string;`
`200`	`200`	`}`
	`201`	`+`
	`202`	`+// These values need to match those in Manifest`
	`203`	`+export type Command = 'toggle' \| 'addSite' \| 'switchEngine';`