@mjhls/mjh-framework 1.0.656 → 1.0.658-masterdeck-loadmore

package/dist/esm/IssueLanding.js

@@ -9,19 +9,19 @@ import './_object-pie-71ac75a4.js';
 import './extends-cc5da797.js';
 import './web.dom.iterable-8956f9a5.js';
 import React__default from 'react';
-import './index-93ec3c59.js';
+import './index-0e45a0b2.js';
 import 'prop-types';
 import 'react-bootstrap/Card';
-import './moment-12415288.js';
+import './moment-e2f9b20c.js';
 import 'next/router';
 import './isSymbol-807e927e.js';
 import './debounce-1a993acf.js';
-import './index.es-938a3a58.js';
+import './index.es-29c1cef5.js';
 import 'react-dom';
 import './visibility-sensor-0baa4eea.js';
-import './index-51a80699.js';
+import './index-73819142.js';
 import './index-5f9f807a.js';
-import './main-0465b2a0.js';
+import './main-5d1e4bd3.js';
 import './entities-7cc3bf45.js';
 import './stringify-008c8802.js';
 import './slicedToArray-7021e5df.js';
@@ -29,9 +29,9 @@ import './asyncToGenerator-7c654f36.js';
 import './_set-species-cede29f8.js';
 import './beam-681a9749.js';
 import './AdSlot.js';
-import './ADInfeed-c27997a3.js';
+import './ADInfeed-e10d10a6.js';
 import './lodash-17fdfebb.js';
-import './ADlgInfeed-41c3909c.js';
+import './ADlgInfeed-c5dc4827.js';
 import './getContentCategory-15dcc413.js';
 import './AuthorComponent-00f13201.js';
 import 'react-bootstrap';

package/dist/esm/LeftNav.js

@@ -6,11 +6,11 @@ import './_iter-detect-59409a32.js';
 import './core.get-iterator-method-54d2e411.js';
 import './web.dom.iterable-8956f9a5.js';
 import React__default, { useRef, useEffect } from 'react';
-import './index-93ec3c59.js';
+import './index-0e45a0b2.js';
 import 'prop-types';
 import './isSymbol-807e927e.js';
 import './debounce-1a993acf.js';
-import './main-0465b2a0.js';
+import './main-5d1e4bd3.js';
 import './stringify-008c8802.js';
 import './slicedToArray-7021e5df.js';
 import './asyncToGenerator-7c654f36.js';

package/dist/esm/MasterDeck.js

@@ -14,30 +14,30 @@ import './web.dom.iterable-8956f9a5.js';
 import './typeof-08f2c380.js';
 import './_is-array-49698029.js';
 import React__default from 'react';
-import { l as lib_3 } from './index-93ec3c59.js';
+import { l as lib_3 } from './index-0e45a0b2.js';
 import 'prop-types';
 import Container from 'react-bootstrap/Container';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'react-bootstrap/Card';
-import './moment-12415288.js';
+import './moment-e2f9b20c.js';
 import { withRouter } from 'next/router';
 import './isSymbol-807e927e.js';
 import { d as debounce_1 } from './debounce-1a993acf.js';
-import { I as InfiniteScroll } from './index.es-938a3a58.js';
+import { I as InfiniteScroll } from './index.es-29c1cef5.js';
 import 'react-dom';
 import { V as VisibilitySensor } from './visibility-sensor-0baa4eea.js';
-import './index-51a80699.js';
-import { m as main_39 } from './main-0465b2a0.js';
+import './index-73819142.js';
+import { m as main_36 } from './main-5d1e4bd3.js';
 import './stringify-008c8802.js';
 import './slicedToArray-7021e5df.js';
 import { _ as _Promise } from './asyncToGenerator-7c654f36.js';
 import './_set-species-cede29f8.js';
 import './beam-681a9749.js';
 import './AdSlot.js';
-import { A as ADInfeed } from './ADInfeed-c27997a3.js';
+import { A as ADInfeed } from './ADInfeed-e10d10a6.js';
 import { l as lodash } from './lodash-17fdfebb.js';
-import { A as ADlgInfeed } from './ADlgInfeed-41c3909c.js';
+import { A as ADlgInfeed } from './ADlgInfeed-c5dc4827.js';
 
 var MasterDeck = function (_React$Component) {
   _inherits(MasterDeck, _React$Component);
@@ -62,23 +62,23 @@ var MasterDeck = function (_React$Component) {
       from: _this.params ? _this.params.from : 0,
       to: _this.params ? _this.params.to : 2,
       total_pages: null,
-      scrolling: true,
+      scrolling: false,
       query: _this.query,
       currentPage: _this.props.currentPage || 1,
-      dataRemapped: false,
+      dataRemapped: !_this.props.showBI || !_this.props.brandInsightAd,
       lastDataSize: _this.data ? _this.data.length : 0,
       itemsPerPage: _this.params ? _this.params.to - _this.params.from : 2
     }, _this.loadMore = debounce_1(function () {
       _this.setState(function (state) {
         var page = state.page,
             from = state.from,
-            per = state.per,
-            to = state.to;
+            to = state.to,
+            itemsPerPage = state.itemsPerPage;
 
         return {
           page: page + 1,
-          from: from + per,
-          to: to + per
+          from: from + itemsPerPage,
+          to: to + itemsPerPage
         };
       }, _this.loadData);
     }, 0), _this.loadData = function () {
@@ -123,25 +123,51 @@ var MasterDeck = function (_React$Component) {
         });
       });
 
