nodebb-plugin-ezoic-infinite 1.6.74 → 1.6.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.6.74",
+  "version": "1.6.75",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -133,29 +133,7 @@ function tightenEzoicMinHeight(wrap) {
     if (!wrap || !wrap.querySelector) return;
 
     const iframes = wrap.querySelectorAll('iframe');
-
-    // If the wrap is still empty, Ezoic often leaves inline `min-height:400px !important` on
-    // nested `.ezoic-ad` containers, which creates large blank gaps. We can't remove it with CSS.
-    // We collapse those gaps after a short grace period, while still allowing late fill.
-    if (!iframes || !iframes.length) {
-      try {
-        const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
-        const age = created ? (now() - created) : 0;
-        // Give auctions/CMP a bit of time; then collapse the notorious 400px gap.
-        if (age >= 12000) {
-          const nodes = wrap.querySelectorAll('.ezoic-ad, .ezoic-ad-adaptive');
-          nodes.forEach((n) => {
-            const st = (n.getAttribute('style') || '').toLowerCase();
-            if (st.includes('min-height:400') || st.includes('min-height: 400') || st.includes('min-height:400px')) {
-              try { n.style.setProperty('min-height', '1px', 'important'); } catch (e) { n.style.minHeight = '1px'; }
-              try { n.style.setProperty('height', 'auto', 'important'); } catch (e) {}
-              try { n.style.setProperty('line-height', '0', 'important'); } catch (e) {}
-            }
-          });
-        }
-      } catch (e) {}
-      return;
-    }
+    if (!iframes || !iframes.length) return;
 
     // Find the closest "big" ezoic container that carries the 400px min-height.
     const firstIframe = iframes[0];
@@ -242,6 +220,42 @@ function tightenEzoicMinHeight(wrap) {
   } catch (e) {}
 }
 
