@mjhls/mjh-framework 1.0.405 → 1.0.407

package/README.md

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

package/dist/cjs/{ADInfeed-494f5e6b.js → ADInfeed-5e2bdf8e.js}

@@ -5,7 +5,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var React = require('react');
 var React__default = _interopDefault(React);
 var Card = _interopDefault(require('react-bootstrap/Card'));
-var AdSlot = require('./AdSlot-4d22aad4.js');
+var AdSlot = require('./AdSlot-06a37b89.js');
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/cjs/{AdSlot-4d22aad4.js → AdSlot-06a37b89.js}

@@ -1180,7 +1180,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       adRendered = _useState2[0],
       setAdRendered = _useState2[1];
 
-  var _useState3 = React.useState(false),
+  var _useState3 = React.useState(true),
       _useState4 = slicedToArray._slicedToArray(_useState3, 2),
       adRefreshable = _useState4[0],
       setAdRefreshable = _useState4[1];

package/dist/cjs/DeckContent.js

@@ -31,9 +31,9 @@ var index$1 = require('./index-fa0fb52c.js');
 var main = require('./main-bc4db521.js');
 var entities = require('./entities-310b46ee.js');
 require('./slicedToArray-419d467a.js');
-require('./AdSlot-4d22aad4.js');
+require('./AdSlot-06a37b89.js');
 require('./promise-0a493c7a.js');
