From 387a95d6a6b4e0af3be2f22603e0f7e5d74bdafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E9=9C=96=E9=93=83?= <rsgltzyd@hotmail.com>
Date: Wed, 20 May 2026 21:15:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20popup=20=E5=B7=B2?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=97=B6=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 RouterProvider 中添加对 contextMenu/pendingData 的 storage 变化监听
- 当 pendingData 变化时，自动跳转到对应功能页面
- 解决了 openPopup() 只聚焦已有窗口而不触发重新挂载的问题
---
 providers/RouterProvider.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/providers/RouterProvider.tsx b/providers/RouterProvider.tsx
index fb7a9ee..8e6c718 100644
--- a/providers/RouterProvider.tsx
+++ b/providers/RouterProvider.tsx
@@ -7,7 +7,7 @@ import {
   useRef,
   useState,
 } from 'react';
-import type { PageType, StorageSchema } from '@/types/storage';
+import type { PageType, StorageSchema, ContextMenuPendingData } from '@/types/storage';
 import { storageUtil } from '@/utils/chromeStorage';
 import {
   getAllFeatureKeys,
@@ -288,6 +288,14 @@ export function RouterProvider({
           setPageOrder(newOrder);
         }
       }
+      // 监听右键菜单数据变化，自动跳转到对应页面（用于 popup 已打开的场景）
+      if (changes['contextMenu/pendingData']) {
+        const newData = changes['contextMenu/pendingData']
+          .newValue as ContextMenuPendingData | null;
+        if (newData && isValidPage(newData.featureKey) && Date.now() - newData.timestamp < 5000) {
+          setCurrentPage(newData.featureKey as PageType);
+        }
+      }
     };
 
     chrome.storage.onChanged.addListener(handleStorageChange);