@mjhls/mjh-framework 1.0.881-beta.0 → 1.0.881-beta.1

package/dist/cjs/ArticleSeriesLandingPage.js

@@ -44,7 +44,7 @@ require('./ADInfeed-2e48af77.js');
 require('./lodash-fc2922d0.js');
 require('./ADlgInfeed-c39c7131.js');
 require('react-bootstrap/Spinner');
-require('./Pagination-d6a59f99.js');
+require('./Pagination-f3ef7bc1.js');
 var MasterDeck = require('./MasterDeck.js');
 
 var _this = undefined;

package/dist/cjs/DeckQueue.js

@@ -39,11 +39,12 @@ var urlFor = require('./urlFor.js');
 var index$2 = require('./index-96b3db50.js');
 var main = require('./main-02daeefe.js');
 var entities = require('./entities-310b46ee.js');
+var stringify = require('./stringify-bbc68047.js');
 var asyncToGenerator = require('./asyncToGenerator-df19209d.js');
 var get = require('./get-adbb11e3.js');
 require('./eq-bb2843ed.js');
 var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
-var Pagination = require('./Pagination-d6a59f99.js');
+var Pagination = require('./Pagination-f3ef7bc1.js');
 
 var DeckQueue = function (_React$Component) {
   inherits._inherits(DeckQueue, _React$Component);
@@ -60,11 +61,12 @@ var DeckQueue = function (_React$Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = inherits._possibleConstructorReturn(this, (_ref = DeckQueue.__proto__ || inherits._Object$getPrototypeOf(DeckQueue)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.data = _this.props.dataRecord, _this.query = _this.props.query, _this.params = _this.props.params, _this.client = _this.props.client, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.imageHeight = _this.props.imageHeight ? _this.props.imageHeight : 270, _this.state = {
+    return _ret = (_temp = (_this = inherits._possibleConstructorReturn(this, (_ref = DeckQueue.__proto__ || inherits._Object$getPrototypeOf(DeckQueue)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.data = _this.props.dataRecord, _this.client = _this.props.client, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.imageHeight = _this.props.imageHeight ? _this.props.imageHeight : 270, _this.state = {
       data: _this.data,
+      prevData: _this.data,
       currentPage: _this.props.currentPage || 1,
       isDataLoading: false,
-      itemsPerPage: _this.params ? _this.params.to - _this.params.from : 2
+      itemsPerPage: _this.props.params ? _this.props.params.to - _this.props.params.from : 2
     }, _this.renderCardImage = function (row) {
       if (row.thumbnail && row.thumbnail.asset) {
         var url = urlFor({
@@ -172,6 +174,13 @@ var DeckQueue = function (_React$Component) {
   }
 
   inherits._createClass(DeckQueue, [{
+    key: 'componentDidUpdate',
+    value: function componentDidUpdate(prevProps, prevState) {
+      if (stringify._JSON$stringify(prevState.prevData) !== stringify._JSON$stringify(this.state.prevData)) {
+        this.seoPagination(this.state.currentPage);
+      }
+    }
+  }, {
     key: 'cardLoader',
     value: function cardLoader(_ref3) {
       var _this3 = this;
@@ -271,6 +280,7 @@ var DeckQueue = function (_React$Component) {
           variant = _props.variant,
           totalDataCount = _props.totalDataCount;
       var _state = this.state,
+          data = _state.data,
           isDataLoading = _state.isDataLoading,
           itemsPerPage = _state.itemsPerPage,
           currentPage = _state.currentPage;
@@ -290,7 +300,7 @@ var DeckQueue = function (_React$Component) {
               'Loading...'
             )
           )
-        ) : React__default.createElement(
+        ) : data && data.length > 0 ? React__default.createElement(
           Container,
           null,
           this.cardLoader({ columns: columns, variant: variant }),
@@ -309,9 +319,21 @@ var DeckQueue = function (_React$Component) {
               '\n                .pagination-wrapper {\n                  margin: 3rem 0;\n                }\n                @media only screen and (max-width: 768px) {\n                  .pagination-wrapper {\n                    margin-bottom: 6rem;\n                  }\n                }\n              '
             )
           )
-        )
+        ) : null
       );
     }
+  }], [{
+    key: 'getDerivedStateFromProps',
+    value: function getDerivedStateFromProps(props, state) {
+      if (stringify._JSON$stringify(props.dataRecord) !== stringify._JSON$stringify(state.prevData)) {
+        return {
+          data: props.dataRecord,
+          prevData: props.dataRecord,
+          currentPage: props.currentPage
+        };
+      }
+      return null;
+    }
   }]);
 
   return DeckQueue;

package/dist/cjs/IssueLanding.js

@@ -48,7 +48,7 @@ require('./ADlgInfeed-c39c7131.js');
 require('./getContentCategory-f38a4c00.js');
 require('./AuthorComponent-02e827ae.js');
 require('react-bootstrap/Button');
-require('./Pagination-d6a59f99.js');
+require('./Pagination-f3ef7bc1.js');
 var BlockContent = require('./BlockContent-091a991f.js');
 require('./index-187c967e.js');
 require('./smoothscroll-5054361f.js');

package/dist/cjs/MasterDeck.js

@@ -36,7 +36,7 @@ var visibilitySensor = require('./visibility-sensor-ad5e3116.js');
 require('./slicedToArray-f6d4eaa8.js');
 require('./index-be0c82be.js');
 var main = require('./main-02daeefe.js');
-require('./stringify-bbc68047.js');
+var stringify = require('./stringify-bbc68047.js');
 var asyncToGenerator = require('./asyncToGenerator-df19209d.js');
 require('./Segment.js');
 require('./Beam.js');
@@ -45,7 +45,7 @@ var ADInfeed = require('./ADInfeed-2e48af77.js');
 var lodash = require('./lodash-fc2922d0.js');
 var ADlgInfeed = require('./ADlgInfeed-c39c7131.js');
 var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
-var Pagination = require('./Pagination-d6a59f99.js');
+var Pagination = require('./Pagination-f3ef7bc1.js');
 
 var MasterDeck = function (_React$Component) {
   inherits._inherits(MasterDeck, _React$Component);
@@ -62,12 +62,13 @@ var MasterDeck = function (_React$Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = inherits._possibleConstructorReturn(this, (_ref = MasterDeck.__proto__ || inherits._Object$getPrototypeOf(MasterDeck)).call.apply(_ref, [this].concat(args))), _this), _this.Deck = _this.props.deck, _this.variant = _this.props.variant, _this.mapping = _this.props.mapping, _this.data = _this.props.dataRecord || [], _this.query = _this.props.query, _this.params = _this.props.params, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.rightItems = _this.props.rightItems ? _this.props.rightItems : false, _this.isSeriesLanding = _this.props.isSeriesLanding ? _this.props.isSeriesLanding : false, _this.client = _this.props.client, _this.state = {
+    return _ret = (_temp = (_this = inherits._possibleConstructorReturn(this, (_ref = MasterDeck.__proto__ || inherits._Object$getPrototypeOf(MasterDeck)).call.apply(_ref, [this].concat(args))), _this), _this.Deck = _this.props.deck, _this.data = _this.props.dataRecord || [], _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.rightItems = _this.props.rightItems ? _this.props.rightItems : false, _this.isSeriesLanding = _this.props.isSeriesLanding ? _this.props.isSeriesLanding : false, _this.state = {
       isDataLoading: false,
       data: _this.data,
+      prevData: _this.data,
       currentPage: _this.props.currentPage || 1,
       dataRemapped: !_this.props.showBI || !_this.props.brandInsightAd,
-      itemsPerPage: _this.params ? _this.params.to - _this.params.from : 2,
+      itemsPerPage: _this.props.params ? _this.props.params.to - _this.props.params.from : 2,
       mobileView: false
     }, _this.seoPagination = function (pageNumber) {
       var _this$props = _this.props,
@@ -359,17 +360,17 @@ var MasterDeck = function (_React$Component) {
   inherits._createClass(MasterDeck, [{
     key: 'componentDidUpdate',
     value: function componentDidUpdate(prevProps, prevState) {
+      if (stringify._JSON$stringify(prevState.prevData) !== stringify._JSON$stringify(this.state.prevData)) {
+        this.seoPagination(this.state.currentPage);
+      }
       // set dataRemap to true as there are no infeed or BI ads or window width is less than limit
       if (typeof window !== 'undefined' && (!this.props.lgInfeedAd || !this.props.brandInsightAd || window.innerWidth < 1400) && !this.state.dataRemapped) {
         !this.state.dataRemapped && this.setState({ dataRemapped: true });
       }
-
       if (typeof window !== 'undefined' && window.innerWidth <= 1191) {
         !this.state.mobileView && this.setState({ mobileView: true });
       }
     }
-    //  Passing 'brandInsightAd','showBI' and 'lgInfeedAd'
-
   }, {
     key: 'render',
     value: function render() {
@@ -383,6 +384,7 @@ var MasterDeck = function (_React$Component) {
           lgInfeedAd = _props$lgInfeedAd === undefined ? false : _props$lgInfeedAd,
           totalDataCount = _props.totalDataCount;
       var _state = this.state,
+          data = _state.data,
           itemsPerPage = _state.itemsPerPage,
           currentPage = _state.currentPage,
           isDataLoading = _state.isDataLoading;
@@ -402,7 +404,7 @@ var MasterDeck = function (_React$Component) {
               'Loading...'
             )
           )
-        ) : React__default.createElement(
+        ) : data && data.length > 0 ? React__default.createElement(
           Container,
           null,
           this.cardLoader({ variant: variant, brandInsightAd: brandInsightAd, showBI: showBI, lgInfeedAd: lgInfeedAd }),
@@ -421,9 +423,23 @@ var MasterDeck = function (_React$Component) {
               '\n                .pagination-wrapper {\n                  margin: 3rem 0;\n                }\n                @media only screen and (max-width: 768px) {\n                  .pagination-wrapper {\n                    margin-bottom: 6rem;\n                  }\n                }\n              '
             )
           )
-        )
+        ) : null
       );
     }
+  }], [{
+    key: 'getDerivedStateFromProps',
+    value: function getDerivedStateFromProps(props, state) {
+      if (stringify._JSON$stringify(props.dataRecord) !== stringify._JSON$stringify(state.prevData)) {
+        return {
+          data: props.dataRecord,
+          prevData: props.dataRecord,
+          currentPage: props.currentPage
+        };
+      }
+      return null;
+    }
+    //  Passing 'brandInsightAd','showBI' and 'lgInfeedAd'
+
   }]);
 
   return MasterDeck;
@@ -694,6 +710,7 @@ var MasterDeck$1 = function (_React$Component) {
               content_placement: brandInsightAd.targeting.content_placement,
               document_url: brandInsightAd.targeting.document_url,
               rootDocumentGroup: brandInsightAd.targeting.rootDocumentGroup
+
             },
             _type: 'brandInsightAd',
             /* Passing refresh flag */
@@ -858,6 +875,7 @@ var MasterDeck$1 = function (_React$Component) {
     value: function render() {
       var _this3 = this;
 
+      if (this.props.totalDataCount) return React__default.createElement(MasterDeckPaginated, this.props);
       //  Setting default value for 'showBI' and 'lgInfeedAd'
       var _props = this.props,
           columns = _props.columns,
@@ -870,9 +888,6 @@ var MasterDeck$1 = function (_React$Component) {
           _props$lgInfeedAd = _props.lgInfeedAd,
           lgInfeedAd = _props$lgInfeedAd === undefined ? false : _props$lgInfeedAd;
 
-
-      if (this.props.totalDataCount) return React__default.createElement(MasterDeckPaginated, this.props);
-
       return React__default.createElement(
         'div',
         { className: 'contentDeck' },