-      _this.setState(function () {
-        if (dataArr.length > 0) {
-          return {
-            data: [].concat(_toConsumableArray(data), _toConsumableArray(dataArr)),
-            lastDataSize: dataArr.length,
-            scrolling: true
-          };
-        } else {
-          return {
-            scrolling: false,
-            lastDataSize: 0
-          };
-        }
-      });
-    }, _this.changePageNumber = function (pageNumber) {
+      if (dataArr.length > 0) {
+        _this.checkMoreDataAvailable();
+        _this.setState({
+          data: [].concat(_toConsumableArray(data), _toConsumableArray(dataArr)),
+          lastDataSize: dataArr.length
+        });
+      } else {
+        _this.setState({
+          scrolling: false,
+          lastDataSize: 0
+        });
+      }
+    }, _this.checkMoreDataAvailable = function () {
+      var _this$state2 = _this.state,
+          from = _this$state2.from,
+          to = _this$state2.to,
+          itemsPerPage = _this$state2.itemsPerPage,
+          query = _this$state2.query;
       var _this$props2 = _this.props,
-          seoPaginate = _this$props2.seoPaginate,
-          pageview = _this$props2.pageview,
-          router = _this$props2.router;
+          client = _this$props2.client,
+          dataHandler = _this$props2.dataHandler;
+
+      var params = _extends({}, _this.props.params, { from: from + itemsPerPage, to: to + itemsPerPage });
+      if (dataHandler) {
+        var dataHandlerPromise = new _Promise(function (resolve, reject) {
+          try {
+            var result = dataHandler(params);
+            resolve(result);
+          } catch (e) {
+            reject(e);
+          }
+        });
+        dataHandlerPromise.then(function (dataArr) {
+          if (dataArr && dataArr.length > 0) _this.setState({ scrolling: true });else _this.setState({ scrolling: false });
+        });
+      } else {
+        client.fetch(query, params).then(function (dataArr) {
+          if (dataArr && dataArr.length > 0) _this.setState({ scrolling: true });else _this.setState({ scrolling: false });
+        });
+      }
+    }, _this.changePageNumber = function (pageNumber) {
+      var _this$props3 = _this.props,
+          seoPaginate = _this$props3.seoPaginate,
+          pageview = _this$props3.pageview,
+          router = _this$props3.router;
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {
@@ -219,9 +245,6 @@ var MasterDeck = function (_React$Component) {
       var insertBrandInsightAd = function insertBrandInsightAd(arr, index, newElement) {
         return [].concat(_toConsumableArray(arr.slice(0, index)), [newElement], _toConsumableArray(arr.slice(index)));
       };
-      _this.componentDidMount = function () {
-        _this.setState({ dataRemapped: !showBI || !brandInsightAd ? true : false });
-      };
       //  Need to pass flag "lgInfeedAd={true}" along with brandInsightAd from site level for large infeed-ad to render
       //  Checking lgInfeedAd flag in desktop view ( window >= 1400px ).
       //  Integrating large infeed AD
@@ -316,7 +339,7 @@ var MasterDeck = function (_React$Component) {
                 React__default.Fragment,
                 { key: index },
                 React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client, defaultImage: _this.defaultImage }),
-                main_39 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
+                main_36 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
                   'div',
                   { className: 'ad-container', style: { margin: '0 auto' } },
                   _this.renderMobileAd(index, numberOfItemsBeforeAd, _this.rightItems)
@@ -366,10 +389,10 @@ var MasterDeck = function (_React$Component) {
         rightItems[i].component
       );
     }, _this.renderManualPagination = function () {
-      var _this$state2 = _this.state,
-          currentPage = _this$state2.currentPage,
-          itemsPerPage = _this$state2.itemsPerPage,
-          lastDataSize = _this$state2.lastDataSize;
+      var _this$state3 = _this.state,
+          currentPage = _this$state3.currentPage,
+          itemsPerPage = _this$state3.itemsPerPage,
+          lastDataSize = _this$state3.lastDataSize;
 
       console.log('lastDataSize:', lastDataSize);
       console.log('itemsPerPage:', itemsPerPage);
@@ -420,7 +443,7 @@ var MasterDeck = function (_React$Component) {
   }, {
     key: 'componentDidMount',
     value: function componentDidMount() {
-      // this.loadData();
+      this.checkMoreDataAvailable();
     }
     //  Passing 'brandInsightAd','showBI' and 'lgInfeedAd'
 
@@ -476,7 +499,16 @@ var MasterDeck = function (_React$Component) {
               'button',
               {
                 className: 'btn',
-                style: { margin: '0 auto 2rem', display: 'block', fontSize: '18px', padding: '.5rem 1.5rem', boxShadow: '1px 2px 4px 4px rgba(0,0,0,.15)', background: 'var(--primary)', color: '#fff', borderRadius: '5px' },
+                style: {
+                  margin: '0 auto 2rem',
+                  display: 'block',
+                  fontSize: '18px',
+                  padding: '.5rem 1.5rem',
+                  boxShadow: '1px 2px 4px 4px rgba(0,0,0,.15)',
+                  background: 'var(--primary)',
+                  color: '#fff',
+                  borderRadius: '5px'
+                },
                 onClick: function onClick(e) {
                   _this3.loadMore();
                 } },

package/dist/esm/NavMagazine.js

@@ -8,7 +8,7 @@ import './web.dom.iterable-8956f9a5.js';
 import React__default, { useRef, useState, useEffect } from 'react';
 import 'prop-types';
 import Container from 'react-bootstrap/Container';
-import { a as main_40 } from './main-0465b2a0.js';
+import { a as main_37 } from './main-5d1e4bd3.js';
 import './stringify-008c8802.js';
 import { _ as _slicedToArray } from './slicedToArray-7021e5df.js';
 import './asyncToGenerator-7c654f36.js';
@@ -27,7 +27,7 @@ import { N as NavFooter } from './NavFooter-e27bd93b.js';
 import { S as SocialNavFooter } from './index.esm-73e847d2.js';
 import './SocialIcons.js';
 import 'react-bootstrap/FormControl';
-import { S as SocialSearchComponent } from './SocialSearchComponent-75527dfe.js';
+import { S as SocialSearchComponent } from './SocialSearchComponent-55960ec4.js';
 
 var NavMagazine = function NavMagazine(props) {
   /*
@@ -307,7 +307,7 @@ var NavMagazine = function NavMagazine(props) {
       {
         id: 'navbar-ham',
         style: { width: '100%', display: 'flex', top: topOffset, overflow: 'auto', zIndex: '999999' },
-        className: main_40 ? 'bottom-nav ios-nav' : 'bottom-nav ',
+        className: main_37 ? 'bottom-nav ios-nav' : 'bottom-nav ',
         variant: 'dark',
         expand: 'xl',
         bg: 'primary',
@@ -323,7 +323,7 @@ var NavMagazine = function NavMagazine(props) {
             'aria-controls': 'basic-navbar-nav',
             onClick: function onClick() {
               // Set overflow fix for iPhones safari browsers
-              if (main_40) {
+              if (main_37) {
                 var mainNav = document.querySelector('#navbar-ham');
                 if (mainNav && mainNav.style) mainNav.style.overflow = 'auto';
               }

package/dist/esm/NavNative.js

@@ -8,7 +8,7 @@ import './web.dom.iterable-8956f9a5.js';
 import React__default, { useRef, useState, useEffect } from 'react';
 import 'prop-types';
 import Container from 'react-bootstrap/Container';
-import { a as main_40 } from './main-0465b2a0.js';
+import { a as main_37 } from './main-5d1e4bd3.js';
 import './stringify-008c8802.js';
 import { _ as _slicedToArray } from './slicedToArray-7021e5df.js';
 import './asyncToGenerator-7c654f36.js';
@@ -252,7 +252,7 @@ var NavNative = function NavNative(props) {
     React__default.createElement(
       Navbar,
       {
-        className: main_40 ? 'bottom-nav ios-nav' : 'bottom-nav android-nav',
+        className: main_37 ? 'bottom-nav ios-nav' : 'bottom-nav android-nav',
         variant: 'dark',
         expand: 'lg',
         bg: 'primary',

package/dist/esm/OncliveHero.js

@@ -1,7 +1,7 @@
 import './_commonjsHelpers-0c4b6f40.js';
 import React__default from 'react';
-import { m as moment } from './moment-12415288.js';
-import { i as imageUrlBuilder } from './index-51a80699.js';
+import { m as moment } from './moment-e2f9b20c.js';
+import { i as imageUrlBuilder } from './index-73819142.js';
 import './iconBase-602d52fe.js';
 import 'react-bootstrap/Badge';
 import './index.esm-9a4c8813.js';

package/dist/esm/OncliveLargeHero.js

@@ -5,9 +5,9 @@ import './core.get-iterator-method-54d2e411.js';
 import './web.dom.iterable-8956f9a5.js';
 import React__default from 'react';
 import 'prop-types';
-import { m as moment } from './moment-12415288.js';
+import { m as moment } from './moment-e2f9b20c.js';
 import 'react-dom';
-import { i as imageUrlBuilder } from './index-51a80699.js';
+import { i as imageUrlBuilder } from './index-73819142.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
 import './slicedToArray-7021e5df.js';