@mjhls/mjh-framework 1.0.405 → 1.0.406

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.405
+# mjh-framework v. 1.0.406
 
 
 > Foundation Framework

package/dist/cjs/index.js

@@ -21910,7 +21910,9 @@ var Article$1 = function Article(props) {
           parent.style.display = 'none';
           setContextualADFlag(false);
         } else {
-          setContextualADFlag(true);
+          if (body[0]._type === 'figure' || body[1]._type === 'figure' || body[2]._type === 'figure' || body[3]._type === 'figure') {
+            setContextualADFlag(true);
+          }
         }
       };
 
@@ -21968,7 +21970,9 @@ var Article$1 = function Article(props) {
           parent.style.display = 'none';
           setContextualADFlag(false);
         } else {
-          setContextualADFlag(true);
+          if (body && body[1] && body[1]._type === 'figure') {
+            setContextualADFlag(true);
+          }
         }
       };
 
@@ -21980,12 +21984,13 @@ var Article$1 = function Article(props) {
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(0, _selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
-        React__default.createElement('span', { className: 'clearfix' }),
+        contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(
           'div',
           { id: 'contextual-native-ad-' + payload._id, className: 'contextual-native-ad' },
           React__default.createElement(AdSlot.DFPAdSlot, _extends$2._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound }))
         ),
+        contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
           serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(_selectedIndex))),
@@ -22439,16 +22444,20 @@ var ArticleQueue$1 = function ArticleQueue(props) {
       setQueueData = _useState2[1];
 
   var refreshAD = function refreshAD(path) {
+
     if (!main.main_39) {
       var activeArticle = queueData.find(function (item) {
         return item.url.current === path;
       });
-      var targeting = getTargeting(props);
+
+      var targeting = getTargeting({ article: activeArticle, position: props.position, prevUrl: props.prevUrl });
+
       debounce.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           var slots = googletag.pubads().getSlots();
           slots.forEach(function (slot) {
             var pos = slot.getTargeting('pos');
+
             slot.clearTargeting();
             _Object$keys(targeting).forEach(function (key) {
               slot.setTargeting(key, targeting[key]);

package/dist/esm/index.js

@@ -21907,7 +21907,9 @@ var Article$1 = function Article(props) {
           parent.style.display = 'none';
           setContextualADFlag(false);
         } else {
-          setContextualADFlag(true);
+          if (body[0]._type === 'figure' || body[1]._type === 'figure' || body[2]._type === 'figure' || body[3]._type === 'figure') {
+            setContextualADFlag(true);
+          }
         }
       };
 
@@ -21965,7 +21967,9 @@ var Article$1 = function Article(props) {
           parent.style.display = 'none';
           setContextualADFlag(false);
         } else {
-          setContextualADFlag(true);
+          if (body && body[1] && body[1]._type === 'figure') {
+            setContextualADFlag(true);
+          }
         }
       };
 
@@ -21977,12 +21981,13 @@ var Article$1 = function Article(props) {
           blocks: [].concat(_toConsumableArray(body.slice(0, _selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
-        React__default.createElement('span', { className: 'clearfix' }),
+        contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(
           'div',
           { id: 'contextual-native-ad-' + payload._id, className: 'contextual-native-ad' },
           React__default.createElement(DFPAdSlot, _extends$2({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound }))
         ),
+        contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(BlockContent, _extends$2({
           serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
           blocks: [].concat(_toConsumableArray(body.slice(_selectedIndex))),
@@ -22436,16 +22441,20 @@ var ArticleQueue$1 = function ArticleQueue(props) {
       setQueueData = _useState2[1];
 
   var refreshAD = function refreshAD(path) {
+
     if (!main_39) {
       var activeArticle = queueData.find(function (item) {
         return item.url.current === path;
       });
-      var targeting = getTargeting(props);
+
+      var targeting = getTargeting({ article: activeArticle, position: props.position, prevUrl: props.prevUrl });
+
       lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           var slots = googletag.pubads().getSlots();
           slots.forEach(function (slot) {
             var pos = slot.getTargeting('pos');
+
             slot.clearTargeting();
             _Object$keys(targeting).forEach(function (key) {
               slot.setTargeting(key, targeting[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.405",
+  "version": "1.0.406",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",