@mjhls/mjh-framework 1.0.324 → 1.0.326

package/dist/cjs/index.js

@@ -10,8 +10,8 @@ require('./web.dom.iterable-8b02d65e.js');
 var debounce = require('./debounce-528ad412.js');
 var main = require('./main-987c23c6.js');
 var toConsumableArray = require('./toConsumableArray-34b5e9a7.js');
-var _extends$2 = require('./extends-e94dbea5.js');
-var inherits$2 = require('./inherits-37d5840f.js');
+var _extends$2 = require('./extends-4c2285ff.js');
+var inherits$2 = require('./inherits-7548e3e8.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 var PropTypes = _interopDefault(require('prop-types'));
@@ -33,11 +33,11 @@ require('./promise-3b44b2a3.js');
 require('./ADInfeed-b042a194.js');
 var DeckContent = require('./DeckContent.js');
 var get$1 = require('./get-3b23d857.js');
-var GridContent = require('./GridContent-139bbe70.js');
+var GridContent = require('./GridContent-9f212ec5.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
 var ThumbnailCard = require('./ThumbnailCard.js');
-var TaxonomyCard = require('./TaxonomyCard-d8eed035.js');
+var TaxonomyCard = require('./TaxonomyCard-e36602e8.js');
 require('./react-social-icons-cd0d9d3b.js');
 var smoothscroll = require('./smoothscroll-95231a70.js');
 var GroupDeck = require('./GroupDeck.js');
@@ -53,7 +53,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-e7423a52.js');
+var TemplateNormal = require('./Normal-c85aee96.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -2844,7 +2844,9 @@ var AD300x250 = function AD300x250(_ref) {
     document_group: targeting.document_group,
     document_url: targeting.document_url,
     pos: pos,
-    campaign_id: targeting.campaign_id
+    campaign_id: targeting.campaign_id,
+    issue_url: targeting.issue_url,
+    publication_url: targeting.publication_url
   };
 
   var browserSizes = [[300, 250], [300, 100]];
@@ -2874,7 +2876,9 @@ var AD300x250x600 = function AD300x250x600(_ref) {
     document_group: targeting.document_group,
     document_url: targeting.document_url,
     pos: pos,
-    campaign_id: targeting.campaign_id
+    campaign_id: targeting.campaign_id,
+    issue_url: targeting.issue_url,
+    publication_url: targeting.publication_url
   };
 
   var browserSizes = [[300, 250], [300, 600], [300, 100]];
@@ -2954,7 +2958,9 @@ var ADFloatingFooter = function ADFloatingFooter(_ref) {
     document_group: targeting.document_group,
     document_url: targeting.document_url,
     pos: position,
-    campaign_id: targeting.campaign_id
+    campaign_id: targeting.campaign_id,
+    issue_url: targeting.issue_url,
+    publication_url: targeting.publication_url
   };
 
   var _useState = React.useState(true),
@@ -3037,7 +3043,9 @@ var ADGutter = function ADGutter(_ref) {
     document_group: targeting.document_group,
     document_url: targeting.document_url,
     pos: position,
-    campaign_id: targeting.campaign_id
+    campaign_id: targeting.campaign_id,
+    issue_url: targeting.issue_url,
+    publication_url: targeting.publication_url
   };
 
   var _useState = React.useState(false),
@@ -3095,7 +3103,9 @@ var ADWelcome = function ADWelcome(_ref) {
     document_group: targeting.document_group,
     document_url: targeting.document_url,
     pos: position,
-    campaign_id: targeting.campaign_id
+    campaign_id: targeting.campaign_id,
+    issue_url: targeting.issue_url,
+    publication_url: targeting.publication_url
   };
 
   var calculateTimeLeft = function calculateTimeLeft(timeLeft) {
@@ -3204,7 +3214,9 @@ var ADSponsoredResources = function ADSponsoredResources(_ref) {
     document_group: targeting.document_group,
     document_url: targeting.document_url,
     pos: position,
-    campaign_id: targeting.campaign_id
+    campaign_id: targeting.campaign_id,
+    issue_url: targeting.issue_url,
+    publication_url: targeting.publication_url
   };
 
   return React__default.createElement(
@@ -16189,16 +16201,18 @@ var InscreenSensor = function (_React$Component) {
 }(React__default.Component);
 
 var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
-  if (authorName && authorURL) return React__default.createElement(
-    Link,
-    { href: '/authors/' + authorURL.current, key: index },
-    React__default.createElement(
-      'a',
-      null,
-      authorName,
-      length !== index + 1 && React__default.createElement('br', null)
-    )
-  );else if (authorName) {
+  if (authorName && authorURL) {
+    return React__default.createElement(
+      Link,
+      { href: '/authors/' + authorURL.current, key: index },
+      React__default.createElement(
+        'a',
+        null,
+        authorName,
+        length !== index + 1 && React__default.createElement('br', null)
+      )
+    );
+  } else if (authorName) {
     return React__default.createElement(
       'span',
       { key: index },
@@ -16222,17 +16236,41 @@ var get_content_placement_url = function get_content_placement_url(cp) {
   return cp_url;
 };
 
+var getArticleSummary = function getArticleSummary(article) {
+  if (article.summary && article.summary.length > 0) {
+    return article.summary;
+  } else {
+    var _article$body = article.body,
+        body = _article$body === undefined ? [] : _article$body;
+
+    var desc = '';
+    body.some(function (children) {
+      children.children && children.children.some(function (item) {
+        if (item.text && String(item.text).trim().length > 0 && desc === '') {
+          desc = String(item.text);
+          return true;
+        }
+      });
+      if (desc !== '') {
+        return true;
+      }
+    });
+    return desc;
+  }
+};
+
 var Article = function Article(props) {
   var client = props.client,
       pageview = props.pageview,
       videoAccountIDs = props.videoAccountIDs,
+      drupalLeadSettings = props.drupalLeadSettings,
       _props$article = props.article,
       title = _props$article.title,
       passwordLock = _props$article.passwordLock,
       authorDetails = _props$article.authorDetails,
+      pageNumber = _props$article.pageNumber,
       published = _props$article.published,
       articleBody = _props$article.body,
-      summary = _props$article.summary,
       thumbnail = _props$article.thumbnail,
       content_placement = _props$article.content_placement,
       _props$article$url = _props$article.url;
@@ -16249,6 +16287,8 @@ var Article = function Article(props) {
       cpModificationRequired = props.cpModificationRequired;
 
 
+  var summary = getArticleSummary(props.article);
+
   var urlFor = function urlFor(source) {
     return index.imageUrlBuilder(client).image(source);
   };
@@ -16274,70 +16314,119 @@ var Article = function Article(props) {
     return null;
   };
 
-  var shareVia = shareOptions.shareVia,
-      shareSubject = shareOptions.shareSubject,
-      twitterSiteName = shareOptions.twitterSiteName,
-      shareImageDefault = shareOptions.shareImageDefault,
-      shareSiteTitle = shareOptions.shareSiteTitle;
-
-  var shareUrl = shareOptions.shareBaseUrl + props.url;
-  var shareTitle = title;
-  var shareSummary = summary;
-  var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
-  var siteName = props.website.title;
+  var renderRelevantTopicsDropdown = function renderRelevantTopicsDropdown() {
+    if (content_placement && content_placement.length > 0) {
+      return React__default.createElement(
+        Dropdown,
+        { style: { marginBottom: '1rem' } },
+        React__default.createElement(
+          Dropdown.Toggle,
+          { variant: 'primary', id: 'partner-dropdown' },
+          'Relevant Topics'
+        ),
+        React__default.createElement(
+          Dropdown.Menu,
+          null,
+          content_placement.length > 0 ? content_placement.map(function (cp, index) {
+            var cp_url = cpModificationRequired ? get_content_placement_url(cp) : cp.path;
+            var href = '/' + cp_url;
+            return React__default.createElement(
+              Dropdown.Item,
+              { key: index, href: href },
+              cp.name
+            );
+          }) : null
+        )
+      );
+    }
+    return null;
+  };
 
-  //Native Ads
-  var findIndex = function findIndex(arr) {
-    var indexes = [];
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
+  var renderBlockContent = function renderBlockContent(payload) {
+    var _payload = payload,
+        body = _payload.body;
 
-    try {
-      for (var _iterator = slicedToArray._getIterator(arr), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var ele = _step.value;
+    var findIndex = function findIndex(arr) {
+      var indexes = [];
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
 
-        if (ele['_type'] === 'block' && ele.children.some(function (child) {
-          return child.text.trim().length > 0;
-        }) && ele['listItem'] != 'bullet' && ele['style'] === 'normal') {
-          indexes.push(arr.indexOf(ele));
-        }
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return) {
-          _iterator.return();
+        for (var _iterator = slicedToArray._getIterator(arr), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var ele = _step.value;
+
+          if (ele['_type'] === 'block' && ele.children.some(function (child) {
+            return child.text.trim().length > 0;
+          }) && ele['listItem'] !== 'bullet' && ele['style'] === 'normal') {
+            indexes.push(arr.indexOf(ele));
+          }
         }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
       } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
         }
       }
-    }
 
-    return indexes;
+      return indexes;
+    };
+    var indexes = findIndex(body);
+    if (indexes.length >= 2 && body.length > 3 && payload.contextualAD) {
+      payload = _extends$2._extends({}, payload, {
+        contextualAD: _extends$2._extends({}, payload.contextualAD, {
+          slotId: (payload.contextualAD.slotId || 'native-ad') + '-' + payload._id
+        })
+      });
+      var selectedIndex = indexes[1] + 1;
+      return React__default.createElement(
+        React__default.Fragment,
+        null,
+        React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings),
+          blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(0, selectedIndex))),
+          imageOptions: { w: 320, h: 240, fit: 'max' }
+        }, client.config())),
+        React__default.createElement(
+          'div',
+          { className: 'contextual-native-ad' },
+          React__default.createElement(AdSlot.DFPAdSlot, _extends$2._extends({}, payload.contextualAD, { refreshFlag: false }))
+        ),
+        React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings),
+          blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(selectedIndex))),
+          imageOptions: { w: 320, h: 240, fit: 'max' }
+        }, client.config()))
+      );
+    } else {
+      return React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
+        serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings),
+        blocks: articleBody,
+        imageOptions: { w: 320, h: 240, fit: 'max' }
+      }, client.config()));
+    }
   };
 
