@duckduckgo/autoconsent 1.0.6 → 1.0.7

package/dist/autoconsent.cjs.js

@@ -701,7 +701,17 @@ function handleMessage(message, debug = false) {
         const elem = document.querySelectorAll(message.selector);
         const results = new Array(elem.length);
         elem.forEach((e, i) => {
-            results[i] = e.offsetParent !== null || window.getComputedStyle(e).display !== "none"; // TODO: handle visibility and z-index?
+            // check for display: none
+            results[i] = false;
+            if (e.offsetParent !== null) {
+                results[i] = true;
+            }
+            else {
+                const css = window.getComputedStyle(e);
+                if (css.position === 'fixed' && css.display !== "none") { // fixed elements may be visible even if the parent is not
+                    results[i] = true;
+                }
+            }
         });
         debug && console.log("[visible?]", message.selector, elem, results);
         if (results.length === 0) {
@@ -1190,6 +1200,8 @@ class Onetrust extends AutoConsentBase {
         await success(tab.wait(1000));
         await tab.clickElements("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked"); // optional step
         await success(tab.waitForThenClick(".save-preference-btn-handler,.js-consent-save", 1000));
+        // popup doesn't disappear immediately
+        await waitFor(async () => !(await tab.elementsAreVisible("#onetrust-banner-sdk")), 10, 500);
         return true;
     }
     async optIn(tab) {

package/dist/autoconsent.esm.js

@@ -697,7 +697,17 @@ function handleMessage(message, debug = false) {
         const elem = document.querySelectorAll(message.selector);
         const results = new Array(elem.length);
         elem.forEach((e, i) => {
-            results[i] = e.offsetParent !== null || window.getComputedStyle(e).display !== "none"; // TODO: handle visibility and z-index?
+            // check for display: none
+            results[i] = false;
+            if (e.offsetParent !== null) {
+                results[i] = true;
+            }
+            else {
+                const css = window.getComputedStyle(e);
+                if (css.position === 'fixed' && css.display !== "none") { // fixed elements may be visible even if the parent is not
+                    results[i] = true;
+                }
+            }
         });
         debug && console.log("[visible?]", message.selector, elem, results);
         if (results.length === 0) {
@@ -1186,6 +1196,8 @@ class Onetrust extends AutoConsentBase {
         await success(tab.wait(1000));
         await tab.clickElements("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked"); // optional step
         await success(tab.waitForThenClick(".save-preference-btn-handler,.js-consent-save", 1000));
+        // popup doesn't disappear immediately
+        await waitFor(async () => !(await tab.elementsAreVisible("#onetrust-banner-sdk")), 10, 500);
         return true;
     }
     async optIn(tab) {

package/dist/autoconsent.puppet.js

@@ -956,6 +956,8 @@ class Onetrust extends AutoConsentBase {
         await success(tab.wait(1000));
         await tab.clickElements("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked"); // optional step
         await success(tab.waitForThenClick(".save-preference-btn-handler,.js-consent-save", 1000));
+        // popup doesn't disappear immediately
+        await waitFor(async () => !(await tab.elementsAreVisible("#onetrust-banner-sdk")), 10, 500);
         return true;
     }
     async optIn(tab) {

package/lib/cmps/onetrust.js

@@ -1,4 +1,4 @@
-import AutoConsentBase, { success } from "./base";
+import AutoConsentBase, { success, waitFor } from "./base";
 export default class Onetrust extends AutoConsentBase {
     constructor() {
         super("Onetrust");
@@ -21,6 +21,8 @@ export default class Onetrust extends AutoConsentBase {
         await success(tab.wait(1000));
         await tab.clickElements("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked"); // optional step
         await success(tab.waitForThenClick(".save-preference-btn-handler,.js-consent-save", 1000));
+        // popup doesn't disappear immediately
+        await waitFor(async () => !(await tab.elementsAreVisible("#onetrust-banner-sdk")), 10, 500);
         return true;
     }
     async optIn(tab) {

package/lib/cmps/onetrust.ts

@@ -1,4 +1,4 @@
-import AutoConsentBase, { success } from "./base";
+import AutoConsentBase, { success, waitFor } from "./base";
 import { TabActor } from "../types";
 
 export default class Onetrust extends AutoConsentBase {
@@ -28,6 +28,12 @@ export default class Onetrust extends AutoConsentBase {
     await success(tab.wait(1000));
     await tab.clickElements("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked"); // optional step
     await success(tab.waitForThenClick(".save-preference-btn-handler,.js-consent-save", 1000));
+    // popup doesn't disappear immediately
+    await waitFor(
+      async () => !(await tab.elementsAreVisible("#onetrust-banner-sdk")),
+      10,
+      500
+    );
     return true;
   }
 

package/lib/web/content.js

@@ -24,7 +24,17 @@ export default function handleMessage(message, debug = false) {
         const elem = document.querySelectorAll(message.selector);
         const results = new Array(elem.length);
         elem.forEach((e, i) => {
-            results[i] = e.offsetParent !== null || window.getComputedStyle(e).display !== "none"; // TODO: handle visibility and z-index?
+            // check for display: none
+            results[i] = false;
+            if (e.offsetParent !== null) {
+                results[i] = true;
+            }
+            else {
+                const css = window.getComputedStyle(e);
+                if (css.position === 'fixed' && css.display !== "none") { // fixed elements may be visible even if the parent is not
+                    results[i] = true;
+                }
+            }
         });
         debug && console.log("[visible?]", message.selector, elem, results);
         if (results.length === 0) {

package/lib/web/content.ts

@@ -24,7 +24,16 @@ export default function handleMessage(message: ContentScriptMessage, debug = fal
     const elem = document.querySelectorAll<HTMLElement>(message.selector);
     const results = new Array(elem.length);
     elem.forEach((e, i) => {
-      results[i] = e.offsetParent !== null || window.getComputedStyle(e).display !== "none"; // TODO: handle visibility and z-index?
+      // check for display: none
+      results[i] = false;
+      if (e.offsetParent !== null) {
+        results[i] = true;
+      } else {
+        const css = window.getComputedStyle(e);
+        if (css.position === 'fixed' && css.display !== "none") { // fixed elements may be visible even if the parent is not
+          results[i] = true;
+        }
+      }
     });
     debug && console.log("[visible?]", message.selector, elem, results);
     if (results.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",

package/rules/autoconsent/aws-amazon.json

@@ -1,6 +1,6 @@
 {
   "name": "aws.amazon.com",
-  "prehideSelectors": ["#awsccc-cb-content", "#awsccc-cs-container-inner"],
+  "prehideSelectors": ["#awsccc-cb-content", "#awsccc-cs-container", "#awsccc-cs-modalOverlay", "#awsccc-cs-container-inner"],
   "detectCmp": [{ "exists": "#awsccc-cb-content" }],
   "detectPopup": [{ "visible": "#awsccc-cb-content" }],
   "optIn": [{ "click": "button[data-id=awsccc-cb-btn-accept" }],

package/rules/autoconsent/bundesregierung-de.json

@@ -2,7 +2,7 @@
   "name": "bundesregierung.de",
   "prehideSelectors": [".bpa-cookie-banner"],
   "detectCmp": [{ "exists": ".bpa-cookie-banner" }],
-  "detectPopup": [{ "visible": ".bpa-module-full-hero" }],
+  "detectPopup": [{ "visible": ".bpa-cookie-banner .bpa-module-full-hero" }],
   "optIn": [{ "click": ".bpa-accept-all-button" }],
   "optOut": [
       {

package/rules/rules.json

@@ -56,6 +56,8 @@
       "name": "aws.amazon.com",
       "prehideSelectors": [
         "#awsccc-cb-content",
+        "#awsccc-cs-container",
+        "#awsccc-cs-modalOverlay",
         "#awsccc-cs-container-inner"
       ],
       "detectCmp": [
@@ -146,7 +148,7 @@
       ],
       "detectPopup": [
         {
-          "visible": ".bpa-module-full-hero"
+          "visible": ".bpa-cookie-banner .bpa-module-full-hero"
         }
       ],
       "optIn": [