@mjhls/mjh-framework 1.0.636 → 1.0.638

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.636
+# mjh-framework v. 1.0.638
 
 > Foundation Framework 
 

package/dist/cjs/ArticleQueue.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-14a67033.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/ExternalResources.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-14a67033.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/PartnerDetailListing.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-14a67033.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/QueueDeckExpanded.js

@@ -511,10 +511,6 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
       } else if (article._type === 'brandInsightAd' && article.adUnit) {
         return React__default.createElement(ADInfeed.ADInfeed, { index: index, infeedAd: article });
       }
-      if (main.main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0) {
-        return renderMobileAd(index, numberOfItemsBeforeAd, rightItems);
-      }
-
       if ((brandInsightAd ? index > heroContent + featureCount : index + 1 > heroContent + featureCount) && (!article._type || !['lg-infeed', 'brandInsightAd'].includes(article._type))) {
         return React__default.createElement(
           visibilitySensor.VisibilitySensor,
@@ -638,6 +634,11 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                   entities.clean_html_1(article.summary)
                 )
               )
+            ),
+            React__default.createElement(
+              'div',
+              null,
+              main.main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && renderMobileAd(index, numberOfItemsBeforeAd, rightItems)
             )
           )
         );
@@ -905,10 +906,6 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
         } else if (article._type === 'brandInsightAd' && article.adUnit) {
           return React__default.createElement(ADInfeed.ADInfeed, { index: index, infeedAd: article });
         }
-        if (main.main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0) {
-          return renderMobileAd(index, numberOfItemsBeforeAd, rightItems);
-        }
-
         if ((brandInsightAd ? index > heroContent + featureCount : index + 1 > heroContent + featureCount) && (!article._type || !['lg-infeed', 'brandInsightAd'].includes(article._type))) {
           return React__default.createElement(
             visibilitySensor.VisibilitySensor,
@@ -1032,6 +1029,11 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                     entities.clean_html_1(article.summary)
                   )
                 )
+              ),
+              React__default.createElement(
+                'div',
+                null,
+                main.main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && renderMobileAd(index, numberOfItemsBeforeAd, rightItems)
               )
             )
           );

package/dist/cjs/View.js

@@ -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-14a67033.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');
@@ -1324,8 +1324,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

@@ -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-14a67033.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/{index-87fd5322.js → index-14a67033.js}

@@ -8027,8 +8027,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 +8106,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 +8140,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 +8183,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 +8244,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 +8345,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',

package/dist/cjs/index.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-14a67033.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

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-e3b00de2.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-e3b00de2.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-e3b00de2.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/QueueDeckExpanded.js

@@ -505,10 +505,6 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
       } else if (article._type === 'brandInsightAd' && article.adUnit) {
         return React__default.createElement(ADInfeed, { index: index, infeedAd: article });
       }
-      if (main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0) {
-        return renderMobileAd(index, numberOfItemsBeforeAd, rightItems);
-      }
-
       if ((brandInsightAd ? index > heroContent + featureCount : index + 1 > heroContent + featureCount) && (!article._type || !['lg-infeed', 'brandInsightAd'].includes(article._type))) {
         return React__default.createElement(
           VisibilitySensor,
@@ -632,6 +628,11 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                   clean_html_1(article.summary)
                 )
               )
+            ),
+            React__default.createElement(
+              'div',
+              null,
+              main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && renderMobileAd(index, numberOfItemsBeforeAd, rightItems)
             )
           )
         );
@@ -899,10 +900,6 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
         } else if (article._type === 'brandInsightAd' && article.adUnit) {
           return React__default.createElement(ADInfeed, { index: index, infeedAd: article });
         }
-        if (main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0) {
-          return renderMobileAd(index, numberOfItemsBeforeAd, rightItems);
-        }
-
         if ((brandInsightAd ? index > heroContent + featureCount : index + 1 > heroContent + featureCount) && (!article._type || !['lg-infeed', 'brandInsightAd'].includes(article._type))) {
           return React__default.createElement(
             VisibilitySensor,
@@ -1026,6 +1023,11 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                     clean_html_1(article.summary)
                   )
                 )
+              ),
+              React__default.createElement(
+                'div',
+                null,
+                main_39 && rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && renderMobileAd(index, numberOfItemsBeforeAd, rightItems)
               )
             )
           );

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-e3b00de2.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';
@@ -1318,8 +1318,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-e3b00de2.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

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

@@ -8020,8 +8020,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 +8099,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 +8133,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 +8176,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 +8237,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 +8338,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',

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-e3b00de2.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.636",
+  "version": "1.0.638",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",