@mjhls/mjh-framework 1.0.435 → 1.0.437

package/dist/cjs/QueueDeckExpanded.js

@@ -29,6 +29,8 @@ var slicedToArray = require('./slicedToArray-419d467a.js');
 require('./AdSlot-4d22aad4.js');
 require('./promise-0a493c7a.js');
 var ADInfeed = require('./ADInfeed-494f5e6b.js');
+var lodash = require('./lodash-fc2922d0.js');
+var ADlgInfeed = require('./ADlgInfeed-be0e0bde.js');
 var AuthorComponent = require('./AuthorComponent-4706f297.js');
 var reactBootstrap = require('react-bootstrap');
 
@@ -143,13 +145,40 @@ var checkExternalUrl = function checkExternalUrl(url) {
   return new RegExp(['http', 'https'].join('|')).test(url);
 };
 
-var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, imageHeight, imageWidth, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent) {
+var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, imageHeight, imageWidth, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent, dektopView) {
   var numberOfItemsBeforeAd = 6;
 
   var insertBrandInsightAd = function insertBrandInsightAd(arr, index, newElement) {
     return [].concat(toConsumableArray._toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray._toConsumableArray(arr.slice(index)));
   };
+
+  if (dektopView && brandInsightAd) {
+    var lgInfeedAd = {
+      _type: 'lg-infeed',
+      adUnit: brandInsightAd.adUnit,
+      className: 'lg-infeed',
+      networkID: brandInsightAd.networkID,
+      sizes: [728, 90],
+      targeting: {
+        content_placement: brandInsightAd.targeting.content_placement,
+        document_url: brandInsightAd.targeting.document_url
+      }
+    };
+
+    var chunks = lodash.lodash.chunk(data, 6).map(function (chunk) {
+      var set = lodash.lodash.chunk(chunk, 2);
+      for (var i = 0; i < set.length; i++) {
+        if (i !== set.length - 1) {
+          set[i].push(lgInfeedAd);
+        }
+      }
+      return lodash.lodash.flattenDeep(set);
+    });
+    data = lodash.lodash.flatten(chunks);
+  }
+
   if (showBI && brandInsightAd) {
+    if (dektopView) brandInsightAd.interval = 8;
     var pos = 0;
     for (var i = 1; pos < data.length; i++) {
       var inFeedAd = {
@@ -170,6 +199,13 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
       pos += brandInsightAd.interval + 1;
     }
   }
+  data = data.map(function (ele, i) {
+    if (ele._type === 'lg-infeed') {
+      return _extends$2._extends({}, ele, { slotId: 'lg-infeed_' + i, targeting: _extends$2._extends({}, ele.targeting, { pos: 'lg-infeed_' + i }) });
+    } else {
+      return ele;
+    }
+  });
 
   var featureCount = 0;
 
@@ -375,6 +411,8 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
             )
           );
         }
+      } else if (article._type === 'lg-infeed' && article.adUnit) {
+        return React__default.createElement(ADlgInfeed.ADlgInfeed, _extends$2._extends({ index: index }, article));
       } else if (article._type === 'brandInsightAd' && article.adUnit) {
         return React__default.createElement(ADInfeed.ADInfeed, { index: index, infeedAd: article });
       }
@@ -382,7 +420,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
         return renderMobileAd(index, numberOfItemsBeforeAd, rightItems);
       }
 
