AG-40699 Fix 'disable-newtab-links' — not preventing ad popups. #483

Squashed commit of the following:

commit 2381b4d
Merge: d45c599 6a878bf
Author: Adam Wróblewski <adam@adguard.com>
Date:   Fri Mar 20 17:43:35 2026 +0100

    Merge branch 'master' into fix/AG-40699

commit d45c599
Author: Adam Wróblewski <adam@adguard.com>
Date:   Thu Mar 19 11:17:34 2026 +0100

    Simplify condition

commit 4026bc2
Author: Adam Wróblewski <adam@adguard.com>
Date:   Thu Mar 19 11:09:43 2026 +0100

    Refactor disable-newtab-links scriptlet: migrate to TypeScript and fix click handling

Author: AdamWr

CHANGELOG.md

@@ -10,6 +10,16 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 <!-- TODO: change `@added unknown` tag due to the actual version -->
 <!--       during new scriptlets or redirects releasing -->
 
+## [Unreleased]
+
+### Fixed
+
+- `disable-newtab-links` not preventing clicks when the element has its own `click` handler
+  added via `addEventListener` [#483].
+
+[Unreleased]: https://github.com/AdguardTeam/Scriptlets/compare/v2.3.0...HEAD
+[#483]: https://github.com/AdguardTeam/Scriptlets/issues/483
+
 ## [v2.3.0] - 2026-03-18
 
 ### Added

src/scriptlets/disable-newtab-links.js src/scriptlets/disable-newtab-links.tssrc/scriptlets/disable-newtab-links.js renamed to src/scriptlets/disable-newtab-links.ts

@@ -1,4 +1,5 @@
 import { hit } from '../helpers';
+import { type Source } from './scriptlets';
 
 /**
  * @scriptlet disable-newtab-links
@@ -17,10 +18,10 @@ import { hit } from '../helpers';
  *
  * @added v1.0.4.
  */
-export function disableNewtabLinks(source) {
+export function disableNewtabLinks(source: Source) {
     document.addEventListener('click', (ev) => {
         let { target } = ev;
-        while (target !== null) {
+        while (target instanceof Element) {
             if (target.localName === 'a' && target.hasAttribute('target')) {
                 ev.stopPropagation();
                 ev.preventDefault();
@@ -29,7 +30,7 @@ export function disableNewtabLinks(source) {
             }
             target = target.parentNode;
         }
-    });
+    }, { capture: true });
 }
 
 export const disableNewtabLinksNames = [

tests/scriptlets/disable-newtab-links.test.js

@@ -54,3 +54,21 @@ test('adg works', (assert) => {
         done();
     });
 });
+
+test('addEventListener click should not fire', (assert) => {
+    let called = false;
+    runScriptlet(name);
+
+    const elem = createLink();
+    elem.addEventListener('click', () => {
+        called = true;
+    });
+    elem.click();
+
+    const done = assert.async();
+    setTimeout(() => {
+        assert.strictEqual(called, false, 'click handler not called');
+        assert.strictEqual(window.hit, 'FIRED', 'hit fired');
+        done();
+    });
+});