@mjhls/mjh-framework 1.0.441 → 1.0.443

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.441
+# mjh-framework v. 1.0.443
 
 > Foundation Framework 
 

package/dist/cjs/{GridContent-db383f73.js → GridContent-25762807.js}

@@ -108,6 +108,16 @@ var GridContent = function (_React$Component) {
       if (prevState.currentPage !== _this.state.currentPage) {
         document.addEventListener('scroll', _this.trackScrolling);
       }
+
+      // Logging GA Pageview on path change
+      var _this$props = _this.props,
+          pageview = _this$props.pageview,
+          currentPath = _this$props.router.asPath;
+      var prevPath = prevProps.router.asPath;
+
+      if (pageview && currentPath !== prevPath) {
+        pageview(currentPath);
+      }
     }, _this.trackScrolling = function () {
       var itemsPerPage = _this.props.params.itemsPerPage ? _this.props.params.itemsPerPage : 10;
       if (window.pageYOffset === 0) {
@@ -166,10 +176,10 @@ var GridContent = function (_React$Component) {
         return _this.defaultImage;
       }
     }, _this.changePageNumber = function (pageNumber, itemsPerPage, itemIndex) {
-      var _this$props = _this.props,
-          seoPaginate = _this$props.seoPaginate,
-          pageview = _this$props.pageview,
-          router = _this$props.router;
+      var _this$props2 = _this.props,
+          seoPaginate = _this$props2.seoPaginate,
+          pageview = _this$props2.pageview,
+          router = _this$props2.router;
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {
@@ -218,9 +228,9 @@ var GridContent = function (_React$Component) {
             }
 
             var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
-            if (pageview) {
-              pageview(newPath);
-            }
+            // if (pageview) {
+            //   pageview(newPath)
+            // }
 
             router.push(pathname, newPath, {
               shallow: true

package/dist/cjs/GridContent.js

@@ -33,7 +33,7 @@ require('./ADInfeed-ae1f348d.js');
 require('./lodash-fc2922d0.js');
 require('./ADlgInfeed-f4c4a1bf.js');
 require('./get-7a75c563.js');
-var GridContent = require('./GridContent-db383f73.js');
+var GridContent = require('./GridContent-25762807.js');
 require('./AuthorComponent-b44bb44e.js');
 
 

package/dist/cjs/QueueDeckExpanded.js

@@ -130,9 +130,9 @@ var changePageNumber = function changePageNumber(pageNumber, seoPaginate, pagevi
       }
       var newPath = pageNumber === 1 ? '' + path : '' + path + (queryString.length > 0 ? '&' : '?') + 'page=' + pageNumber;
 
-      if (pageview) {
-        pageview(newPath);
-      }
+      // if (pageview) {
+      //   pageview(newPath)
+      // }
 
       router.push(pathname, newPath, {
         shallow: true
@@ -576,6 +576,18 @@ var usePrevious = function usePrevious(value) {
 
 var QueueDeckExpanded = function QueueDeckExpanded(props) {
   var router = Router.useRouter();
+
+  // Logging GA Pageview on path change
+  var prevPath = usePrevious(lodash.lodash.get(router, 'asPath', undefined));
+  React.useEffect(function () {
+    var pageview = props.pageview;
+
+    var currentPath = router.asPath;
+    if (prevPath && prevPath !== currentPath && pageview) {
+      pageview(router.asPath);
+    }
+  }, [router]);
+
   var initialData = props.dataRecord,
       client = props.client,
       params = props.params,
@@ -640,6 +652,23 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 
   var prevValues = usePrevious(values);
+
+  //check for change in filter parameters from client side and refresh the page
+  React.useEffect(function () {
+    if (initialData && data !== initialData && initialData.length >= 0) {
+      setData(initialData);
+      setCurrentPage(initialCurrentPage ? initialCurrentPage : 1);
+      setValues({
+        from: params ? params.from : 0,
+        to: params ? params.to : 0,
+        page: 1
+      });
+      if (initialData.length > 0) {
+        setScrolling(true);
+      }
+    }
+  }, [initialData]);
+
   React.useEffect(function () {
     if (lgInfeedAd && window && window.innerWidth >= 1200) {
       setDesktopView(true);

package/dist/cjs/index.js

@@ -36,7 +36,7 @@ var DeckContent = require('./DeckContent.js');
 require('./lodash-fc2922d0.js');
 require('./ADlgInfeed-f4c4a1bf.js');
 var get$1 = require('./get-7a75c563.js');
-var GridContent = require('./GridContent-db383f73.js');
+var GridContent = require('./GridContent-25762807.js');
 var AuthorComponent = require('./AuthorComponent-b44bb44e.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
@@ -2552,6 +2552,11 @@ var CMEDeck = function CMEDeck(_ref) {
       autoScroll ? React__default['default'].createElement(
         React__default['default'].Fragment,
         null,
+        React__default['default'].createElement(
+          'style',
+          { jsx: true },
+          '\n                .infinite-scroll-component {\n                  overflow: hidden !important;\n                }\n              '
+        ),
         React__default['default'].createElement(
           index_es.InfiniteScroll,
           {
@@ -17310,11 +17315,12 @@ var Article = function Article(props) {
         contextualAD: _extends$2._extends({}, payload.contextualAD, {
           slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id,
           className: 'ADFluid',
-          sizes: lgContextAd ? [[728, 90], ['fluid'], [300, 100]] : [['fluid'], [300, 100]],
-          sizeMapping: [{
-            viewport: [7680, 4320],
-            sizes: lgContextAd ? [[728, 90], ['fluid'], [300, 100]] : [['fluid'], [300, 100]]
-          }, { viewport: [1024, 768], sizes: [['fluid'], [300, 100]] }]
+          // Adding new ad size for large contextual ad for desktop screens >= 1200x768
+          sizes: lgContextAd ? [[728, 90], 'fluid', [300, 100]] : ['fluid', [300, 100]],
+          sizeMapping: lgContextAd ? [{
+            viewport: [1200, 768],
+            sizes: [[728, 90], 'fluid', [300, 100]]
+          }, { viewport: [0, 0], sizes: ['fluid', [300, 100]] }] : ['fluid', [300, 100]]
         })
       });
       var _selectedIndex = indexes[1] + 1;
@@ -17328,8 +17334,15 @@ var Article = function Article(props) {
         } else {
           var _parent = document.getElementById('contextual-native-ad-' + payload._id);
           if (adData && adData.event && adData.event.size && _parent) {
-            _parent.style.width = adData.event.size[0] + 'px';
-            _parent.style.height = adData.event.size[1] + 'px';
+            // Adding fix for fluid contextual ad to avoid from collapsing when size is [0,0]
+            var fluidSizes = [[0, 0]];
+            var checkAdSize = function checkAdSize(size) {
+              return AdSlot._JSON$stringify(size) === AdSlot._JSON$stringify(adData.event.size);
+            };
+            if (!fluidSizes.some(checkAdSize)) {
+              _parent.style.width = adData.event.size[0] + 'px';
+              _parent.style.height = adData.event.size[1] + 'px';
+            }
             _parent.style.margin = 'auto';
           }
           if (body[0]._type === 'figure' || body[1]._type === 'figure' || body[2]._type === 'figure' || body[3]._type === 'figure') {
@@ -17593,7 +17606,7 @@ var Article = function Article(props) {
     React__default['default'].createElement(
       'style',
       { jsx: 'true' },
-      '\n          .sanityDisplayLabel {\n            margin: .5rem 0;\n            border: 1px solid black;\n            width: fit-content;\n            padding: 5px;\n          }\n        '
+      '\n        .sanityDisplayLabel {\n          margin: 0.5rem 0;\n          border: 1px solid black;\n          width: fit-content;\n          padding: 5px;\n        }\n      '
     )
   );
 };

package/dist/esm/{GridContent-6b38c580.js → GridContent-93e5f16a.js}

@@ -98,6 +98,16 @@ var GridContent = function (_React$Component) {
       if (prevState.currentPage !== _this.state.currentPage) {
         document.addEventListener('scroll', _this.trackScrolling);
       }
+
+      // Logging GA Pageview on path change
+      var _this$props = _this.props,
+          pageview = _this$props.pageview,
+          currentPath = _this$props.router.asPath;
+      var prevPath = prevProps.router.asPath;
+
+      if (pageview && currentPath !== prevPath) {
+        pageview(currentPath);
+      }
     }, _this.trackScrolling = function () {
       var itemsPerPage = _this.props.params.itemsPerPage ? _this.props.params.itemsPerPage : 10;
       if (window.pageYOffset === 0) {
@@ -156,10 +166,10 @@ var GridContent = function (_React$Component) {
         return _this.defaultImage;
       }
     }, _this.changePageNumber = function (pageNumber, itemsPerPage, itemIndex) {
-      var _this$props = _this.props,
-          seoPaginate = _this$props.seoPaginate,
-          pageview = _this$props.pageview,
-          router = _this$props.router;
+      var _this$props2 = _this.props,
+          seoPaginate = _this$props2.seoPaginate,
+          pageview = _this$props2.pageview,
+          router = _this$props2.router;
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {
@@ -208,9 +218,9 @@ var GridContent = function (_React$Component) {
             }
 
             var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
-            if (pageview) {
-              pageview(newPath);
-            }
+            // if (pageview) {
+            //   pageview(newPath)
+            // }
 
             router.push(pathname, newPath, {
               shallow: true

package/dist/esm/GridContent.js

@@ -31,5 +31,5 @@ import './ADInfeed-dff74bbe.js';
 import './lodash-17fdfebb.js';
 import './ADlgInfeed-7b29db85.js';
 import './get-bc6cf9fb.js';
-export { G as default } from './GridContent-6b38c580.js';
+export { G as default } from './GridContent-93e5f16a.js';
 import './AuthorComponent-4f5f15ed.js';

package/dist/esm/QueueDeckExpanded.js

@@ -6,7 +6,7 @@ import './_iter-detect-7c281f0a.js';
 import { _ as _toConsumableArray } from './toConsumableArray-c5e2fde8.js';
 import './_object-pie-33c40e79.js';
 import { _ as _extends } from './extends-92072fff.js';
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import { l as lib_3 } from './debounce-42a7f724.js';
 import 'prop-types';
 import 'react-bootstrap/Card';
@@ -124,9 +124,9 @@ var changePageNumber = function changePageNumber(pageNumber, seoPaginate, pagevi
       }
       var newPath = pageNumber === 1 ? '' + path : '' + path + (queryString.length > 0 ? '&' : '?') + 'page=' + pageNumber;
 
-      if (pageview) {
-        pageview(newPath);
-      }
+      // if (pageview) {
+      //   pageview(newPath)
+      // }
 
       router.push(pathname, newPath, {
         shallow: true
@@ -570,6 +570,18 @@ var usePrevious = function usePrevious(value) {
 
 var QueueDeckExpanded = function QueueDeckExpanded(props) {
   var router = useRouter();
+
+  // Logging GA Pageview on path change
+  var prevPath = usePrevious(lodash.get(router, 'asPath', undefined));
+  useEffect(function () {
+    var pageview = props.pageview;
+
+    var currentPath = router.asPath;
+    if (prevPath && prevPath !== currentPath && pageview) {
+      pageview(router.asPath);
+    }
+  }, [router]);
+
   var initialData = props.dataRecord,
       client = props.client,
       params = props.params,
@@ -634,6 +646,23 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 
   var prevValues = usePrevious(values);
+
+  //check for change in filter parameters from client side and refresh the page
+  useEffect(function () {
+    if (initialData && data !== initialData && initialData.length >= 0) {
+      setData(initialData);
+      setCurrentPage(initialCurrentPage ? initialCurrentPage : 1);
+      setValues({
+        from: params ? params.from : 0,
+        to: params ? params.to : 0,
+        page: 1
+      });
+      if (initialData.length > 0) {
+        setScrolling(true);
+      }
+    }
+  }, [initialData]);
+
   useEffect(function () {
     if (lgInfeedAd && window && window.innerWidth >= 1200) {
       setDesktopView(true);

package/dist/esm/index.js

@@ -33,7 +33,7 @@ export { default as DeckContent } from './DeckContent.js';
 import './lodash-17fdfebb.js';
 import './ADlgInfeed-7b29db85.js';
 import { i as isFunction_1, a as isArray_1, _ as _arrayMap } from './get-bc6cf9fb.js';
-export { A as AD, G as GridContent } from './GridContent-6b38c580.js';
+export { A as AD, G as GridContent } from './GridContent-93e5f16a.js';
 import { A as AuthorComponent } from './AuthorComponent-4f5f15ed.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
@@ -2528,6 +2528,11 @@ var CMEDeck = function CMEDeck(_ref) {
       autoScroll ? React.createElement(
         React.Fragment,
         null,
+        React.createElement(
+          'style',
+          { jsx: true },
+          '\n                .infinite-scroll-component {\n                  overflow: hidden !important;\n                }\n              '
+        ),
         React.createElement(
           InfiniteScroll,
           {
@@ -17286,11 +17291,12 @@ var Article = function Article(props) {
         contextualAD: _extends$2({}, payload.contextualAD, {
           slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id,
           className: 'ADFluid',
-          sizes: lgContextAd ? [[728, 90], ['fluid'], [300, 100]] : [['fluid'], [300, 100]],
-          sizeMapping: [{
-            viewport: [7680, 4320],
-            sizes: lgContextAd ? [[728, 90], ['fluid'], [300, 100]] : [['fluid'], [300, 100]]
-          }, { viewport: [1024, 768], sizes: [['fluid'], [300, 100]] }]
+          // Adding new ad size for large contextual ad for desktop screens >= 1200x768
+          sizes: lgContextAd ? [[728, 90], 'fluid', [300, 100]] : ['fluid', [300, 100]],
+          sizeMapping: lgContextAd ? [{
+            viewport: [1200, 768],
+            sizes: [[728, 90], 'fluid', [300, 100]]
+          }, { viewport: [0, 0], sizes: ['fluid', [300, 100]] }] : ['fluid', [300, 100]]
         })
       });
       var _selectedIndex = indexes[1] + 1;
@@ -17304,8 +17310,15 @@ var Article = function Article(props) {
         } else {
           var _parent = document.getElementById('contextual-native-ad-' + payload._id);
           if (adData && adData.event && adData.event.size && _parent) {
-            _parent.style.width = adData.event.size[0] + 'px';
-            _parent.style.height = adData.event.size[1] + 'px';
+            // Adding fix for fluid contextual ad to avoid from collapsing when size is [0,0]
+            var fluidSizes = [[0, 0]];
+            var checkAdSize = function checkAdSize(size) {
+              return _JSON$stringify(size) === _JSON$stringify(adData.event.size);
+            };
+            if (!fluidSizes.some(checkAdSize)) {
+              _parent.style.width = adData.event.size[0] + 'px';
+              _parent.style.height = adData.event.size[1] + 'px';
+            }
             _parent.style.margin = 'auto';
           }
           if (body[0]._type === 'figure' || body[1]._type === 'figure' || body[2]._type === 'figure' || body[3]._type === 'figure') {
@@ -17569,7 +17582,7 @@ var Article = function Article(props) {
     React.createElement(
       'style',
       { jsx: 'true' },
-      '\n          .sanityDisplayLabel {\n            margin: .5rem 0;\n            border: 1px solid black;\n            width: fit-content;\n            padding: 5px;\n          }\n        '
+      '\n        .sanityDisplayLabel {\n          margin: 0.5rem 0;\n          border: 1px solid black;\n          width: fit-content;\n          padding: 5px;\n        }\n      '
     )
   );
 };

package/package.json

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