@mjhls/mjh-framework 1.0.945 → 1.0.946

package/dist/cjs/DeckQueue.js

@@ -69,7 +69,8 @@ var DeckQueue = function (_React$Component) {
       total_pages: null,
       scrolling: true,
       query: _this.query,
-      currentPage: _this.props.currentPage || 1
+      currentPage: _this.props.currentPage || 1,
+      lastDataSize: _this.data ? _this.data.length : 0
     }, _this.loadMore = debounce.debounce_1(function () {
       _this.setState(function (state) {
         var page = state.page,
@@ -109,11 +110,13 @@ var DeckQueue = function (_React$Component) {
           if (dataArr.length > 0) {
             return {
               data: [].concat(toConsumableArray._toConsumableArray(data), toConsumableArray._toConsumableArray(dataArr)),
+              lastDataSize: dataArr.length,
               scrolling: true
             };
           } else {
             return {
-              scrolling: false
+              scrolling: false,
+              lastDataSize: 0
             };
           }
         });
@@ -199,8 +202,12 @@ var DeckQueue = function (_React$Component) {
         { style: { display: 'flex', flex: '1 0 auto' } },
         rightItems[i].component
       );
-    }, _this.renderManualPagination = function () {
-      var currentPage = _this.state.currentPage;
+    }, _this.renderManualPagination = function (_ref2) {
+      var nextPagePostsCount = _ref2.nextPagePostsCount;
+      var _this$state2 = _this.state,
+          currentPage = _this$state2.currentPage,
+          per = _this$state2.per,
+          lastDataSize = _this$state2.lastDataSize;
 
       return React__default['default'].createElement(
         'div',
@@ -210,7 +217,7 @@ var DeckQueue = function (_React$Component) {
           { href: '?page=' + (currentPage - 1) },
           '<< Previous'
         ),
-        React__default['default'].createElement(
+        !(lastDataSize < per) && nextPagePostsCount > 0 && React__default['default'].createElement(
           'a',
           { href: '?page=' + (currentPage + 1) },
           'Next >>'
@@ -325,19 +332,30 @@ var DeckQueue = function (_React$Component) {
           columns = _props.columns,
           variant = _props.variant,
           autoScroll = _props.autoScroll,
-          page = _props.page;
+          page = _props.page,
+          _props$nextPagePostsC = _props.nextPagePostsCount,
+          nextPagePostsCount = _props$nextPagePostsC === undefined ? 3 : _props$nextPagePostsC;
 
 
       return React__default['default'].createElement(
         'div',
         { className: 'contentDeck' },
         autoScroll ? React__default['default'].createElement(
-          index_es.InfiniteScroll,
-          { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling },
+          React__default['default'].Fragment,
+          null,
           React__default['default'].createElement(
-            Container__default['default'],
+            index_es.InfiniteScroll,
+            { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling },
+            React__default['default'].createElement(
+              Container__default['default'],
+              null,
+              this.cardLoader(page, columns, variant)
+            )
+          ),
+          React__default['default'].createElement(
+            'noscript',
             null,
-            this.cardLoader(page, columns, variant)
+            this.renderManualPagination({ nextPagePostsCount: nextPagePostsCount })
           )
         ) : React__default['default'].createElement(
           React__default['default'].Fragment,
@@ -371,7 +389,7 @@ var DeckQueue = function (_React$Component) {
           React__default['default'].createElement(
             'noscript',
             null,
-            this.renderManualPagination()
+            this.renderManualPagination({ nextPagePostsCount: nextPagePostsCount })
           )
         )
       );

package/dist/cjs/IssueLanding.js

@@ -128,7 +128,9 @@ var IssueLanding = function IssueLanding(props) {
       _props$imageHeight = props.imageHeight,
       imageHeight = _props$imageHeight === undefined ? 270 : _props$imageHeight,
       _props$imageWidth = props.imageWidth,
-      imageWidth = _props$imageWidth === undefined ? 480 : _props$imageWidth;
+      imageWidth = _props$imageWidth === undefined ? 480 : _props$imageWidth,
+      _props$nextPagePostsC = props.nextPagePostsCount,
+      nextPagePostsCount = _props$nextPagePostsC === undefined ? 1 : _props$nextPagePostsC;
 
   return React__default['default'].createElement(
     'div',
@@ -162,7 +164,8 @@ var IssueLanding = function IssueLanding(props) {
       showPubInfo: showPubInfo,
       columns: 'rotate',
       variant: 'top',
-      contentCategoryMapping: settings.contentCategoryMapping ? settings.contentCategoryMapping : []
+      contentCategoryMapping: settings.contentCategoryMapping ? settings.contentCategoryMapping : [],
+      nextPagePostsCount: nextPagePostsCount
     })
   );
 };

package/dist/cjs/MediaSeriesLanding.js

@@ -246,7 +246,8 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
       pageview = props.pageview,
       currentPage = props.currentPage,
       docGroupID = props.docGroupID,
-      parentUrl = props.parentUrl;
+      parentUrl = props.parentUrl,
+      nextPagePostsCount = props.nextPagePostsCount;
 
   var _useState7 = React.useState(false),
       _useState8 = slicedToArray._slicedToArray(_useState7, 2),
@@ -374,14 +375,15 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
       currentPage: currentPage,
       pageview: pageview,
       autoScroll: true,
-      seoPaginate: true
+      seoPaginate: true,
+      nextPagePostsCount: nextPagePostsCount
     })
   );
 };
 
 MediaSeriesLanding.getInitialData = function () {
   var _ref3 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee2(ctx, client, cache) {
-    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, allSeries, buildUsedTopicsArray, usedTopics, taxonomyFilter;
+    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, nextPagePostsCount, allSeries, buildUsedTopicsArray, usedTopics, taxonomyFilter;
     return asyncToGenerator.regenerator.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -411,9 +413,14 @@ MediaSeriesLanding.getInitialData = function () {
           case 13:
             seriesData = _context2.sent;
             _context2.next = 16;
-            return client.fetch('*[_type == \'documentGroup\' && references(\'' + docGroupID._id + '\') && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now()) ]  {\n    topicMapping[]->\n  }');
+            return client.fetch('count(' + seriesQuery + ')', _extends._extends({}, params, { from: params.to, to: params.to + itemsPerPage }));
 
           case 16:
+            nextPagePostsCount = _context2.sent;
+            _context2.next = 19;
+            return client.fetch('*[_type == \'documentGroup\' && references(\'' + docGroupID._id + '\') && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now()) ]  {\n    topicMapping[]->\n  }');
+
+          case 19:
             allSeries = _context2.sent;
 
             //Take all series topicMapping and put in an array
@@ -434,10 +441,10 @@ MediaSeriesLanding.getInitialData = function () {
             };
 
             usedTopics = buildUsedTopicsArray(allSeries);
-            _context2.next = 21;
+            _context2.next = 24;
             return client.fetch('\n  *[_type == \'taxonomy\' && !defined(parent) && isMainTopic] | order(name asc) {\n    _id,\n    identifier,\n    name,\n    "children": *[_type == \'taxonomy\' && references(^._id)] | order(name asc){\n        _id,\n        name,\n        identifier,\n        "grandchildren": *[_type == \'taxonomy\' && references(^._id)] | order(name asc) {...}\n      }\t\n    }');
 
-          case 21:
+          case 24:
             taxonomyFilter = _context2.sent;
 
 
@@ -478,10 +485,11 @@ MediaSeriesLanding.getInitialData = function () {
               docGroupID: docGroupID._id,
               parentUrl: identifier,
               statusCode: statusCode,
-              docGroup: docGroupID
+              docGroup: docGroupID,
+              nextPagePostsCount: nextPagePostsCount
             });
 
-          case 25:
+          case 28:
           case 'end':
             return _context2.stop();
         }

package/dist/esm/DeckQueue.js

@@ -59,7 +59,8 @@ var DeckQueue = function (_React$Component) {
       total_pages: null,
       scrolling: true,
       query: _this.query,
-      currentPage: _this.props.currentPage || 1
+      currentPage: _this.props.currentPage || 1,
+      lastDataSize: _this.data ? _this.data.length : 0
     }, _this.loadMore = debounce_1(function () {
       _this.setState(function (state) {
         var page = state.page,
@@ -99,11 +100,13 @@ var DeckQueue = function (_React$Component) {
           if (dataArr.length > 0) {
             return {
               data: [].concat(_toConsumableArray(data), _toConsumableArray(dataArr)),
+              lastDataSize: dataArr.length,
               scrolling: true
             };
           } else {
             return {
-              scrolling: false
+              scrolling: false,
+              lastDataSize: 0
             };
           }
         });
@@ -189,8 +192,12 @@ var DeckQueue = function (_React$Component) {
         { style: { display: 'flex', flex: '1 0 auto' } },
         rightItems[i].component
       );
-    }, _this.renderManualPagination = function () {
-      var currentPage = _this.state.currentPage;
+    }, _this.renderManualPagination = function (_ref2) {
+      var nextPagePostsCount = _ref2.nextPagePostsCount;
+      var _this$state2 = _this.state,
+          currentPage = _this$state2.currentPage,
+          per = _this$state2.per,
+          lastDataSize = _this$state2.lastDataSize;
 
       return React__default.createElement(
         'div',
@@ -200,7 +207,7 @@ var DeckQueue = function (_React$Component) {
           { href: '?page=' + (currentPage - 1) },
           '<< Previous'
         ),
-        React__default.createElement(
+        !(lastDataSize < per) && nextPagePostsCount > 0 && React__default.createElement(
           'a',
           { href: '?page=' + (currentPage + 1) },
           'Next >>'
@@ -315,19 +322,30 @@ var DeckQueue = function (_React$Component) {
           columns = _props.columns,
           variant = _props.variant,
           autoScroll = _props.autoScroll,
-          page = _props.page;
+          page = _props.page,
+          _props$nextPagePostsC = _props.nextPagePostsCount,
+          nextPagePostsCount = _props$nextPagePostsC === undefined ? 3 : _props$nextPagePostsC;
 
 
       return React__default.createElement(
         'div',
         { className: 'contentDeck' },
         autoScroll ? React__default.createElement(
-          InfiniteScroll,
-          { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling },
+          React__default.Fragment,
+          null,
           React__default.createElement(
-            Container,
+            InfiniteScroll,
+            { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling },
+            React__default.createElement(
+              Container,
+              null,
+              this.cardLoader(page, columns, variant)
+            )
+          ),
+          React__default.createElement(
+            'noscript',
             null,
-            this.cardLoader(page, columns, variant)
+            this.renderManualPagination({ nextPagePostsCount: nextPagePostsCount })
           )
         ) : React__default.createElement(
           React__default.Fragment,
@@ -361,7 +379,7 @@ var DeckQueue = function (_React$Component) {
           React__default.createElement(
             'noscript',
             null,
-            this.renderManualPagination()
+            this.renderManualPagination({ nextPagePostsCount: nextPagePostsCount })
           )
         )
       );

package/dist/esm/IssueLanding.js

@@ -122,7 +122,9 @@ var IssueLanding = function IssueLanding(props) {
       _props$imageHeight = props.imageHeight,
       imageHeight = _props$imageHeight === undefined ? 270 : _props$imageHeight,
       _props$imageWidth = props.imageWidth,
-      imageWidth = _props$imageWidth === undefined ? 480 : _props$imageWidth;
+      imageWidth = _props$imageWidth === undefined ? 480 : _props$imageWidth,
+      _props$nextPagePostsC = props.nextPagePostsCount,
+      nextPagePostsCount = _props$nextPagePostsC === undefined ? 1 : _props$nextPagePostsC;
 
   return React__default.createElement(
     'div',
@@ -156,7 +158,8 @@ var IssueLanding = function IssueLanding(props) {
       showPubInfo: showPubInfo,
       columns: 'rotate',
       variant: 'top',
-      contentCategoryMapping: settings.contentCategoryMapping ? settings.contentCategoryMapping : []
+      contentCategoryMapping: settings.contentCategoryMapping ? settings.contentCategoryMapping : [],
+      nextPagePostsCount: nextPagePostsCount
     })
   );
 };

package/dist/esm/MediaSeriesLanding.js

@@ -239,7 +239,8 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
       pageview = props.pageview,
       currentPage = props.currentPage,
       docGroupID = props.docGroupID,
-      parentUrl = props.parentUrl;
+      parentUrl = props.parentUrl,
+      nextPagePostsCount = props.nextPagePostsCount;
 
   var _useState7 = useState(false),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -367,14 +368,15 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
       currentPage: currentPage,
       pageview: pageview,
       autoScroll: true,
-      seoPaginate: true
+      seoPaginate: true,
+      nextPagePostsCount: nextPagePostsCount
     })
   );
 };
 
 MediaSeriesLanding.getInitialData = function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(ctx, client, cache) {
-    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, allSeries, buildUsedTopicsArray, usedTopics, taxonomyFilter;
+    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, nextPagePostsCount, allSeries, buildUsedTopicsArray, usedTopics, taxonomyFilter;
     return regenerator.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -404,9 +406,14 @@ MediaSeriesLanding.getInitialData = function () {
           case 13:
             seriesData = _context2.sent;
             _context2.next = 16;
-            return client.fetch('*[_type == \'documentGroup\' && references(\'' + docGroupID._id + '\') && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now()) ]  {\n    topicMapping[]->\n  }');
+            return client.fetch('count(' + seriesQuery + ')', _extends({}, params, { from: params.to, to: params.to + itemsPerPage }));
 
           case 16:
+            nextPagePostsCount = _context2.sent;
+            _context2.next = 19;
+            return client.fetch('*[_type == \'documentGroup\' && references(\'' + docGroupID._id + '\') && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now()) ]  {\n    topicMapping[]->\n  }');
+
+          case 19:
             allSeries = _context2.sent;
 
             //Take all series topicMapping and put in an array
@@ -427,10 +434,10 @@ MediaSeriesLanding.getInitialData = function () {
             };
 
             usedTopics = buildUsedTopicsArray(allSeries);
-            _context2.next = 21;
+            _context2.next = 24;
             return client.fetch('\n  *[_type == \'taxonomy\' && !defined(parent) && isMainTopic] | order(name asc) {\n    _id,\n    identifier,\n    name,\n    "children": *[_type == \'taxonomy\' && references(^._id)] | order(name asc){\n        _id,\n        name,\n        identifier,\n        "grandchildren": *[_type == \'taxonomy\' && references(^._id)] | order(name asc) {...}\n      }\t\n    }');
 
-          case 21:
+          case 24:
             taxonomyFilter = _context2.sent;
 
 
@@ -471,10 +478,11 @@ MediaSeriesLanding.getInitialData = function () {
               docGroupID: docGroupID._id,
               parentUrl: identifier,
               statusCode: statusCode,
-              docGroup: docGroupID
+              docGroup: docGroupID,
+              nextPagePostsCount: nextPagePostsCount
             });
 
-          case 25:
+          case 28:
           case 'end':
             return _context2.stop();
         }

package/package.json

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