@mjhls/mjh-framework 1.0.769-inf-scroll-test-v2 → 1.0.769-pagination-test

package/dist/cjs/AD728x90.js

@@ -83,8 +83,11 @@ var AD728x90 = function AD728x90(_ref) {
       className: 'AD728x90',
       sizes: mobileView ? mobileSizes : browserSizes,
       sizeMapping: [{
-        viewport: [768, 1],
+        viewport: [1000, 1],
         sizes: [[728, 90], [970, 90]]
+      }, {
+        viewport: [768, 1],
+        sizes: [[728, 90]]
       }, {
         viewport: [1, 1],
         sizes: [[320, 50], [300, 50]]

package/dist/cjs/ArticleProgramLandingPage.js

@@ -5,7 +5,7 @@ var slicedToArray = require('./slicedToArray-5d1bc3b3.js');
 var _extends = require('./extends-9d158713.js');
 var React = require('react');
 var BlockContent = require('./BlockContent-36e54d77.js');
-var getSerializers = require('./index-50f1b226.js');
+var getSerializers = require('./index-b367bc0c.js');
 var ArticleSeriesListing = require('./ArticleSeriesListing.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-c2573ffd.js');

package/dist/cjs/ExternalResources.js

@@ -4,7 +4,7 @@ var _extends = require('./extends-9d158713.js');
 var slicedToArray = require('./slicedToArray-5d1bc3b3.js');
 var React = require('react');
 var BlockContent = require('./BlockContent-36e54d77.js');
-var getSerializers = require('./index-50f1b226.js');
+var getSerializers = require('./index-b367bc0c.js');
 var index = require('./index-f86bb269.js');
 var Router = require('next/router');
 var Button = require('react-bootstrap/Button');

package/dist/cjs/HorizontalArticleListing.js

@@ -5,7 +5,7 @@ var React = require('react');
 var ArticleCarousel = require('./ArticleCarousel.js');
 var index_esm = require('./index.esm-974f47d9.js');
 var BlockContent = require('./BlockContent-36e54d77.js');
-var getSerializers = require('./index-50f1b226.js');
+var getSerializers = require('./index-b367bc0c.js');
 require('./_commonjsHelpers-06173234.js');
 require('./_to-object-6de10e57.js');
 require('./_object-pie-083f2dd6.js');

package/dist/cjs/MediaSeriesLanding.js

@@ -16,15 +16,18 @@ require('./_iter-detect-55a5657a.js');
 require('./_object-pie-083f2dd6.js');
 require('./toConsumableArray-ddb70795.js');
 require('./slicedToArray-5d1bc3b3.js');
-require('./index-efca863c.js');
+require('next/router');
+require('./index-0e4427c8.js');
+require('prop-types');
 require('./index.es-f3e47207.js');
-require('./SeriesSlider-7dbeaa51.js');
+require('./SeriesSlider-3fdabc5e.js');
 require('./index-187c967e.js');
 require('./index-80f57cff.js');
 require('react-dom');
-require('prop-types');
 require('./smoothscroll-99df7f93.js');
+require('./index-efca863c.js');
 require('./main-025fdc78.js');
+require('./visibility-sensor-8b54af99.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -89,7 +92,7 @@ MediaSeriesLanding.getInitialData = function () {
               to: start + itemsPerPage,
               url: pathname
             };
-            seriesQuery = '*[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\' && isShow != false][0]{\n    _id,\n    name,\n    identifier,\n      \'series\': *[_type == \'documentGroup\' && references(^._id) && isSeries != false && isShow != false] | order(_createdAt desc)[$from...$to]{\n        _id,\n        name,\n        identifier,\n        \'articles\': \n            *[!(_id in path("drafts.**")) \n            && _type == "article"\n            && defined(title)\n            && is_visible\n            && defined(url)\n            && references(^._id)\n            && passwordLock != true\n            && defined(published)\n            && dateTime(published) <= dateTime(now())\n          ] | order(published desc)  {\n            ...,\n              title,\n              summary,\n              thumbnail,\n              url,\n              published,\n              authorMapping[0]->,\n              taxonomyMapping[]->,\n              contentCategory->,\n              \'pageNumber\': ' + currentPage + '\n            }\n\n    }\n}';
+            seriesQuery = '*[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\'][0]{\n    _id,\n    name,\n    identifier,\n      \'series\': *[_type == \'documentGroup\' && references(^._id) && isSeries != false && isShow != false] | order(published desc) [$from...$to]{\n        _id,\n        name,\n        identifier,\n        \'articles\': \n            *[!(_id in path("drafts.**")) \n            && _type == "article"\n            && defined(title)\n            && is_visible\n            && defined(url)\n            && references(^._id)\n            && passwordLock != true\n            && defined(published)\n            && dateTime(published) <= dateTime(now())\n          ] | order(published asc)  {\n            ...,\n              title,\n              summary,\n              thumbnail,\n              url,\n              published,\n              authorMapping[0]->,\n              taxonomyMapping[]->,\n              contentCategory->,\n              \'pageNumber\': ' + currentPage + '\n            }\n\n    }\n}';
             _context.next = 9;
             return client.fetch(seriesQuery, params);
 
@@ -97,7 +100,7 @@ MediaSeriesLanding.getInitialData = function () {
             seriesData = _context.sent;
             filterDropDownData = [];
             _context.next = 13;
-            return client.fetch('*[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\'][0]{\n      _id,\n      name,\n      identifier,\n        \'series\': *[_type == \'documentGroup\' && references(^._id) && isSeries != false]{\n          _id,\n          name,\n          identifier\n        \n      }\n  }');
+            return client.fetch('*[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\'][0]{\n      _id,\n      name,\n      identifier,\n        \'series\': *[_type == \'documentGroup\' && references(^._id) && isSeries != false && isShow != false]{\n          _id,\n          name,\n          identifier\n        \n      }\n  }');
 
           case 13:
             allSeries = _context.sent;

package/dist/cjs/PartnerDetailListing.js

@@ -12,7 +12,7 @@ var QueueDeckExpanded = require('./QueueDeckExpanded.js');
 var Breadcrumbs = require('./Breadcrumbs.js');
 var Feature = require('./Feature.js');
 var urlFor = require('./urlFor.js');
-var getSerializers = require('./index-50f1b226.js');
+var getSerializers = require('./index-b367bc0c.js');
 var BlockContent = require('./BlockContent-36e54d77.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-c2573ffd.js');

package/dist/cjs/SeriesListingDeck.js

@@ -4,9 +4,11 @@ var toConsumableArray = require('./toConsumableArray-ddb70795.js');
 var _extends = require('./extends-9d158713.js');
 var slicedToArray = require('./slicedToArray-5d1bc3b3.js');
 var React = require('react');
-require('./index-efca863c.js');
+var Router = require('next/router');
+var index = require('./index-0e4427c8.js');
 var index_es = require('./index.es-f3e47207.js');
-var SeriesSlider = require('./SeriesSlider-7dbeaa51.js');
+var SeriesSlider = require('./SeriesSlider-3fdabc5e.js');
+var visibilitySensor = require('./visibility-sensor-8b54af99.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-c2573ffd.js');
 require('./_to-object-6de10e57.js');
@@ -14,11 +16,12 @@ require('./_iter-detect-55a5657a.js');
 require('./core.get-iterator-method-f474eacc.js');
 require('./_object-pie-083f2dd6.js');
 require('./web.dom.iterable-46657b5c.js');
+require('prop-types');
 require('./index-187c967e.js');
 require('./index-80f57cff.js');
 require('react-dom');
-require('prop-types');
 require('./smoothscroll-99df7f93.js');
+require('./index-efca863c.js');
 require('./main-025fdc78.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -34,14 +37,13 @@ var usePrevious = function usePrevious(value) {
 };
 
 var SeriesListingDeck = function SeriesListingDeck(props) {
-  var data = props.data;
-      props.imageHeight;
-      props.imageWidth;
-      props.Website;
-      var client = props.client,
+  var data = props.data,
+      client = props.client,
       query = props.query,
       params = props.params,
-      parentIdentifier = props.identifier;
+      parentIdentifier = props.identifier,
+      initialCurrentPage = props.currentPage,
+      pageview = props.pageview;
 
   var _useState = React.useState(params ? params.count : 0),
       _useState2 = slicedToArray._slicedToArray(_useState, 1),
@@ -57,17 +59,24 @@ var SeriesListingDeck = function SeriesListingDeck(props) {
       seriesData = _useState6[0],
       setSeriesData = _useState6[1];
 
-  var _useState7 = React.useState({
+  var _useState7 = React.useState(initialCurrentPage || 1),
+      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
+      currentPage = _useState8[0],
+      setCurrentPage = _useState8[1];
+
+  var _useState9 = React.useState({
     from: params ? params.from : 0,
     to: params ? params.to : 0,
     page: 1
   }),
-      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
-      values = _useState8[0],
-      setValues = _useState8[1];
+      _useState10 = slicedToArray._slicedToArray(_useState9, 2),
+      values = _useState10[0],
+      setValues = _useState10[1];
 
   var prevValues = usePrevious(values);
 
+  var router = Router.useRouter();
+
   var loadMore = function loadMore() {
     setValues({
       page: values.page + 1,
@@ -76,6 +85,62 @@ var SeriesListingDeck = function SeriesListingDeck(props) {
     });
   };
 
+  var changePageNumber = function changePageNumber(pageNumber, arrIndex, pageview) {
+    if (pageNumber) {
+      var path = router.asPath;
+      var qrIndex = path.indexOf('?');
+      var pathname = router.pathname;
+      var queryString = '';
+
+      if (qrIndex > 0) {
+        path = path.substring(1, qrIndex);
+
+        var partialQS = router.asPath.substring(qrIndex + 1);
+        var partialQSArr = partialQS.split('&');
+
+        // exclude page=xxx from query string
+        partialQSArr.map(function (item) {
+          var itemArr = item.split('=');
+          var key = itemArr[0];
+          var val = itemArr[1];
+
+          if (key !== 'page') {
+            queryString += (queryString.length === 0 ? '' : '&') + key + '=' + val;
+          }
+        });
+      }
+
+      if (queryString.length > 0) {
+        path += '?' + queryString;
+      }
+
+      // pageNumber = parseInt(pageNumber)
+      var index$1 = Number(arrIndex);
+      var perPage = 6;
+
+      pageNumber = Math.ceil((index$1 + 1) / perPage);
+
+      if (currentPage !== pageNumber) {
+        index.lib_3.refresh();
+
+        setCurrentPage(pageNumber);
+        if (path[0] !== '/') {
+          path = '/' + path;
+        }
+
+        var newPath = pageNumber === 1 ? '' + path : '' + path + (queryString.length > 0 ? '&' : '?') + 'page=' + pageNumber;
+
+        if (pageview) {
+          pageview(newPath);
+        }
+
+        router.push(pathname, newPath, {
+          shallow: true
+        });
+      }
+    }
+  };
+
   var loadData = function loadData(values, query, client, params, setSeriesData, setScrolling) {
     params = _extends._extends({}, params, {
       from: values.from,
@@ -134,25 +199,34 @@ var SeriesListingDeck = function SeriesListingDeck(props) {
       seriesData && seriesData.length ? React__default['default'].createElement(
         'div',
         null,
-        seriesData.map(function (series) {
+        seriesData.map(function (series, index) {
           return React__default['default'].createElement(
-            'div',
-            { className: 'mb-5', key: series.name },
+            visibilitySensor.VisibilitySensor,
+            {
+              key: series._id ? series._id : index,
+              partialVisibility: true,
+              onChange: function onChange(isVisible) {
+                isVisible && changePageNumber(currentPage, index, pageview);
+              } },
             React__default['default'].createElement(
               'div',
-              { style: { fontSize: '20px', borderBottom: '1px solid #eee', margin: '0 .5rem', color: '373a3c' } },
+              { className: 'mb-5', key: series.name },
               React__default['default'].createElement(
-                'a',
-                { href: '/' + parentIdentifier + '/' + series.identifier.current },
-                series.name
-              )
-            ),
-            series.articles && series.articles.length == 0 && React__default['default'].createElement(
-              'p',
-              { className: 'mt-2 ml-2' },
-              'Please check back for more content.'
-            ),
-            series.articles && series.articles.length > 0 && React__default['default'].createElement(SeriesSlider.SeriesSlider, _extends._extends({}, props, { dataset: series.articles, client: client }))
+                'div',
+                { style: { fontSize: '20px', fontWeight: 'bold', borderBottom: '1px solid #eee', margin: '0 .5rem', color: '373a3c' } },
+                React__default['default'].createElement(
+                  'a',
+                  { href: '/' + parentIdentifier + '/' + series.identifier.current },
+                  series.name
+                )
+              ),
+              series.articles && series.articles.length == 0 && React__default['default'].createElement(
+                'p',
+                { className: 'mt-2 ml-2' },
+                'Please check back for more content.'
+              ),
+              series.articles && series.articles.length > 0 && React__default['default'].createElement(SeriesSlider.SeriesSlider, _extends._extends({}, props, { dataset: series.articles, client: client }))
+            )
           );
         })
       ) : React__default['default'].createElement(

package/dist/cjs/{SeriesSlider-7dbeaa51.js → SeriesSlider-3fdabc5e.js}

@@ -288,7 +288,7 @@ var SeriesSlider = function SeriesSlider(_ref) {
                   'span',
                   null,
                   'EP. ',
-                  dataset.length - index$2,
+                  index$2 + 1,
                   ': ',
                   article.title
                 ) : article.title

package/dist/cjs/TaxonomyDescription.js

@@ -6,7 +6,7 @@ var React = require('react');
 var Router = require('next/router');
 var Head = require('next/head');
 var BlockContent = require('./BlockContent-36e54d77.js');
-var getSerializers = require('./index-50f1b226.js');
+var getSerializers = require('./index-b367bc0c.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-c2573ffd.js');
 require('./_to-object-6de10e57.js');

package/dist/cjs/VideoProgramLandingPage.js

@@ -7,7 +7,7 @@ var BlockContent = require('./BlockContent-36e54d77.js');
 var Col = require('react-bootstrap/Col');
 var Form = require('react-bootstrap/Form');
 var Button = require('react-bootstrap/Button');
-var getSerializers = require('./index-50f1b226.js');
+var getSerializers = require('./index-b367bc0c.js');
 var VideoSeriesListing = require('./VideoSeriesListing.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-c2573ffd.js');

package/dist/cjs/VideoSeriesListing.js

@@ -229,10 +229,10 @@ var VideoSeriesListing = function (_React$Component) {
 
           return React__default['default'].createElement(
             'div',
-            { key: index, style: { marginBottom: '2rem' }, counter: itemCounter++ },
+            { key: index, counter: itemCounter++ },
             React__default['default'].createElement(
               'div',
-              { className: 'video-title-banner', style: { fontWeight: 'bold', color: 'var(--primary)', padding: '.25rem 0', fontSize: '1.25rem', borderBottom: '1px solid #d4a64d' } },
+              { className: 'video-title-banner', style: { fontWeight: 'bold', color: 'var(--primary)', padding: '.25rem 0', fontSize: '1.3rem', borderBottom: '2px solid #d4a64d' } },
               React__default['default'].createElement(
                 'a',
                 { href: '/' + _this.props.page + '/' + docSeries.url.current },