@mjhls/mjh-framework 1.0.402 → 1.0.404

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.402
+# mjh-framework v. 1.0.404
 
 
 > Foundation Framework

package/dist/cjs/{ADInfeed-d1783f42.js → ADInfeed-494f5e6b.js}

@@ -5,7 +5,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var React = require('react');
 var React__default = _interopDefault(React);
 var Card = _interopDefault(require('react-bootstrap/Card'));
-var AdSlot = require('./AdSlot-20aa927e.js');
+var AdSlot = require('./AdSlot-4d22aad4.js');
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/cjs/{AdSlot-20aa927e.js → AdSlot-4d22aad4.js}

@@ -4,13 +4,13 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 var _toObject = require('./_to-object-329a650b.js');
-var main = require('./main-2020ba94.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 var debounce = require('./debounce-b088070c.js');
 var PropTypes = _interopDefault(require('prop-types'));
+var main = require('./main-bc4db521.js');
 var slicedToArray = require('./slicedToArray-419d467a.js');
-var promise = require('./promise-d5136080.js');
+var promise = require('./promise-0a493c7a.js');
 
 var $JSON = _toObject._core.JSON || (_toObject._core.JSON = { stringify: JSON.stringify });
 var stringify = function stringify(it) { // eslint-disable-line no-unused-vars

package/dist/cjs/DeckContent.js

@@ -6,8 +6,8 @@ require('./_commonjsHelpers-06173234.js');
 require('./_to-object-329a650b.js');
 require('./web.dom.iterable-5c889cf1.js');
 require('./_library-dd23b178.js');
-var main = require('./main-2020ba94.js');
-var toConsumableArray = require('./toConsumableArray-3cf1df2c.js');
+require('./_iter-detect-234453c3.js');
+var toConsumableArray = require('./toConsumableArray-25d0e2a3.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends$2 = require('./extends-60837c34.js');
 var inherits$2 = require('./inherits-e793003e.js');
@@ -23,15 +23,17 @@ var Card = _interopDefault(require('react-bootstrap/Card'));
 var moment = require('./moment-66a6a284.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var visibilitySensor = require('./visibility-sensor-43e0b37c.js');
+var index_es = require('./index.es-ab3f2690.js');
 require('react-dom');
+var visibilitySensor = require('./visibility-sensor-0c45a583.js');
 var index = require('./index-b5eb3ff8.js');
 var index$1 = require('./index-fa0fb52c.js');
+var main = require('./main-bc4db521.js');
 var entities = require('./entities-310b46ee.js');
 require('./slicedToArray-419d467a.js');
-require('./AdSlot-20aa927e.js');
-require('./promise-d5136080.js');
-var ADInfeed = require('./ADInfeed-d1783f42.js');
+require('./AdSlot-4d22aad4.js');
+require('./promise-0a493c7a.js');
+var ADInfeed = require('./ADInfeed-494f5e6b.js');
 
 var DeckContent = function (_React$Component) {
   inherits$2._inherits(DeckContent, _React$Component);
@@ -420,7 +422,7 @@ var DeckContent = function (_React$Component) {
           React__default.Fragment,
           null,
           React__default.createElement(
-            visibilitySensor.InfiniteScroll,
+            index_es.InfiniteScroll,
             { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling, scrollThreshold: 0.9 },
             React__default.createElement(
               Container,

package/dist/cjs/DeckQueue.js

@@ -6,8 +6,8 @@ require('./_commonjsHelpers-06173234.js');
 require('./_to-object-329a650b.js');
 require('./web.dom.iterable-5c889cf1.js');
 require('./_library-dd23b178.js');
-var main = require('./main-2020ba94.js');
-var toConsumableArray = require('./toConsumableArray-3cf1df2c.js');
+require('./_iter-detect-234453c3.js');
+var toConsumableArray = require('./toConsumableArray-25d0e2a3.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends$2 = require('./extends-60837c34.js');
 var inherits$2 = require('./inherits-e793003e.js');
@@ -23,10 +23,12 @@ var Card = _interopDefault(require('react-bootstrap/Card'));
 var moment = require('./moment-66a6a284.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var visibilitySensor = require('./visibility-sensor-43e0b37c.js');
+var index_es = require('./index.es-ab3f2690.js');
 require('react-dom');
+var visibilitySensor = require('./visibility-sensor-0c45a583.js');
 var index = require('./index-b5eb3ff8.js');
 var index$1 = require('./index-fa0fb52c.js');
+var main = require('./main-bc4db521.js');
 var entities = require('./entities-310b46ee.js');
 var get$1 = require('./get-5aa7468c.js');
 
@@ -318,7 +320,7 @@ var DeckQueue = function (_React$Component) {
         'div',
         { className: 'contentDeck' },
         autoScroll ? React__default.createElement(
-          visibilitySensor.InfiniteScroll,
+          index_es.InfiniteScroll,
           { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling },
           React__default.createElement(
             Container,

package/dist/cjs/{Dfp-27b922b0.js → Dfp-2399639f.js}

@@ -9,8 +9,8 @@ var React = require('react');
 var React__default = _interopDefault(React);
 var debounce = require('./debounce-b088070c.js');
 var PropTypes = _interopDefault(require('prop-types'));
-var visibilitySensor = require('./visibility-sensor-43e0b37c.js');
 require('react-dom');
+var visibilitySensor = require('./visibility-sensor-0c45a583.js');
 var slicedToArray = require('./slicedToArray-419d467a.js');
 
 var AD = function AD(_ref) {

package/dist/cjs/{Figure-8dd7df44.js → Figure-9e886c5b.js}

@@ -36,8 +36,7 @@ var FigureComponent = function FigureComponent(props) {
   if (typeof window === 'undefined') return null;
 
   var node = props.node,
-      client = props.client,
-      contextualADFlag = props.contextualADFlag;
+      client = props.client;
 
 
   if (!node.asset) return null;
@@ -117,7 +116,7 @@ var FigureComponent = function FigureComponent(props) {
         React__default.Fragment,
         null,
         React__default.createElement(reactBootstrap.Figure.Image, {
-          style: { maxWidth: '100%', cursor: 'pointer' },
+          style: { maxWidth: '100%', cursor: 'pointer', width: 'auto' },
           className: 'figure-image',
           src: urlFor(node, client).url(),
           alt: alt && alt,
@@ -129,7 +128,6 @@ var FigureComponent = function FigureComponent(props) {
         caption && React__default.createElement('div', { dangerouslySetInnerHTML: { __html: '<span class=\'figure-caption\'>' + caption + '</span>' } })
       )
     ),
-    contextualADFlag && React__default.createElement('p', { className: 'clearfix' }),
     React__default.createElement(
       'div',
       { className: 'lightbox-target ' + (openImg ? 'open' : 'close') },

package/dist/cjs/{GridContent-c0c0d3e5.js → GridContent-2f42692a.js}

@@ -2,8 +2,7 @@
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
-var main = require('./main-2020ba94.js');
-var toConsumableArray = require('./toConsumableArray-3cf1df2c.js');
+var toConsumableArray = require('./toConsumableArray-25d0e2a3.js');
 var _extends$2 = require('./extends-60837c34.js');
 var inherits$2 = require('./inherits-e793003e.js');
 var React = require('react');
@@ -16,16 +15,18 @@ var Card = _interopDefault(require('react-bootstrap/Card'));
 var moment = require('./moment-66a6a284.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var visibilitySensor = require('./visibility-sensor-43e0b37c.js');
+var index_es = require('./index.es-ab3f2690.js');
+var visibilitySensor = require('./visibility-sensor-0c45a583.js');
 var index = require('./index-b5eb3ff8.js');
 var index$1 = require('./index-fa0fb52c.js');
+var main = require('./main-bc4db521.js');
 var entities = require('./entities-310b46ee.js');
-var ADInfeed = require('./ADInfeed-d1783f42.js');
+var ADInfeed = require('./ADInfeed-494f5e6b.js');
 var get$1 = require('./get-5aa7468c.js');
 var AuthorComponent = require('./AuthorComponent-4706f297.js');
 
 var Dfp = React__default.lazy(function () {
-  return Promise.resolve().then(function () { return require('./Dfp-27b922b0.js'); });
+  return Promise.resolve().then(function () { return require('./Dfp-2399639f.js'); });
 });
 
 var AD = function AD(props) {
@@ -574,7 +575,7 @@ var GridContent = function (_React$Component) {
         'div',
         { className: 'contentDeck' },
         autoScroll ? React__default.createElement(
-          visibilitySensor.InfiniteScroll,
+          index_es.InfiniteScroll,
           { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling },
           React__default.createElement(
             Container,

package/dist/cjs/GridContent.js

@@ -4,8 +4,8 @@ require('./_commonjsHelpers-06173234.js');
 require('./_to-object-329a650b.js');
 require('./web.dom.iterable-5c889cf1.js');
 require('./_library-dd23b178.js');
-require('./main-2020ba94.js');
-require('./toConsumableArray-3cf1df2c.js');
+require('./_iter-detect-234453c3.js');
+require('./toConsumableArray-25d0e2a3.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
 require('./inherits-e793003e.js');
@@ -19,17 +19,19 @@ require('react-bootstrap/Col');
 require('react-bootstrap/Card');
 require('./moment-66a6a284.js');
 require('next/router');
-require('./visibility-sensor-43e0b37c.js');
+require('./index.es-ab3f2690.js');
 require('react-dom');
+require('./visibility-sensor-0c45a583.js');
 require('./index-b5eb3ff8.js');
 require('./index-fa0fb52c.js');
+require('./main-bc4db521.js');
 require('./entities-310b46ee.js');
 require('./slicedToArray-419d467a.js');
-require('./AdSlot-20aa927e.js');
-require('./promise-d5136080.js');
-require('./ADInfeed-d1783f42.js');
+require('./AdSlot-4d22aad4.js');
+require('./promise-0a493c7a.js');
+require('./ADInfeed-494f5e6b.js');
 require('./get-5aa7468c.js');
-var GridContent = require('./GridContent-c0c0d3e5.js');
+var GridContent = require('./GridContent-2f42692a.js');
 require('./AuthorComponent-4706f297.js');
 
 

package/dist/cjs/IssueDeck.js

@@ -3,17 +3,33 @@
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
 require('./_commonjsHelpers-06173234.js');
+require('./_to-object-329a650b.js');
+require('./web.dom.iterable-5c889cf1.js');
+require('./_iter-detect-234453c3.js');
+var toConsumableArray = require('./toConsumableArray-25d0e2a3.js');
+require('./_object-pie-68c5bcbc.js');
+var _extends$2 = require('./extends-60837c34.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 require('prop-types');
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
 var Card = _interopDefault(require('react-bootstrap/Card'));
+var index_es = require('./index.es-ab3f2690.js');
 require('react-dom');
 var index = require('./index-b5eb3ff8.js');
 var index$1 = require('./index-fa0fb52c.js');
+var slicedToArray = require('./slicedToArray-419d467a.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 
+var usePrevious = function usePrevious(value) {
+  var ref = React.useRef();
+  React.useEffect(function () {
+    ref.current = value;
+  });
+  return ref.current;
+};
+
 var IssueDeck = function IssueDeck(props) {
   var data = props.data,
       href = props.href,
@@ -21,8 +37,36 @@ var IssueDeck = function IssueDeck(props) {
       imageWidth = props.imageWidth,
       Website = props.Website,
       client = props.client,
-      publication = props.publication;
+      publication = props.publication,
+      query = props.query,
+      params = props.params;
+
+  var _useState = React.useState(params ? params.count : 0),
+      _useState2 = slicedToArray._slicedToArray(_useState, 1),
+      count = _useState2[0];
+
+  var _useState3 = React.useState(true),
+      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
+      scrolling = _useState4[0],
+      setScrolling = _useState4[1];
+
+  var _useState5 = React.useState(data),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      issuesData = _useState6[0],
+      setIssuesData = _useState6[1];
+
+  var _useState7 = 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];
 
+  var deckRef = React.useRef(null);
+
+  var prevValues = usePrevious(values);
 
   var urlFor = function urlFor(source) {
     var builder = index.imageUrlBuilder(client);
@@ -40,120 +84,172 @@ var IssueDeck = function IssueDeck(props) {
     }
   };
 
+  var loadMore = function loadMore() {
+    setValues({
+      page: values.page + 1,
+      from: values.from + count,
+      to: values.to + count
+    });
+  };
+
+  var loadData = function loadData(values, query, client, params, setIssuesData, setScrolling) {
+    params = _extends$2._extends({}, params, {
+      from: values.from,
+      to: values.to
+    });
+
+    client.fetch(query, params).then(function (dataArr) {
+      if (!dataArr) {
+        dataArr = [];
+      }
+
+      dataArr = dataArr.map(function (item) {
+        return _extends$2._extends({}, item, {
+          pageNumber: values.page
+        });
+      });
+
+      if (dataArr.length > 0) {
+        setIssuesData(function (prevData) {
+          return [].concat(toConsumableArray._toConsumableArray(prevData), toConsumableArray._toConsumableArray(dataArr));
+        });
+        setScrolling(true);
+      } else {
+        var parentScroll = document.getElementsByClassName('infinite-scroll-component')[0];
+        parentScroll.style.overflow = 'hidden';
+        setScrolling(false);
+      }
+    });
+  };
+
+  React.useEffect(function () {
+    if (prevValues) {
+      if (values.page !== prevValues.page && values.from !== prevValues.from && values.to !== prevValues.from) {
+        loadData(values, query, client, params, setIssuesData, setScrolling);
+      }
+    }
+  }, [values, prevValues, query, client, params, setIssuesData, setScrolling]);
+
   return React__default.createElement(
-    Row,
-    null,
-    data && data.length ? data.map(function (row, index) {
-      return publication && row.identifier && row.identifier.current && React__default.createElement(
-        Col,
-        { md: 12, lg: 12, key: index },
-        React__default.createElement(
-          Card,
-          { className: 'queue-card journal-queue', style: { borderTop: '1px solid #EEE' } },
+    index_es.InfiniteScroll,
+    { ref: deckRef, dataLength: issuesData && issuesData.length, next: function next() {
+        return loadMore();
+      }, hasMore: scrolling, scrollThreshold: 0.9 },
+    React__default.createElement(
+      Row,
+      null,
+      issuesData && issuesData.length ? issuesData.map(function (row, index) {
+        return publication && row.identifier && row.identifier.current && React__default.createElement(
+          Col,
+          { md: 12, lg: 12, key: index },
           React__default.createElement(
-            Row,
-            { style: { flexDirection: 'left' } },
+            Card,
+            { className: 'queue-card journal-queue', style: { borderTop: '1px solid #EEE' } },
             React__default.createElement(
-              Col,
-              { md: 12, lg: 4, className: 'body-image', style: { textAlign: 'center' } },
-              row.issues.length > 0 ? React__default.createElement(
-                'a',
-                { href: href + '/' + publication + '/' + row.identifier.current, style: { width: '100%' } },
-                row.thumbnail && React__default.createElement(
-                  index$1.LazyLoad,
-                  { height: imageHeight },
-                  React__default.createElement(Card.Img, { variant: 'top', src: renderCardImage(row.thumbnail), alt: row.name, style: { objectFit: 'contain' } })
-                )
-              ) : React__default.createElement(
-                'a',
-                null,
-                row.thumbnail && React__default.createElement(
-                  index$1.LazyLoad,
-                  { height: imageHeight },
-                  React__default.createElement(Card.Img, { variant: 'top', src: renderCardImage(row.thumbnail), alt: row.name, style: { objectFit: 'contain' } })
+              Row,
+              { style: { flexDirection: 'left' } },
+              React__default.createElement(
+                Col,
+                { md: 12, lg: 4, className: 'body-image', style: { textAlign: 'center' } },
+                row.issues.length > 0 ? React__default.createElement(
+                  'a',
+                  { href: href + '/' + publication + '/' + row.identifier.current, style: { width: '100%' } },
+                  row.thumbnail && React__default.createElement(
+                    index$1.LazyLoad,
+                    { height: imageHeight },
+                    React__default.createElement(Card.Img, { variant: 'top', src: renderCardImage(row.thumbnail), alt: row.name, style: { objectFit: 'contain' } })
+                  )
+                ) : React__default.createElement(
+                  'a',
+                  null,
+                  row.thumbnail && React__default.createElement(
+                    index$1.LazyLoad,
+                    { height: imageHeight },
+                    React__default.createElement(Card.Img, { variant: 'top', src: renderCardImage(row.thumbnail), alt: row.name, style: { objectFit: 'contain' } })
+                  )
                 )
-              )
-            ),
-            React__default.createElement(
-              Col,
-              { md: 12, lg: 8 },
+              ),
               React__default.createElement(
-                Card.Body,
-                { style: { padding: '20px' }, className: 'body-text' },
+                Col,
+                { md: 12, lg: 8 },
                 React__default.createElement(
-                  Row,
-                  null,
+                  Card.Body,
+                  { style: { padding: '20px' }, className: 'body-text' },
                   React__default.createElement(
-                    Col,
+                    Row,
                     null,
                     React__default.createElement(
-                      Card.Title,
+                      Col,
                       null,
-                      row.name
+                      React__default.createElement(
+                        Card.Title,
+                        null,
+                        row.name
+                      )
                     )
-                  )
-                ),
-                React__default.createElement(
-                  Row,
-                  null,
+                  ),
                   React__default.createElement(
-                    Col,
+                    Row,
                     null,
                     React__default.createElement(
-                      'div',
+                      Col,
                       null,
-                      'Volume: ',
-                      row.volume
+                      React__default.createElement(
+                        'div',
+                        null,
+                        'Volume: ',
+                        row.volume
+                      )
                     )
-                  )
-                ),
-                React__default.createElement(
-                  Row,
-                  null,
+                  ),
                   React__default.createElement(
-                    Col,
+                    Row,
                     null,
                     React__default.createElement(
-                      'div',
+                      Col,
                       null,
-                      'Number: ',
-                      row.number
-                    )
-                  )
-                ),
-                React__default.createElement(
-                  Row,
-                  null,
-                  row.issues.length > 0 && React__default.createElement(
-                    'a',
-                    { style: { paddingRight: '15px', paddingLeft: '15px' }, href: href + '/' + publication + '/' + row.identifier.current },
-                    React__default.createElement(
-                      Button,
-                      { style: { marginTop: '20px', marginRight: '1rem' }, variant: 'secondary' },
-                      'View Issue'
+                      React__default.createElement(
+                        'div',
+                        null,
+                        'Number: ',
+                        row.number
+                      )
                     )
                   ),
-                  row.pdf && row.pdf.asset && React__default.createElement(
-                    'a',
-                    { href: row.pdf.asset.url, target: '_blank', className: 'btn btn-primary', style: { marginTop: '20px' } },
-                    'Download Issue'
+                  React__default.createElement(
+                    Row,
+                    null,
+                    row.issues.length > 0 && React__default.createElement(
+                      'a',
+                      { style: { paddingRight: '15px', paddingLeft: '15px' }, href: href + '/' + publication + '/' + row.identifier.current },
+                      React__default.createElement(
+                        Button,
+                        { style: { marginTop: '20px', marginRight: '1rem' }, variant: 'secondary' },
+                        'View Issue'
+                      )
+                    ),
+                    row.pdf && row.pdf.asset && React__default.createElement(
+                      'a',
+                      { href: row.pdf.asset.url, target: '_blank', className: 'btn btn-primary', style: { marginTop: '20px' } },
+                      'Download Issue'
+                    )
                   )
                 )
               )
             )
           )
-        )
-      );
-    }) : React__default.createElement(
-      'div',
-      null,
-      React__default.createElement(
-        'h5',
+        );
+      }) : React__default.createElement(
+        'div',
         null,
         React__default.createElement(
-          'em',
-          { className: 'pl-3' },
-          'New content coming soon, please check back later.'
+          'h5',
+          null,
+          React__default.createElement(
+            'em',
+            { className: 'pl-3' },
+            'New content coming soon, please check back later.'
+          )
         )
       )
     )

package/dist/cjs/MasterDeck.js

@@ -6,8 +6,8 @@ require('./_commonjsHelpers-06173234.js');
 require('./_to-object-329a650b.js');
 require('./web.dom.iterable-5c889cf1.js');
 require('./_library-dd23b178.js');
-var main = require('./main-2020ba94.js');
-var toConsumableArray = require('./toConsumableArray-3cf1df2c.js');
+require('./_iter-detect-234453c3.js');
+var toConsumableArray = require('./toConsumableArray-25d0e2a3.js');
 require('./_object-pie-68c5bcbc.js');
 var _extends$2 = require('./extends-60837c34.js');
 var inherits$2 = require('./inherits-e793003e.js');
@@ -23,10 +23,12 @@ require('react-bootstrap/Card');
 require('./moment-66a6a284.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var visibilitySensor = require('./visibility-sensor-43e0b37c.js');
+var index_es = require('./index.es-ab3f2690.js');
 require('react-dom');
+var visibilitySensor = require('./visibility-sensor-0c45a583.js');
 require('./index-b5eb3ff8.js');
-var promise = require('./promise-d5136080.js');
+var main = require('./main-bc4db521.js');
+var promise = require('./promise-0a493c7a.js');
 
 var MasterDeck = function (_React$Component) {
   inherits$2._inherits(MasterDeck, _React$Component);
@@ -202,7 +204,7 @@ var MasterDeck = function (_React$Component) {
       return React__default.createElement(
         'div',
         null,
-        _this.state.data && _this.state.data.map(function (row, index) {
+        _this.state.data && _this.state.data.length > 0 ? _this.state.data.map(function (row, index) {
           var pageNumber = row.pageNumber || _this.state.page;
 
           return React__default.createElement(
@@ -226,7 +228,19 @@ var MasterDeck = function (_React$Component) {
               )
             )
           );
-        })
+        }) : React__default.createElement(
+          'div',
+          null,
+          React__default.createElement(
+            'h5',
+            null,
+            React__default.createElement(
+              'em',
+              null,
+              'New content coming soon, please check back later.'
+            )
+          )
+        )
       );
     }, _this.renderMobileAd = function (index, numberOfItemsBeforeAd, rightItems) {
       var i = ((index + 1) / numberOfItemsBeforeAd - 1) % rightItems.length;
@@ -297,7 +311,7 @@ var MasterDeck = function (_React$Component) {
           React__default.Fragment,
           null,
           React__default.createElement(
-            visibilitySensor.InfiniteScroll,
+            index_es.InfiniteScroll,
             { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling, scrollThreshold: 0.9 },
             React__default.createElement(
               Container,