@highfivve/ad-tag 5.13.1 → 5.13.3

package/lib/ads/modules/sticky-footer-ad-v2/footerStickyAd.js

@@ -1,13 +1,16 @@
 import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
+import { isGamAnchor } from 'ad-tag/ads/auctions/anchorContext';
 const adStickyContainerDataRef = '[data-ref=h5v-sticky-ad]';
 const adStickyCloseButtonDataRef = '[data-ref=h5v-sticky-ad-close]';
 const adStickyCloseButtonContent = '.h5v-closeButtonContent';
 const adStickyHidingClass = 'h5v-footerAd--hidden';
 const desktopInitialHidingClass = 'h5v-footerAd--hidden-d';
 const mobileInitialHidingClass = 'h5v-footerAd--hidden-m';
-const stickyRenderedEvent = (mobileStickyDomId, disallowedAdvertiserIds, channel, window) => new Promise(resolve => {
+const isStickySlotEvent = (slot, mobileStickyDomId, resolvedAdUnitPath, channel, window) => slot.getSlotElementId() === mobileStickyDomId ||
+    (channel === 'gam' && isGamAnchor(slot, window) && slot.getAdUnitPath() === resolvedAdUnitPath);
+const stickyRenderedEvent = (mobileStickyDomId, resolvedAdUnitPath, disallowedAdvertiserIds, channel, window) => new Promise(resolve => {
     const listener = (event) => {
-        if (event.slot.getSlotElementId() !== mobileStickyDomId) {
+        if (!isStickySlotEvent(event.slot, mobileStickyDomId, resolvedAdUnitPath, channel, window)) {
             return;
         }
         if (channel === 'gam') {
@@ -44,7 +47,7 @@ const hideAdSlot = (element) => {
 const showAdSlot = (element) => {
     element.classList.remove(adStickyHidingClass, desktopInitialHidingClass, mobileInitialHidingClass);
 };
-export const initAdSticky = (window, env, log, footerStickyDomId, disallowedAdvertiserIds, channel, closingButtonText) => {
+export const initAdSticky = (window, env, log, footerStickyDomId, resolvedAdUnitPath, disallowedAdvertiserIds, channel, closingButtonText) => {
     const stickyAd = 'sticky-ad';
     const adSticky = window.document.querySelector(adStickyContainerDataRef);
     const closeButton = window.document.querySelector(adStickyCloseButtonDataRef);
@@ -91,7 +94,7 @@ export const initAdSticky = (window, env, log, footerStickyDomId, disallowedAdve
             else if (renderResult === 'standard') {
                 showAdSlot(adSticky);
                 const stickyOnLoadEventPromise = stickyOnLoadEvent(footerStickyDomId, window);
-                return stickyRenderedEvent(footerStickyDomId, disallowedAdvertiserIds, channel, window)
+                return stickyRenderedEvent(footerStickyDomId, resolvedAdUnitPath, disallowedAdvertiserIds, channel, window)
                     .then(result => result === 'empty' || result === 'disallowed'
                     ? Promise.resolve(result)
                     : stickyOnLoadEventPromise.then(() => result))
@@ -102,7 +105,7 @@ export const initAdSticky = (window, env, log, footerStickyDomId, disallowedAdve
         if (env === 'production') {
             if (footerStickyDomId) {
                 const stickyOnLoadEventPromise = stickyOnLoadEvent(footerStickyDomId, window);
-                stickyRenderedEvent(footerStickyDomId, disallowedAdvertiserIds, channel, window)
+                stickyRenderedEvent(footerStickyDomId, resolvedAdUnitPath, disallowedAdvertiserIds, channel, window)
                     .then(result => result === 'empty' || result === 'disallowed'
                     ? Promise.resolve(result)
                     : stickyOnLoadEventPromise.then(() => result))

package/lib/ads/modules/sticky-footer-ad-v2/index.js

@@ -1,4 +1,5 @@
 import { LOW_PRIORITY, mkPrepareRequestAdsStep } from 'ad-tag/ads/adPipeline';
+import { resolveAdUnitPath } from 'ad-tag/ads/adUnitPath';
 import { initAdSticky } from './footerStickyAd';
 export const createStickyFooterAdsV2 = () => {
     const name = 'sticky-footer-ads-v2';
@@ -22,7 +23,7 @@ export const createStickyFooterAdsV2 = () => {
                     }
                     if (footerAdSlot) {
                         const channel = ctx.auction__.anchorBottomChannel(footerAdSlot.moliSlot.domId);
-                        initAdSticky(ctx.window__, ctx.env__, ctx.logger__, footerAdSlot.moliSlot.domId, config.disallowedAdvertiserIds, channel, config.closingButtonText);
+                        initAdSticky(ctx.window__, ctx.env__, ctx.logger__, footerAdSlot.moliSlot.domId, resolveAdUnitPath(footerAdSlot.moliSlot.adUnitPath, ctx.adUnitPathVariables__), config.disallowedAdvertiserIds, channel, config.closingButtonText);
                     }
                     return Promise.resolve();
                 })

package/lib/ads/modules/sticky-header-ad/renderResult.js

@@ -1,11 +1,20 @@
 import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
+import { resolveAdUnitPath } from 'ad-tag/ads/adUnitPath';
+import { isGamAnchor } from 'ad-tag/ads/auctions/anchorContext';
 export const adRenderResult = (ctx, headerSlot, disallowedAdvertiserIds, channel, minVisibleDuration) => new Promise(resolve => {
     if (ctx.env__ === 'test') {
         resolve('standard');
         return;
     }
+    const resolvedAdUnitPath = channel === 'gam'
+        ? resolveAdUnitPath(headerSlot.adUnitPath, ctx.adUnitPathVariables__)
+        : null;
+    const isHeaderSlotEvent = (slot) => slot.getSlotElementId() === headerSlot.domId ||
+        (resolvedAdUnitPath !== null &&
+            isGamAnchor(slot, ctx.window__) &&
+            slot.getAdUnitPath() === resolvedAdUnitPath);
     const listener = event => {
-        if (event.slot.getSlotElementId() !== headerSlot.domId) {
+        if (!isHeaderSlotEvent(event.slot)) {
             return;
         }
         if (channel === 'gam') {

package/lib/gen/packageJson.js

@@ -1,3 +1,3 @@
 export const packageJson = {
-    version: '5.13.1'
+    version: '5.13.3'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highfivve/ad-tag",
-  "version": "5.13.1",
+  "version": "5.13.3",
   "license": "Apache-2.0",
   "description": "An ad tag implementation called moli",
   "main": "./lib/index.js",