@mjhls/mjh-framework 1.0.158 → 1.0.160

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.158
+# mjh-framework v. 1.0.160
 
 
 

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import React__default, { Component, useState, useEffect, useRef, createElement, createContext } from 'react';
+import React__default, { Component, useState, useEffect, useRef, createContext, createElement } from 'react';
 import PropTypes from 'prop-types';
 import reactDom from 'react-dom';
 import Container from 'react-bootstrap/Container';
@@ -7,7 +7,7 @@ import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
 import moment from 'moment';
 import Link from 'next/link';
-import { withRouter, useRouter } from 'next/router';
+import Router, { withRouter, useRouter } from 'next/router';
 import LazyLoad from 'react-lazyload';
 import Media from 'react-bootstrap/Media';
 import { Media as Media$1, Container as Container$1, Dropdown, Figure, Carousel, Table, Button as Button$1, ProgressBar, Card as Card$1 } from 'react-bootstrap';
@@ -7689,16 +7689,12 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                     Media$1.Body,
                     null,
                     React__default.createElement(
-                      Link,
-                      { href: mapping[contentCategoryName] + '/[url]', as: mapping[contentCategoryName] + '/' + article.url.current },
-                      React__default.createElement(
-                        'a',
-                        null,
-                        article.title && React__default.createElement(
-                          'h4',
-                          { className: 'card-title', style: { fontWeight: '500', color: 'var(--gray-dark)', marginBottom: '.5rem' } },
-                          article.title
-                        )
+                      'a',
+                      { href: article.url.current, target: '_blank' },
+                      article.title && React__default.createElement(
+                        'h4',
+                        { className: 'card-title', style: { fontWeight: '500', color: 'var(--gray-dark)', marginBottom: '.5rem' } },
+                        article.title
                       )
                     ),
                     showPublished && article.published && React__default.createElement(
@@ -7755,7 +7751,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                     style: { flexDirection: 'column', marginBottom: '1.25rem', paddingBottom: '1.25rem', borderBottom: '1px solid #ddd' } },
                   (article.thumbnail && article.thumbnail.asset || defaultImage) && React__default.createElement(
                     Link,
-                    { href: article.url.current, as: mapping[contentCategoryName] + '/' + article.url.current },
+                    { href: article.url.current },
                     React__default.createElement(
                       'a',
                       { className: 'feature-wrapper' },
@@ -7771,7 +7767,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                     null,
                     React__default.createElement(
                       Link,
-                      { href: mapping[contentCategoryName] + '/[url]', as: mapping[contentCategoryName] + '/' + article.url.current },
+                      { href: article.url.current },
                       React__default.createElement(
                         'a',
                         null,
@@ -9013,10 +9009,11 @@ var SideFooter = function SideFooter(props) {
   /*
   useage example: <SideFooter cache={props.cache} logo='/an_mjhls_brand_logo.png' />
   */
-  var _props$cache$siteSett = props.cache.siteSettingCache,
-      socialLinks = _props$cache$siteSett.socialLinks,
-      footerLinks = _props$cache$siteSett.footerLinks,
-      name = _props$cache$siteSett.name;
+  var _get = get_1(props, 'cache.siteSettingCache', {}),
+      socialLinks = _get.socialLinks,
+      footerLinks = _get.footerLinks,
+      name = _get.name;
+
   var logo = props.logo;
 
   var year = new Date().getFullYear();
@@ -10745,7 +10742,7 @@ var FigureComponent = function FigureComponent(_ref) {
     var screenWidth = window.innerWidth;
     if (screenWidth > 1000) {
       if (widthP === 'auto') {
-        setimageWidth('30%');
+        if (imgFloat === 'none') setimageWidth('auto');else setimageWidth('30%');
       } else {
         setimageWidth(widthP + '%');
       }
@@ -10756,12 +10753,12 @@ var FigureComponent = function FigureComponent(_ref) {
     var screenWidth = window.innerWidth;
     if (screenWidth > 1000) {
       if (widthP === 'auto') {
-        setimageWidth('30%');
+        if (imgFloat === 'none') setimageWidth('auto');else setimageWidth('30%');
       } else {
         setimageWidth(widthP + '%');
       }
     }
-  }, [widthP]);
+  }, [widthP, imgFloat]);
 
   useEffect(function () {
     var screenWidth = window.innerWidth;
@@ -10780,20 +10777,17 @@ var FigureComponent = function FigureComponent(_ref) {
       'a',
       { href: link, target: blank ? '_blank' : '_self' },
       React__default.createElement(Figure.Image, { style: { width: '100%' }, className: 'figure-image', ref: imgElement, onLoad: loadImg, src: urlFor$1(node$$1, client).url(), alt: alt && alt }),
-      caption && React__default.createElement(
-        Figure.Caption,
-        { style: { width: '100%', maxWidth: '100%' } },
-        caption
-      )
+      caption && React__default.createElement('div', { dangerouslySetInnerHTML: { __html: '<span class=\'figure-caption\'>' + caption + '</span>' } })
     ) : React__default.createElement(
       React__default.Fragment,
       null,
       React__default.createElement(Figure.Image, { style: { width: '100%' }, className: 'figure-image', ref: imgElement, onLoad: loadImg, src: urlFor$1(node$$1, client).url(), alt: alt && alt }),
-      caption && React__default.createElement(
-        Figure.Caption,
-        { style: { width: '100%', maxWidth: '100%' } },
-        caption
-      )
+      caption && React__default.createElement('div', { dangerouslySetInnerHTML: { __html: '<span class=\'figure-caption\'>' + caption + '</span>' } })
+    ),
+    React__default.createElement(
+      'style',
+      { jsx: 'true' },
+      '\n        figure-caption {\n          font-size: 90%;\n          color: #6c757d;\n        }\n      '
     )
   );
 };
@@ -10802,10 +10796,10 @@ var urlFor$2 = function urlFor(source, builder) {
   return builder.image(source);
 };
 
-var onChangeSlide = function onChangeSlide(selectedIndex, pageview, setCarouselIndex, asPath) {
-  setCarouselIndex(selectedIndex);
-  lib_3.refresh();
-  if (pageview) pageview(asPath);
+var onChangeSlide = function onChangeSlide(selectedIndex, router) {
+  var pageNumber = selectedIndex + 1;
+  var href = '/view/' + router.query.url + '/?page=' + pageNumber;
+  Router.push(router.pathname, pageNumber > 1 ? href : '/view/' + router.query.url, { shallow: true });
 };
 
 var Slideshow = function Slideshow(_ref) {
@@ -10822,23 +10816,34 @@ var Slideshow = function Slideshow(_ref) {
 
   var builder = imageUrlBuilder(client);
 
+  useEffect(function () {
+    var itemArr = router.asPath.split('?page=');
+    var pageNumber = parseInt(itemArr[1]);
+    if (!pageNumber || isNaN(pageNumber) || pageNumber > slides.length) {
+      setCarouselIndex(0);
+    } else {
+      setCarouselIndex(parseInt(itemArr[1]) - 1);
+    }
+  }, [router]);
+
+  useEffect(function () {
+    lib_3.refresh();
+    if (pageview) pageview(router.asPath);
+  }, [router]);
+
   return React__default.createElement(
     'div',
     { className: 'mt-3 mb-3' },
     React__default.createElement(
       Carousel,
       { activeIndex: carouselIndex, onSelect: function onSelect(selectedIndex, e) {
-          return onChangeSlide(selectedIndex, pageview, setCarouselIndex, router.asPath);
+          return onChangeSlide(selectedIndex, router);
         } },
       slides && slides.map(function (slide) {
         return React__default.createElement(
           Carousel.Item,
           { key: slide._key },
-          React__default.createElement('img', {
-            src: slide.asset && urlFor$2(slide.asset, builder).url(),
-            alt: slide.alt && slide.alt,
-            style: { width: '100%' }
-          }),
+          React__default.createElement('img', { src: slide.asset && urlFor$2(slide.asset, builder).url(), alt: slide.alt && slide.alt, style: { width: '100%' } }),
           slide.caption && React__default.createElement(
             'p',
             { className: 'p-2' },
@@ -14392,7 +14397,7 @@ var Sidebar = function Sidebar(_ref) {
 
   return React__default.createElement(
     'article',
-    { className: 'sidebar', style: { background: '#eee' } },
+    { className: 'sidebar' },
     React__default.createElement(
       'div',
       null,
@@ -14406,7 +14411,7 @@ var Sidebar = function Sidebar(_ref) {
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .sidebar {\n          width: 40%;\n          padding: 1rem 0 0;\n          margin-left: 1rem;\n          margin-right: 10%;\n        }\n        @media screen and (max-width: 991px) {\n          .sidebar {\n            width: unset;\n            padding: 1.25rem;\n            margin-left: 1rem;\n            margin-right: 1rem;\n          }\n        }\n      '
+      '\n        .sidebar {\n          clear: both;\n          float: right;\n          background-color: #eee;\n          width: 40%;\n          padding: 1rem;\n          margin: 0 0 1rem 1rem;\n        }\n        @media screen and (max-width: 991px) {\n          .sidebar {\n            float: none;\n            width: auto;\n            margin: 1rem 0;\n          }\n        }\n      '
     )
   );
 };
@@ -14531,16 +14536,19 @@ var Video = function Video(_ref) {
     if (videoID) {
       return React__default.createElement(ReactPlayerLoader, { accountId: accountIDs.brightcove.accountId, videoId: videoID, playerId: accountIDs.brightcove.playerId, attrs: { className: 'brightcove' } });
     } else if (experienceID) {
-      return React__default.createElement('iframe', {
-        src: 'https://players.brightcove.net/' + accountIDs.brightcove.accountId + '/experience_' + experienceID + '/index.html',
-        allowFullScreen: 'true',
-        webkitallowfullscreen: 'true',
-        mozallowfullscreen: 'true',
-        frameBorder: 'none',
-        scrolling: 'no',
-        height: '411',
-        width: '100%'
-      });
+      return React__default.createElement(
+        'div',
+        { className: 'playlist-player', style: { position: 'relative', display: 'block', margin: '0px auto', minHeight: '380px' } },
+        React__default.createElement('iframe', {
+          src: 'https://players.brightcove.net/' + accountIDs.brightcove.accountId + '/experience_' + experienceID + '/index.html',
+          allowFullScreen: 'true',
+          webkitallowfullscreen: 'true',
+          mozallowfullscreen: 'true',
+          frameBorder: 'none',
+          scrolling: 'no',
+          style: { border: 'none', top: '0px', right: '0px', bottom: '0px', left: '0px', width: '100%', height: '100%' }
+        })
+      );
     }
     return null;
   }
@@ -15219,10 +15227,10 @@ var urlFor$3 = function urlFor(source, builder) {
   return builder.image(source);
 };
 
-var onChangeSlide$1 = function onChangeSlide(selectedIndex, pageview, setCarouselIndex, asPath) {
-  setCarouselIndex(selectedIndex);
-  lib_3.refresh();
-  if (pageview) pageview(asPath);
+var onChangeSlide$1 = function onChangeSlide(selectedIndex, router) {
+  var pageNumber = selectedIndex + 1;
+  var href = '/view/' + router.query.url + '/?page=' + pageNumber;
+  Router.push(router.pathname, pageNumber > 1 ? href : '/view/' + router.query.url, { shallow: true });
 };
 
 var Slideshow$1 = function Slideshow(_ref) {
@@ -15231,7 +15239,6 @@ var Slideshow$1 = function Slideshow(_ref) {
       pageview = _ref.pageview,
       serializerArguments = _ref.serializerArguments;
 
-  console.log(slides);
   var router = useRouter();
 
   var _useState = useState(0),
@@ -15241,14 +15248,29 @@ var Slideshow$1 = function Slideshow(_ref) {
 
   var builder = imageUrlBuilder(client);
 
+  useEffect(function () {
+    var itemArr = router.asPath.split('?page=');
+    var pageNumber = parseInt(itemArr[1]);
+    if (!pageNumber || isNaN(pageNumber) || pageNumber > slides.length) {
+      setCarouselIndex(0);
+    } else {
+      setCarouselIndex(parseInt(itemArr[1]) - 1);
+    }
+  }, [router]);
+
+  useEffect(function () {
+    lib_3.refresh();
+    if (pageview) pageview(router.asPath);
+  }, [router]);
+
   return React__default.createElement(
     'div',
     { className: 'mt-3 mb-3' },
     React__default.createElement(
       Carousel,
       { activeIndex: carouselIndex, onSelect: function onSelect(selectedIndex, e) {
-          return onChangeSlide$1(selectedIndex, pageview, setCarouselIndex, router.asPath);
-        }, indicators: false },
+          return onChangeSlide$1(selectedIndex, router);
+        } },
       slides && slides.map(function (slide) {
         if (slide.slideshowImage && slide.slideshowImage.asset) {
           return React__default.createElement(