-  var insert = function insert(arr, index, newElement) {
-    return [].concat(toConsumableArray._toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray._toConsumableArray(arr.slice(index)));
-  };
-  var newBody = [];
-  if (props.article.contextualAD) {
-    var indexes = findIndex(articleBody);
+  var shareVia = shareOptions.shareVia,
+      shareSubject = shareOptions.shareSubject,
+      twitterSiteName = shareOptions.twitterSiteName,
+      shareImageDefault = shareOptions.shareImageDefault,
+      shareBaseUrl = shareOptions.shareBaseUrl,
+      shareSiteTitle = shareOptions.shareSiteTitle;
 
-    if (indexes.length >= 2 && articleBody.length > 3) {
-      var setIndex = indexes[1];
-      newBody = insert(articleBody, setIndex + 1, props.article.contextualAD);
-    } else {
-      newBody = articleBody;
-    }
-  } else {
-    newBody = articleBody;
-  }
-  //End Native Ads
+  var shareUrl = shareBaseUrl + props.url;
+  var shareTitle = title;
+  var shareSummary = summary;
+  var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
+  var siteName = props.website.title;
 
   return React__default.createElement(
     React__default.Fragment,
@@ -16362,6 +16451,7 @@ var Article = function Article(props) {
             null,
             shareTitle + ' | ' + props.cache.siteSettingCache.name
           ),
+          passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
           React__default.createElement('meta', { property: 'og:url', content: shareUrl }),
           React__default.createElement('meta', { property: 'og:title', content: shareTitle }),
           React__default.createElement('meta', { property: 'og:image', content: shareImage }),
@@ -16373,11 +16463,6 @@ var Article = function Article(props) {
           React__default.createElement('meta', { name: 'twitter:site', content: '@' + shareSiteTitle }),
           React__default.createElement('meta', { name: 'twitter:description', content: shareSummary })
         ),
-        React__default.createElement(
-          Head,
-          null,
-          passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' })
-        ),
         React__default.createElement(
           'h1',
           { className: 'page-title' },
@@ -16410,7 +16495,7 @@ var Article = function Article(props) {
                 issue.articleSource && React__default.createElement(
                   'p',
                   null,
-                  'Source: ' + issue.articleSource
+                  issue.articleSource
                 )
               ),
               React__default.createElement(
@@ -16432,6 +16517,11 @@ var Article = function Article(props) {
                   )
                 )
               )
+            ),
+            pageNumber && React__default.createElement(
+              'div',
+              { className: 'article-pageNumber' },
+              'Page Number: ' + pageNumber
             )
           ),
           React__default.createElement(
@@ -16449,28 +16539,7 @@ var Article = function Article(props) {
               twitterSiteName: twitterSiteName
             })
           ),
