fix: 使用 openPopup() 替代 tabs.create() 打开弹窗

- background.ts: 使用 browser.action.openPopup() 打开 popup 弹窗
- 先保存数据到 storage,然后打开 popup
- RouterProvider.tsx: 初始化时检查 storage 中的 pendingData 并跳转到对应页面
- 移除之前错误的 tabs.create() 方式
This commit is contained in:
雨霖铃
2026-05-20 21:07:06 +08:00
parent 5868316c3a
commit 8e56ebff6e
2 changed files with 27 additions and 4 deletions
+10 -3
View File
@@ -2,6 +2,7 @@ import '../.wxt/types/imports.d.ts';
import { browser } from 'wxt/browser'; import { browser } from 'wxt/browser';
import { MessageAction, onMessage, sendMessage } from '@/utils/messages'; import { MessageAction, onMessage, sendMessage } from '@/utils/messages';
import { createAllContextMenus, parseContextMenuClick } from '@/utils/contextMenu'; import { createAllContextMenus, parseContextMenuClick } from '@/utils/contextMenu';
import { saveContextMenuData } from '@/utils/useContextMenuData';
export default defineBackground(() => { export default defineBackground(() => {
browser.runtime.onInstalled.addListener(() => { browser.runtime.onInstalled.addListener(() => {
@@ -32,9 +33,15 @@ export default defineBackground(() => {
// sidepanel 未打开或无法通信,继续执行其他方案 // sidepanel 未打开或无法通信,继续执行其他方案
} }
const popupUrl = chrome.runtime.getURL('/popup.html'); // 保存数据到 storagepopup 打开后会读取
const params = new URLSearchParams({ feature: featureKey, payload }); await saveContextMenuData({ featureKey, payload });
await browser.tabs.create({ url: `${popupUrl}?${params.toString()}` });
// 打开 popup 弹窗
try {
await browser.action.openPopup();
} catch (err) {
console.error('[Context Menu] 打开 popup 失败:', err);
}
}); });
// 监听扩展图标点击事件,打开侧边栏 // 监听扩展图标点击事件,打开侧边栏
+17 -1
View File
@@ -14,7 +14,7 @@ import {
getDefaultPageOrder, getDefaultPageOrder,
getDefaultVisibleFeatureKeys, getDefaultVisibleFeatureKeys,
} from '@/config/features'; } from '@/config/features';
import { saveContextMenuData } from '@/utils/useContextMenuData'; import { saveContextMenuData, clearContextMenuData } from '@/utils/useContextMenuData';
/** /**
* 校验是否为合法的页面类型 * 校验是否为合法的页面类型
@@ -204,8 +204,24 @@ export function RouterProvider({
url.searchParams.delete('feature'); url.searchParams.delete('feature');
url.searchParams.delete('payload'); url.searchParams.delete('payload');
window.history.replaceState({}, '', url.toString()); window.history.replaceState({}, '', url.toString());
return;
} }
} }
// 检查 storage 中的右键菜单待处理数据(用于 openPopup 场景)
storageUtil
.get('contextMenu/pendingData', undefined)
.then((pendingData) => {
if (
pendingData &&
isValidPage(pendingData.featureKey) &&
Date.now() - pendingData.timestamp < 5000
) {
navigateTo(pendingData.featureKey as PageType);
clearContextMenuData().catch(console.error);
}
})
.catch(console.error);
} }
}) })
.catch(console.error); .catch(console.error);