@mjhls/mjh-framework 1.0.94 → 1.0.95

package/dist/index.js

@@ -14,7 +14,8 @@ var Col = _interopDefault(require('react-bootstrap/Col'));
 var Card = _interopDefault(require('react-bootstrap/Card'));
 var moment = _interopDefault(require('moment'));
 var Link = _interopDefault(require('next/link'));
-var router = require('next/router');
+var Router = require('next/router');
+var Router__default = _interopDefault(Router);
 var Media = _interopDefault(require('react-bootstrap/Media'));
 var reactBootstrap = require('react-bootstrap');
 var ListGroup = _interopDefault(require('react-bootstrap/ListGroup'));
@@ -3897,19 +3898,19 @@ var DeckContent = function (_React$Component) {
       var _this$props = _this.props,
           seoPaginate = _this$props.seoPaginate,
           pageview = _this$props.pageview,
-          router$$1 = _this$props.router;
+          router = _this$props.router;
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {
-        var path = router$$1.asPath;
+        var path = router.asPath;
         var qrIndex = path.indexOf('?');
-        var pathname = router$$1.pathname;
+        var pathname = router.pathname;
         var queryString = '';
 
         if (qrIndex > 0) {
           path = path.substring(1, qrIndex);
 
-          var partialQS = router$$1.asPath.substring(qrIndex + 1);
+          var partialQS = router.asPath.substring(qrIndex + 1);
           var partialQSArr = partialQS.split('&');
 
           // exclude page=xxx from query string
@@ -3955,7 +3956,7 @@ var DeckContent = function (_React$Component) {
 
               pageview(newPath);
 
-              router$$1.push(pathname, newPath, {
+              router.push(pathname, newPath, {
                 shallow: true
               });
             });
@@ -3980,8 +3981,7 @@ var DeckContent = function (_React$Component) {
           }
 
           var pageNumber = row.pageNumber || _this.state.page;
-          var contentCategoryName = row.contentCategory ? row.contentCategory.name : 'Articles';
-
+          var contentCategoryName = row.contentCategory && row.contentCategory.name && _this.mapping[row.contentCategory.name] ? row.contentCategory.name : 'Articles';
           return React__default.createElement(
             VisibilitySensor,
             {
@@ -4152,7 +4152,7 @@ var DeckContent = function (_React$Component) {
   return DeckContent;
 }(React__default.Component);
 
-var ContentCard = router.withRouter(DeckContent);
+var ContentCard = Router.withRouter(DeckContent);
 
 /**
  * Checks if `value` is classified as an `Array` object.
@@ -5229,19 +5229,19 @@ var GridContent = function (_React$Component) {
       var _this$props = _this.props,
           seoPaginate = _this$props.seoPaginate,
           pageview = _this$props.pageview,
-          router$$1 = _this$props.router;
+          router = _this$props.router;
       var currentPage = _this.state.currentPage;
 
       if (seoPaginate) {
-        var path = router$$1.asPath;
+        var path = router.asPath;
         var qrIndex = path.indexOf('?');
-        var pathname = router$$1.pathname;
+        var pathname = router.pathname;
         var queryString = '';
 
         if (qrIndex > 0) {
           path = path.substring(1, qrIndex);
 
-          var partialQS = router$$1.asPath.substring(qrIndex + 1);
+          var partialQS = router.asPath.substring(qrIndex + 1);
           var partialQSArr = partialQS.split('&');
 
           // exclude page=xxx from query string
@@ -5276,7 +5276,7 @@ var GridContent = function (_React$Component) {
 
               pageview(newPath);
 
-              router$$1.push(pathname, newPath, {
+              router.push(pathname, newPath, {
                 shallow: true
               });
             });
@@ -5373,7 +5373,7 @@ var GridContent = function (_React$Component) {
         { className: 'grid-container' },
         this.state.data && this.state.data.map(function (row, index$$1) {
           var pageNumber = row.pageNumber || _this2.state.page;
-          var contentCategoryName = row.contentCategory ? row.contentCategory.name : 'Articles';
+          var contentCategoryName = row.contentCategory && row.contentCategory.name && _this2.mapping[row.contentCategory.name] ? row.contentCategory.name : 'Articles';
           return React__default.createElement(
             VisibilitySensor,
             {
@@ -5493,7 +5493,7 @@ var GridContent = function (_React$Component) {
   return GridContent;
 }(React__default.Component);
 
-var GridContent$1 = router.withRouter(GridContent);
+var GridContent$1 = Router.withRouter(GridContent);
 
 var DeckQueue = function (_React$Component) {
   inherits(DeckQueue, _React$Component);
@@ -5509,74 +5509,151 @@ var DeckQueue = function (_React$Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = possibleConstructorReturn(this, (_ref = DeckQueue.__proto__ || Object.getPrototypeOf(DeckQueue)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.data = _this.props.dataRecord, _this.query = _this.props.query, _this.params = _this.props.params, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.state = {
+    return _ret = (_temp = (_this = possibleConstructorReturn(this, (_ref = DeckQueue.__proto__ || Object.getPrototypeOf(DeckQueue)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.data = _this.props.dataRecord, _this.query = _this.props.query, _this.params = _this.props.params, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.state = {
       data: _this.data,
       per: _this.params ? _this.params.to : 2,
-      page: 1,
+      page: _this.props.currentPage || 1,
       from: _this.params ? _this.params.from : 0,
       to: _this.params ? _this.params.to : 2,
       total_pages: null,
       scrolling: true,
-      query: _this.query
-    }, _this.loadMore = function () {
-      setTimeout(function () {
-        _this.setState(function (state, props) {
-          return {
-            page: state.page + 1,
-            from: state.from + state.per,
-            to: state.to + state.per
-          };
-        }, _this.loadData);
-      }, 10);
-    }, _this.loadData = function () {
+      query: _this.query,
+      currentPage: _this.props.currentPage || 1
+    }, _this.loadMore = debounce_1(function () {
+      _this.setState(function (state) {
+        var page = state.page,
+            from = state.from,
+            per = state.per,
+            to = state.to;
+
+        return {
+          page: page + 1,
+          from: from + per,
+          to: to + per
+        };
+      }, _this.loadData);
+    }, 0), _this.loadData = function () {
       var _this$state = _this.state,
           from = _this$state.from,
           to = _this$state.to,
           data = _this$state.data,
-          query = _this$state.query;
+          query = _this$state.query,
+          page = _this$state.page;
       var client = _this.props.client;
 
 
       var params = _extends({}, _this.params, { from: from, to: to
         // const queryUpdated = query.replace('$from', params.from).replace('$to', params.to)
-
-      });if (_this.pointer && _this.pointerArray) {
-        var pointer = _this.pointer;
-        client.fetch(query, params).then(function (dataArr) {
-          _this.setState(function (state, props) {
-            if (dataArr[_this.pointerArray][pointer].length > 0) {
-              return {
-                data: [].concat(toConsumableArray(data), toConsumableArray(dataArr[_this.pointerArray][pointer])),
-                scrolling: true
-              };
-            } else {
-              return {
-                scrolling: false
-              };
-            }
+      });client.fetch(query, params).then(function (dataArr) {
+        if (_this.pointer && _this.pointerArray) {
+          var pointer = _this.pointer;
+          dataArr = dataArr[_this.pointerArray][pointer];
+        }
+        dataArr = dataArr.map(function (item) {
+          return _extends({}, item, {
+            pageNumber: page
           });
         });
-      } else {
-        client.fetch(query, params).then(function (dataArr) {
-          _this.setState(function (state, props) {
-            if (dataArr.length > 0) {
-              return {
-                data: [].concat(toConsumableArray(data), toConsumableArray(dataArr)),
-                scrolling: true
-              };
-            } else {
-              return {
-                scrolling: false
-              };
-            }
-          });
+
+        _this.setState(function () {
+          if (dataArr.length > 0) {
+            return {
+              data: [].concat(toConsumableArray(data), toConsumableArray(dataArr)),
+              scrolling: true
+            };
+          } else {
+            return {
+              scrolling: false
+            };
+          }
         });
-      }
+      });
     }, _this.urlFor = function (source) {
       var client = _this.props.client;
 
       var builder = imageUrlBuilder(client);
       return builder.image(source);
+    }, _this.renderCardImage = function (row, page) {
+      if (row.thumbnail) {
+        return _this.urlFor(row.thumbnail).url();
+      } else {
+        return _this.defaultImage;
+      }
+    }, _this.changePageNumber = function (pageNumber) {
+      var _this$props = _this.props,
+          seoPaginate = _this$props.seoPaginate,
+          pageview = _this$props.pageview,
+          router = _this$props.router;
+      var currentPage = _this.state.currentPage;
+
+      if (seoPaginate) {
+        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);
+
+        if (currentPage !== pageNumber) {
+          lib_3.refresh();
+          if (pageview) {
+            _this.setState({
+              currentPage: pageNumber
+            }, function () {
+              if (path[0] !== '/') {
+                path = '/' + path;
+              }
+
+              var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
+
+              pageview(newPath);
+
+              router.push(pathname, newPath, {
+                shallow: true
+              });
+            });
+          }
+        }
+      }
+    }, _this.renderManualPagination = function () {
+      var currentPage = _this.state.currentPage;
+
+      return React__default.createElement(
+        'div',
+        { className: 'd-flex justify-content-between' },
+        currentPage && currentPage > 1 && React__default.createElement(
+          'a',
+          { href: '?page=' + (currentPage - 1) },
+          '<< Previous'
+        ),
+        React__default.createElement(
+          'a',
+          { href: '?page=' + (currentPage + 1) },
+          'Next >>'
+        )
+      );
     }, _temp), possibleConstructorReturn(_this, _ret);
   }
 
@@ -5591,64 +5668,73 @@ var DeckQueue = function (_React$Component) {
       return React__default.createElement(
         Row,
         null,
-        this.state.data && this.state.data.map(function (row, index) {
+        this.state.data && this.state.data.map(function (row, index$$1) {
+          var pageNumber = row.pageNumber || _this2.state.page;
           // const thumbnailURL = get(row, 'thumbnail.asset.url', this.props.defaultImage)
           var thumbnailURL = row.thumbnail ? _this2.urlFor(row.thumbnail).url() : _this2.props.defaultImage;
           return React__default.createElement(
-            Col,
-            { key: index, md: 12, lg: lgVar, style: { display: 'flex', flex: '1 0 auto' } },
+            VisibilitySensor,
+            {
+              key: index$$1,
+              onChange: function onChange(isVisible) {
+                isVisible && _this2.changePageNumber(pageNumber);
+              } },
             React__default.createElement(
-              Card,
-              { className: 'queue-card', style: { borderTop: '1px solid #EEE' } },
+              Col,
+              { md: 12, lg: lgVar, style: { display: 'flex', flex: '1 0 auto' } },
               React__default.createElement(
-                Row,
-                { style: { flexDirection: mode } },
-                React__default.createElement(
-                  Col,
-                  { md: 12, lg: 4 },
-                  React__default.createElement(
-                    Link,
-                    { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
-                    React__default.createElement(Card.Img, { variant: 'top', src: thumbnailURL })
-                  )
-                ),
+                Card,
+                { className: 'queue-card', style: { borderTop: '1px solid #EEE' } },
                 React__default.createElement(
-                  Col,
-                  null,
+                  Row,
+                  { style: { flexDirection: mode } },
                   React__default.createElement(
-                    Card.Body,
-                    { style: { padding: '20px' } },
-                    row.title && React__default.createElement(
+                    Col,
+                    { md: 12, lg: 4 },
+                    React__default.createElement(
                       Link,
                       { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
-                      React__default.createElement(
-                        Card.Title,
-                        null,
-                        row.title
-                      )
-                    ),
-                    _this2.props.showPublished && row.published && React__default.createElement(
-                      Card.Subtitle,
-                      null,
-                      moment(row.published).format('MMMM DD, YYYY')
-                    ),
-                    _this2.props.showRecent && row.recent && row.recent.title && React__default.createElement(
-                      Card.Subtitle,
-                      null,
-                      'Recent : ',
-                      React__default.createElement(
+                      React__default.createElement(Card.Img, { variant: 'top', src: thumbnailURL })
+                    )
+                  ),
+                  React__default.createElement(
+                    Col,
+                    null,
+                    React__default.createElement(
+                      Card.Body,
+                      { style: { padding: '20px' } },
+                      row.title && React__default.createElement(
                         Link,
-                        { href: 'view/' + row.recent.url.current },
-                        row.recent.title
-                      )
-                    ),
-                    row.summary && React__default.createElement(
-                      Link,
-                      { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
-                      React__default.createElement(
-                        Card.Text,
+                        { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
+                        React__default.createElement(
+                          Card.Title,
+                          null,
+                          row.title
+                        )
+                      ),
+                      _this2.props.showPublished && row.published && React__default.createElement(
+                        Card.Subtitle,
                         null,
-                        row.summary
+                        moment(row.published).format('MMMM DD, YYYY')
+                      ),
+                      _this2.props.showRecent && row.recent && row.recent.title && React__default.createElement(
+                        Card.Subtitle,
+                        null,
+                        'Recent : ',
+                        React__default.createElement(
+                          Link,
+                          { href: 'view/' + row.recent.url.current },
+                          row.recent.title
+                        )
+                      ),
+                      row.summary && React__default.createElement(
+                        Link,
+                        { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
+                        React__default.createElement(
+                          Card.Text,
+                          null,
+                          row.summary
+                        )
                       )
                     )
                   )
@@ -5710,6 +5796,11 @@ var DeckQueue = function (_React$Component) {
                 'End of data'
               )
             )
+          ),
+          React__default.createElement(
+            'noscript',
+            null,
+            this.renderManualPagination()
           )
         )
       );
@@ -5718,6 +5809,8 @@ var DeckQueue = function (_React$Component) {
   return DeckQueue;
 }(React__default.Component);
 
+var Queue = Router.withRouter(DeckQueue);
+
 var ThumbnailCard = function ThumbnailCard(_ref) {
   var size = _ref.size,
       mediaData = _ref.mediaData,
@@ -6260,17 +6353,17 @@ var loadData = function loadData(values, query, client, params, setData, setScro
   });
 };
 
-var changePageNumber = function changePageNumber(pageNumber, seoPaginate, pageview, router$$1, currentPage, setCurrentPage) {
+var changePageNumber = function changePageNumber(pageNumber, seoPaginate, pageview, router, currentPage, setCurrentPage) {
   if (seoPaginate) {
-    var path = router$$1.asPath;
+    var path = router.asPath;
     var qrIndex = path.indexOf('?');
-    var pathname = router$$1.pathname;
+    var pathname = router.pathname;
     var queryString = '';
 
     if (qrIndex > 0) {
       path = path.substring(1, qrIndex);
 
-      var partialQS = router$$1.asPath.substring(qrIndex + 1);
+      var partialQS = router.asPath.substring(qrIndex + 1);
       var partialQSArr = partialQS.split('&');
 
       // exclude page=xxx from query string
@@ -6300,7 +6393,7 @@ var changePageNumber = function changePageNumber(pageNumber, seoPaginate, pagevi
         }
         var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
         pageview(newPath);
-        router$$1.push(pathname, newPath, {
+        router.push(pathname, newPath, {
           shallow: true
         });
       }
@@ -6330,7 +6423,7 @@ var renderAuthor = function renderAuthor(authorName, authorURL, index$$1, length
   }
 };
 
-var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate, pageview, router$$1, currentPage, setCurrentPage, showPublished, defaultImage) {
+var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage) {
   return React__default.createElement(
     'div',
     null,
@@ -6342,7 +6435,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
         {
           key: article._id ? article._id : index$$1,
           onChange: function onChange(isVisible) {
-            isVisible && changePageNumber(pageNumber, seoPaginate, pageview, router$$1, currentPage, setCurrentPage);
+            isVisible && changePageNumber(pageNumber, seoPaginate, pageview, router, currentPage, setCurrentPage);
           } },
         React__default.createElement(
           React__default.Fragment,
@@ -6430,7 +6523,7 @@ var usePrevious = function usePrevious(value) {
 };
 
 var QueueDeckExpanded = function QueueDeckExpanded(props) {
-  var router$$1 = router.useRouter();
+  var router = Router.useRouter();
   var initialData = props.dataRecord,
       client = props.client,
       params = props.params,
@@ -6500,7 +6593,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
         React__default.createElement(
           reactBootstrap.Container,
           null,
-          cardLoader(data, builder, mapping, values, seoPaginate, pageview, router$$1, currentPage, setCurrentPage, showPublished, defaultImage)
+          cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage)
         )
       ),
       React__default.createElement(
@@ -6514,7 +6607,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       React__default.createElement(
         reactBootstrap.Container,
         null,
-        cardLoader(data, builder, mapping, values, seoPaginate, pageview, router$$1, currentPage, setCurrentPage, showPublished, defaultImage)
+        cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage)
       ),
       React__default.createElement(
         'div',
@@ -7045,19 +7138,32 @@ var Search = function Search(_ref) {
       _ref$btnText = _ref.btnText,
       btnText = _ref$btnText === undefined ? 'Search' : _ref$btnText;
 
-  var router$$1 = router.useRouter();
+  var router = Router.useRouter();
 
   var _useState = React.useState(''),
       _useState2 = slicedToArray(_useState, 2),
       searchKey = _useState2[0],
       setSearchKey = _useState2[1];
 
-  var handleSearch = function handleSearch(value) {
-    router$$1.push({
-      pathname: '/search',
-      query: { searchTerm: value }
+  var _useState3 = React.useState(false),
+      _useState4 = slicedToArray(_useState3, 2),
+      activesearch = _useState4[0],
+      setActivesearch = _useState4[1];
+
+  React.useEffect(function () {
+    if (activesearch) {
+      router.push({
+        pathname: '/search',
+        query: { searchTerm: searchKey }
+      });
+    }
+  }, [activesearch]);
+
+  React.useEffect(function () {
+    Router__default.events.on('routeChangeComplete', function () {
+      return setActivesearch(false);
     });
-  };
+  });
 
   return React__default.createElement(
     Form,
@@ -7065,16 +7171,17 @@ var Search = function Search(_ref) {
       inline: true,
       onSubmit: function onSubmit(e) {
         e.preventDefault();
-        handleSearch(searchKey);
+        setActivesearch(true);
       } },
+    activesearch && React__default.createElement(reactBootstrap.Spinner, { className: 'active-loader mr-3', animation: 'border', variant: 'light' }),
     React__default.createElement(FormControl, { type: 'text', placeholder: placeholder, className: 'mr-sm-2', value: searchKey, onChange: function onChange(e) {
         return setSearchKey(e.target.value);
       } }),
     React__default.createElement(
       Button,
       { variant: 'secondary', onClick: function onClick() {
-          return handleSearch(searchKey);
-        } },
+          return setActivesearch(true);
+        }, disabled: activesearch },
       btnText
     )
   );
@@ -8549,7 +8656,7 @@ var Slideshow = function Slideshow(_ref) {
       client = _ref.client,
       pageview = _ref.pageview;
 
-  var router$$1 = router.useRouter();
+  var router = Router.useRouter();
 
   var _useState = React.useState(0),
       _useState2 = slicedToArray(_useState, 2),
@@ -8564,14 +8671,14 @@ var Slideshow = function Slideshow(_ref) {
     React__default.createElement(
       reactBootstrap.Carousel,
       { activeIndex: carouselIndex, onSelect: function onSelect(selectedIndex, e) {
-          return onChangeSlide(selectedIndex, pageview, setCarouselIndex, router$$1.asPath);
+          return onChangeSlide(selectedIndex, pageview, setCarouselIndex, router.asPath);
         } },
       slides && slides.map(function (slide) {
         return React__default.createElement(
           reactBootstrap.Carousel.Item,
           { key: slide._key },
-          React__default.createElement('img', { src: slide.image && urlFor$1(slide.image, builder).url(), style: { width: '100%' } }),
-          React__default.createElement(
+          React__default.createElement('img', { src: slide.asset && urlFor$1(slide.asset, builder).url(), alt: slide.alt && slide.alt, style: { width: '100%' } }),
+          slide.caption && React__default.createElement(
             'p',
             { className: 'p-2' },
             slide.caption
@@ -12258,7 +12365,7 @@ var YouTubeGallery = function YouTubeGallery(_ref) {
   var nodes = _ref.nodes,
       client = _ref.client;
 
-  var router$$1 = router.useRouter();
+  var router = Router.useRouter();
   //state
 
   var _useState = React.useState(''),
@@ -12278,8 +12385,8 @@ var YouTubeGallery = function YouTubeGallery(_ref) {
   //variables
 
 
-  var get2 = router$$1.asPath.split('/')[1];
-  var get3 = router$$1.asPath.split('/')[2].split('?')[0];
+  var get2 = router.asPath.split('/')[1];
+  var get3 = router.asPath.split('/')[2].split('?')[0];
 
   // Once component mounts, set the variables
   React.useEffect(function () {
@@ -12614,7 +12721,7 @@ var Breadcrumbs = function Breadcrumbs() {
 
 exports.DeckContent = ContentCard;
 exports.GridContent = GridContent$1;
-exports.DeckQueue = DeckQueue;
+exports.DeckQueue = Queue;
 exports.ThumbnailCard = ThumbnailCard;
 exports.TaxonomyCard = TaxonomyCard;
 exports.GroupDeck = GroupDeck;