@websline/cms-view-utils 1.9.0 → 1.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websline/cms-view-utils",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "type": "module",
   "files": [
     "src",

package/src/ads/createAdRunner.js

@@ -208,17 +208,19 @@ const createAdRunner = ({
 
 		/**
 		 * Following the ad ends it too: a visitor who acted on it has seen what it
-		 * had to say, and meeting it again on the next page reads as nagging.
+		 * had to say, and meeting it again on the next page reads as nagging. A
+		 * persistent ad stays until the visitor closes it.
 		 */
 		click(ad) {
 			if (!ad) return;
 
 			track(ad.uuid, "click");
-			release(ad);
+			if (!ad.persistent) release(ad);
 		},
 
+		/** An ad that is not closable has no close button, so nothing to dismiss. */
 		dismiss(ad) {
-			if (!ad) return;
+			if (!ad || ad.closable === false) return;
 
 			track(ad.uuid, "close");
 			release(ad);

package/src/ads/selectAd.js

@@ -98,8 +98,12 @@ const filterEligibleAds = ({
 	candidates.filter((ad) => {
 		if (!hasConsent(ad, isConsentGiven)) return false;
 		// Once per visit is the floor; a reload must not put it back on the screen.
-		if (wasSeenThisVisit(ad, seenAt(ad.uuid))) return false;
-		if (isSuppressed(ad, dismissedAt(ad.uuid), now)) return false;
+		// A persistent ad has no such floor: it stays on every page until closed.
+		if (!ad.persistent && wasSeenThisVisit(ad, seenAt(ad.uuid))) return false;
+		// `closable: false` has no close button, so no dismissal can hold it back.
+		if (ad.closable !== false && isSuppressed(ad, dismissedAt(ad.uuid), now)) {
+			return false;
+		}
 
 		const { cookieName, cookieValue, paramName, paramValue } = ad.conditions ?? {};
 

package/src/ads/triggers.js

@@ -39,16 +39,41 @@ const afterDelay = (seconds, fire, timers) => {
 	return () => timers.clearTimeout(id);
 };
 
+/** How far the page can scroll at all; zero for a page that fits the window. */
+const scrollableHeight = (target, doc) =>
+	Math.max((doc?.documentElement?.scrollHeight ?? 0) - (target.innerHeight ?? 0), 0);
+
 /**
- * Keeps listening until the page has really moved. `once` would drop the listener
- * on the first scroll event even when it arrived back at the top — an overscroll
- * bounce or a sideways scroll — and the ad would never appear for that visit.
+ * Fixed rather than set per ad, and in pixels rather than a share of the page: a
+ * share of a long page lies far down, so the ad would come late or not at all.
  */
-const onFirstScroll = (fire, target) => {
+const SCROLL_DISTANCE_PX = 300;
+
+/**
+ * Keeps listening until the distance is reached: `once` would drop the listener
+ * on an overscroll bounce back at the top and lose the ad for that visit. A page
+ * shorter than the distance counts once scrolled to its end.
+ */
+const onScrolledPast = (fire, target, doc) => {
+	const reached = () => {
+		const scrollable = scrollableHeight(target, doc);
+
+		// A pixel of slack: at the very end, zoomed pages report a fractional scrollY.
+		return (
+			scrollable > 0 && target.scrollY >= Math.min(SCROLL_DISTANCE_PX, scrollable) - 1
+		);
+	};
+
+	// Already that far when the ad arrived — no further event may come.
+	if (reached()) {
+		fire();
+		return () => {};
+	}
+
 	const stop = () => target.removeEventListener("scroll", handler);
 
 	function handler() {
-		if (target.scrollY <= 0) return;
+		if (!reached()) return;
 
 		stop();
 		fire();
@@ -120,14 +145,7 @@ const watchTrigger = (trigger, onFire, env = {}) => {
 		}
 
 		case "scroll":
-			if (!target) return never();
-			// Already scrolled when the ad arrived — the event will not come again.
-			if (target.scrollY > 0) {
-				fire();
-				return never();
-			}
-
-			return onFirstScroll(fire, target);
+			return target ? onScrolledPast(fire, target, doc) : never();
 
 		case "exit_intent":
 			return doc ? onExitIntent(fire, doc) : never();
@@ -138,4 +156,4 @@ const watchTrigger = (trigger, onFire, env = {}) => {
 	}
 };
 
-export { countPageView, PAGE_VIEWS_KEY, watchTrigger };
+export { countPageView, PAGE_VIEWS_KEY, SCROLL_DISTANCE_PX, watchTrigger };