fix updateStyleEntry for frame styles in popup

Author: tophf

src/background/style-manager/index.js

@@ -81,6 +81,29 @@ export function getAllOrdered(keys) {
     : res;
 }
 
+/**
+ * @param {number} [id]
+ * @param {number} [tabId]
+ * @param {boolean} [needsOvrs]
+ * @returns {MatchUrlResult[]}
+ */
+export function getByIdInTab(id, tabId, needsOvrs) {
+  const urlObj = tabCache[tabId]?.[kUrl] || {};
+  const urls = new Set();
+  const res = [];
+  for (const frameId in urlObj) {
+    const url = urlObj[frameId];
+    if (!urls.has(url)) {
+      urls.add(url);
+      for (const v of getByUrl(url, id, tabId, needsOvrs)) {
+        v.frameUrl = +frameId ? url : '';
+        res.push(v);
+      }
+    }
+  }
+  return res;
+}
+
 /**
  * @param {string} url
  * @param {number} [id]

src/popup/render.js

@@ -9,7 +9,7 @@ import {CHROME} from '@/js/ua';
 import {ownRoot} from '@/js/urls';
 import {capitalize, clipString, stringAsRegExpStr, t} from '@/js/util';
 import {MF} from '@/js/util-webext';
-import {isBlocked, tabId, tabUrl, tabUrlSupported} from '.';
+import {isBlocked, tabId, tabUrlSupported} from '.';
 import {openOptions, openStyleFinder, pSideConfig, tSideHint} from './events';
 import {closeMenu, menu, openMenu} from './menu';
 
@@ -279,7 +279,7 @@ export function updateStateIcon(newDark, newDisabled) {
 export async function updateStyleEntry(id, del) {
   const entry = $id(kStyleIdPrefix + id);
   const inMenu = id === menu.styleId && menu.isConnected;
-  const [res] = del ? [] : await API.styles.getByUrl(tabUrl, id, tabId, inMenu);
+  const [res] = del ? [] : await API.styles.getByIdInTab(id, tabId, inMenu);
   if (res) {
     const el = createStyleElement(Object.assign(res.style, res), entry);
     if (!el.isConnected) installed.append(el);