Improve trusted-click-element scriptlet

gorhill · gorhill · commit 32a4d640fbe1 · 2026-06-03T11:38:06.000-04:00
Add support for xpath expressions: if a selector starts with `xpath:`, the selector will instead be used as an xpath expression to find the matching elements. Related discussion: uBlockOrigin/uAssets#33142
diff --git a/src/js/resources/scriptlets.js b/src/js/resources/scriptlets.js
@@ -1888,12 +1888,23 @@ function trustedClickElement(
         return elem.shadowRoot;
     };
 
+    const queryOrEvaluateSelector = (selector, context) => {
+        if ( selector.startsWith('xpath:') === false ) {
+            return context.querySelector(selector);
+        }
+        const result = document.evaluate(selector.slice(6), context, null, 9, null);
+        if ( result.resultType !== 9 ) { return null; }
+        const elem = result.singleNodeValue;
+        if ( elem?.nodeType !== 1 ) { return null; }
+        return elem;
+    }
+
     const querySelectorEx = (selector, context = document) => {
         const pos = selector.indexOf(' >>> ');
-        if ( pos === -1 ) { return context.querySelector(selector); }
+        if ( pos === -1 ) { return queryOrEvaluateSelector(selector, context); }
         const outside = selector.slice(0, pos).trim();
         const inside = selector.slice(pos + 5).trim();
-        const elem = context.querySelector(outside);
+        const elem = queryOrEvaluateSelector(outside, context);
         if ( elem === null ) { return null; }
         const shadowRoot = getShadowRoot(elem);
         return shadowRoot && querySelectorEx(inside, shadowRoot);
