@mjhls/mjh-framework 1.0.224 → 1.0.226

package/dist/esm/index.js

@@ -15,17 +15,17 @@ import { i as imageUrlBuilder } from './index-ca4ff5cb.js';
 import './index-3c1ee9ab.js';
 import { m as main_35, a as main_36 } from './main-dea495b7.js';
 import { h as html_decode_1, c as clean_html_1 } from './entities-e85d3a4a.js';
-import { s as slicedToArray, _ as _extends$2, t as toConsumableArray, i as inherits$2, c as createClass, a as classCallCheck, p as possibleConstructorReturn } from './_babelHelpers-67c05996.js';
-import { D as DFPAdSlot } from './AdSlot-b67f8534.js';
-export { D as AdSlot } from './AdSlot-b67f8534.js';
+import { s as slicedToArray, _ as _extends$2, t as toConsumableArray, i as inherits$2, c as createClass, a as classCallCheck, p as possibleConstructorReturn, b as asyncToGenerator } from './_babelHelpers-c212c59c.js';
+import { D as DFPAdSlot } from './AdSlot-748bc6ff.js';
+export { D as AdSlot } from './AdSlot-748bc6ff.js';
 export { default as DeckContent } from './DeckContent.js';
 import './get-b074314b.js';
-export { A as AD, G as GridContent } from './GridContent-e5cdc9da.js';
+export { A as AD, G as GridContent } from './GridContent-e1c38e7f.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
 export { default as ThumbnailCard } from './ThumbnailCard.js';
-import { B as BlockContent } from './TaxonomyCard-f9c93953.js';
-export { T as TaxonomyCard } from './TaxonomyCard-f9c93953.js';
+import { B as BlockContent } from './TaxonomyCard-92f9e327.js';
+export { T as TaxonomyCard } from './TaxonomyCard-92f9e327.js';
 import GroupDeck from './GroupDeck.js';
 export { default as GroupDeck } from './GroupDeck.js';
 import { g as getYoutubeId } from './YoutubeGroup-1368335c.js';
@@ -40,8 +40,8 @@ export { default as PublicationDeck } from './PublicationDeck.js';
 export { default as IssueDeck } from './IssueDeck.js';
 import 'react-bootstrap/Badge';
 export { default as IssueContentDeck } from './IssueContentDeck.js';
-import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-8e0aa5e8.js';
-export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-8e0aa5e8.js';
+import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-088cf5cf.js';
+export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-088cf5cf.js';
 import 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -57,8 +57,8 @@ import Carousel$1 from 'react-bootstrap/Carousel';
 import Breadcrumb from 'react-bootstrap/Breadcrumb';
 import DropdownButton from 'react-bootstrap/DropdownButton';
 import Dropdown from 'react-bootstrap/Dropdown';
