@mjhls/mjh-framework 1.0.959-gridcontent-nojs-fix-v2 → 1.0.959-gridcontent-nojs-fix-v3

package/dist/cjs/GridContent.js

@@ -87,7 +87,8 @@ var GridContent = function (_React$Component) {
       lgInfeedAd: _this.props.lgInfeedAd ? _this.props.lgInfeedAd : false,
       showCategory: _this.props.showCategory ? _this.props.showCategory : false,
       contentCategoryMapping: _this.props.contentCategoryMapping ? contentCategoryMapping : [],
-      lastDataSize: _this.data ? _this.data.length : 0
+      lastDataSize: _this.data ? _this.data.length : 0,
+      dataRemapped: !_this.props.showBI || !_this.props.brandInsight
     }, _this.loadMore = debounce.debounce_1(function () {
       _this.setState(function (state) {
         var page = state.page,
@@ -115,6 +116,10 @@ var GridContent = function (_React$Component) {
       if (pageview && currentPath !== prevPath) {
         pageview(currentPath);
       }
+      // 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.brandInsight || window.innerWidth < 1400) && !_this.state.dataRemapped) {
+        !_this.state.dataRemapped && _this.setState({ dataRemapped: true });
+      }
     }, _this.loadData = function () {
       var _this$state = _this.state,
           from = _this$state.from,
@@ -429,6 +434,7 @@ var GridContent = function (_React$Component) {
           });
 
           posts = lodash.lodash.flatten(chunks);
+          !this.state.dataRemapped && this.setState({ dataRemapped: true }); // To detect if appending of insights ads are completed
         }
 
         if (showBI) {
@@ -463,8 +469,6 @@ var GridContent = function (_React$Component) {
             posts = insert(posts, pos, inFeedAd);
             pos += brandInsight.interval + 1;
           }
-        } else {
-          posts = data;
         }
         posts = firstThree.concat(posts);
       } else {
@@ -496,6 +500,10 @@ var GridContent = function (_React$Component) {
       var itemsPerPage = this.props.params && this.props.params.itemsPerPage ? this.props.params.itemsPerPage : 10;
       var heroContent = this.props.heroContent ? this.props.heroContent : 0;
       var featureCount = 0;
+      if (!this.state.dataRemapped) {
+        //For Javascript Disabled Cases. data is not remapped if JS is disabled.
+        posts = this.state.data;
+      }
       return React__default['default'].createElement(
         'div',
         { className: 'grid-container' },

package/dist/esm/GridContent.js

@@ -77,7 +77,8 @@ var GridContent = function (_React$Component) {
       lgInfeedAd: _this.props.lgInfeedAd ? _this.props.lgInfeedAd : false,
       showCategory: _this.props.showCategory ? _this.props.showCategory : false,
       contentCategoryMapping: _this.props.contentCategoryMapping ? contentCategoryMapping : [],
-      lastDataSize: _this.data ? _this.data.length : 0
+      lastDataSize: _this.data ? _this.data.length : 0,
+      dataRemapped: !_this.props.showBI || !_this.props.brandInsight
     }, _this.loadMore = debounce_1(function () {
       _this.setState(function (state) {
         var page = state.page,
@@ -105,6 +106,10 @@ var GridContent = function (_React$Component) {
       if (pageview && currentPath !== prevPath) {
         pageview(currentPath);
       }
+      // 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.brandInsight || window.innerWidth < 1400) && !_this.state.dataRemapped) {
+        !_this.state.dataRemapped && _this.setState({ dataRemapped: true });
+      }
     }, _this.loadData = function () {
       var _this$state = _this.state,
           from = _this$state.from,
@@ -419,6 +424,7 @@ var GridContent = function (_React$Component) {
           });
 
           posts = lodash.flatten(chunks);
+          !this.state.dataRemapped && this.setState({ dataRemapped: true }); // To detect if appending of insights ads are completed
         }
 
         if (showBI) {
@@ -453,8 +459,6 @@ var GridContent = function (_React$Component) {
             posts = insert(posts, pos, inFeedAd);
             pos += brandInsight.interval + 1;
           }
-        } else {
-          posts = data;
         }
         posts = firstThree.concat(posts);
       } else {
@@ -486,6 +490,10 @@ var GridContent = function (_React$Component) {
       var itemsPerPage = this.props.params && this.props.params.itemsPerPage ? this.props.params.itemsPerPage : 10;
       var heroContent = this.props.heroContent ? this.props.heroContent : 0;
       var featureCount = 0;
+      if (!this.state.dataRemapped) {
+        //For Javascript Disabled Cases. data is not remapped if JS is disabled.
+        posts = this.state.data;
+      }
       return React__default.createElement(
         'div',
         { className: 'grid-container' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.959-gridcontent-nojs-fix-v2",
+  "version": "1.0.959-gridcontent-nojs-fix-v3",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",