@mjhls/mjh-framework 1.0.697 → 1.0.699-beta.0

package/dist/cjs/View.js

@@ -10,29 +10,29 @@ require('./_iter-detect-60b2f026.js');
 var toConsumableArray = require('./toConsumableArray-9a3476fe.js');
 require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
-var _extends = require('./extends-60837c34.js');
+var _extends$1 = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
 require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
-var _typeof$1 = require('./typeof-725500bc.js');
+var _typeof = require('./typeof-725500bc.js');
 require('./_is-array-754e012d.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-var index = require('./index-2d0a4911.js');
+var index = require('./index-fa8ed292.js');
 require('prop-types');
 require('react-bootstrap/Row');
 require('react-bootstrap/Col');
-var moment = require('./moment-66a6a284.js');
+var moment = require('./moment-575fe24c.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('./isSymbol-04666465.js');
 require('./debounce-eb287781.js');
-var index_es = require('./index.es-ab3f2690.js');
+var index_es = require('./index.es-9110add6.js');
 require('react-dom');
-require('./index-b5eb3ff8.js');
+require('./index-be0c82be.js');
 require('./index-da796b8c.js');
-var main = require('./main-b6c96c8d.js');
+var main = require('./main-03ffa84c.js');
 require('./entities-310b46ee.js');
 var stringify = require('./stringify-7c5aff47.js');
 var slicedToArray = require('./slicedToArray-8f385299.js');
@@ -41,16 +41,15 @@ require('./_set-species-f92c67c5.js');
 require('./Segment.js');
 require('./Beam.js');
 var AdSlot = require('./AdSlot.js');
-var BlockContent = require('./BlockContent-88f69acd.js');
+var BlockContent = require('./BlockContent-091a991f.js');
 require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 require('./iconBase-68959171.js');
 require('./index.esm-90433435.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
-var defineProperty$1 = require('./defineProperty-55548b25.js');
 var Form = _interopDefault(require('react-bootstrap/Form'));
-var getSerializers = require('./index-a9422f8a.js');
+var getSerializers = require('./index-e05857f8.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');
@@ -66,7 +65,7 @@ var getSeriesDetail = require('./getSeriesDetail.js');
 require('./index-bd6c9f56.js');
 var getRelatedArticle = require('./getRelatedArticle.js');
 var getQuery = require('./getQuery.js');
-var getTargeting = require('./getTargeting-fee8c429.js');
+var getTargeting = require('./getTargeting-9af0ef69.js');
 var getKeywords = require('./getKeywords.js');
 var urlFor = require('./urlFor.js');
 var styleInject_es = require('./style-inject.es-dcee06b6.js');
@@ -146,9 +145,9 @@ var DocumentGroup = function DocumentGroup(_ref) {
       style: { display: 'flex', flexDirection: 'column', padding: '0 1rem', justifyContent: thumbnailUrl ? 'center' : 'flex-start', alignItems: 'center' } },
     thumbnailUrl && React__default.createElement('img', { style: { maxWidth: '220px', maxHeight: '100px', marginTop: '1rem' }, src: thumbnailUrl, alt: name }),
     !thumbnailUrl && React__default.createElement('p', {
-      style: { maxWidth: '315px', margin: '0', color: 'var(--primary)', textAlign: thumbnailUrl ? 'center' : main.main_39 ? 'left' : 'right', marginTop: '.25rem' },
+      style: { maxWidth: '315px', margin: '0', color: 'var(--primary)', textAlign: thumbnailUrl ? 'center' : main.main_36 ? 'left' : 'right', marginTop: '.25rem' },
       dangerouslySetInnerHTML: { __html: name } }),
-    main.main_39 && !thumbnailUrl && React__default.createElement(
+    main.main_36 && !thumbnailUrl && React__default.createElement(
       'style',
       { jsx: 'true' },
       '\n          a.doc-group {\n            display: block !important;\n            padding: 0!important;\n          }\n        '
@@ -158,7 +157,7 @@ var DocumentGroup = function DocumentGroup(_ref) {
 
 var findIndex = function findIndex(arr) {
   var indexes = [];
-  if ((typeof arr === 'undefined' ? 'undefined' : _typeof$1._typeof(arr)) === 'object') {
+  if ((typeof arr === 'undefined' ? 'undefined' : _typeof._typeof(arr)) === 'object') {
     var _iteratorNormalCompletion = true;
     var _didIteratorError = false;
     var _iteratorError = undefined;
@@ -255,7 +254,7 @@ var ISI = function ISI(props) {
   );
 };
 
-var css = ".RelatedArticles-module_mediaContainer__10h9k {\r\n  display: flex;\r\n  flex-direction: row;\r\n  flex-wrap: nowrap;\r\n  margin: 0 -1rem;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn {\r\n  margin: 0 1rem 1rem;\r\n  width: calc(33% - 1rem);\r\n  display: column;\r\n  flex-direction: row;\r\n  margin-bottom: 0.75rem;\r\n  padding-bottom: 0.75rem;\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn:last-child {\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_cardTitle__3P-Ib {\r\n  font-weight: bold;\r\n  color: #252525;\r\n  margin-bottom: 0.25rem;\r\n  font-size: 15px;\r\n}\r\n.RelatedArticles-module_authorListing__1EFg4 span.RelatedArticles-module_text-muted__3b0zX {\r\n  color: #000;\r\n  font-weight: bold;\r\n}\r\n.RelatedArticles-module_cardDate__1wOR5 {\r\n  color: var(--dark);\r\n  display: block;\r\n  background: #fff !important;\r\n  margin-bottom: 0;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 {\r\n  display: block;\r\n  text-align: center;\r\n  margin-bottom: 0.5rem;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n  height: 135px;\r\n  width: 100%;\r\n  object-fit: cover;\r\n  object-position: center;\r\n}\r\n@media screen and (max-width: 1064px) {\r\n}\r\n@media screen and (max-width: 968px) {\r\n  .RelatedArticles-module_mediaContainer__10h9k {\r\n    flex-wrap: wrap;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    width: 100%;\r\n  }\r\n  .RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n    width: 100%;\r\n    height: auto;\r\n\r\n    max-height: 175px;\r\n    object-fit: contain;\r\n    margin-bottom: 1rem;\r\n  }\r\n}\r\n";
+var css = ".RelatedArticles-module_mediaContainer__10h9k {\r\n  display: flex;\r\n  flex-direction: row;\r\n  flex-wrap: nowrap;\r\n  margin: 0 -1rem;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn {\r\n  margin: 0 1rem 1rem;\r\n  width: calc(33% - 1rem);\r\n  display: column;\r\n  flex-direction: row;\r\n  margin-bottom: 0.75rem;\r\n  padding-bottom: 0.75rem;\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn:last-child {\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_cardTitle__3P-Ib {\r\n  font-weight: bold;\r\n  color: #252525;\r\n  margin-bottom: 0.25rem;\r\n  font-size: 15px;\r\n}\r\n.RelatedArticles-module_authorListing__1EFg4 span.RelatedArticles-module_text-muted__3b0zX {\r\n  color: #000;\r\n  font-weight: bold;\r\n}\r\n.RelatedArticles-module_cardDate__1wOR5 {\r\n  color: var(--dark);\r\n  display: block;\r\n  background: #fff !important;\r\n  margin-bottom: 0;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 {\r\n  display: block;\r\n  text-align: center;\r\n  margin-bottom: 0.5rem;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n  height: 135px;\r\n  width: 100%;\r\n  object-fit: cover;\r\n  object-position: center;\r\n}\r\n@media screen and (max-width: 1064px) {\r\n}\r\n@media screen and (max-width: 968px) {\r\n  .RelatedArticles-module_mediaContainer__10h9k {\r\n    flex-wrap: wrap;\r\n  }\r\n  .RelatedArticles-module_imgWrapper__5Jx_4 {\r\n    display: none;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    width: 100%;\r\n    margin-bottom: 0.5rem;\r\n    padding: 0;\r\n  }\r\n  .RelatedArticles-module_cardTitle__3P-Ib {\r\n    font-size: 0.75rem;\r\n    margin-bottom: 0;\r\n  }\r\n}\r\n";
 var styles = { "mediaContainer": "RelatedArticles-module_mediaContainer__10h9k", "mediaCard": "RelatedArticles-module_mediaCard__3wQbn", "cardTitle": "RelatedArticles-module_cardTitle__3P-Ib", "authorListing": "RelatedArticles-module_authorListing__1EFg4", "text-muted": "RelatedArticles-module_text-muted__3b0zX", "cardDate": "RelatedArticles-module_cardDate__1wOR5", "imgWrapper": "RelatedArticles-module_imgWrapper__5Jx_4" };
 styleInject_es.styleInject(css);
 
@@ -383,6 +382,7 @@ var Article = function Article(props) {
       issue = _props$article.issue,
       source = _props$article.source,
       documentGroupMapping = _props$article.documentGroupMapping,
+      issueGroup = _props$article.issueGroup,
       showIsi = _props$article.showIsi,
       isi = _props$article.isi,
       regionalPages = props.regionalPages,
@@ -397,7 +397,9 @@ var Article = function Article(props) {
       _props$sponsoredFlag = props.sponsoredFlag,
       sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag,
       _props$authorImgHeigh = props.authorImgHeight,
-      authorImgHeight = _props$authorImgHeigh === undefined ? 270 : _props$authorImgHeigh;
+      authorImgHeight = _props$authorImgHeigh === undefined ? 270 : _props$authorImgHeigh,
+      _props$refreshFlag = props.refreshFlag,
+      refreshFlag = _props$refreshFlag === undefined ? false : _props$refreshFlag;
 
   var targeting = getTargeting.getTargeting(props);
   var onChangeArticle = props.onChangeArticle;
@@ -473,7 +475,7 @@ var Article = function Article(props) {
   };
   var renderAuthorBiography = function renderAuthorBiography(biography) {
     if (biography) {
-      return React__default.createElement(BlockContent.BlockContent, _extends._extends({
+      return React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
         serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
         blocks: [biography]
       }, client.config()));
@@ -491,65 +493,76 @@ var Article = function Article(props) {
   };
 
   var RelevantTopics = function RelevantTopics() {
-    if (content_placement && content_placement.length > 0 || documentGroupMapping) {
-      return React__default.createElement(
-        'div',
-        { style: { color: '#262626' } },
-        React__default.createElement(
-          'p',
-          { className: 'mb-0' },
-          React__default.createElement(
-            'b',
-            null,
-            'Related Content:'
-          )
-        ),
-        documentGroupMapping && documentGroupMapping.map(function (documentGroup) {
-          if (!documentGroup.parent) {
-            return null;
+    if (content_placement && content_placement.length > 0 || documentGroupMapping && documentGroupMapping.length > 0) {
+      var relatedLinks = [];
+      if (documentGroupMapping && documentGroupMapping.length > 0) {
+        documentGroupMapping.forEach(function (documentGroup) {
+          if (documentGroup.parent) {
+            relatedLinks = [].concat(toConsumableArray._toConsumableArray(relatedLinks), [{ label: documentGroup.name, href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path }]);
           }
-
-          return React__default.createElement(
-            React__default.Fragment,
-            null,
-            React__default.createElement(
-              'span',
-              { className: '' },
-              React__default.createElement(
-                'a',
-                {
-                  className: 'related-links',
-                  style: { color: 'blue' },
-                  href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path },
-                documentGroup.name
-              )
-            ),
-            content_placement && content_placement.length ? ' | ' : null
-          );
-        }),
-        content_placement && content_placement.length > 0 ? content_placement.map(function (cp, index) {
+        });
+      }
+      if (content_placement && content_placement.length > 0) {
+        content_placement.filter(function (item) {
+          return item.path !== 'news';
+        }).forEach(function (cp) {
           var cp_url = cpModificationRequired ? getTargeting.getContentPlacementUrl(cp) : cp.path;
           var href = '/' + cp_url;
-          return React__default.createElement(
-            React__default.Fragment,
-            { key: index },
-            React__default.createElement(
+          relatedLinks = [].concat(toConsumableArray._toConsumableArray(relatedLinks), [{ label: cp.name, href: href }]);
+        });
+      }
+      if (issueGroup && issueGroup.name && issueGroup.identifier && issueGroup.identifier.current && issueGroup.parent && issueGroup.parent.identifier && issueGroup.parent.identifier.current) {
+        relatedLinks = [].concat(toConsumableArray._toConsumableArray(relatedLinks), [{ label: issueGroup.name, href: '/publications/' + issueGroup.parent.identifier.current + '/' + issueGroup.identifier.current }]);
+      }
+      if (relatedLinks && relatedLinks.length > 0) {
+        return React__default.createElement(
+          'div',
+          null,
+          relatedLinks.map(function (relatedLink, index) {
+            return React__default.createElement(
               'span',
-              null,
+              { key: index, className: 'related-link' },
               React__default.createElement(
                 'a',
-                { className: 'related-links', key: index, href: href, style: { color: 'blue' } },
-                cp.name
+                { className: 'related-links', style: { color: 'blue' }, href: relatedLink.href },
+                relatedLink.label
+              ),
+              React__default.createElement(
+                'style',
+                { jsx: 'true' },
+                '\n                      .related-link:not(:first-child):before {\n                        content: \' | \';\n                      }\n                    '
               )
-            ),
-            content_placement.length > index + 1 ? ' | ' : null
-          );
-        }) : null
-      );
+            );
+          })
+        );
+      }
+      return null;
     }
     return null;
   };
 
+  var RelatedContent = function RelatedContent() {
+    return React__default.createElement(
+      'section',
+      { id: 'related-content-section', className: 'my-1' },
+      React__default.createElement(
+        'p',
+        { className: 'mb-0' },
+        React__default.createElement(
+          'b',
+          null,
+          'Related Content:'
+        )
+      ),
+      React__default.createElement(RelevantTopics, null),
+      React__default.createElement(
+        'div',
+        { className: 'pt-2' },
+        React__default.createElement(RelatedArticle, { articles: article.relatedArticle, client: client })
+      )
+    );
+  };
+
   var form = function form() {
     return React__default.createElement(
       React__default.Fragment,
@@ -598,11 +611,11 @@ var Article = function Article(props) {
     var indexes = findIndex(body);
 
     if (indexes.length >= 2 && body.length > 3 && payload.contextualAD && payload.contextualVideoAD) {
-      payload = _extends._extends({}, payload, {
-        contextualAD: _extends._extends({}, payload.contextualAD, {
+      payload = _extends$1._extends({}, payload, {
+        contextualAD: _extends$1._extends({}, payload.contextualAD, {
           slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id
         }),
-        contextualVideoAD: _extends._extends({}, payload.contextualVideoAD, {
+        contextualVideoAD: _extends$1._extends({}, payload.contextualVideoAD, {
           slotId: (payload.contextualVideoAD.slotId || 'in-context_video') + '-' + payload._id
         })
       });
@@ -636,7 +649,7 @@ var Article = function Article(props) {
       return React__default.createElement(
         React__default.Fragment,
         null,
-        React__default.createElement(BlockContent.BlockContent, _extends._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
           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' }
@@ -645,23 +658,23 @@ var Article = function Article(props) {
         React__default.createElement(
           'div',
           { id: 'contextual-native-ad-' + payload._id, className: 'contextual-native-ad' },
-          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: previewAd ? null : checkIsAdFound }))
+          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualAD, { refreshFlag: refreshFlag, checkIsAdFound: previewAd ? null : checkIsAdFound }))
         ),
         React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(
           'div',
           { id: 'contextual-video-ad-' + payload._id, className: 'contextual-video-ad' },
-          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
+          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualVideoAD, { refreshFlag: refreshFlag, checkIsAdFound: checkIsVideoAdFound }))
         ),
-        React__default.createElement(BlockContent.BlockContent, _extends._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
           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()))
       );
     } else if (indexes.length >= 2 && body.length >= 3 && payload.contextualAD && !payload.contextualVideoAD) {
-      payload = _extends._extends({}, payload, {
-        contextualAD: _extends._extends({}, payload.contextualAD, {
+      payload = _extends$1._extends({}, payload, {
+        contextualAD: _extends$1._extends({}, payload.contextualAD, {
           slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id,
           className: 'ADFluid',
           //  Fetching new contextual targeting based on the current active article.
@@ -708,7 +721,7 @@ var Article = function Article(props) {
       return React__default.createElement(
         React__default.Fragment,
         null,
-        React__default.createElement(BlockContent.BlockContent, _extends._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
           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' }
@@ -717,18 +730,18 @@ var Article = function Article(props) {
         (visibleFlag || queueData && queueData.length === 1 || !props.infiniteScroll) && React__default.createElement(
           'div',
           { id: 'contextual-native-ad-' + payload._id, className: 'contextual-native-ad' },
-          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: previewAd ? null : _checkIsAdFound }))
+          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualAD, { refreshFlag: refreshFlag, checkIsAdFound: previewAd ? null : _checkIsAdFound }))
         ),
         contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
-        React__default.createElement(BlockContent.BlockContent, _extends._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
           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()))
       );
     } else if (indexes.length >= 2 && body.length > 3 && payload.contextualVideoAD && !payload.contextualAD) {
-      payload = _extends._extends({}, payload, {
-        contextualVideoAD: _extends._extends({}, payload.contextualVideoAD, {
+      payload = _extends$1._extends({}, payload, {
+        contextualVideoAD: _extends$1._extends({}, payload.contextualVideoAD, {
           slotId: (payload.contextualVideoAD.slotId || 'in-context_video') + '-' + payload._id
         })
       });
@@ -751,7 +764,7 @@ var Article = function Article(props) {
       return React__default.createElement(
         React__default.Fragment,
         null,
-        React__default.createElement(BlockContent.BlockContent, _extends._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
           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' }
@@ -760,16 +773,16 @@ var Article = function Article(props) {
         React__default.createElement(
           'div',
           { id: 'contextual-video-ad-' + payload._id, className: 'contextual-video-ad' },
-          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
+          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualVideoAD, { refreshFlag: refreshFlag, checkIsAdFound: _checkIsAdFound2 }))
         ),
-        React__default.createElement(BlockContent.BlockContent, _extends._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
           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({
+      return React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
         serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads, targeting, article),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
@@ -955,7 +968,7 @@ var Article = function Article(props) {
             React__default.createElement(
               'div',
               { className: 'ad-box', style: { textAlign: 'center' } },
-              main.main_39 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+              main.main_36 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
                 if (index === 0) {
                   return React__default.createElement(
                     'div',
@@ -1008,20 +1021,7 @@ var Article = function Article(props) {
               )
             ),
             React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } }),
-            showRelatedArticles && !showIsi && React__default.createElement(
-              React__default.Fragment,
-              null,
-              React__default.createElement(
-                'div',
-                null,
-                React__default.createElement(RelevantTopics, null)
-              ),
-              React__default.createElement(
-                'div',
-                { className: 'pt-2' },
-                React__default.createElement(RelatedArticle, { articles: article.relatedArticle, client: client })
-              )
-            )
+            showRelatedArticles && !showIsi && React__default.createElement(RelatedContent, null)
           ),
           renderIsiContent(props.article)
         ),
@@ -1034,7 +1034,7 @@ var Article = function Article(props) {
           })
         )
       ),
-      main.main_39 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+      main.main_36 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
         if (index > 0) {
           return React__default.createElement(
             'div',
@@ -1090,7 +1090,7 @@ var ArticleQueue = function ArticleQueue(props) {
 
 
   var firstArticle = function firstArticle() {
-    var article = _extends._Object$assign({}, props.article);
+    var article = _extends$1._Object$assign({}, props.article);
     var targeting = getTargeting.getTargeting(props);
     article.Ads = Ads.getRightItems(targeting);
     return article;
@@ -1107,7 +1107,7 @@ var ArticleQueue = function ArticleQueue(props) {
     });
     var targeting = getTargeting.getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
 
-    if (!main.main_39) {
+    if (!main.main_36) {
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           var slots = googletag.pubads().getSlots();
@@ -1125,7 +1125,7 @@ var ArticleQueue = function ArticleQueue(props) {
       });
     }
     //Refresh leaderboard ad on mobile
-    if (main.main_39) {
+    if (main.main_36) {
       var leaderboardSlotId = '';
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
@@ -1186,50 +1186,77 @@ var ArticleQueue = function ArticleQueue(props) {
     }, 1000);
   }, [queueData.length]);
 
-  var loadmore = function loadmore() {
-    var query = props.relatedArticleQuery;
-    var params = props.params;
-    if (queueData && queueData.length < maxListLength) {
-      params.index = queueData.length - 1;
-      props.client.fetch(query, params).then(function () {
-        var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee(article) {
-          var startingIndex, endingIndex, targeting;
-          return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  if (!(article && article._id)) {
-                    _context.next = 9;
-                    break;
-                  }
-
-                  //query next 4 related article without repeating previous 4 related articles
-                  startingIndex = queueData.length + 1;
-                  endingIndex = startingIndex + 2;
-                  _context.next = 5;
-                  return getRelatedArticle(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
-
-                case 5:
-                  article.relatedArticle = _context.sent;
-                  targeting = getTargeting.getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
-
-                  article.Ads = Ads.getRightItems(targeting);
-                  setQueueData([].concat(toConsumableArray._toConsumableArray(queueData), [article]));
-
-                case 9:
-                case 'end':
-                  return _context.stop();
+  var loadmore = function () {
+    var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
+      var index, article, startingIndex, endingIndex, targeting;
+      return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(queueData && queueData.length < maxListLength)) {
+                _context.next = 27;
+                break;
               }
-            }
-          }, _callee, _this);
-        }));
 
-        return function (_x) {
-          return _ref.apply(this, arguments);
-        };
-      }());
-    }
-  };
+              index = queueData.length - 1;
+              article = null;
+              _context.prev = 3;
+              _context.next = 6;
+              return getRelatedArticle(null, props.client, props.article, prevUrl, index);
+
+            case 6:
+              article = _context.sent;
+              _context.next = 12;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context['catch'](3);
+
+              console.error(_context.t0);
+
+            case 12:
+              if (!(article && article._id)) {
+                _context.next = 27;
+                break;
+              }
+
+              //query next 4 related article without repeating previous 4 related articles
+              startingIndex = queueData.length + 1;
+              endingIndex = startingIndex + 2;
+              _context.prev = 15;
+              _context.next = 18;
+              return getRelatedArticle(null, props.client, props.article, prevUrl, startingIndex + '..' + endingIndex);
+
+            case 18:
+              article.relatedArticle = _context.sent;
+              _context.next = 24;
+              break;
+
+            case 21:
+              _context.prev = 21;
+              _context.t1 = _context['catch'](15);
+
+              console.error(_context.t1);
+
+            case 24:
+              targeting = getTargeting.getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
+
+              article.Ads = Ads.getRightItems(targeting);
+              setQueueData([].concat(toConsumableArray._toConsumableArray(queueData), [article]));
+
+            case 27:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, _this, [[3, 9], [15, 21]]);
+    }));
+
+    return function loadmore() {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
@@ -1286,7 +1313,7 @@ var ArticleQueue = function ArticleQueue(props) {
     index_es.InfiniteScroll,
     { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true, style: { overflow: 'hidden' } },
     queueData.map(function (article, index) {
-      return React__default.createElement(Article, _extends._extends({
+      return React__default.createElement(Article, _extends$1._extends({
         key: index
       }, props, {
         onChangeArticle: onChangeArticle,
@@ -1301,74 +1328,6 @@ var ArticleQueue = function ArticleQueue(props) {
   );
 };
 
-var Articles = function Articles(props) {
-  var _extends2;
-
-  var videoAccountIDs = props.videoAccountIDs,
-      Ads = props.Ads,
-      cpModificationRequired = props.cpModificationRequired,
-      Settings = props.Settings,
-      ISIContent = props.ISIContent,
-      prevUrl = props.prevUrl,
-      setActiveArticle = props.setActiveArticle,
-      article = props.article,
-      client = props.client,
-      relatedArticleQuery = props.relatedArticleQuery,
-      Website = props.Website,
-      pageview = props.pageview,
-      shareOptions = props.shareOptions,
-      WAds = props.WAds,
-      regionalPages = props.regionalPages,
-      nationalPage = props.nationalPage,
-      canonicalTag = props.canonicalTag;
-  var taxonomyMapping = article.taxonomyMapping,
-      _article$url = article.url;
-  _article$url = _article$url === undefined ? {
-    current: null
-  } : _article$url;
-  var url = _article$url.current,
-      content_placement = article.content_placement;
-
-
-  var taxonomy = [];
-  content_placement.forEach(function (_ref2) {
-    var path = _ref2.path,
-        _id = _ref2._id;
-
-    var prev_url_to_check = prevUrl;
-    if (prev_url_to_check.includes('?')) {
-      prev_url_to_check = prev_url_to_check.split('?')[0];
-    }
-    if (prev_url_to_check.endsWith(path)) taxonomy.push(_id);
-  });
-
-  if (taxonomy.length === 0) {
-    taxonomy = taxonomyMapping.map(function (_ref3) {
-      var _ref = _ref3._ref;
-      return _ref;
-    });
-  }
-
-  var params = {
-    url: url,
-    taxonomy: taxonomy,
-    index: 0
-  };
-
-  return React__default.createElement(ArticleQueue, _extends._extends((_extends2 = {
-    client: client,
-    params: params,
-    relatedArticleQuery: relatedArticleQuery,
-    website: Website,
-    checkSponsered: true,
-    pageview: pageview,
-    shareOptions: shareOptions,
-    Ads: WAds,
-    regionalPages: regionalPages,
-    nationalPage: nationalPage
-  }, defineProperty$1._defineProperty(_extends2, 'pageview', pageview), defineProperty$1._defineProperty(_extends2, 'onVote', function onVote() {}), defineProperty$1._defineProperty(_extends2, 'ISIContent', ISIContent), defineProperty$1._defineProperty(_extends2, 'videoAccountIDs', videoAccountIDs), defineProperty$1._defineProperty(_extends2, 'sponsoredTaxonomies', []), defineProperty$1._defineProperty(_extends2, 'cpModificationRequired', cpModificationRequired), defineProperty$1._defineProperty(_extends2, 'Settings', Settings), defineProperty$1._defineProperty(_extends2, 'canonicalTag', canonicalTag), _extends2), props));
-};
-
 var _this$1 = undefined;
 
 var View = function View(props) {
@@ -1547,7 +1506,15 @@ var View = function View(props) {
         props.article.seriesDetail && props.article.seriesDetail.nextUrl && React__default.createElement('link', { rel: 'next', href: props.article.seriesDetail.nextUrl })
       )
     ),
-    !needInfiniteScroll ? React__default.createElement(Article, _extends._extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(Articles, _extends._extends({ infiniteScroll: true, showRelatedArticles: showRelatedArticles, canonicalTag: canonicalTag }, props))
+    !needInfiniteScroll ? React__default.createElement(Article, _extends$1._extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(ArticleQueue, _extends$1._extends({
+      infiniteScroll: true,
+      showRelatedArticles: showRelatedArticles,
+      canonicalTag: canonicalTag,
+      checkSponsered: true,
+      Ads: props.WAds,
+      onVote: function onVote() {},
+      sponsoredTaxonomies: []
+    }, props))
   );
 };
 

package/dist/cjs/YahooHero.js

@@ -10,9 +10,9 @@ require('./web.dom.iterable-a0e279c1.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 require('prop-types');
-var moment = require('./moment-66a6a284.js');
+var moment = require('./moment-575fe24c.js');
 require('react-dom');
-var index$1 = require('./index-b5eb3ff8.js');
+var index$1 = require('./index-be0c82be.js');
 var index$2 = require('./index-da796b8c.js');
 var entities = require('./entities-310b46ee.js');
 require('./slicedToArray-8f385299.js');