-import { F as FaLongArrowAltRight } from './Ustream-6bb45fe7.js';
-export { U as Ustream } from './Ustream-6bb45fe7.js';
+import { F as FaLongArrowAltRight } from './Ustream-2bfb1813.js';
+export { U as Ustream } from './Ustream-2bfb1813.js';
 
 var AccordionPanel = function AccordionPanel(props) {
   var accordionClassName = props.accordionClassName,
@@ -10438,7 +10438,7 @@ var Slideshow$1 = function Slideshow(_ref) {
 
   var onChangeSlide = function onChangeSlide(selectedIndex) {
     var pageNumber = selectedIndex + 1;
-    var href = '/view/' + router.query.url + '/?page=' + pageNumber;
+    var href = '/view/' + router.query.url + '?page=' + pageNumber;
     router.push(router.pathname, pageNumber > 1 ? href : '/view/' + router.query.url, { shallow: true });
   };
 
@@ -12364,8 +12364,9 @@ var ArticleQueue = function (_React$Component) {
       title: _this.props.article.title,
       summary: metaDescription,
       queueData: [article],
-      relatedArticles: [],
-      keywords: []
+      keywords: [],
+      maxListLength: 10,
+      loading: false
     }, _this.preVscroll = 0;
     _this.isScrollDown = true;
 
@@ -12377,25 +12378,6 @@ var ArticleQueue = function (_React$Component) {
     value: function componentDidMount() {
       window.addEventListener('scroll', this.scrollDirectionDetect);
     }
-  }, {
-    key: 'componentDidUpdate',
-    value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
-
-      if (prevProps.relatedArticles != this.props.relatedArticles) {
-        var relatedArticles = this.props.relatedArticles.map(function (article) {
-          var targeting = _this2.getTargeting(_this2.props.article);
-          var Ads = _this2.props.Ads.getRightItems(targeting);
-          return _extends$2({}, article, { Ads: Ads });
-        });
-        var queueData = [].concat(toConsumableArray(this.state.queueData));
-        if (prevProps.relatedArticles.length == 0) {
-          queueData.push(relatedArticles.shift());
-          this.setState({ queueData: queueData });
-        }
-        this.setState({ relatedArticles: relatedArticles });
-      }
-    }
   }, {
     key: 'componentWillUnmount',
     value: function componentWillUnmount() {
@@ -12406,7 +12388,7 @@ var ArticleQueue = function (_React$Component) {
   }, {
     key: 'render',
     value: function render() {
-      var _this3 = this;
+      var _this2 = this;
 
       var _state = this.state,
           config = _state.config,
@@ -12429,12 +12411,12 @@ var ArticleQueue = function (_React$Component) {
           queueData.map(function (article, index) {
             return React__default.createElement(Article, _extends$2({
               key: index,
-              urlFor: _this3.urlFor,
-              isCutomPage: _this3.isCutomPage,
-              renderIsiContent: _this3.renderIsiContent
-            }, _this3.props, {
+              urlFor: _this2.urlFor,
+              isCutomPage: _this2.isCutomPage,
+              renderIsiContent: _this2.renderIsiContent
+            }, _this2.props, {
               shareOptions: shareOptions,
-              changeUrl: _this3.changeUrl,
+              changeUrl: _this2.changeUrl,
               article: article
             }));
           })
@@ -12446,37 +12428,68 @@ var ArticleQueue = function (_React$Component) {
 }(React__default.Component);
 
 var _initialiseProps = function _initialiseProps() {
-  var _this4 = this;
+  var _this3 = this;
 
   this.scrollDirectionDetect = function (e) {
     var window = e.currentTarget;
-    var isScrollDown = _this4.isScrollDown;
+    var isScrollDown = _this3.isScrollDown;
 
 
-    if (_this4.preVscroll > window.scrollY) {
+    if (_this3.preVscroll > window.scrollY) {
       if (!isScrollDown) {
-        _this4.isScrollDown = true;
+        _this3.isScrollDown = true;
       }
-    } else if (_this4.preVscroll < window.scrollY) {
+    } else if (_this3.preVscroll < window.scrollY) {
       if (isScrollDown) {
-        _this4.isScrollDown = false;
+        _this3.isScrollDown = false;
       }
     }
-    _this4.preVscroll = window.scrollY;
+    _this3.preVscroll = window.scrollY;
   };
 
-  this.loadmore = function () {
-    var queueData = [].concat(toConsumableArray(_this4.state.queueData));
-    var relatedArticles = [].concat(toConsumableArray(_this4.state.relatedArticles));
-    if (relatedArticles.length > 0) {
-      queueData.push(relatedArticles.shift());
-      _this4.setState({ queueData: queueData, relatedArticles: relatedArticles });
-    }
-  };
+  this.loadmore = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var maxListLength, queueData, query, params, article, targeting;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            maxListLength = _this3.props.maxListLength ? _this3.props.maxListLength : _this3.state.maxListLength;
+            queueData = [].concat(toConsumableArray(_this3.state.queueData));
+            query = _this3.props.relatedArticleQuery;
+            params = _this3.props.params;
+
+            if (!(queueData.length < maxListLength)) {
+              _context.next = 10;
+              break;
+            }
+
+            params.index = queueData.length - 1;
+
+            _context.next = 8;
+            return _this3.props.client.fetch(query, params);
+
+          case 8:
+            article = _context.sent;
+
+            if (article) {
+              targeting = _this3.getTargeting(article);
+
+              article.Ads = _this3.props.Ads.getRightItems(targeting);
+              queueData.push(article);
+              _this3.setState({ queueData: queueData });
+            }
+
+          case 10:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, _this3);
+  }));
 
   this.isCutomPage = function (article) {
     var url = article.url.current;
-    var _props2 = _this4.props,
+    var _props2 = _this3.props,
         regionalPages = _props2.regionalPages,
         nationalPage = _props2.nationalPage;
 
@@ -12484,7 +12497,7 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.urlFor = function (source) {
-    return imageUrlBuilder(_this4.props.client).image(source);
+    return imageUrlBuilder(_this3.props.client).image(source);
   };
 
   this.getTargeting = function (article) {
@@ -12509,7 +12522,7 @@ var _initialiseProps = function _initialiseProps() {
         content_placement = article.content_placement;
 
     var context = url;
-    var localHistory = _this4.props.historyCookie ? JSON.parse(_this4.props.historyCookie) : [];
+    var localHistory = _this3.props.historyCookie ? JSON.parse(_this3.props.historyCookie) : [];
     if (!context && localHistory) {
       context = localHistory[localHistory.length - 1];
     }
@@ -12548,7 +12561,7 @@ var _initialiseProps = function _initialiseProps() {
     var _article$taxonomyMapp = article.taxonomyMapping,
         taxonomyMapping = _article$taxonomyMapp === undefined ? [] : _article$taxonomyMapp;
 
-    if (_this4.props.checkSponsered) {
+    if (_this3.props.checkSponsered) {
 
       return taxonomyMapping.some(function (item) {
         return item._ref === 'ict_taxonomy_735_sponsoredresources';
@@ -12560,7 +12573,7 @@ var _initialiseProps = function _initialiseProps() {
 
   this.renderIsiContent = function (article) {
     var url = article.url.current;
-    var _props3 = _this4.props,
+    var _props3 = _this3.props,
         ISIContent = _props3.iSIContent,
         regionalPages = _props3.regionalPages,
         nationalPage = _props3.nationalPage;
@@ -12594,7 +12607,7 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.refreshAdd = function (path) {
-    var article = _this4.state.queueData.find(function (item) {
+    var article = _this3.state.queueData.find(function (item) {
       return item.url.current == path;
     });
     var title = article.title,
@@ -12614,20 +12627,20 @@ var _initialiseProps = function _initialiseProps() {
     var description = _article$seo.meta_description;
 
     var keywords = [].concat(toConsumableArray(internalTag), toConsumableArray(userDefinedTag), toConsumableArray(SponsorshipTag), toConsumableArray(seoTag));
-    var config = _extends$2({}, _this4.state.config);
-    var targeting = _this4.getTargeting(article);
+    var config = _extends$2({}, _this3.state.config);
+    var targeting = _this3.getTargeting(article);
     var rightItems = [];
 
-    if (_this4.checkSponseredArticle(article)) {
+    if (_this3.checkSponseredArticle(article)) {
       rightItems = [];
     } else {
-      rightItems = _this4.props.Ads.getRightItems(targeting);
+      rightItems = _this3.props.Ads.getRightItems(targeting);
     }
-    var horizontalAD = _this4.props.Ads.getHorizontal(targeting);
+    var horizontalAD = _this3.props.Ads.getHorizontal(targeting);
     config.rightItems = rightItems;
     config.horizontalAD = horizontalAD;
-    var metaDescription = description ? description : summary ? summary : _this4.getFirstLine(article);
-    _this4.setState({ config: config, title: title, summary: metaDescription }, function () {
+    var metaDescription = description ? description : summary ? summary : _this3.getFirstLine(article);
+    _this3.setState({ config: config, title: title, summary: metaDescription }, function () {
       if (!main_36) {
         lib_3.refresh();
       }
@@ -12635,28 +12648,28 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.changeUrl = function (path, visibility) {
-    var isScrollDown = _this4.isScrollDown;
+    var isScrollDown = _this3.isScrollDown;
 
     var newPath = '/view/' + path;
     if (!isScrollDown) {
       if (visibility == 'top') {
         // Router.push('/view/[url]', newPath, {shallow:true})
         window.history.pushState({ page: path }, path, newPath);
-        if (_this4.props.pageview) {
-          _this4.props.pageview(newPath);
+        if (_this3.props.pageview) {
+          _this3.props.pageview(newPath);
         }
 
-        _this4.refreshAdd(path);
+        _this3.refreshAdd(path);
       }
     } else {
       if (visibility == 'bottom') {
         // Router.push('/view/[url]', newPath, {shallow:true})
         window.history.pushState({ page: path }, path, newPath);
-        if (_this4.props.pageview) {
-          _this4.props.pageview(newPath);
+        if (_this3.props.pageview) {
+          _this3.props.pageview(newPath);
         }
 
-        _this4.refreshAdd(path);
+        _this3.refreshAdd(path);
       }
     }
   };

package/package.json

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