@mjhls/mjh-framework 1.0.471 → 1.0.472

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.471
+# mjh-framework v. 1.0.472
 
 > Foundation Framework 
 

package/dist/cjs/QueueDeckExpanded.js

@@ -160,8 +160,14 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
     return [].concat(toConsumableArray._toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray._toConsumableArray(arr.slice(index)));
   };
 
+  var _useState = React.useState(false),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
+      dataRemapped = _useState2[0],
+      setDataRemapped = _useState2[1];
   //  Need to pass flag "lgInfeedAd={true}" along with brandInsightAd from site level for large infeed-ad to render
   //  Checking window and lgInfeedAd flag in desktop view ( window >= 1400px ).
+
+
   if (lgInfeedAd && brandInsightAd && typeof window !== 'undefined' && window.innerWidth >= 1400) {
     var lgInfeed = {
       _type: 'lg-infeed',
@@ -190,8 +196,16 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
       return lodash.lodash.flattenDeep(set);
     });
     data = lodash.lodash.flatten(chunks);
+    !dataRemapped && setDataRemapped(true); // To detect if appending of insights ads are completed
   }
 
+  // set dataRemap to true as there are no infeed or BI ads or window width is less than limit
+  React.useEffect(function () {
+    if (typeof window !== 'undefined' && (!lgInfeedAd || !brandInsightAd || window.innerWidth < 1400) && !dataRemapped) {
+      setDataRemapped(true);
+    }
+  }, []);
+
   if (showBI && brandInsightAd) {
     //  Checking window and lgInfeedAd flag in desktop view ( window >= 1400px ).
     if (lgInfeedAd && typeof window !== 'undefined' && window.innerWidth >= 1400) brandInsightAd.interval = 8;
@@ -240,7 +254,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
   return React__default.createElement(
     'div',
     null,
-    data && data.length > 0 ? data.map(function (article, index) {
+    data && dataRemapped && data.length > 0 ? data.map(function (article, index) {
       var pageNumber = article.pageNumber || values.page;
       var contentCategoryName = article.contentCategory ? article.contentCategory.name : 'Articles';
 
@@ -660,33 +674,33 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
 
   var builder = index$1.imageUrlBuilder(client);
 
-  var _useState = React.useState(initialData),
-      _useState2 = slicedToArray._slicedToArray(_useState, 2),
-      data = _useState2[0],
-      setData = _useState2[1];
-
-  var _useState3 = React.useState(true),
+  var _useState3 = React.useState(initialData),
       _useState4 = slicedToArray._slicedToArray(_useState3, 2),
-      scrolling = _useState4[0],
-      setScrolling = _useState4[1];
+      data = _useState4[0],
+      setData = _useState4[1];
 
-  var _useState5 = React.useState(params ? params.to : 0),
-      _useState6 = slicedToArray._slicedToArray(_useState5, 1),
-      per = _useState6[0];
+  var _useState5 = React.useState(true),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      scrolling = _useState6[0],
+      setScrolling = _useState6[1];
 
-  var _useState7 = React.useState(initialCurrentPage || 1),
-      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
-      currentPage = _useState8[0],
-      setCurrentPage = _useState8[1];
+  var _useState7 = React.useState(params ? params.to : 0),
+      _useState8 = slicedToArray._slicedToArray(_useState7, 1),
+      per = _useState8[0];
 
-  var _useState9 = React.useState({
+  var _useState9 = React.useState(initialCurrentPage || 1),
+      _useState10 = slicedToArray._slicedToArray(_useState9, 2),
+      currentPage = _useState10[0],
+      setCurrentPage = _useState10[1];
+
+  var _useState11 = React.useState({
     from: params ? params.from : 0,
     to: params ? params.to : 0,
     page: 1
   }),
-      _useState10 = slicedToArray._slicedToArray(_useState9, 2),
-      values = _useState10[0],
-      setValues = _useState10[1];
+      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
+      values = _useState12[0],
+      setValues = _useState12[1];
 
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 

package/dist/esm/QueueDeckExpanded.js

@@ -154,8 +154,14 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
     return [].concat(_toConsumableArray(arr.slice(0, index)), [newElement], _toConsumableArray(arr.slice(index)));
   };
 
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      dataRemapped = _useState2[0],
+      setDataRemapped = _useState2[1];
   //  Need to pass flag "lgInfeedAd={true}" along with brandInsightAd from site level for large infeed-ad to render
   //  Checking window and lgInfeedAd flag in desktop view ( window >= 1400px ).
+
+
   if (lgInfeedAd && brandInsightAd && typeof window !== 'undefined' && window.innerWidth >= 1400) {
     var lgInfeed = {
       _type: 'lg-infeed',
@@ -184,8 +190,16 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
       return lodash.flattenDeep(set);
     });
     data = lodash.flatten(chunks);
+    !dataRemapped && setDataRemapped(true); // To detect if appending of insights ads are completed
   }
 
+  // set dataRemap to true as there are no infeed or BI ads or window width is less than limit
+  useEffect(function () {
+    if (typeof window !== 'undefined' && (!lgInfeedAd || !brandInsightAd || window.innerWidth < 1400) && !dataRemapped) {
+      setDataRemapped(true);
+    }
+  }, []);
+
   if (showBI && brandInsightAd) {
     //  Checking window and lgInfeedAd flag in desktop view ( window >= 1400px ).
     if (lgInfeedAd && typeof window !== 'undefined' && window.innerWidth >= 1400) brandInsightAd.interval = 8;
@@ -234,7 +248,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
   return React__default.createElement(
     'div',
     null,
-    data && data.length > 0 ? data.map(function (article, index) {
+    data && dataRemapped && data.length > 0 ? data.map(function (article, index) {
       var pageNumber = article.pageNumber || values.page;
       var contentCategoryName = article.contentCategory ? article.contentCategory.name : 'Articles';
 
@@ -654,33 +668,33 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
 
   var builder = imageUrlBuilder(client);
 
-  var _useState = useState(initialData),
-      _useState2 = _slicedToArray(_useState, 2),
-      data = _useState2[0],
-      setData = _useState2[1];
-
-  var _useState3 = useState(true),
+  var _useState3 = useState(initialData),
       _useState4 = _slicedToArray(_useState3, 2),
-      scrolling = _useState4[0],
-      setScrolling = _useState4[1];
+      data = _useState4[0],
+      setData = _useState4[1];
 
-  var _useState5 = useState(params ? params.to : 0),
-      _useState6 = _slicedToArray(_useState5, 1),
-      per = _useState6[0];
+  var _useState5 = useState(true),
+      _useState6 = _slicedToArray(_useState5, 2),
+      scrolling = _useState6[0],
+      setScrolling = _useState6[1];
 
-  var _useState7 = useState(initialCurrentPage || 1),
-      _useState8 = _slicedToArray(_useState7, 2),
-      currentPage = _useState8[0],
-      setCurrentPage = _useState8[1];
+  var _useState7 = useState(params ? params.to : 0),
+      _useState8 = _slicedToArray(_useState7, 1),
+      per = _useState8[0];
 
-  var _useState9 = useState({
+  var _useState9 = useState(initialCurrentPage || 1),
+      _useState10 = _slicedToArray(_useState9, 2),
+      currentPage = _useState10[0],
+      setCurrentPage = _useState10[1];
+
+  var _useState11 = useState({
     from: params ? params.from : 0,
     to: params ? params.to : 0,
     page: 1
   }),
-      _useState10 = _slicedToArray(_useState9, 2),
-      values = _useState10[0],
-      setValues = _useState10[1];
+      _useState12 = _slicedToArray(_useState11, 2),
+      values = _useState12[0],
+      setValues = _useState12[1];
 
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 

package/package.json

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