+// If a placement never fills, Ezoic may still leave an inline `min-height:400px !important`
+// on nested containers, creating large "blank" blocks. On SPA/infinite scroll, some
+// auctions can fail (network/CMP/adblock). We collapse those gaps after a grace period.
+function collapseEmptyGap(wrap) {
+  try {
+    if (!wrap || !wrap.isConnected) return;
+    if (isFilledNode(wrap)) return;
+
+    const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
+    if (!created) return;
+    // Give plenty of time for late fill (CMP / header bidding).
+    if ((now() - created) < 12000) return;
+
+    // Find the nested node that carries the 400px min-height.
+    const nodes = wrap.querySelectorAll('.ezoic-ad, .ezoic-ad-adaptive');
+    nodes.forEach((n) => {
+      const st = (n.getAttribute('style') || '').toLowerCase();
+      if (st.includes('min-height:400')) {
+        try { n.style.setProperty('min-height', '1px', 'important'); } catch (e) { n.style.minHeight = '1px'; }
+        try { n.style.setProperty('height', 'auto', 'important'); } catch (e) {}
+      }
+    });
+
+    // Also collapse our wrapper's reserved height.
+    try { wrap.style.setProperty('min-height', '1px', 'important'); } catch (e) { wrap.style.minHeight = '1px'; }
+    try { wrap.style.setProperty('height', 'auto', 'important'); } catch (e) {}
+  } catch (e) {}
+}
+
+function collapseEmptyGaps(kindClass) {
+  try {
+    const wraps = document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`);
+    wraps.forEach((w) => collapseEmptyGap(w));
+  } catch (e) {}
+}
+
 function watchWrapForFill(wrap) {
   try {
     if (!wrap || wrap.__ezFillObs) return;
@@ -760,15 +774,16 @@ function globalGapFixInit() {
         if (wrap.getAttribute('data-ezoic-pin') === '1') return;
       } catch (e) {}
 
-      // For message/topic pages we may prune filled or empty orphans if they are far away,
-      // otherwise consecutive "stacks" can appear when posts are virtualized.
+      // Virtualized lists can remove anchors from the DOM while keeping our wraps.
+      // If we keep *filled* wraps alive when their anchors disappear, they will visually
+      // "stack" (back-to-back) when the user scrolls back up.
+      //
+      // Topic list pages (categoryTopics) are also virtualized in some themes/plugins,
+      // so we must treat between-ads similarly to message-ads.
       const isMessage = (kindClass === 'ezoic-ad-message');
-      // IMPORTANT:
-      // On category/topic lists, NodeBB can virtualize/recycle list items while scrolling.
-      // If we keep *filled* wraps when their anchor items are gone, they can visually
-      // "stack" together on upward scroll. We therefore allow filled wraps to be hidden
-      // when orphaned, but we still avoid fully releasing them (so they can come back
-      // when anchors reappear).
+      const isBetween = (kindClass === 'ezoic-ad-between');
+      const isVirtualizedList = isMessage || isBetween;
+      if (!isVirtualizedList && isFilled(wrap)) return; // keep filled ads for non-virtualized lists
 
       // Never prune a fresh wrap: it may fill late.
       try {
@@ -776,34 +791,34 @@ function globalGapFixInit() {
         if (created && (now() - created) < keepEmptyWrapMs()) return;
       } catch (e) {}
 
-if (hasNearbyItem(wrap)) {
-  try { wrap.classList && wrap.classList.remove('ez-orphan-hidden'); wrap.style && (wrap.style.display = ''); } catch (e) {}
-  return;
-}
-
-// If the anchor item is no longer in the DOM (virtualized), hide the wrap so ads never "stack"
-// back-to-back while scrolling. We'll recycle it when its anchor comes back.
-try { wrap.classList && wrap.classList.add('ez-orphan-hidden'); wrap.style && (wrap.style.display = 'none'); } catch (e) {}
+      if (hasNearbyItem(wrap)) {
+        try {
+          wrap.classList && wrap.classList.remove('ez-orphan-hidden');
+          wrap.style && (wrap.style.display = '');
+        } catch (e) {}
+        return;
+      }
 
-// For message ads: only release if far offscreen to avoid perceived "vanishing" during fast scroll.
-// For non-message lists (topics/categories): do not release filled wraps at all; only hide.
-if (isMessage) {
-  try {
-    const r = wrap.getBoundingClientRect();
-    const vh = Math.max(1, window.innerHeight || 1);
-    const farAbove = r.bottom < -vh * 2;
-    const farBelow = r.top > vh * 4;
-    if (!farAbove && !farBelow) return;
-  } catch (e) {
-    return;
-  }
-}
+      // If the anchor item is no longer in the DOM (virtualized), hide the wrap so ads never "stack"
+      // back-to-back while scrolling. When the anchor comes back, the wrap can be shown again.
+      try {
+        wrap.classList && wrap.classList.add('ez-orphan-hidden');
+        wrap.style && (wrap.style.display = 'none');
+      } catch (e) {}
 
-// Never release filled wraps on non-message lists; hiding is enough to prevent stacks.
-if (!isMessage && isFilled(wrap)) return;
+      // Release only if far offscreen (keep UX stable). Use looser thresholds for topic lists.
+      try {
+        const r = wrap.getBoundingClientRect();
+        const vh = Math.max(1, window.innerHeight || 1);
+        const farAbove = r.bottom < -vh * (isBetween ? 4 : 2);
+        const farBelow = r.top > vh * (isBetween ? 8 : 4);
+        if (!farAbove && !farBelow) return;
+      } catch (e) {
+        return;
+      }
 
-withInternalDomChange(() => releaseWrapNode(wrap));
-removed++;
+      withInternalDomChange(() => releaseWrapNode(wrap));
+      removed++;
     });
 
     return removed;
@@ -829,6 +844,7 @@ removed++;
       }
     };
 
+    const lookback = (kindClass === 'ezoic-ad-between') ? 12 : 3;
     let removed = 0;
     for (const w of wraps) {
       // Never decluster pinned placements.
@@ -837,7 +853,7 @@ removed++;
       } catch (e) {}
 
       let prev = w.previousElementSibling;
-      for (let i = 0; i < 3 && prev; i++) {
+      for (let i = 0; i < lookback && prev; i++) {
         if (isWrap(prev)) {
           // If the previous wrap is pinned, keep this one (spacing is intentional).
           try {
@@ -1050,8 +1066,6 @@ removed++;
               watchWrapForFill(ww);
               setTimeout(() => { try { tightenEzoicMinHeight(ww); } catch (e) {} }, 900);
               setTimeout(() => { try { tightenEzoicMinHeight(ww); } catch (e) {} }, 2200);
-              // Collapse the notorious 400px inline min-height if the slot stays empty.
-              setTimeout(() => { try { tightenEzoicMinHeight(ww); } catch (e) {} }, 12500);
             }
           } catch (e) {}
           setTimeout(() => { clearTimeout(hardTimer); release(); }, 650);
@@ -1229,6 +1243,7 @@ function buildOrdinalMap(items) {
           'curPosts'
         );
         decluster('ezoic-ad-message');
+        collapseEmptyGaps('ezoic-ad-message');
       }
     } else if (kind === 'categoryTopics') {
       if (normalizeBool(cfg.enableBetweenAds)) {
@@ -1243,6 +1258,7 @@ function buildOrdinalMap(items) {
           'curTopics'
         );
         decluster('ezoic-ad-between');
+        collapseEmptyGaps('ezoic-ad-between');
       }
     } else if (kind === 'categories') {
       if (normalizeBool(cfg.enableCategoryAds)) {
@@ -1257,6 +1273,7 @@ function buildOrdinalMap(items) {
           'curCategories'
         );
         decluster('ezoic-ad-categories');
+        collapseEmptyGaps('ezoic-ad-categories');
       }
     }