-          content_placement && content_placement.length > 0 && React__default.createElement(
-            Dropdown,
-            { style: { marginBottom: '1rem' } },
-            React__default.createElement(
-              Dropdown.Toggle,
-              { variant: 'primary', id: 'partner-dropdown' },
-              'Relevant Topics'
-            ),
-            React__default.createElement(
-              Dropdown.Menu,
-              null,
-              content_placement.length > 0 ? content_placement.map(function (cp, index) {
-                var cp_url = cpModificationRequired ? get_content_placement_url(cp) : cp.path;
-                var href = '/' + cp_url;
-                return React__default.createElement(
-                  Dropdown.Item,
-                  { key: index, href: href },
-                  cp.name
-                );
-              }) : null
-            )
-          ),
+          renderRelevantTopicsDropdown(),
           React__default.createElement(
             'p',
             null,
@@ -16483,7 +16552,7 @@ var Article = function Article(props) {
             React__default.createElement('br', null)
           ),
           main.main_39 && props.article.Ads.map(function (ad, index) {
-            if (index == 0) {
+            if (index === 0) {
               return React__default.createElement(
                 'div',
                 { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto', marginTop: '-1rem', marginBottom: '1rem' } },
@@ -16494,11 +16563,7 @@ var Article = function Article(props) {
           React__default.createElement(
             'div',
             { className: 'block-content' },
-            React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-              serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true),
-              blocks: newBody,
-              imageOptions: { w: 320, h: 240, fit: 'max' }
-            }, client.config())),
+            renderBlockContent(props.article),
             issue && issue.url && React__default.createElement(
               'a',
               { href: issue.url, target: '_blank', title: 'Download issue' },
@@ -16523,64 +16588,18 @@ var Article = function Article(props) {
     React__default.createElement('hr', { className: 'article-seperater' })
   );
 };
+
 var ArticleQueue = function ArticleQueue(props) {
-  var website = props.website,
+  var _props$prevUrl = props.prevUrl,
+      prevUrl = _props$prevUrl === undefined ? '/' : _props$prevUrl,
       Ads = props.Ads,
-      mainNavCache = props.mainNavCache,
-      subNavCache = props.subNavCache,
-      isLiveSite = props.isLiveSite,
-      _props$sponsoredTaxon = props.sponsoredTaxonomies,
-      sponsoredTaxonomies = _props$sponsoredTaxon === undefined ? [] : _props$sponsoredTaxon,
       _props$maxListLength = props.maxListLength,
       maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
+      _props$sponsoredTaxon = props.sponsoredTaxonomies,
+      sponsoredTaxonomies = _props$sponsoredTaxon === undefined ? [] : _props$sponsoredTaxon,
       _props$cpModification = props.cpModificationRequired,
       cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification;
 
-  var _useState = React.useState(''),
-      _useState2 = slicedToArray._slicedToArray(_useState, 2),
-      prevUrl = _useState2[0],
-      setPrevUrl = _useState2[1];
-
-  var _useState3 = React.useState([props.article]),
-      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
-      queueData = _useState4[0],
-      setQueueData = _useState4[1];
-
-  var _useState5 = React.useState({}),
-      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
-      activeArticle = _useState6[0],
-      setActiveArticle = _useState6[1];
-
-  var preVscroll = 0;
-  var isScrollDown = true;
-
-  var _activeArticle$title = activeArticle.title,
-      _activeArticle$summar = activeArticle.summary,
-      summary = _activeArticle$summar === undefined ? '' : _activeArticle$summar;
-
-
-  var getFirstLine = function getFirstLine(article) {
-    var _article$body = article.body,
-        body = _article$body === undefined ? [] : _article$body;
-
-    var desc = '';
-    body.some(function (children) {
-      children.children && children.children.some(function (item) {
-        if (item.text && String(item.text).trim().length > 0 && desc == '') {
-          desc = String(item.text);
-          return true;
-        }
-      });
-      if (desc !== '') {
-        return true;
-      }
-    });
-    return desc;
-  };
-
-  if (summary.length === 0) {
-    summary = getFirstLine(activeArticle);
-  }
 
   var getTargeting = function getTargeting(article) {
     var _article$internalTag = article.internalTag,
@@ -16640,31 +16659,51 @@ var ArticleQueue = function ArticleQueue(props) {
       document_url: [url],
       content_placement: content_placement_urls
     };
+
+    if (article.issue && article.issue.path) {
+      targeting.issue_url = [article.issue.path];
+      if (article.issue.publication && article.issue.publication.path) {
+        targeting.publication_url = [article.issue.publication.path];
+      }
+    }
+
     return targeting;
   };
 
-  var _useState7 = React.useState(getTargeting(activeArticle)),
-      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
-      targeting = _useState8[0],
-      setTargeting = _useState8[1];
-
-  var keywords = targeting && targeting.keywords ? targeting.keywords : [];
-
-  var config = {
-    navComponent: website.navigation,
-    navItems: mainNavCache,
-    columns: '3',
-    leftItems: subNavCache,
-    rightItems: [],
-    horizontalAD: {},
-    isLiveSite: isLiveSite
+  var firstArticle = function firstArticle() {
+    var article = _extends$2._Object$assign({}, props.article);
+    var targeting = getTargeting(props.article);
+    article.Ads = Ads.getRightItems(targeting);
+    return article;
   };
-  props.article.Ads = Ads.getRightItems(targeting);
 
-  var _useState9 = React.useState(config),
-      _useState10 = slicedToArray._slicedToArray(_useState9, 2),
-      pageConfig = _useState10[0],
-      setPageConfig = _useState10[1];
+  var _useState = React.useState([firstArticle()]),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
+      queueData = _useState2[0],
+      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(activeArticle);
+      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]);
+            });
+            slot.setTargeting('pos', pos);
+          });
+          debounce.lib_3.refresh();
+        }
+      });
+    }
+  };
 
   var checkSponseredArticle = function checkSponseredArticle(article) {
     var _article$taxonomyMapp = article.taxonomyMapping,
@@ -16679,51 +16718,8 @@ var ArticleQueue = function ArticleQueue(props) {
     }
   };
 
