Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update ContextMenu init and settings (#2004)
Leendert de Borst431fbee9ae1d
diff --git a/apps/browser-extension/src/entrypoints/background/ContextMenu.ts b/apps/browser-extension/src/entrypoints/background/ContextMenu.tsindex 2d08c134e..cfdcd507b 100644--- a/apps/browser-extension/src/entrypoints/background/ContextMenu.ts+++ b/apps/browser-extension/src/entrypoints/background/ContextMenu.ts@@ -7,44 +7,83 @@ import { t } from '@/i18n/StandaloneI18n';import { browser } from "#imports";+/*+ * Register the click listener once at module load (top-level scope).+ */+browser.contextMenus.onClicked.addListener((info: Browser.contextMenus.OnClickData, tab?: Browser.tabs.Tab) =>+ handleContextMenuClick(info, tab)+);+/**- * Setup the context menus.+ * Create a context menu item.*/-export async function setupContextMenus() : Promise<void> {- // Create root menu- browser.contextMenus.create({- id: "aliasvault-root",- title: "AliasVault",- contexts: ["all"]+function createContextMenu(properties: Browser.contextMenus.CreateProperties) : Promise<void> {+ return new Promise((resolve, reject) => {+ try {+ const result = browser.contextMenus.create(properties, () => {+ const lastError = browser.runtime.lastError;+ if (lastError) {+ reject(new Error(lastError.message ?? 'contextMenus.create failed'));+ } else {+ resolve();+ }+ });+ // Some polyfill versions return a thenable; if so, attach handlers as a fallback.+ if (result && typeof (result as unknown as Promise<unknown>).then === 'function') {+ (result as unknown as Promise<unknown>).then(() => resolve(), reject);+ }+ } catch (error) {+ reject(error instanceof Error ? error : new Error(String(error)));+ }});+}- // Add fill option first (only for editable fields)- browser.contextMenus.create({- id: "aliasvault-activate-form",- parentId: "aliasvault-root",- title: await t('content.autofillWithAliasVault'),- contexts: ["editable"],- });+/**+ * Setup the context menus.+ */+export async function setupContextMenus() : Promise<void> {+ try {+ await browser.contextMenus.removeAll();+ } catch (error) {+ console.error('Failed to remove existing context menus:', error);+ }- // Add separator (only for editable fields)- browser.contextMenus.create({- id: "aliasvault-separator",- parentId: "aliasvault-root",- type: "separator",- contexts: ["editable"],- });+ const [activateFormTitle, generatePasswordTitle] = await Promise.all([+ t('content.autofillWithAliasVault'),+ t('content.generateRandomPassword'),+ ]);- // Add password generator option- browser.contextMenus.create({- id: "aliasvault-generate-password",- parentId: "aliasvault-root",- title: await t('content.generateRandomPassword'),- contexts: ["all"]- });+ try {+ // Root must exist before its children+ await createContextMenu({+ id: "aliasvault-root",+ title: "AliasVault",+ contexts: ["all"]+ });- browser.contextMenus.onClicked.addListener((info: Browser.contextMenus.OnClickData, tab?: Browser.tabs.Tab) =>- handleContextMenuClick(info, tab)- );+ await Promise.all([+ createContextMenu({+ id: "aliasvault-activate-form",+ parentId: "aliasvault-root",+ title: activateFormTitle,+ contexts: ["editable"],+ }),+ createContextMenu({+ id: "aliasvault-separator",+ parentId: "aliasvault-root",+ type: "separator",+ contexts: ["editable"],+ }),+ createContextMenu({+ id: "aliasvault-generate-password",+ parentId: "aliasvault-root",+ title: generatePasswordTitle,+ contexts: ["all"]+ }),+ ]);+ } catch (error) {+ console.error('Failed to create context menus:', error);+ }}/**diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsxindex 655b6d2b8..1684d1366 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx@@ -49,10 +49,7 @@ const ContextMenuSettings: React.FC = () => {<div className="flex items-center justify-between"><div><p className="font-medium text-gray-900 dark:text-white">{t('settings.rightClickContextMenu')}</p>- <p className={`text-sm mt-1 ${isContextMenuEnabled ? 'text-gray-600 dark:text-gray-400' : 'text-red-600 dark:text-red-400'}`}>- {isContextMenuEnabled ? t('settings.contextMenuEnabled') : t('settings.contextMenuDisabled')}- </p>- <p className="text-sm text-gray-500 dark:text-gray-400 mt-2">+ <p className="text-sm text-gray-500 dark:text-gray-400 mt-2 pe-2">{t('settings.contextMenuDescription')}</p></div>