@highfivve/ad-tag 5.6.0 → 5.6.3

package/lib/ads/a9.js

@@ -137,7 +137,7 @@ const resolveAdUnitPath = (path, slotDepth, variables) => {
     return adUnitPath.resolveAdUnitPath(truncated, variables);
 };
 export const a9RequestBids = (config) => mkRequestBidsStep('a9-fetch-bids', (context, slotDefinitions) => new Promise(resolve => {
-    if (!hasRequiredConsent(context.tcData__)) {
+    if (!hasRequiredConsent(context.tcData__) || config.enabled === false) {
         context.logger__.debug('A9', 'Skip any due to missing consent');
         resolve();
         return;

package/lib/ads/adService.js

@@ -93,7 +93,7 @@ export class AdService {
                 prepareRequestAds.push(prebidPrepareRequestAds(config.prebid));
                 requestBids.push(prebidRequestBids(config.prebid, adServer));
             }
-            if (config.a9 && env === 'production' && isGam) {
+            if (config.a9 && config.a9.enabled !== false && env === 'production' && isGam) {
                 init.push(a9Init(config.a9, this.assetService));
                 configure.push(a9Configure(config.a9, config.schain));
                 configure.push(a9PublisherAudiences(config.a9));

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

@@ -1,4 +1,5 @@
 import { getBrowserStorageValue } from 'ad-tag/util/localStorage';
+import { isGamInterstitial } from 'ad-tag/ads/auctions/interstitialContext';
 const interstitialContainerSelector = '[data-ref="h5v-interstitial"]';
 const interstitialCloseButtonSelector = '[data-ref="h5v-interstitial-close"]';
 const interstitialHidingClass = 'h5v-interstitial--hidden';
@@ -8,14 +9,14 @@ const interstitialRenderedEvent = (interstitialDomId, disallowedAdvertiserIds, w
             return;
         }
         if (event.isEmpty) {
-            resolve('empty');
+            resolve({ result: 'empty', slot: event.slot });
         }
         else if (event.advertiserId && disallowedAdvertiserIds.includes(event.advertiserId)) {
-            resolve('disallowed');
+            resolve({ result: 'disallowed', slot: event.slot });
         }
         else {
             event.slot.setConfig({ safeFrame: { forceSafeFrame: true } });
-            resolve('standard');
+            resolve({ result: 'standard', slot: event.slot });
         }
         window.googletag.pubads().removeEventListener('slotRenderEnded', listener);
     };
@@ -60,14 +61,16 @@ export const initInterstitialModule = (window, env, log, interstitialDomId, disa
         closeButton.addEventListener('click', () => {
             closeInterstitial();
         });
-        const onRenderResult = (renderResult) => {
-            log.debug(interstitial, `result ${renderResult}`);
-            if (renderResult === 'disallowed' || renderResult === 'empty') {
+        const onRenderResult = ({ result, slot }) => {
+            log.debug(interstitial, `result ${result}`);
+            if (result === 'disallowed' ||
+                result === 'empty' ||
+                (slot && isGamInterstitial(slot, window))) {
                 log.debug(interstitial, 'hide interstitial container');
                 hideAdSlot(interstitialAdContainer);
                 return Promise.resolve();
             }
-            else if (renderResult === 'standard') {
+            else if (result === 'standard') {
                 showAdSlot(interstitialAdContainer);
                 if (closeAutomaticallyAfterMs) {
                     timeoutToBeClearedWhenModuleIsInitialized = window.setTimeout(() => {
@@ -76,9 +79,9 @@ export const initInterstitialModule = (window, env, log, interstitialDomId, disa
                 }
                 const interstitialOnLoadEventPromise = interstitialOnLoadEvent(interstitialDomId, window);
                 return interstitialRenderedEvent(interstitialDomId, disallowedAdvertiserIds, window)
-                    .then(result => result === 'empty' || result === 'disallowed'
-                    ? Promise.resolve(result)
-                    : interstitialOnLoadEventPromise.then(() => result))
+                    .then(renderResult => renderResult.result === 'empty' || renderResult.result === 'disallowed'
+                    ? Promise.resolve(renderResult)
+                    : interstitialOnLoadEventPromise.then(() => renderResult))
                     .then(onRenderResult);
             }
             return Promise.resolve();
@@ -87,17 +90,17 @@ export const initInterstitialModule = (window, env, log, interstitialDomId, disa
             case 'production':
                 const interstitialOnLoadEventPromise = interstitialOnLoadEvent(interstitialDomId, window);
                 interstitialRenderedEvent(interstitialDomId, disallowedAdvertiserIds, window)
-                    .then(result => result === 'empty' || result === 'disallowed'
-                    ? Promise.resolve(result)
-                    : interstitialOnLoadEventPromise.then(() => result))
+                    .then(renderResult => renderResult.result === 'empty' || renderResult.result === 'disallowed'
+                    ? Promise.resolve(renderResult)
+                    : interstitialOnLoadEventPromise.then(() => renderResult))
                     .then(onRenderResult);
                 break;
             case 'test':
                 if (!!getBrowserStorageValue('test-interstitial', localStorage)) {
-                    onRenderResult('standard');
+                    onRenderResult({ result: 'standard', slot: null });
                 }
                 else {
-                    onRenderResult('empty');
+                    onRenderResult({ result: 'empty', slot: null });
                 }
                 break;
             default:

package/lib/gen/packageJson.js

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

package/lib/types/prebidjs.js

@@ -10,6 +10,7 @@ export var prebidjs;
     prebidjs.AppNexusAst = 'appnexusAst';
     prebidjs.AppNexus = 'appnexus';
     prebidjs.GumGum = 'gumgum';
+    prebidjs.Equativ = 'equativ';
     prebidjs.ImproveDigital = 'improvedigital';
     prebidjs.IndexExchange = 'ix';
     prebidjs.InMobi = 'inmobi';

package/package.json

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