fix #1891: preload using nav destination url

openstyles · Jan 17, 2025 · 7def10e · 7def10e
1 parent 99a0e86
commit 7def10e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/background/style-manager/index.js b/src/background/style-manager/index.js
@@ -1,4 +1,4 @@
-import {IMPORT_THROTTLE, k_size, kUrl, UCD} from '@/js/consts';
+import {IMPORT_THROTTLE, k_size, kStyleViaXhr, kUrl, UCD} from '@/js/consts';
 import * as prefs from '@/js/prefs';
 import {calcStyleDigest, styleCodeEmpty} from '@/js/sections-util';
 import {calcObjSize, mapObj} from '@/js/util';
@@ -243,14 +243,18 @@ export function getSectionsByUrl(url, id, isInitialApply) {
   if (isInitialApply === 'cfg') {
     return {cfg};
   }
-  if (frameId === 0) {
+  let res, cache;
+  if (frameId === 0
+  && isInitialApply !== kStyleViaXhr
+  && (res = td[kUrl])
+  && (res = res[0]) !== url
+  && res.split('#', 1)[0] === url.split('#', 1)[0]) {
     /* Chrome hides text frament from location.href of the page e.g. #:~:text=foo
        so we'll use the real URL reported by webNavigation API.
        TODO: if FF will do the same, this won't work as is: FF reports onCommitted too late */
-    url = td[kUrl]?.[0] || url;
+    url = res || url;
   }
-  let res;
-  let cache = styleCache.get(url);
+  cache = styleCache.get(url);
   if (!cache) {
     cache = {url, sections: {}};
     styleCache.add(cache);

diff --git a/src/background/style-via-webrequest.js b/src/background/style-via-webrequest.js
@@ -157,7 +157,7 @@ async function prepareStyles(req) {
   }
   const oldData = toSend[key];
   const data = oldData || {};
-  const payload = data.payload = getSectionsByUrl.call({sender: req}, url, null, true);
+  const payload = data.payload = getSectionsByUrl.call({sender: req}, url, null, kStyleViaXhr);
   const willStyle = payload.sections.length;
   data.url = url;
   if (oldData) removePreloadedStyles(null, key, data, willStyle);
@@ -200,6 +200,7 @@ async function prepareStylesMV3(tabId, frameId, url, data, key, payload) {
     id: ruleId,
     condition: {
       tabIds: [tabId],
+      urlFilter: '|' + url + '|',
       resourceTypes: [frameId ? kSubFrame : kMainFrame],
       // Forcing the rule to be evaluated later, when response headers are received.
       excludedResponseHeaders: [{header: kSetCookie, values: [cookie]}],