@highfivve/ad-tag 5.7.0 → 5.7.2

package/lib/ads/googleAdManager.js

@@ -305,9 +305,8 @@ export const gptDefineSlots = () => (context, slots) => {
                 if (adSlot) {
                     if (moliSlot.gpt) {
                         adSlot.setConfig(moliSlot.gpt);
-                        context.logger__.debug('GAM', `Add slot settings: [AdSlot] ${adSlot} [Settings] ${moliSlot.gpt}`);
+                        context.logger__.debug('GAM', `Add slot settings: [AdSlot] ${adSlot.getSlotElementId()}`, moliSlot.gpt);
                     }
-                    adSlot.setCollapseEmptyDiv(moliSlot.gpt?.collapseEmptyDiv !== false);
                     adSlot.addService(context.window__.googletag.pubads());
                     context.logger__.debug('GAM', `Register slot: [DomID] ${moliSlot.domId} [AdUnitPath] ${moliSlot.adUnitPath}`);
                     return Promise.resolve({

package/lib/ads/isAdvertiserIncluded.js

@@ -0,0 +1,5 @@
+export const isAdvertiserIncluded = (event, advertisersList) => {
+    const { advertiserId, companyIds } = event;
+    return ((!!advertiserId && advertisersList.includes(advertiserId)) ||
+        (!!companyIds && advertisersList.some(id => companyIds.includes(id))));
+};

package/lib/ads/modules/ad-reload/adVisibilityService.js

@@ -1,3 +1,4 @@
+import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
 export class AdVisibilityService {
     constructor(userActivityService, refreshInterval, refreshIntervalOverrides, useIntersectionObserver, disableAdVisibilityChecks, viewabilityOverrides, window, logger) {
         this.userActivityService = userActivityService;
@@ -60,7 +61,7 @@ export class AdVisibilityService {
         this.setUpdateTimer(true);
         this.logger?.debug('AdVisibilityService', 'initialized');
     }
-    trackSlot(slot, refreshCallback, advertiserId) {
+    trackSlot(slot, refreshCallback, advertiserId, companyIds) {
         const slotDomId = slot.getSlotElementId();
         const domElement = this.observedDomElementForSlot(slot);
         if (domElement) {
@@ -75,9 +76,8 @@ export class AdVisibilityService {
                     (override?.variant === 'disabled' &&
                         (override.disableAllAdVisibilityChecks ||
                             !(override.disabledAdVisibilityCheckAdvertiserIds &&
-                                override.disabledAdVisibilityCheckAdvertiserIds.length > 0 &&
-                                advertiserId) ||
-                            override.disabledAdVisibilityCheckAdvertiserIds.includes(advertiserId)))
+                                override.disabledAdVisibilityCheckAdvertiserIds.length > 0) ||
+                            isAdvertiserIncluded({ advertiserId, companyIds }, override.disabledAdVisibilityCheckAdvertiserIds)))
                     ? this.window.performance.now()
                     : undefined,
                 durationVisibleSum: 0,

package/lib/ads/modules/ad-reload/index.js

@@ -2,6 +2,7 @@ import { AdVisibilityService } from './adVisibilityService';
 import { UserActivityService } from './userActivityService';
 import { mkConfigureStep } from '../../adPipeline';
 import { isNotNull } from 'ad-tag/util/arrayUtils';
+import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
 export class AdReload {
     constructor() {
         this.name = 'moli-ad-reload';
@@ -33,8 +34,7 @@ export class AdReload {
             const slotIsMonitored = slotsToMonitor.indexOf(slotDomId) > -1;
             const orderIdNotExcluded = !campaignId || config.excludeOrderIds.indexOf(campaignId) === -1;
             const orderIdIncluded = !!campaignId && config.includeOrderIds.indexOf(campaignId) > -1;
-            const advertiserIdIncluded = (!!advertiserId && config.includeAdvertiserIds.indexOf(advertiserId) > -1) ||
-                (!!companyIds && config.includeAdvertiserIds.some(id => companyIds.includes(id)));
+            const advertiserIdIncluded = isAdvertiserIncluded(renderEndedEvent, config.includeAdvertiserIds);
             const yieldGroupIdIncluded = !!yieldGroupIds && config.includeYieldGroupIds.some(id => yieldGroupIds.indexOf(id) > -1);
             const trackingSlotAllowed = !slotIsEmpty &&
                 slotIsMonitored &&
@@ -52,7 +52,7 @@ export class AdReload {
             }
             const slotAlreadyTracked = !!this.adVisibilityService?.isSlotTracked(slotDomId);
             if (trackingSlotAllowed) {
-                this.adVisibilityService.trackSlot(googleTagSlot, reloadAdSlotCallback, advertiserId);
+                this.adVisibilityService.trackSlot(googleTagSlot, reloadAdSlotCallback, advertiserId, companyIds);
             }
             else if (slotAlreadyTracked) {
                 this.adVisibilityService.removeSlotTracking(googleTagSlot);

package/lib/ads/modules/interstitial/interstitialAd.js

@@ -1,5 +1,6 @@
 import { getBrowserStorageValue } from 'ad-tag/util/localStorage';
 import { isGamInterstitial } from 'ad-tag/ads/auctions/interstitialContext';
+import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
 const interstitialContainerSelector = '[data-ref="h5v-interstitial"]';
 const interstitialCloseButtonSelector = '[data-ref="h5v-interstitial-close"]';
 const interstitialHidingClass = 'h5v-interstitial--hidden';
@@ -11,11 +12,7 @@ const interstitialRenderedEvent = (interstitialDomId, disallowedAdvertiserIds, w
         if (event.isEmpty) {
             resolve({ result: 'empty', slot: event.slot });
         }
-        else if (event.advertiserId && disallowedAdvertiserIds.includes(event.advertiserId)) {
-            resolve({ result: 'disallowed', slot: event.slot });
-        }
-        else if (event.companyIds &&
-            disallowedAdvertiserIds.some(id => event.companyIds?.includes(id))) {
+        else if (isAdvertiserIncluded(event, disallowedAdvertiserIds)) {
             resolve({ result: 'disallowed', slot: event.slot });
         }
         else {

package/lib/ads/modules/sticky-footer-ad/desktopFloorAd.js

@@ -1,3 +1,4 @@
+import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
 const closeButtonDataRef = 'footer-ad-close-button';
 const containerDataRefSelector = '[data-ref=h5-footer-ad-container]';
 const closeButtonDataRefSelector = `[data-ref=${closeButtonDataRef}]`;
@@ -21,8 +22,7 @@ const renderFooterAd = (window, floorAdDomId, disallowedAdvertiserIds, log) => (
         !footerAdElement ||
         slot.getSlotElementId() !== floorAdDomId ||
         event.isEmpty ||
-        (!!event.advertiserId && disallowedAdvertiserIds.includes(event.advertiserId)) ||
-        (!!event.companyIds && disallowedAdvertiserIds.some(id => event.companyIds?.includes(id))) ||
+        isAdvertiserIncluded(event, disallowedAdvertiserIds) ||
         window.matchMedia('(max-width: 767px)').matches) {
         log.debug('[footer-ad]', 'remove footer ad container');
         return;

package/lib/ads/modules/sticky-footer-ad/mobileSticky.js

@@ -1,3 +1,4 @@
+import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
 const adStickyContainerDataRef = '[data-ref=sticky-ad]';
 const adStickyCloseButtonDataRef = '[data-ref=sticky-ad-close]';
 const adVisibleClass = 'h5-sticky-ad--visible';
@@ -20,11 +21,7 @@ const stickyRenderedEvent = (adSticky, mobileStickyDomId, disallowedAdvertiserId
             }
             resolve('empty');
         }
-        else if (!!event.advertiserId && disallowedAdvertiserIds.includes(event.advertiserId)) {
-            resolve('disallowed');
-        }
-        else if (!!event.companyIds &&
-            disallowedAdvertiserIds.some(id => event.companyIds?.includes(id))) {
+        else if (isAdvertiserIncluded(event, disallowedAdvertiserIds)) {
             resolve('disallowed');
         }
         else {

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

@@ -1,3 +1,4 @@
+import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
 const adStickyContainerDataRef = '[data-ref=h5v-sticky-ad]';
 const adStickyCloseButtonDataRef = '[data-ref=h5v-sticky-ad-close]';
 const adStickyCloseButtonContent = '.h5v-closeButtonContent';
@@ -12,11 +13,7 @@ const stickyRenderedEvent = (mobileStickyDomId, disallowedAdvertiserIds, window)
         if (event.isEmpty) {
             resolve('empty');
         }
-        else if (event.advertiserId && disallowedAdvertiserIds.includes(event.advertiserId)) {
-            resolve('disallowed');
-        }
-        else if (!!event.companyIds &&
-            disallowedAdvertiserIds.some(id => event.companyIds?.includes(id))) {
+        else if (isAdvertiserIncluded(event, disallowedAdvertiserIds)) {
             resolve('disallowed');
         }
         else {

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

@@ -1,3 +1,4 @@
+import { isAdvertiserIncluded } from 'ad-tag/ads/isAdvertiserIncluded';
 export const adRenderResult = (ctx, headerSlot, disallowedAdvertiserIds, minVisibleDuration) => new Promise(resolve => {
     if (ctx.env__ === 'test') {
         resolve('standard');
@@ -7,11 +8,7 @@ export const adRenderResult = (ctx, headerSlot, disallowedAdvertiserIds, minVisi
         if (event.slot.getSlotElementId() !== headerSlot.domId) {
             return;
         }
-        if (event.advertiserId && disallowedAdvertiserIds.includes(event.advertiserId)) {
-            resolve('disallowed');
-        }
-        else if (event.companyIds &&
-            disallowedAdvertiserIds.some(id => event.companyIds?.includes(id))) {
+        if (isAdvertiserIncluded(event, disallowedAdvertiserIds)) {
             resolve('disallowed');
         }
         else if (event.isEmpty) {

package/lib/gen/packageJson.js

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

package/package.json

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