Reduce code duplication and improve robustness: extract refreshContextMenu helper and add parseInt validation

Co-authored-by: PeterDaveHello <[email protected]>

Author: Copilot

src/background/menus.mjs

@@ -85,8 +85,8 @@ export function refreshMenu() {
     }
 
     // Add custom selection tools that are active
-    userConfig.customSelectionTools.forEach((tool, i) => {
-      if (tool.active && tool.name) {
+    userConfig.customSelectionTools?.forEach((tool, i) => {
+      if (tool?.active && tool?.name) {
         Browser.contextMenus.create({
           id: menuId + 'custom_' + i,
           parentId: menuId,

src/content-script/index.jsx

@@ -291,9 +291,11 @@ async function prepareForRightClickMenu() {
       } else if (data.itemId.startsWith('custom_')) {
         // Handle custom selection tools from context menu
         const customIndex = parseInt(data.itemId.replace('custom_', ''), 10)
-        const customTool = userConfig.customSelectionTools?.[customIndex]
-        if (customTool?.active && customTool?.name) {
-          prompt = customTool.prompt.replace('{{selection}}', data.selectionText)
+        if (!isNaN(customIndex) && customIndex >= 0) {
+          const customTool = userConfig.customSelectionTools?.[customIndex]
+          if (customTool?.active && customTool?.name) {
+            prompt = customTool.prompt.replace('{{selection}}', data.selectionText)
+          }
         }
       } else if (data.itemId in menuConfig) {
         const menuItem = menuConfig[data.itemId]

src/popup/sections/SelectionTools.jsx

@@ -18,6 +18,13 @@ const defaultTool = {
   active: true,
 }
 
+// Helper function to refresh context menu
+const refreshContextMenu = () => {
+  Browser.runtime.sendMessage({
+    type: 'REFRESH_MENU',
+  })
+}
+
 export function SelectionTools({ config, updateConfig }) {
   const { t } = useTranslation()
   const [editing, setEditing] = useState(false)
@@ -56,9 +63,7 @@ export function SelectionTools({ config, updateConfig }) {
               customSelectionTools[editingIndex] = editingTool
               await updateConfig({ customSelectionTools })
             }
-            Browser.runtime.sendMessage({
-              type: 'REFRESH_MENU',
-            })
+            refreshContextMenu()
             setEditing(false)
           }}
         >
@@ -111,9 +116,7 @@ export function SelectionTools({ config, updateConfig }) {
               const activeSelectionTools = config.activeSelectionTools.filter((i) => i !== key)
               if (checked) activeSelectionTools.push(key)
               await updateConfig({ activeSelectionTools })
-              Browser.runtime.sendMessage({
-                type: 'REFRESH_MENU',
-              })
+              refreshContextMenu()
             }}
           />
           {t(toolsConfig[key].label)}
@@ -133,9 +136,7 @@ export function SelectionTools({ config, updateConfig }) {
                   const customSelectionTools = [...config.customSelectionTools]
                   customSelectionTools[index] = { ...tool, active: e.target.checked }
                   await updateConfig({ customSelectionTools })
-                  Browser.runtime.sendMessage({
-                    type: 'REFRESH_MENU',
-                  })
+                  refreshContextMenu()
                 }}
               />
               {tool.name}
@@ -160,9 +161,7 @@ export function SelectionTools({ config, updateConfig }) {
                     const customSelectionTools = [...config.customSelectionTools]
                     customSelectionTools.splice(index, 1)
                     await updateConfig({ customSelectionTools })
-                    Browser.runtime.sendMessage({
-                      type: 'REFRESH_MENU',
-                    })
+                    refreshContextMenu()
                   }}
                 >
                   <TrashIcon />