-  var updateConfig = function updateConfig(article) {
-    if (prevUrl && prevUrl.length) {
-      var _targeting = getTargeting(article);
-      var _config = {
-        navComponent: website.navigation,
-        navItems: mainNavCache,
-        columns: '3',
-        leftItems: subNavCache,
-        rightItems: checkSponseredArticle(article) ? [] : Ads.getRightItems(_targeting),
-        horizontalAD: checkSponseredArticle(article) ? {} : Ads.getHorizontal(_targeting),
-        isLiveSite: isLiveSite
-      };
-      setPageConfig(_config);
-      if (!main.main_39) {
-        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]);
-              });
-              slot.setTargeting('pos', pos);
-            });
-            debounce.lib_3.refresh();
-          }
-        });
-      }
-    }
-  };
-
-  React.useEffect(function () {
-    setPrevUrl(document && document.referrer ? document.referrer : '/');
-    props.article.Ads = Ads.getRightItems(targeting);
-    setActiveArticle(props.article);
-  }, [setPrevUrl]);
-
-  React.useEffect(function () {
-    setActiveArticle(props.article);
-  }, [prevUrl]);
-
-  React.useEffect(function () {
-    updateConfig(activeArticle);
-  }, [activeArticle]);
+  var preVscroll = 0;
+  var isScrollDown = true;
 
   var scrollDirectionDetect = function scrollDirectionDetect(e) {
     var window = e.currentTarget;
@@ -16741,74 +16737,59 @@ var ArticleQueue = function ArticleQueue(props) {
 
   React.useEffect(function () {
     window.addEventListener('scroll', scrollDirectionDetect);
+    return function () {
+      return window.removeEventListener('scroll', scrollDirectionDetect);
+    };
   });
 
   var loadmore = function loadmore() {
     var query = props.relatedArticleQuery;
     var params = props.params;
-    var data = queueData.map(function (item) {
-      return item;
-    });
-    if (data && data.length < maxListLength) {
-      params.index = data.length - 1;
+    if (queueData && queueData.length < maxListLength) {
+      params.index = queueData.length - 1;
       props.client.fetch(query, params).then(function (article) {
         if (article && article._id) {
-          var _targeting2 = getTargeting(article);
-          article.Ads = props.Ads.getRightItems(_targeting2);
-          data.push(article);
-          setQueueData(data);
+          var targeting = getTargeting(article);
+          article.Ads = Ads.getRightItems(targeting);
+          setQueueData([].concat(toConsumableArray._toConsumableArray(queueData), [article]));
         }
       });
     }
   };
 
-  var refreshAdd = function refreshAdd(path) {
-    var article = queueData.find(function (item) {
-      return item.url.current === path;
-    });
-    var targeting = getTargeting(article);
-    console.log('Forced Ad refresh', targeting);
-    article.Ads = Ads.getRightItems(targeting);
-    setActiveArticle(article);
-  };
-
   var changeUrl = function changeUrl(path, visibility) {
     var newPath = '/view/' + path;
     if (!isScrollDown) {
       if (visibility === 'top') {
-        // Router.push('/view/[url]', newPath, { shallow: true })
+        // router.push('/view/[url]', newPath, { shallow: true })
         window.history.pushState({ page: path }, path, newPath);
         if (props.pageview) {
           props.pageview(newPath);
         }
-        refreshAdd(path);
+        refreshAD(path);
       }
     } else {
       if (visibility === 'bottom') {
-        // Router.push('/view/[url]', newPath, { shallow: true })
+        // router.push('/view/[url]', newPath, { shallow: true })
         window.history.pushState({ page: path }, path, newPath);
         if (props.pageview) {
           props.pageview(newPath);
         }
-        refreshAdd(path);
+        refreshAD(path);
       }
     }
   };
 
-  if (prevUrl && prevUrl.length) {
-    return React__default.createElement(
-      visibilitySensor.InfiniteScroll,
-      { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
-      queueData.map(function (article, index) {
-        if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
-          article.contextualAD = Ads.getNativeContextualAD(getTargeting(article));
-        }
-        return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
-      })
-    );
-  } else {
-    return null;
-  }
+  return React__default.createElement(
+    visibilitySensor.InfiniteScroll,
+    { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
+    queueData.map(function (article, index) {
+      if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
+        article.contextualAD = Ads.getNativeContextualAD(getTargeting(article));
+      }
+      return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
+    })
+  );
 };
 
 var KMTracker = function KMTracker(props) {