-      if (brandInsightAd ? index > heroContent + featureCount : index + 1 > heroContent + featureCount) {
+      if ((brandInsightAd ? index > heroContent + featureCount : index + 1 > heroContent + featureCount) && article._type && !['lg-infeed', 'brandInsightAd'].includes(article._type)) {
         return React__default.createElement(
           visibilitySensor.VisibilitySensor,
           {
@@ -558,7 +596,9 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       _props$showBI = props.showBI,
       showBI = _props$showBI === undefined ? false : _props$showBI,
       _props$heroContent = props.heroContent,
-      heroContent = _props$heroContent === undefined ? 0 : _props$heroContent;
+      heroContent = _props$heroContent === undefined ? 0 : _props$heroContent,
+      _props$lgInfeedAd = props.lgInfeedAd,
+      lgInfeedAd = _props$lgInfeedAd === undefined ? false : _props$lgInfeedAd;
   var initialCurrentPage = props.currentPage,
       showPublished = props.showPublished;
 
@@ -592,11 +632,18 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       values = _useState10[0],
       setValues = _useState10[1];
 
+  var _useState11 = React.useState(false),
+      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
+      dektopView = _useState12[0],
+      setDesktopView = _useState12[1];
+
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 
   var prevValues = usePrevious(values);
-
   React.useEffect(function () {
+    if (lgInfeedAd && window && window.innerWidth >= 1200) {
+      setDesktopView(true);
+    }
     if (prevValues) {
       if (values.page !== prevValues.page && values.from !== prevValues.from && values.to !== prevValues.from) {
         loadData(values, query, client, params, setData, setScrolling, pointer, pointerArray);
@@ -633,7 +680,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
         React__default.createElement(
           reactBootstrap.Container,
           null,
-          cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, imageHeight, imageWidth, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent)
+          cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, imageHeight, imageWidth, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent, dektopView)
         )
       ),
       React__default.createElement(
@@ -647,7 +694,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       React__default.createElement(
         reactBootstrap.Container,
         null,
-        cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent)
+        cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent, dektopView)
       ),
       React__default.createElement(
         'div',

package/dist/cjs/TemplateNormal.js

@@ -21,7 +21,7 @@ require('./react-social-icons-cd0d9d3b.js');
 require('react-bootstrap');
 require('./index.esm-340d3792.js');
 require('react-bootstrap/Button');
-var TemplateNormal = require('./Normal-54dd4121.js');
+var TemplateNormal = require('./Normal-62915103.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');

package/dist/cjs/index.js

@@ -37,8 +37,10 @@ var AdSlot = require('./AdSlot-4d22aad4.js');
 var promise = require('./promise-0a493c7a.js');
 require('./ADInfeed-494f5e6b.js');
 var DeckContent = require('./DeckContent.js');
+require('./lodash-fc2922d0.js');
+require('./ADlgInfeed-be0e0bde.js');
 var get$1 = require('./get-5aa7468c.js');
-var GridContent = require('./GridContent-f401c40f.js');
+var GridContent = require('./GridContent-068c0b1c.js');
 var AuthorComponent = require('./AuthorComponent-4706f297.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
@@ -59,7 +61,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-54dd4121.js');
+var TemplateNormal = require('./Normal-62915103.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -17779,30 +17781,30 @@ var ArticleQueue = function ArticleQueue(props) {
         if (visibility === 'top') {
           // router.push('/view/[url]', newPath, { shallow: true })
           window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          changeMeta(meta);
           if (props.pageview) {
             props.pageview(newPath);
           }
           refreshAD(path);
-          changeMeta(meta);
         }
       } else {
         if (visibility === 'bottom') {
           // router.push('/view/[url]', newPath, { shallow: true })
           window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          changeMeta(meta);
           if (props.pageview) {
             props.pageview(newPath);
           }
           refreshAD(path);
-          changeMeta(meta);
         }
       }
       if (visibility === 'small-top') {
         window.history.pushState({ page: path }, meta.shareTitle, newPath);
+        changeMeta(meta);
         if (props.pageview) {
           props.pageview(newPath);
         }
         refreshAD(path);
-        changeMeta(meta);
       }
     }
   };
@@ -22863,30 +22865,30 @@ var ArticleQueue$1 = function ArticleQueue(props) {
         if (visibility === 'top') {
           // router.push('/view/[url]', newPath, { shallow: true })
           window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          changeMeta(meta);
           if (props.pageview) {
             props.pageview(newPath);
           }
           refreshAD(path);
-          changeMeta(meta);
         }
       } else {
         if (visibility === 'bottom') {
           // router.push('/view/[url]', newPath, { shallow: true })
           window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          changeMeta(meta);
           if (props.pageview) {
             props.pageview(newPath);
           }
           refreshAD(path);
-          changeMeta(meta);
         }
       }
       if (visibility === 'small-top') {
         window.history.pushState({ page: path }, meta.shareTitle, newPath);
+        changeMeta(meta);
         if (props.pageview) {
           props.pageview(newPath);
         }
         refreshAD(path);
-        changeMeta(meta);
       }
     }
   };