-var ADInfeed = require('./ADInfeed-494f5e6b.js');
+var ADInfeed = require('./ADInfeed-5e2bdf8e.js');
 
 var DeckContent = function (_React$Component) {
   inherits$2._inherits(DeckContent, _React$Component);

package/dist/cjs/{GridContent-62c5d302.js → GridContent-f040c478.js}

@@ -21,7 +21,7 @@ var index = require('./index-b5eb3ff8.js');
 var index$1 = require('./index-fa0fb52c.js');
 var main = require('./main-bc4db521.js');
 var entities = require('./entities-310b46ee.js');
-var ADInfeed = require('./ADInfeed-494f5e6b.js');
+var ADInfeed = require('./ADInfeed-5e2bdf8e.js');
 var get$1 = require('./get-5aa7468c.js');
 var AuthorComponent = require('./AuthorComponent-4706f297.js');
 

package/dist/cjs/GridContent.js

@@ -27,11 +27,11 @@ require('./index-fa0fb52c.js');
 require('./main-bc4db521.js');
 require('./entities-310b46ee.js');
 require('./slicedToArray-419d467a.js');
-require('./AdSlot-4d22aad4.js');
+require('./AdSlot-06a37b89.js');
 require('./promise-0a493c7a.js');
-require('./ADInfeed-494f5e6b.js');
+require('./ADInfeed-5e2bdf8e.js');
 require('./get-5aa7468c.js');
-var GridContent = require('./GridContent-62c5d302.js');
+var GridContent = require('./GridContent-f040c478.js');
 require('./AuthorComponent-4706f297.js');
 
 

package/dist/cjs/{Normal-4a0d7dfc.js → Normal-1c1c3793.js}

@@ -11,7 +11,7 @@ var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 var main = require('./main-bc4db521.js');
 var slicedToArray = require('./slicedToArray-419d467a.js');
-var AdSlot = require('./AdSlot-4d22aad4.js');
+var AdSlot = require('./AdSlot-06a37b89.js');
 var get$1 = require('./get-5aa7468c.js');
 var reactSocialIcons = require('./react-social-icons-cd0d9d3b.js');
 var reactBootstrap = require('react-bootstrap');

package/dist/cjs/QueueDeckExpanded.js

@@ -26,9 +26,9 @@ var index$1 = require('./index-fa0fb52c.js');
 var main = require('./main-bc4db521.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-419d467a.js');
-require('./AdSlot-4d22aad4.js');
+require('./AdSlot-06a37b89.js');
 require('./promise-0a493c7a.js');
-var ADInfeed = require('./ADInfeed-494f5e6b.js');
+var ADInfeed = require('./ADInfeed-5e2bdf8e.js');
 var AuthorComponent = require('./AuthorComponent-4706f297.js');
 var reactBootstrap = require('react-bootstrap');
 

package/dist/cjs/TemplateNormal.js

@@ -14,14 +14,14 @@ require('react-bootstrap/Col');
 require('next/router');
 require('./main-bc4db521.js');
 require('./slicedToArray-419d467a.js');
-require('./AdSlot-4d22aad4.js');
+require('./AdSlot-06a37b89.js');
 require('./promise-0a493c7a.js');
 require('./get-5aa7468c.js');
 require('./react-social-icons-cd0d9d3b.js');
 require('react-bootstrap');
 require('./index.esm-340d3792.js');
 require('react-bootstrap/Button');
-var TemplateNormal = require('./Normal-4a0d7dfc.js');
+var TemplateNormal = require('./Normal-1c1c3793.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');

package/dist/cjs/index.js

@@ -33,12 +33,12 @@ var index$1 = require('./index-fa0fb52c.js');
 var main = require('./main-bc4db521.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-419d467a.js');
-var AdSlot = require('./AdSlot-4d22aad4.js');
+var AdSlot = require('./AdSlot-06a37b89.js');
 var promise = require('./promise-0a493c7a.js');
-require('./ADInfeed-494f5e6b.js');
+require('./ADInfeed-5e2bdf8e.js');
 var DeckContent = require('./DeckContent.js');
 var get$1 = require('./get-5aa7468c.js');
-var GridContent = require('./GridContent-62c5d302.js');
+var GridContent = require('./GridContent-f040c478.js');
 var AuthorComponent = require('./AuthorComponent-4706f297.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
@@ -59,7 +59,7 @@ var IssueDeck = require('./IssueDeck.js');
 require('react-bootstrap/Badge');
 var IssueContentDeck = require('./IssueContentDeck.js');
 var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
-var TemplateNormal = require('./Normal-4a0d7dfc.js');
+var TemplateNormal = require('./Normal-1c1c3793.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -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/{ADInfeed-e5cefea5.js → ADInfeed-22b3c761.js}

@@ -1,6 +1,6 @@
 import React__default from 'react';
 import Card from 'react-bootstrap/Card';
-import { D as DFPAdSlot } from './AdSlot-78e48a2c.js';
+import { D as DFPAdSlot } from './AdSlot-dabf7e14.js';
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/esm/{AdSlot-78e48a2c.js → AdSlot-dabf7e14.js}

@@ -1175,7 +1175,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       adRendered = _useState2[0],
       setAdRendered = _useState2[1];
 
-  var _useState3 = useState(false),
+  var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
       adRefreshable = _useState4[0],
       setAdRefreshable = _useState4[1];

package/dist/esm/DeckContent.js

@@ -25,9 +25,9 @@ import { L as LazyLoad } from './index-5f9f807a.js';
 import { m as main_39 } from './main-7d1b3c98.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
 import './slicedToArray-04e02710.js';
-import './AdSlot-78e48a2c.js';
+import './AdSlot-dabf7e14.js';
 import './promise-2592a80a.js';
-import { A as ADInfeed } from './ADInfeed-e5cefea5.js';
+import { A as ADInfeed } from './ADInfeed-22b3c761.js';
 
 var DeckContent = function (_React$Component) {
   _inherits(DeckContent, _React$Component);

package/dist/esm/{GridContent-2cabe342.js → GridContent-42c3d947.js}

@@ -15,7 +15,7 @@ import { i as imageUrlBuilder } from './index-51a80699.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { m as main_39 } from './main-7d1b3c98.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
-import { A as ADInfeed } from './ADInfeed-e5cefea5.js';
+import { A as ADInfeed } from './ADInfeed-22b3c761.js';
 import { g as get_1 } from './get-53653403.js';
 import { A as AuthorComponent } from './AuthorComponent-c9e46673.js';
 

package/dist/esm/GridContent.js

@@ -25,9 +25,9 @@ import './index-5f9f807a.js';
 import './main-7d1b3c98.js';
 import './entities-7cc3bf45.js';
 import './slicedToArray-04e02710.js';
-import './AdSlot-78e48a2c.js';
+import './AdSlot-dabf7e14.js';
 import './promise-2592a80a.js';
-import './ADInfeed-e5cefea5.js';
+import './ADInfeed-22b3c761.js';
 import './get-53653403.js';
-export { G as default } from './GridContent-2cabe342.js';
+export { G as default } from './GridContent-42c3d947.js';
 import './AuthorComponent-c9e46673.js';

package/dist/esm/{Normal-b8c423e3.js → Normal-a975e81f.js}

@@ -5,7 +5,7 @@ import Col from 'react-bootstrap/Col';
 import { useRouter } from 'next/router';
 import { m as main_39, c as main_40 } from './main-7d1b3c98.js';
 import { _ as _slicedToArray } from './slicedToArray-04e02710.js';
-import { D as DFPAdSlot } from './AdSlot-78e48a2c.js';
+import { D as DFPAdSlot } from './AdSlot-dabf7e14.js';
 import { g as get_1 } from './get-53653403.js';
 import { r as reactSocialIcons_1 } from './react-social-icons-a7d5c5c7.js';
 import { Dropdown } from 'react-bootstrap';

package/dist/esm/QueueDeckExpanded.js

@@ -20,9 +20,9 @@ import { L as LazyLoad } from './index-5f9f807a.js';
 import { m as main_39 } from './main-7d1b3c98.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
 import { _ as _slicedToArray } from './slicedToArray-04e02710.js';
-import './AdSlot-78e48a2c.js';
+import './AdSlot-dabf7e14.js';
 import './promise-2592a80a.js';
-import { A as ADInfeed } from './ADInfeed-e5cefea5.js';
+import { A as ADInfeed } from './ADInfeed-22b3c761.js';
 import { A as AuthorComponent } from './AuthorComponent-c9e46673.js';
 import { Container, Media } from 'react-bootstrap';
 

package/dist/esm/TemplateNormal.js

@@ -12,14 +12,14 @@ import 'react-bootstrap/Col';
 import 'next/router';
 import './main-7d1b3c98.js';
 import './slicedToArray-04e02710.js';
-import './AdSlot-78e48a2c.js';
+import './AdSlot-dabf7e14.js';
 import './promise-2592a80a.js';
 import './get-53653403.js';
 import './react-social-icons-a7d5c5c7.js';
 import 'react-bootstrap';
 import './index.esm-536609db.js';
 import 'react-bootstrap/Button';
-export { T as default } from './Normal-b8c423e3.js';
+export { T as default } from './Normal-a975e81f.js';
 import 'react-bootstrap/ListGroup';
 import 'next/head';
 import 'react-bootstrap/Nav';

package/dist/esm/index.js

@@ -25,13 +25,13 @@ import { L as LazyLoad } from './index-5f9f807a.js';
 import { m as main_39, a as main_16, b as main_38 } from './main-7d1b3c98.js';
 import { h as html_decode_1, c as clean_html_1 } from './entities-7cc3bf45.js';
 import { _ as _slicedToArray, a as _getIterator } from './slicedToArray-04e02710.js';
-import { _ as _JSON$stringify, a as _asyncToGenerator, r as regenerator, D as DFPAdSlot, B as Beam } from './AdSlot-78e48a2c.js';
-export { D as AdSlot, B as Beam } from './AdSlot-78e48a2c.js';
+import { _ as _JSON$stringify, a as _asyncToGenerator, r as regenerator, D as DFPAdSlot, B as Beam } from './AdSlot-dabf7e14.js';
+export { D as AdSlot, B as Beam } from './AdSlot-dabf7e14.js';
 import { _ as _anInstance, a as _forOf, b as _redefineAll, c as _setSpecies } from './promise-2592a80a.js';
-import './ADInfeed-e5cefea5.js';
+import './ADInfeed-22b3c761.js';
 export { default as DeckContent } from './DeckContent.js';
 import { i as isFunction_1, a as isArray_1, _ as _arrayMap } from './get-53653403.js';
-export { A as AD, G as GridContent } from './GridContent-2cabe342.js';
+export { A as AD, G as GridContent } from './GridContent-42c3d947.js';
 import { A as AuthorComponent } from './AuthorComponent-c9e46673.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
@@ -54,8 +54,8 @@ export { default as IssueDeck } from './IssueDeck.js';
 import 'react-bootstrap/Badge';
 export { default as IssueContentDeck } from './IssueContentDeck.js';
 import Spinner from 'react-bootstrap/Spinner';
-import { M as MdPictureAsPdf } from './Normal-b8c423e3.js';
-export { A as AD728x90, g as ADSponsoredResources, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, h as SideFooter, T as TemplateNormal } from './Normal-b8c423e3.js';
+import { M as MdPictureAsPdf } from './Normal-a975e81f.js';
+export { A as AD728x90, g as ADSponsoredResources, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, h as SideFooter, T as TemplateNormal } from './Normal-a975e81f.js';
 import 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -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.407",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",