nodebb-plugin-ezoic-infinite 1.5.80 → 1.5.82

package/package.json

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

package/public/client.js

@@ -704,9 +704,10 @@ function globalGapFixInit() {
   }
 
   function pruneOrphanWraps(kindClass, items) {
-    // Message ads should remain stable (desktop + mobile). Pruning them can make it look like
-    // ads vanish on scroll and can reduce fill on long topics.
-    if (kindClass === 'ezoic-ad-message') return 0;
+    // Topic pages can be virtualized (posts removed from DOM as you scroll).
+    // When that happens, previously-inserted ad wraps may become "orphan" nodes with no
+    // nearby post containers, which leads to ads clustering together when scrolling back up.
+    // We prune only *true* orphans that are far offscreen to keep the UI stable.
     if (!items || !items.length) return 0;
     const itemSet = new Set(items);
     const wraps = document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`);
@@ -737,7 +738,10 @@ function globalGapFixInit() {
         if (wrap.getAttribute('data-ezoic-pin') === '1') return;
       } catch (e) {}
 
-      if (isFilled(wrap)) return; // never prune filled ads
+      // 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.
+      const isMessage = (kindClass === 'ezoic-ad-message');
+      if (!isMessage && isFilled(wrap)) return; // never prune filled ads for non-message lists
 
       // Never prune a fresh wrap: it may fill late.
       try {
@@ -745,10 +749,30 @@ function globalGapFixInit() {
         if (created && (now() - created) < keepEmptyWrapMs()) return;
       } catch (e) {}
 
-      if (hasNearbyItem(wrap)) return;
+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) {}
 
-      withInternalDomChange(() => releaseWrapNode(wrap));
-      removed++;
+// For message ads: only release if far offscreen to avoid perceived "vanishing" during fast scroll.
+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;
+  }
+}
+
+withInternalDomChange(() => releaseWrapNode(wrap));
+removed++;
     });
 
     return removed;
@@ -1013,6 +1037,36 @@ function globalGapFixInit() {
 
   // ---------------- core injection ----------------
 
+function getItemOrdinal(el, fallbackIndex) {
+  try {
+    if (!el) return fallbackIndex + 1;
+    const di = el.getAttribute('data-index') || (el.dataset && (el.dataset.index || el.dataset.postIndex));
+    if (di !== null && di !== undefined && di !== '' && !isNaN(di)) {
+      const n = parseInt(di, 10);
+      if (Number.isFinite(n) && n >= 0) return n + 1;
+    }
+    const d1 = el.getAttribute('data-idx') || el.getAttribute('data-position') || (el.dataset && (el.dataset.idx || el.dataset.position));
+    if (d1 !== null && d1 !== undefined && d1 !== '' && !isNaN(d1)) {
+      const n = parseInt(d1, 10);
+      if (Number.isFinite(n) && n > 0) return n;
+    }
+  } catch (e) {}
+  return fallbackIndex + 1;
+}
+
+function buildOrdinalMap(items) {
+  const map = new Map();
+  let max = 0;
+  for (let i = 0; i < items.length; i++) {
+    const el = items[i];
+    const ord = getItemOrdinal(el, i);
+    map.set(ord, el);
+    if (ord > max) max = ord;
+  }
+  return { map, max };
+}
+
+
   function computeTargets(count, interval, showFirst) {
     const out = [];
     if (count <= 0) return out;
@@ -1027,14 +1081,15 @@ function globalGapFixInit() {
   function injectBetween(kindClass, items, interval, showFirst, allIds, cursorKey) {
     if (!items.length) return 0;
 
-    const targets = computeTargets(items.length, interval, showFirst);
+    const { map: ordinalMap, max: maxOrdinal } = buildOrdinalMap(items);
+    const targets = computeTargets(maxOrdinal, interval, showFirst);
     let inserted = 0;
     const maxInserts = MAX_INSERTS_PER_RUN + (isBoosted() ? 1 : 0);
 
     for (const afterPos of targets) {
       if (inserted >= maxInserts) break;
-
-      const el = items[afterPos - 1];
+      const el = ordinalMap.get(afterPos);
+      if (!el) continue;
       if (!el || !el.isConnected) continue;
       if (isAdjacentAd(el)) continue;
       if (findWrap(kindClass, afterPos)) continue;

package/public/test.txt

@@ -0,0 +1 @@
+hi