@mjhls/mjh-framework 1.0.637 → 1.0.639

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.637
+# mjh-framework v. 1.0.639
 
 > Foundation Framework 
 

package/dist/cjs/ArticleQueue.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-c9f99d47.js');
+require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 var _typeof = require('./typeof-725500bc.js');
@@ -45,7 +45,7 @@ require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 require('react-bootstrap/Button');
-var getSerializers = require('./index-87fd5322.js');
+var getSerializers = require('./index-8c869759.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/ArticleSeriesListing.js

@@ -10,7 +10,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-var inherits = require('./inherits-c9f99d47.js');
+var inherits = require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');

package/dist/cjs/DeckContent.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-var inherits = require('./inherits-c9f99d47.js');
+var inherits = require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');

package/dist/cjs/DeckQueue.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-var inherits = require('./inherits-c9f99d47.js');
+var inherits = require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');

package/dist/cjs/ExternalResources.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-c9f99d47.js');
+require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');
@@ -45,7 +45,7 @@ require('./GroupDeck.js');
 require('react-bootstrap');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 var index$3 = require('./index-5be2866f.js');
-var getSerializers = require('./index-87fd5322.js');
+var getSerializers = require('./index-8c869759.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/GridContent.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-var inherits = require('./inherits-c9f99d47.js');
+var inherits = require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');

package/dist/cjs/MasterDeck.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-var inherits = require('./inherits-c9f99d47.js');
+var inherits = require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');

package/dist/cjs/PartnerDetailListing.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-c9f99d47.js');
+require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');
@@ -51,7 +51,7 @@ require('./GroupDeck.js');
 require('react-bootstrap');
 var QueueDeckExpanded = require('./QueueDeckExpanded.js');
 require('react-bootstrap/Button');
-var getSerializers = require('./index-87fd5322.js');
+var getSerializers = require('./index-8c869759.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/VideoSeriesCard.js

@@ -8,7 +8,7 @@ require('./es6.string.iterator-cc0bbaa4.js');
 require('./_library-dd23b178.js');
 require('./_object-pie-68c5bcbc.js');
 require('./web.dom.iterable-a0e279c1.js');
-var _typeof = require('./typeof-725500bc.js');
+var _typeof$1 = require('./typeof-725500bc.js');
 require('./_is-array-754e012d.js');
 var React = require('react');
 var React__default = _interopDefault(React);
@@ -48,7 +48,7 @@ var VideoSeriesCard = function VideoSeriesCard(props) {
             index$2.LazyLoad,
             null,
             React__default.createElement('img', {
-              src: data.thumbnail && data.thumbnail.asset ? builder.image(data.thumbnail).url() : data.thumbnail && _typeof._typeof(data.thumbnail == 'string') ? data.thumbnail : defaultImage
+              src: data.thumbnail && data.thumbnail.asset ? builder.image(data.thumbnail).url() : data.thumbnail && _typeof$1._typeof(data.thumbnail == 'string') ? data.thumbnail : defaultImage
             })
           )
         )

package/dist/cjs/VideoSeriesListing.js

@@ -10,7 +10,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-var inherits = require('./inherits-c9f99d47.js');
+var inherits = require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');

package/dist/cjs/View.js

@@ -12,10 +12,10 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-c9f99d47.js');
+require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
-var _typeof = require('./typeof-725500bc.js');
+var _typeof$1 = require('./typeof-725500bc.js');
 require('./_is-array-754e012d.js');
 var React = require('react');
 var React__default = _interopDefault(React);
@@ -45,7 +45,7 @@ require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 var Button = _interopDefault(require('react-bootstrap/Button'));
-var getSerializers = require('./index-87fd5322.js');
+var getSerializers = require('./index-8c869759.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');
@@ -152,7 +152,7 @@ var DocumentGroup = function DocumentGroup(_ref) {
 
 var findIndex = function findIndex(arr) {
   var indexes = [];
-  if ((typeof arr === 'undefined' ? 'undefined' : _typeof._typeof(arr)) === 'object') {
+  if ((typeof arr === 'undefined' ? 'undefined' : _typeof$1._typeof(arr)) === 'object') {
     var _iteratorNormalCompletion = true;
     var _didIteratorError = false;
     var _iteratorError = undefined;
@@ -328,6 +328,8 @@ var Article = function Article(props) {
       sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag,
       _props$authorImgHeigh = props.authorImgHeight,
       authorImgHeight = _props$authorImgHeigh === undefined ? 270 : _props$authorImgHeigh;
+
+  var targeting = getTargeting.getTargeting(props);
   var onChangeArticle = props.onChangeArticle;
 
   //If sponsored flag, disable contextual ads
@@ -543,7 +545,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent.BlockContent, _extends._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -560,7 +562,7 @@ var Article = function Article(props) {
           React__default.createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
         ),
         React__default.createElement(BlockContent.BlockContent, _extends._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -615,7 +617,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent.BlockContent, _extends._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -627,7 +629,7 @@ var Article = function Article(props) {
         ),
         contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(BlockContent.BlockContent, _extends._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -658,7 +660,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent.BlockContent, _extends._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -669,14 +671,14 @@ var Article = function Article(props) {
           React__default.createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
         ),
         React__default.createElement(BlockContent.BlockContent, _extends._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else {
       return React__default.createElement(BlockContent.BlockContent, _extends._extends({
-        serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads),
+        serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads, targeting),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
       }, client.config()));
@@ -1324,8 +1326,21 @@ var View = function View(props) {
     return false;
   };
 
+  var checkArticleSeries = function checkArticleSeries(article) {
+    if (!article || !article.body) {
+      return false;
+    }
+    for (var i = 0; i < article.body.length; i++) {
+      if (article.body[i]._type === 'articleSeries') {
+        return true;
+      }
+    }
+    return false;
+  };
+
   var isVideoSeries = checkVideoSeries(props.article);
-  var needInfiniteScroll = ['Articles', 'Videos', 'Podcasts'].includes(article.category.name) && article.taxonomyMapping && article.passwordLock !== true && !isVideoSeries && !article.ExcludeFromInfiniteScroll && !sponsoredFlag;
+  var isArticleSeries = checkArticleSeries(props.article);
+  var needInfiniteScroll = ['Articles', 'Videos', 'Podcasts'].includes(article.category.name) && article.taxonomyMapping && article.passwordLock !== true && !isVideoSeries && !isArticleSeries && !article.ExcludeFromInfiniteScroll && !sponsoredFlag;
 
   if (['Articles', 'Videos', 'Podcasts'].includes(article.category.name)) {
     description = null;

package/dist/cjs/getSerializers.js

@@ -10,7 +10,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-c9f99d47.js');
+require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');
@@ -40,7 +40,7 @@ require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 require('react-bootstrap/Button');
-var getSerializers = require('./index-87fd5322.js');
+var getSerializers = require('./index-8c869759.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/{index-87fd5322.js → index-8c869759.js}

@@ -5,7 +5,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 var toConsumableArray = require('./toConsumableArray-9a3476fe.js');
 var _extends = require('./extends-60837c34.js');
-var inherits = require('./inherits-c9f99d47.js');
+var inherits = require('./inherits-513d81cd.js');
+var _typeof$1 = require('./typeof-725500bc.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 var index = require('./index-2d0a4911.js');
@@ -2183,7 +2184,9 @@ var Video = function Video(_ref) {
       _ref$autoplay = _ref.autoplay,
       autoplay = _ref$autoplay === undefined ? false : _ref$autoplay,
       _ref$autoplayNextVide = _ref.autoplayNextVideo,
-      autoplayNextVideo = _ref$autoplayNextVide === undefined ? function () {} : _ref$autoplayNextVide;
+      autoplayNextVideo = _ref$autoplayNextVide === undefined ? function () {} : _ref$autoplayNextVide,
+      _ref$targeting = _ref.targeting,
+      targeting = _ref$targeting === undefined ? null : _ref$targeting;
   var source = node.source,
       videoID = node.videoID,
       playlistID = node.playlistID,
@@ -2206,7 +2209,12 @@ var Video = function Video(_ref) {
   var onVideoSuccess = function onVideoSuccess(success) {
     //console.log('success:', success.ref)
     var player = success.ref;
-
+    if (_typeof$1._typeof(player.ima3) === 'object' && player.ima3.settings && player.ima3.settings.serverUrl && targeting !== null) {
+      player.ima3.settings.debug = true;
+      if (targeting.content_placement && targeting.document_url) {
+        player.ima3.settings.serverUrl = player.ima3.settings.serverUrl + '&cust_params=' + encodeURIComponent('content_placement=' + targeting.content_placement + '&document_url=' + targeting.document_url);
+      }
+    }
     // this is video ready
     player.on('loadedmetadata', function (evt) {
       //console.log('loadedmetadata:', evt)
@@ -8027,8 +8035,9 @@ var ArticleSeries = function ArticleSeries(_ref) {
   var router = Router.useRouter();
 
   var refArray = React.useRef([]);
+  var adRefArray = React.useRef([]);
 
-  var _useState = React.useState(77),
+  var _useState = React.useState(100),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       NavoffsetTop = _useState2[0],
       setNavoffsetTop = _useState2[1];
@@ -8105,26 +8114,26 @@ var ArticleSeries = function ArticleSeries(_ref) {
   };
 
   React.useEffect(function () {
-    if (!firstLoad) {
-      scrollToArticle();
-    }
     try {
-      setNavoffsetTop(document.getElementById('navbar-ham').offsetHeight);
+      setNavoffsetTop(document.getElementById('navbar-ham').offsetHeight - 15);
     } catch (e) {}
   }, []);
 
   var scrollToArticle = function scrollToArticle(id) {
     var localArticleID = id ? id : selectedArticle;
     var findArticle = function findArticle(ref) {
-      return ref.props.id === localArticleID;
+      if (ref) {
+        return ref.props.id === localArticleID;
+      }
+      return false;
     };
     var indexOfRef = refArray.current.findIndex(findArticle);
 
     if (indexOfRef >= 0) {
-      //console.log(refArray.current[indexOfRef].wraperRef.current)
-      refArray.current[indexOfRef].wraperRef.current.scrollIntoView({ behavior: 'smooth' });
-      window.scrollTo({ top: refArray.current[indexOfRef].wraperRef.current.offsetTop + NavoffsetTop, behavior: 'smooth' });
+      //refArray.current[indexOfRef].wraperRef.current.scrollIntoView({ behavior: 'smooth' })
+      window.scrollTo({ top: refArray.current[indexOfRef].wraperRef.current.offsetTop - NavoffsetTop, behavior: 'smooth' });
     }
+    setFirstLoad(true);
   };
 
   var renderAuthorBiography = function renderAuthorBiography(biography) {
@@ -8139,10 +8148,10 @@ var ArticleSeries = function ArticleSeries(_ref) {
     // Change URL and do other changes
     var doChanges = function doChanges() {
       if (firstLoad) {
-        window.history.pushState({ page: path }, '', newPath);
+        refreshAD();
       }
+      window.history.pushState({ page: path }, '', newPath);
       document.title = title;
-      refreshAD();
       setFirstLoad(true);
     };
 
@@ -8182,6 +8191,26 @@ var ArticleSeries = function ArticleSeries(_ref) {
     };
   });
 
+  React.useEffect(function () {
+    if (!firstLoad) {
+      if (main.main_39) {
+        grabLoadedAds();
+      }
+    }
+  }, []);
+
+  var grabLoadedAds = function grabLoadedAds() {
+    console.dir(index.lib_3);
+    index.lib_3.getGoogletag().then(function (googletag) {
+      var checkIfReady = window.setInterval(function () {
+        if (window.googletag && googletag.pubadsReady) {
+          clearInterval(checkIfReady);
+          scrollToArticle();
+        }
+      }, 1000);
+    });
+  };
+
   var refreshAD = function refreshAD(path) {
     //const activeArticle = path
     //let targeting = getTargeting({ article: activeArticle, cpModificationRequired, position: props.position, prevUrl })
@@ -8223,13 +8252,38 @@ var ArticleSeries = function ArticleSeries(_ref) {
       )
     ),
     React__default.createElement('hr', { className: 'article-seperater' }),
+    React__default.createElement(
+      'div',
+      { className: 'ad-box', style: { textAlign: 'center' } },
+      main.main_39 && Ads.map(function (ad, index) {
+        if (index === 0) {
+          return React__default.createElement(
+            'div',
+            {
+              key: 'addid-1',
+              id: 'addid-1',
+              ref: function ref(ele) {
+                return adRefArray.current[0] = ele;
+              },
+              style: {
+                display: 'flex',
+                flex: '1 0 auto',
+                justifyContent: 'center',
+                alignItems: 'center',
+                textAlign: 'center'
+              } },
+            ad.component
+          );
+        }
+      })
+    ),
     React__default.createElement(
       'div',
       { className: 'article-container', style: { marginBottom: '2rem' } },
       nodes.articles.map(function (article, index) {
         return React__default.createElement(
-          React__default.Fragment,
-          null,
+          'div',
+          { key: article.title },
           React__default.createElement(
             InscreenSensor,
             {
@@ -8299,13 +8353,16 @@ var ArticleSeries = function ArticleSeries(_ref) {
             React__default.createElement(
               'div',
               { className: 'ad-box', style: { textAlign: 'center' } },
-              main.main_39 && nodes.articles.length - 1 !== index && Ads.map(function (ad, index) {
-                if (index === 0) {
+              main.main_39 && nodes.articles.length - 1 !== index && Ads.map(function (ad, innerIndex) {
+                if (innerIndex === 0) {
                   return React__default.createElement(
                     'div',
                     {
-                      key: index,
-                      id: 'addid-' + index,
+                      key: 'addid-' + (index + 2),
+                      id: 'addid-' + (index + 2),
+                      ref: function ref(ele) {
+                        return adRefArray.current[index + 1] = ele;
+                      },
                       style: {
                         display: 'flex',
                         flex: '1 0 auto',
@@ -8611,7 +8668,8 @@ var getSerializers = function getSerializers() {
       _props$2 = props[8],
       contextualADFlag = _props$2 === undefined ? false : _props$2,
       articleId = props[9],
-      Ads = props[10];
+      Ads = props[10],
+      targeting = props[11];
 
   return {
     types: {
@@ -8677,7 +8735,7 @@ var getSerializers = function getSerializers() {
       video: function video(_ref11) {
         var node = _ref11.node;
 
-        return React__default.createElement(Video, { node: node, autoplay: autoplay, accountIDs: videoAccountIDs || {} });
+        return React__default.createElement(Video, { node: node, autoplay: autoplay, accountIDs: videoAccountIDs || {}, targeting: targeting });
       },
       audio: function audio(_ref12) {
         var node = _ref12.node;

package/dist/cjs/index.js

@@ -12,7 +12,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-c9f99d47.js');
+require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');
@@ -77,7 +77,7 @@ require('./index-5be2866f.js');
 require('./js.cookie-a511c430.js');
 var EventsDeck = require('./EventsDeck.js');
 var CMEDeck = require('./CMEDeck.js');
-var getSerializers = require('./index-87fd5322.js');
+var getSerializers = require('./index-8c869759.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/{inherits-c9f99d47.js → inherits-513d81cd.js}

@@ -5,7 +5,7 @@ var _toObject = require('./_to-object-329a650b.js');
 var es6_string_iterator = require('./es6.string.iterator-cc0bbaa4.js');
 var _objectSap = require('./_object-sap-5e74ba08.js');
 var defineProperty = require('./define-property-f4d12f4e.js');
-var _typeof = require('./typeof-725500bc.js');
+var _typeof$1 = require('./typeof-725500bc.js');
 
 // 19.1.2.9 Object.getPrototypeOf(O)
 
@@ -75,7 +75,7 @@ exports.__esModule = true;
 
 
 
-var _typeof3 = _interopRequireDefault(_typeof._typeof_1);
+var _typeof3 = _interopRequireDefault(_typeof$1._typeof_1);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -102,7 +102,7 @@ var _setProto = {
   set: Object.setPrototypeOf || ('__proto__' in {} ? // eslint-disable-line
     function (test, buggy, set) {
       try {
-        set = _toObject._ctx(Function.call, _typeof._objectGopd.f(Object.prototype, '__proto__').set, 2);
+        set = _toObject._ctx(Function.call, _typeof$1._objectGopd.f(Object.prototype, '__proto__').set, 2);
         set(test, []);
         buggy = !(test instanceof Array);
       } catch (e) { buggy = true; }
@@ -156,7 +156,7 @@ var _create2 = _interopRequireDefault(create$1);
 
 
 
-var _typeof3 = _interopRequireDefault(_typeof._typeof_1);
+var _typeof3 = _interopRequireDefault(_typeof$1._typeof_1);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/dist/esm/ArticleQueue.js

@@ -40,7 +40,7 @@ import './smoothscroll-4b699764.js';
 import './GroupDeck.js';
 import 'react-bootstrap';
 import 'react-bootstrap/Button';
-import { I as InscreenSensor, g as getSerializers } from './index-539e2942.js';
+import { I as InscreenSensor, g as getSerializers } from './index-ccfe8253.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/ExternalResources.js

@@ -39,7 +39,7 @@ import './GroupDeck.js';
 import 'react-bootstrap';
 import Button from 'react-bootstrap/Button';
 import { m as momentTimezone } from './index-d2f90501.js';
-import { g as getSerializers } from './index-539e2942.js';
+import { g as getSerializers } from './index-ccfe8253.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/PartnerDetailListing.js

@@ -46,7 +46,7 @@ import './GroupDeck.js';
 import 'react-bootstrap';
 import QueueDeckExpanded from './QueueDeckExpanded.js';
 import 'react-bootstrap/Button';
-import { g as getSerializers } from './index-539e2942.js';
+import { g as getSerializers } from './index-ccfe8253.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/View.js

@@ -39,7 +39,7 @@ import './smoothscroll-4b699764.js';
 import './GroupDeck.js';
 import 'react-bootstrap';
 import Button from 'react-bootstrap/Button';
-import { I as InscreenSensor, r as renderAuthor, g as getSerializers } from './index-539e2942.js';
+import { I as InscreenSensor, r as renderAuthor, g as getSerializers } from './index-ccfe8253.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';
@@ -322,6 +322,8 @@ var Article = function Article(props) {
       sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag,
       _props$authorImgHeigh = props.authorImgHeight,
       authorImgHeight = _props$authorImgHeigh === undefined ? 270 : _props$authorImgHeigh;
+
+  var targeting = getTargeting(props);
   var onChangeArticle = props.onChangeArticle;
 
   //If sponsored flag, disable contextual ads
@@ -537,7 +539,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent, _extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(_toConsumableArray(articleBody.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -554,7 +556,7 @@ var Article = function Article(props) {
           React__default.createElement(DFPAdSlot, _extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
         ),
         React__default.createElement(BlockContent, _extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(_toConsumableArray(articleBody.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -609,7 +611,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent, _extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(_toConsumableArray(articleBody.slice(0, _selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -621,7 +623,7 @@ var Article = function Article(props) {
         ),
         contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(BlockContent, _extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(_toConsumableArray(articleBody.slice(_selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -652,7 +654,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent, _extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(_toConsumableArray(articleBody.slice(0, _selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -663,14 +665,14 @@ var Article = function Article(props) {
           React__default.createElement(DFPAdSlot, _extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
         ),
         React__default.createElement(BlockContent, _extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(_toConsumableArray(articleBody.slice(_selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else {
       return React__default.createElement(BlockContent, _extends({
-        serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads),
+        serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads, targeting),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
       }, client.config()));
@@ -1318,8 +1320,21 @@ var View = function View(props) {
     return false;
   };
 
+  var checkArticleSeries = function checkArticleSeries(article) {
+    if (!article || !article.body) {
+      return false;
+    }
+    for (var i = 0; i < article.body.length; i++) {
+      if (article.body[i]._type === 'articleSeries') {
+        return true;
+      }
+    }
+    return false;
+  };
+
   var isVideoSeries = checkVideoSeries(props.article);
-  var needInfiniteScroll = ['Articles', 'Videos', 'Podcasts'].includes(article.category.name) && article.taxonomyMapping && article.passwordLock !== true && !isVideoSeries && !article.ExcludeFromInfiniteScroll && !sponsoredFlag;
+  var isArticleSeries = checkArticleSeries(props.article);
+  var needInfiniteScroll = ['Articles', 'Videos', 'Podcasts'].includes(article.category.name) && article.taxonomyMapping && article.passwordLock !== true && !isVideoSeries && !isArticleSeries && !article.ExcludeFromInfiniteScroll && !sponsoredFlag;
 
   if (['Articles', 'Videos', 'Podcasts'].includes(article.category.name)) {
     description = null;

package/dist/esm/getSerializers.js

@@ -38,7 +38,7 @@ import './smoothscroll-4b699764.js';
 import './GroupDeck.js';
 import 'react-bootstrap';
 import 'react-bootstrap/Button';
-export { g as default } from './index-539e2942.js';
+export { g as default } from './index-ccfe8253.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/{index-539e2942.js → index-ccfe8253.js}

@@ -2,6 +2,7 @@ import { c as createCommonjsModule, u as unwrapExports } from './_commonjsHelper
 import { a as _Array$from, _ as _toConsumableArray } from './toConsumableArray-e7f3f5a6.js';
 import { _ as _extends } from './extends-229166d5.js';
 import { _ as _inherits$1, a as _classCallCheck$1, b as _possibleConstructorReturn$1, c as _Object$getPrototypeOf, d as _createClass$1 } from './inherits-9ddef7b3.js';
+import { _ as _typeof$1 } from './typeof-fea75829.js';
 import React__default, { useState, useEffect, useRef } from 'react';
 import { l as lib_3 } from './index-93ec3c59.js';
 import PropTypes from 'prop-types';
@@ -2176,7 +2177,9 @@ var Video = function Video(_ref) {
       _ref$autoplay = _ref.autoplay,
       autoplay = _ref$autoplay === undefined ? false : _ref$autoplay,
       _ref$autoplayNextVide = _ref.autoplayNextVideo,
-      autoplayNextVideo = _ref$autoplayNextVide === undefined ? function () {} : _ref$autoplayNextVide;
+      autoplayNextVideo = _ref$autoplayNextVide === undefined ? function () {} : _ref$autoplayNextVide,
+      _ref$targeting = _ref.targeting,
+      targeting = _ref$targeting === undefined ? null : _ref$targeting;
   var source = node.source,
       videoID = node.videoID,
       playlistID = node.playlistID,
@@ -2199,7 +2202,12 @@ var Video = function Video(_ref) {
   var onVideoSuccess = function onVideoSuccess(success) {
     //console.log('success:', success.ref)
     var player = success.ref;
-
+    if (_typeof$1(player.ima3) === 'object' && player.ima3.settings && player.ima3.settings.serverUrl && targeting !== null) {
+      player.ima3.settings.debug = true;
+      if (targeting.content_placement && targeting.document_url) {
+        player.ima3.settings.serverUrl = player.ima3.settings.serverUrl + '&cust_params=' + encodeURIComponent('content_placement=' + targeting.content_placement + '&document_url=' + targeting.document_url);
+      }
+    }
     // this is video ready
     player.on('loadedmetadata', function (evt) {
       //console.log('loadedmetadata:', evt)
@@ -8020,8 +8028,9 @@ var ArticleSeries = function ArticleSeries(_ref) {
   var router = useRouter();
 
   var refArray = useRef([]);
+  var adRefArray = useRef([]);
 
-  var _useState = useState(77),
+  var _useState = useState(100),
       _useState2 = _slicedToArray(_useState, 2),
       NavoffsetTop = _useState2[0],
       setNavoffsetTop = _useState2[1];
@@ -8098,26 +8107,26 @@ var ArticleSeries = function ArticleSeries(_ref) {
   };
 
   useEffect(function () {
-    if (!firstLoad) {
-      scrollToArticle();
-    }
     try {
-      setNavoffsetTop(document.getElementById('navbar-ham').offsetHeight);
+      setNavoffsetTop(document.getElementById('navbar-ham').offsetHeight - 15);
     } catch (e) {}
   }, []);
 
   var scrollToArticle = function scrollToArticle(id) {
     var localArticleID = id ? id : selectedArticle;
     var findArticle = function findArticle(ref) {
-      return ref.props.id === localArticleID;
+      if (ref) {
+        return ref.props.id === localArticleID;
+      }
+      return false;
     };
     var indexOfRef = refArray.current.findIndex(findArticle);
 
     if (indexOfRef >= 0) {
-      //console.log(refArray.current[indexOfRef].wraperRef.current)
-      refArray.current[indexOfRef].wraperRef.current.scrollIntoView({ behavior: 'smooth' });
-      window.scrollTo({ top: refArray.current[indexOfRef].wraperRef.current.offsetTop + NavoffsetTop, behavior: 'smooth' });
+      //refArray.current[indexOfRef].wraperRef.current.scrollIntoView({ behavior: 'smooth' })
+      window.scrollTo({ top: refArray.current[indexOfRef].wraperRef.current.offsetTop - NavoffsetTop, behavior: 'smooth' });
     }
+    setFirstLoad(true);
   };
 
   var renderAuthorBiography = function renderAuthorBiography(biography) {
@@ -8132,10 +8141,10 @@ var ArticleSeries = function ArticleSeries(_ref) {
     // Change URL and do other changes
     var doChanges = function doChanges() {
       if (firstLoad) {
-        window.history.pushState({ page: path }, '', newPath);
+        refreshAD();
       }
+      window.history.pushState({ page: path }, '', newPath);
       document.title = title;
-      refreshAD();
       setFirstLoad(true);
     };
 
@@ -8175,6 +8184,26 @@ var ArticleSeries = function ArticleSeries(_ref) {
     };
   });
 
+  useEffect(function () {
+    if (!firstLoad) {
+      if (main_39) {
+        grabLoadedAds();
+      }
+    }
+  }, []);
+
+  var grabLoadedAds = function grabLoadedAds() {
+    console.dir(lib_3);
+    lib_3.getGoogletag().then(function (googletag) {
+      var checkIfReady = window.setInterval(function () {
+        if (window.googletag && googletag.pubadsReady) {
+          clearInterval(checkIfReady);
+          scrollToArticle();
+        }
+      }, 1000);
+    });
+  };
+
   var refreshAD = function refreshAD(path) {
     //const activeArticle = path
     //let targeting = getTargeting({ article: activeArticle, cpModificationRequired, position: props.position, prevUrl })
@@ -8216,13 +8245,38 @@ var ArticleSeries = function ArticleSeries(_ref) {
       )
     ),
     React__default.createElement('hr', { className: 'article-seperater' }),
+    React__default.createElement(
+      'div',
+      { className: 'ad-box', style: { textAlign: 'center' } },
+      main_39 && Ads.map(function (ad, index) {
+        if (index === 0) {
+          return React__default.createElement(
+            'div',
+            {
+              key: 'addid-1',
+              id: 'addid-1',
+              ref: function ref(ele) {
+                return adRefArray.current[0] = ele;
+              },
+              style: {
+                display: 'flex',
+                flex: '1 0 auto',
+                justifyContent: 'center',
+                alignItems: 'center',
+                textAlign: 'center'
+              } },
+            ad.component
+          );
+        }
+      })
+    ),
     React__default.createElement(
       'div',
       { className: 'article-container', style: { marginBottom: '2rem' } },
       nodes.articles.map(function (article, index) {
         return React__default.createElement(
-          React__default.Fragment,
-          null,
+          'div',
+          { key: article.title },
           React__default.createElement(
             InscreenSensor,
             {
@@ -8292,13 +8346,16 @@ var ArticleSeries = function ArticleSeries(_ref) {
             React__default.createElement(
               'div',
               { className: 'ad-box', style: { textAlign: 'center' } },
-              main_39 && nodes.articles.length - 1 !== index && Ads.map(function (ad, index) {
-                if (index === 0) {
+              main_39 && nodes.articles.length - 1 !== index && Ads.map(function (ad, innerIndex) {
+                if (innerIndex === 0) {
                   return React__default.createElement(
                     'div',
                     {
-                      key: index,
-                      id: 'addid-' + index,
+                      key: 'addid-' + (index + 2),
+                      id: 'addid-' + (index + 2),
+                      ref: function ref(ele) {
+                        return adRefArray.current[index + 1] = ele;
+                      },
                       style: {
                         display: 'flex',
                         flex: '1 0 auto',
@@ -8604,7 +8661,8 @@ var getSerializers = function getSerializers() {
       _props$2 = props[8],
       contextualADFlag = _props$2 === undefined ? false : _props$2,
       articleId = props[9],
-      Ads = props[10];
+      Ads = props[10],
+      targeting = props[11];
 
   return {
     types: {
@@ -8670,7 +8728,7 @@ var getSerializers = function getSerializers() {
       video: function video(_ref11) {
         var node = _ref11.node;
 
-        return React__default.createElement(Video, { node: node, autoplay: autoplay, accountIDs: videoAccountIDs || {} });
+        return React__default.createElement(Video, { node: node, autoplay: autoplay, accountIDs: videoAccountIDs || {}, targeting: targeting });
       },
       audio: function audio(_ref12) {
         var node = _ref12.node;

package/dist/esm/index.js

@@ -73,7 +73,7 @@ import './index-d2f90501.js';
 import './js.cookie-6874175c.js';
 export { default as EventsDeck } from './EventsDeck.js';
 export { default as CMEDeck } from './CMEDeck.js';
-export { g as getSerializers } from './index-539e2942.js';
+export { g as getSerializers } from './index-ccfe8253.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/package.json

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