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

package/dist/cjs/IssueLanding.js

@@ -14,19 +14,19 @@ require('./extends-60837c34.js');
 require('./web.dom.iterable-a0e279c1.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-require('./index-2d0a4911.js');
+require('./index-fa8ed292.js');
 require('prop-types');
 require('react-bootstrap/Card');
-require('./moment-66a6a284.js');
+require('./moment-575fe24c.js');
 require('next/router');
 require('./isSymbol-04666465.js');
 require('./debounce-eb287781.js');
-require('./index.es-ab3f2690.js');
+require('./index.es-9110add6.js');
 require('react-dom');
 require('./visibility-sensor-0c45a583.js');
-require('./index-b5eb3ff8.js');
+require('./index-be0c82be.js');
 require('./index-da796b8c.js');
-require('./main-b6c96c8d.js');
+require('./main-a4cb15bb.js');
 require('./entities-310b46ee.js');
 require('./stringify-7c5aff47.js');
 require('./slicedToArray-8f385299.js');
@@ -34,9 +34,9 @@ require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.js');
 require('./beam-7217b7e7.js');
 require('./AdSlot.js');
-require('./ADInfeed-eaa6c661.js');
+require('./ADInfeed-15a7d07f.js');
 require('./lodash-fc2922d0.js');
-require('./ADlgInfeed-f25eb4f7.js');
+require('./ADlgInfeed-da05bb23.js');
 require('./getContentCategory-f38a4c00.js');
 require('./AuthorComponent-bb831b74.js');
 require('react-bootstrap');

package/dist/cjs/LeftNav.js

@@ -13,11 +13,11 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./web.dom.iterable-a0e279c1.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-require('./index-2d0a4911.js');
+require('./index-fa8ed292.js');
 require('prop-types');
 require('./isSymbol-04666465.js');
 require('./debounce-eb287781.js');
-require('./main-b6c96c8d.js');
+require('./main-a4cb15bb.js');
 require('./stringify-7c5aff47.js');
 require('./slicedToArray-8f385299.js');
 require('./asyncToGenerator-533d476a.js');

package/dist/cjs/MasterDeck.js

@@ -19,31 +19,31 @@ 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');
 var Container = _interopDefault(require('react-bootstrap/Container'));
 require('react-bootstrap/Row');
 require('react-bootstrap/Col');
 require('react-bootstrap/Card');
-require('./moment-66a6a284.js');
+require('./moment-575fe24c.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('./isSymbol-04666465.js');
 var debounce = require('./debounce-eb287781.js');
-var index_es = require('./index.es-ab3f2690.js');
+var index_es = require('./index.es-9110add6.js');
 require('react-dom');
 var visibilitySensor = require('./visibility-sensor-0c45a583.js');
-require('./index-b5eb3ff8.js');
-var main = require('./main-b6c96c8d.js');
+require('./index-be0c82be.js');
+var main = require('./main-a4cb15bb.js');
 require('./stringify-7c5aff47.js');
 require('./slicedToArray-8f385299.js');
 var asyncToGenerator = require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.js');
 require('./beam-7217b7e7.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-eaa6c661.js');
+var ADInfeed = require('./ADInfeed-15a7d07f.js');
 var lodash = require('./lodash-fc2922d0.js');
-var ADlgInfeed = require('./ADlgInfeed-f25eb4f7.js');
+var ADlgInfeed = require('./ADlgInfeed-da05bb23.js');
 
 var MasterDeck = function (_React$Component) {
   inherits._inherits(MasterDeck, _React$Component);
@@ -68,23 +68,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.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 () {
@@ -129,25 +129,51 @@ var MasterDeck = function (_React$Component) {
         });
       });
 
-      _this.setState(function () {
-        if (dataArr.length > 0) {
-          return {
-            data: [].concat(toConsumableArray._toConsumableArray(data), toConsumableArray._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._toConsumableArray(data), toConsumableArray._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._extends({}, _this.props.params, { from: from + itemsPerPage, to: to + itemsPerPage });
+      if (dataHandler) {
+        var dataHandlerPromise = new asyncToGenerator._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) {
@@ -225,9 +251,6 @@ var MasterDeck = function (_React$Component) {
       var insertBrandInsightAd = function insertBrandInsightAd(arr, index, newElement) {
         return [].concat(toConsumableArray._toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray._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
@@ -322,7 +345,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.main_39 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
+                main.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)
@@ -372,10 +395,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);
@@ -426,7 +449,7 @@ var MasterDeck = function (_React$Component) {
   }, {
     key: 'componentDidMount',
     value: function componentDidMount() {
-      // this.loadData();
+      this.checkMoreDataAvailable();
     }
     //  Passing 'brandInsightAd','showBI' and 'lgInfeedAd'
 
@@ -482,7 +505,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/cjs/NavMagazine.js

@@ -15,7 +15,7 @@ var React = require('react');
 var React__default = _interopDefault(React);
 require('prop-types');
 var Container = _interopDefault(require('react-bootstrap/Container'));
-var main = require('./main-b6c96c8d.js');
+var main = require('./main-a4cb15bb.js');
 require('./stringify-7c5aff47.js');
 var slicedToArray = require('./slicedToArray-8f385299.js');
 require('./asyncToGenerator-533d476a.js');
@@ -34,7 +34,7 @@ var NavFooter = require('./NavFooter-76c913e3.js');
 var index_esm$2 = require('./index.esm-fe549f9c.js');
 require('./SocialIcons.js');
 require('react-bootstrap/FormControl');
-var SocialSearchComponent = require('./SocialSearchComponent-962b1344.js');
+var SocialSearchComponent = require('./SocialSearchComponent-81a50f81.js');
 
 var NavMagazine = function NavMagazine(props) {
   /*
@@ -314,7 +314,7 @@ var NavMagazine = function NavMagazine(props) {
       {
         id: 'navbar-ham',
         style: { width: '100%', display: 'flex', top: topOffset, overflow: 'auto', zIndex: '999999' },
-        className: main.main_40 ? 'bottom-nav ios-nav' : 'bottom-nav ',
+        className: main.main_37 ? 'bottom-nav ios-nav' : 'bottom-nav ',
         variant: 'dark',
         expand: 'xl',
         bg: 'primary',
@@ -330,7 +330,7 @@ var NavMagazine = function NavMagazine(props) {
             'aria-controls': 'basic-navbar-nav',
             onClick: function onClick() {
               // Set overflow fix for iPhones safari browsers
-              if (main.main_40) {
+              if (main.main_37) {
                 var mainNav = document.querySelector('#navbar-ham');
                 if (mainNav && mainNav.style) mainNav.style.overflow = 'auto';
               }

package/dist/cjs/NavNative.js

@@ -15,7 +15,7 @@ var React = require('react');
 var React__default = _interopDefault(React);
 require('prop-types');
 var Container = _interopDefault(require('react-bootstrap/Container'));
-var main = require('./main-b6c96c8d.js');
+var main = require('./main-a4cb15bb.js');
 require('./stringify-7c5aff47.js');
 var slicedToArray = require('./slicedToArray-8f385299.js');
 require('./asyncToGenerator-533d476a.js');
@@ -259,7 +259,7 @@ var NavNative = function NavNative(props) {
     React__default.createElement(
       Navbar,
       {
-        className: main.main_40 ? 'bottom-nav ios-nav' : 'bottom-nav android-nav',
+        className: main.main_37 ? 'bottom-nav ios-nav' : 'bottom-nav android-nav',
         variant: 'dark',
         expand: 'lg',
         bg: 'primary',

package/dist/cjs/OncliveHero.js

@@ -5,8 +5,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 require('./_commonjsHelpers-06173234.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-var moment = require('./moment-66a6a284.js');
-var index$1 = require('./index-b5eb3ff8.js');
+var moment = require('./moment-575fe24c.js');
+var index$1 = require('./index-be0c82be.js');
 require('./iconBase-68959171.js');
 require('react-bootstrap/Badge');
 require('./index.esm-89fabc47.js');

package/dist/cjs/OncliveLargeHero.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');