@mjhls/mjh-framework 1.0.400 → 1.0.402

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # mjh-framework v. 1.0.400
2
+ # mjh-framework v. 1.0.402
3
3
 
4
4
 
5
5
  > Foundation Framework
@@ -8,6 +8,8 @@ var React__default = _interopDefault(React);
8
8
  var Container = _interopDefault(require('react-bootstrap/Container'));
9
9
  var Row = _interopDefault(require('react-bootstrap/Row'));
10
10
  var Col = _interopDefault(require('react-bootstrap/Col'));
11
+ var Router = require('next/router');
12
+ var Router__default = _interopDefault(Router);
11
13
  var slicedToArray = require('./slicedToArray-419d467a.js');
12
14
  var AdSlot = require('./AdSlot-20aa927e.js');
13
15
  var get$1 = require('./get-5aa7468c.js');
@@ -2083,7 +2085,22 @@ var TemplateNormal = function TemplateNormal(props) {
2083
2085
  showRightAd = props.showRightAd,
2084
2086
  sponsoredFlag = props.sponsoredFlag;
2085
2087
 
2088
+ var router = Router.useRouter();
2086
2089
 
2090
+ var _useState = React.useState(0),
2091
+ _useState2 = slicedToArray._slicedToArray(_useState, 2),
2092
+ currentPage = _useState2[0],
2093
+ setCurrentPage = _useState2[1];
2094
+
2095
+ React.useEffect(function () {
2096
+ router.asPath && router.asPath.split('?').forEach(function (item) {
2097
+ if (item.includes('page=')) {
2098
+ setCurrentPage(item.split('=')[1]);
2099
+ } else {
2100
+ setCurrentPage(0);
2101
+ }
2102
+ });
2103
+ }, [router]);
2087
2104
  var navigation = function navigation() {
2088
2105
  switch (config.navComponent) {
2089
2106
  case 'normal':
@@ -2152,7 +2169,12 @@ var TemplateNormal = function TemplateNormal(props) {
2152
2169
  return React__default.createElement(
2153
2170
  'section',
2154
2171
  null,
2155
- React__default.createElement(Header$1, { title: title ? title + ' | ' + website.title : '' + website.title, isLiveSite: config.isLiveSite, keyword: keywords, description: description }),
2172
+ React__default.createElement(Header$1, {
2173
+ title: title ? title + ' ' + (currentPage !== 0 ? '| Page ' + currentPage + ' ' : router && router.query && router.query.page ? '| Page ' + router.query.page + ' ' : '') + '| ' + website.title : website.title + ' ' + (currentPage !== 0 ? '| Page ' + currentPage + ' ' : router && router.query && router.query.page ? '| Page ' + router.query.page + ' ' : ''),
2174
+ isLiveSite: config.isLiveSite,
2175
+ keyword: keywords,
2176
+ description: description + ('' + (router && router.query && router.query.page ? '| Page ' + router.query.page : ''))
2177
+ }),
2156
2178
  navigation(),
2157
2179
  sponsoredFlag ? React__default.createElement('div', { style: { height: '50px' } }) : React__default.createElement(
2158
2180
  React__default.Fragment,
@@ -985,7 +985,14 @@ var TaxonomyCard = function TaxonomyCard(props) {
985
985
 
986
986
  var socialLinks = [linkedIn, twitter, facebook];
987
987
  var address = [address1, address2, city, state, zip, country];
988
- var companyDetails = [{ key: 'company', value: company }, { key: 'url', value: website }, { key: 'email', value: email }, { key: 'url', value: extraURL1 }, { key: 'url', value: extraURL2 }, { key: 'url', value: extraURL3 }, { key: 'url', value: extraURL4 }];
988
+ var companyDetails = [];
989
+ company && companyDetails.push({ key: 'company', value: company });
990
+ website && companyDetails.push({ key: 'url', value: website });
991
+ email && companyDetails.push({ key: 'email', value: email });
992
+ extraURL1 && companyDetails.push({ key: 'url', value: extraURL1 });
993
+ extraURL2 && companyDetails.push({ key: 'url', value: extraURL2 });
994
+ extraURL3 && companyDetails.push({ key: 'url', value: extraURL3 });
995
+ extraURL4 && companyDetails.push({ key: 'url', value: extraURL4 });
989
996
  return React__default.createElement(
990
997
  Col,
991
998
  { key: itemCounter, md: 12, lg: lgVar, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
@@ -13,7 +13,7 @@ require('react-bootstrap/Card');
13
13
  require('react-dom');
14
14
  require('./index-b5eb3ff8.js');
15
15
  require('./index-fa0fb52c.js');
16
- var TaxonomyCard = require('./TaxonomyCard-cf264332.js');
16
+ var TaxonomyCard = require('./TaxonomyCard-eb928f05.js');
17
17
  require('./react-social-icons-cd0d9d3b.js');
18
18
 
19
19
 
@@ -11,6 +11,7 @@ require('prop-types');
11
11
  require('react-bootstrap/Container');
12
12
  require('react-bootstrap/Row');
13
13
  require('react-bootstrap/Col');
14
+ require('next/router');
14
15
  require('./slicedToArray-419d467a.js');
15
16
  require('./AdSlot-20aa927e.js');
16
17
  require('./promise-d5136080.js');
@@ -19,7 +20,7 @@ require('./react-social-icons-cd0d9d3b.js');
19
20
  require('react-bootstrap');
20
21
  require('./index.esm-340d3792.js');
21
22
  require('react-bootstrap/Button');
22
- var TemplateNormal = require('./Normal-53437675.js');
23
+ var TemplateNormal = require('./Normal-c1c98dcf.js');
23
24
  require('react-bootstrap/ListGroup');
24
25
  require('next/head');
25
26
  require('react-bootstrap/Nav');
package/dist/cjs/index.js CHANGED
@@ -41,7 +41,7 @@ var AuthorComponent = require('./AuthorComponent-4706f297.js');
41
41
  var DeckQueue = require('./DeckQueue.js');
42
42
  require('react-bootstrap/Media');
43
43
  var ThumbnailCard = require('./ThumbnailCard.js');
44
- var TaxonomyCard = require('./TaxonomyCard-cf264332.js');
44
+ var TaxonomyCard = require('./TaxonomyCard-eb928f05.js');
45
45
  require('./react-social-icons-cd0d9d3b.js');
46
46
  var smoothscroll = require('./smoothscroll-95231a70.js');
47
47
  var GroupDeck = require('./GroupDeck.js');
@@ -57,7 +57,7 @@ var IssueDeck = require('./IssueDeck.js');
57
57
  require('react-bootstrap/Badge');
58
58
  var IssueContentDeck = require('./IssueContentDeck.js');
59
59
  var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
60
- var TemplateNormal = require('./Normal-53437675.js');
60
+ var TemplateNormal = require('./Normal-c1c98dcf.js');
61
61
  require('react-bootstrap/ListGroup');
62
62
  var Head = _interopDefault(require('next/head'));
63
63
  var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -6444,12 +6444,22 @@ var Media = function Media(_ref) {
6444
6444
  }
6445
6445
 
6446
6446
  React.useEffect(function () {
6447
- var mediaLink = document.getElementById('media-link');
6448
- if (mediaLink) {
6449
- var prevSibling = mediaLink.previousSibling;
6450
- if (prevSibling) prevSibling.style.display = 'inline';
6451
- var nextSibling = mediaLink.nextSibling;
6452
- if (nextSibling) nextSibling.style.display = 'inline';
6447
+ var mediaLinks = document.querySelectorAll('.media-link');
6448
+ if (mediaLinks.length > 0) {
6449
+ mediaLinks.forEach(function (mediaLink) {
6450
+ var prevSibling = mediaLink.previousSibling;
6451
+ if (prevSibling && prevSibling.textContent && prevSibling.textContent !== '') {
6452
+ prevSibling.style.display = 'inline';
6453
+ prevSibling.style.paddingRight = '0';
6454
+ prevSibling.style.marginRight = '0';
6455
+ }
6456
+ var nextSibling = mediaLink.nextSibling;
6457
+ if (nextSibling && nextSibling.textContent && nextSibling.textContent !== '') {
6458
+ nextSibling.style.display = 'inline';
6459
+ nextSibling.style.paddingLeft = '0';
6460
+ nextSibling.style.marginLeft = '0';
6461
+ }
6462
+ });
6453
6463
  }
6454
6464
  }, []);
6455
6465
 
@@ -6519,7 +6529,7 @@ var Media = function Media(_ref) {
6519
6529
  href: uploadDoc.asset.url + '?dl='
6520
6530
  } : { href: uploadDoc.asset.url, target: blank ? '_blank' : '_self', rel: 'noopener noreferrer' }, {
6521
6531
  style: { paddingLeft: '4px', paddingRight: '4px' },
6522
- id: 'media-link' }),
6532
+ className: 'media-link' }),
6523
6533
  caption
6524
6534
  );
6525
6535
  } else {
@@ -14344,6 +14354,11 @@ var getSerializers = function getSerializers() {
14344
14354
  return {
14345
14355
  types: {
14346
14356
  block: function block(props) {
14357
+ var _props$node$style = props.node.style,
14358
+ style = _props$node$style === undefined ? 'normal' : _props$node$style;
14359
+
14360
+ if (style === 'hr') return React__default.createElement('hr', { className: 'horizontal-rule' });
14361
+ if (style === 'br') return React__default.createElement('br', { className: 'line-break' });
14347
14362
  props = convertEntities(props);
14348
14363
  return TaxonomyCard.BlockContent.defaultSerializers.types.block(props);
14349
14364
  },
@@ -14506,7 +14521,7 @@ var getSerializers = function getSerializers() {
14506
14521
  // feature_img { asset-> {url} }
14507
14522
  // }`
14508
14523
 
14509
- //Update* Added control toggle for features. Will default to off -
14524
+ //Update* Added control toggle for features. Will default to off -
14510
14525
  //<Feature controls dataset={props.features} /></div>
14511
14526
 
14512
14527
  var Feature = function Feature(props) {
@@ -14575,6 +14590,11 @@ var Feature = function Feature(props) {
14575
14590
  return React__default.createElement(
14576
14591
  'div',
14577
14592
  null,
14593
+ React__default.createElement(
14594
+ 'style',
14595
+ { jsx: true },
14596
+ '\n .carousel-indicators {\n visibility: hidden;\n }\n\n .carousel-control-prev-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M0 12c0 6.627 5.373 12 12 12s12-5.373 12-12-5.373-12-12-12-12 5.373-12 12zm7.58 0l5.988-5.995 1.414 1.416-4.574 4.579 4.574 4.59-1.414 1.416-5.988-6.006z\'/%3E%3C/svg%3E") !important;\n }\n .carousel-control-next-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm-1.218 19l-1.782-1.75 5.25-5.25-5.25-5.25 1.782-1.75 6.968 7-6.968 7z\'/%3E%3C/svg%3E") !important;\n }\n .carousel-item img {\n padding-left: 0 !important;\n max-height: 500px !important;\n min-height: 500px !important;\n }\n .carousel-item::after {\n content: \'\';\n position: absolute;\n width: 100%;\n height: 10px;\n bottom: 0;\n left: 0;\n z-index: 999;\n background: rgba(255, 255, 255, 0.6);\n }\n .carousel-caption {\n padding-right: 0 !important;\n justify-content: left !important;\n display: flex;\n flex-direction: row-reverse;\n justify-content: center !important;\n align-items: center;\n bottom: 5px;\n width: 100%;\n padding-top: 0px;\n left: 0 !important;\n padding-bottom: 0px;\n }\n .carousel-caption a {\n width: 100%;\n margin-top: auto;\n padding: 8%;\n margin-bottom: 0px;\n background: rgba(255, 255, 255, 0.6);\n }\n .carousel-caption a p,\n .carousel-caption a h3 {\n color: #3e3f3a !important;\n text-align: left;\n word-break: break-word;\n }\n\n .carousel-control-prev,\n .carousel-control-next {\n z-index: 999;\n }\n .carousel-caption h3,\n .carousel-caption p {\n font-family: Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica Neue, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;\n }\n .carousel-caption p {\n font-size: 1.2em;\n }\n .carousel-caption h3 {\n font-size: 1.6em;\n font-weight: 400;\n }\n .carousel-item {\n background: #eee !important;\n }\n\n .carousel-control-prev-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M0 12c0 6.627 5.373 12 12 12s12-5.373 12-12-5.373-12-12-12-12 5.373-12 12zm7.58 0l5.988-5.995 1.414 1.416-4.574 4.579 4.574 4.59-1.414 1.416-5.988-6.006z\'/%3E%3C/svg%3E") !important;\n }\n .carousel-control-next-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm-1.218 19l-1.782-1.75 5.25-5.25-5.25-5.25 1.782-1.75 6.968 7-6.968 7z\'/%3E%3C/svg%3E") !important;\n }\n '
14597
+ ),
14578
14598
  React__default.createElement(
14579
14599
  Carousel,
14580
14600
  { touch: true, controls: controls },
@@ -14588,10 +14608,16 @@ var Feature = function Feature(props) {
14588
14608
  return React__default.createElement(
14589
14609
  Carousel.Item,
14590
14610
  { key: index, style: { background: 'var(--primary)' } },
14591
- React__default.createElement('img', { style: { maxHeight: '375px', minHeight: '300px', objectFit: 'cover', paddingLeft: '50%' }, className: 'd-block w-100', src: urlFor(feature_img).width(imageWidth).url(), alt: feature_alt }),
14611
+ React__default.createElement('img', {
14612
+ style: { maxHeight: '375px', minHeight: '300px', objectFit: 'cover', paddingLeft: '50%' },
14613
+ className: 'd-block w-100',
14614
+ src: urlFor(feature_img).width(imageWidth).url(),
14615
+ alt: feature_alt
14616
+ }),
14592
14617
  React__default.createElement(
14593
14618
  Carousel.Caption,
14594
- { style: { paddingRight: '50%', left: '3rem', right: '3rem', top: '0', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },
14619
+ {
14620
+ style: { paddingRight: '50%', left: '3rem', right: '3rem', top: '0', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },
14595
14621
  renderUrl(feature_link, feature_title, feature_body)
14596
14622
  )
14597
14623
  );
@@ -17741,7 +17767,9 @@ var Article = function Article(props) {
17741
17767
  parent.style.display = 'none';
17742
17768
  setContextualADFlag(false);
17743
17769
  } else {
17744
- setContextualADFlag(true);
17770
+ if (body[1]._type === 'figure') {
17771
+ setContextualADFlag(true);
17772
+ }
17745
17773
  }
17746
17774
  };
17747
17775
 
@@ -3,6 +3,7 @@ import React__default, { useState, useEffect, useRef } from 'react';
3
3
  import Container from 'react-bootstrap/Container';
4
4
  import Row from 'react-bootstrap/Row';
5
5
  import Col from 'react-bootstrap/Col';
6
+ import { useRouter } from 'next/router';
6
7
  import { _ as _slicedToArray } from './slicedToArray-04e02710.js';
7
8
  import { D as DFPAdSlot } from './AdSlot-c3ed3214.js';
8
9
  import { g as get_1 } from './get-53653403.js';
@@ -2078,7 +2079,22 @@ var TemplateNormal = function TemplateNormal(props) {
2078
2079
  showRightAd = props.showRightAd,
2079
2080
  sponsoredFlag = props.sponsoredFlag;
2080
2081
 
2082
+ var router = useRouter();
2081
2083
 
2084
+ var _useState = useState(0),
2085
+ _useState2 = _slicedToArray(_useState, 2),
2086
+ currentPage = _useState2[0],
2087
+ setCurrentPage = _useState2[1];
2088
+
2089
+ useEffect(function () {
2090
+ router.asPath && router.asPath.split('?').forEach(function (item) {
2091
+ if (item.includes('page=')) {
2092
+ setCurrentPage(item.split('=')[1]);
2093
+ } else {
2094
+ setCurrentPage(0);
2095
+ }
2096
+ });
2097
+ }, [router]);
2082
2098
  var navigation = function navigation() {
2083
2099
  switch (config.navComponent) {
2084
2100
  case 'normal':
@@ -2147,7 +2163,12 @@ var TemplateNormal = function TemplateNormal(props) {
2147
2163
  return React__default.createElement(
2148
2164
  'section',
2149
2165
  null,
2150
- React__default.createElement(Header$1, { title: title ? title + ' | ' + website.title : '' + website.title, isLiveSite: config.isLiveSite, keyword: keywords, description: description }),
2166
+ React__default.createElement(Header$1, {
2167
+ title: title ? title + ' ' + (currentPage !== 0 ? '| Page ' + currentPage + ' ' : router && router.query && router.query.page ? '| Page ' + router.query.page + ' ' : '') + '| ' + website.title : website.title + ' ' + (currentPage !== 0 ? '| Page ' + currentPage + ' ' : router && router.query && router.query.page ? '| Page ' + router.query.page + ' ' : ''),
2168
+ isLiveSite: config.isLiveSite,
2169
+ keyword: keywords,
2170
+ description: description + ('' + (router && router.query && router.query.page ? '| Page ' + router.query.page : ''))
2171
+ }),
2151
2172
  navigation(),
2152
2173
  sponsoredFlag ? React__default.createElement('div', { style: { height: '50px' } }) : React__default.createElement(
2153
2174
  React__default.Fragment,
@@ -980,7 +980,14 @@ var TaxonomyCard = function TaxonomyCard(props) {
980
980
 
981
981
  var socialLinks = [linkedIn, twitter, facebook];
982
982
  var address = [address1, address2, city, state, zip, country];
983
- var companyDetails = [{ key: 'company', value: company }, { key: 'url', value: website }, { key: 'email', value: email }, { key: 'url', value: extraURL1 }, { key: 'url', value: extraURL2 }, { key: 'url', value: extraURL3 }, { key: 'url', value: extraURL4 }];
983
+ var companyDetails = [];
984
+ company && companyDetails.push({ key: 'company', value: company });
985
+ website && companyDetails.push({ key: 'url', value: website });
986
+ email && companyDetails.push({ key: 'email', value: email });
987
+ extraURL1 && companyDetails.push({ key: 'url', value: extraURL1 });
988
+ extraURL2 && companyDetails.push({ key: 'url', value: extraURL2 });
989
+ extraURL3 && companyDetails.push({ key: 'url', value: extraURL3 });
990
+ extraURL4 && companyDetails.push({ key: 'url', value: extraURL4 });
984
991
  return React__default.createElement(
985
992
  Col,
986
993
  { key: itemCounter, md: 12, lg: lgVar, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
@@ -11,5 +11,5 @@ import 'react-bootstrap/Card';
11
11
  import 'react-dom';
12
12
  import './index-51a80699.js';
13
13
  import './index-5f9f807a.js';
14
- export { T as default } from './TaxonomyCard-12f0a90a.js';
14
+ export { T as default } from './TaxonomyCard-b29aa7ac.js';
15
15
  import './react-social-icons-a7d5c5c7.js';
@@ -9,6 +9,7 @@ import 'prop-types';
9
9
  import 'react-bootstrap/Container';
10
10
  import 'react-bootstrap/Row';
11
11
  import 'react-bootstrap/Col';
12
+ import 'next/router';
12
13
  import './slicedToArray-04e02710.js';
13
14
  import './AdSlot-c3ed3214.js';
14
15
  import './promise-5d7cd78a.js';
@@ -17,7 +18,7 @@ import './react-social-icons-a7d5c5c7.js';
17
18
  import 'react-bootstrap';
18
19
  import './index.esm-536609db.js';
19
20
  import 'react-bootstrap/Button';
20
- export { T as default } from './Normal-fe65159c.js';
21
+ export { T as default } from './Normal-68ef59cd.js';
21
22
  import 'react-bootstrap/ListGroup';
22
23
  import 'next/head';
23
24
  import 'react-bootstrap/Nav';
package/dist/esm/index.js CHANGED
@@ -34,8 +34,8 @@ import { A as AuthorComponent } from './AuthorComponent-c9e46673.js';
34
34
  export { default as DeckQueue } from './DeckQueue.js';
35
35
  import 'react-bootstrap/Media';
36
36
  export { default as ThumbnailCard } from './ThumbnailCard.js';
37
- import { B as BlockContent } from './TaxonomyCard-12f0a90a.js';
38
- export { T as TaxonomyCard } from './TaxonomyCard-12f0a90a.js';
37
+ import { B as BlockContent } from './TaxonomyCard-b29aa7ac.js';
38
+ export { T as TaxonomyCard } from './TaxonomyCard-b29aa7ac.js';
39
39
  import './react-social-icons-a7d5c5c7.js';
40
40
  import { g as getYoutubeId } from './smoothscroll-4b699764.js';
41
41
  import GroupDeck from './GroupDeck.js';
@@ -52,8 +52,8 @@ export { default as IssueDeck } from './IssueDeck.js';
52
52
  import 'react-bootstrap/Badge';
53
53
  export { default as IssueContentDeck } from './IssueContentDeck.js';
54
54
  import Spinner from 'react-bootstrap/Spinner';
55
- import { M as MdPictureAsPdf } from './Normal-fe65159c.js';
56
- export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-fe65159c.js';
55
+ import { M as MdPictureAsPdf } from './Normal-68ef59cd.js';
56
+ export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-68ef59cd.js';
57
57
  import 'react-bootstrap/ListGroup';
58
58
  import Head from 'next/head';
59
59
  import Accordion from 'react-bootstrap/Accordion';
@@ -6441,12 +6441,22 @@ var Media = function Media(_ref) {
6441
6441
  }
6442
6442
 
6443
6443
  useEffect(function () {
6444
- var mediaLink = document.getElementById('media-link');
6445
- if (mediaLink) {
6446
- var prevSibling = mediaLink.previousSibling;
6447
- if (prevSibling) prevSibling.style.display = 'inline';
6448
- var nextSibling = mediaLink.nextSibling;
6449
- if (nextSibling) nextSibling.style.display = 'inline';
6444
+ var mediaLinks = document.querySelectorAll('.media-link');
6445
+ if (mediaLinks.length > 0) {
6446
+ mediaLinks.forEach(function (mediaLink) {
6447
+ var prevSibling = mediaLink.previousSibling;
6448
+ if (prevSibling && prevSibling.textContent && prevSibling.textContent !== '') {
6449
+ prevSibling.style.display = 'inline';
6450
+ prevSibling.style.paddingRight = '0';
6451
+ prevSibling.style.marginRight = '0';
6452
+ }
6453
+ var nextSibling = mediaLink.nextSibling;
6454
+ if (nextSibling && nextSibling.textContent && nextSibling.textContent !== '') {
6455
+ nextSibling.style.display = 'inline';
6456
+ nextSibling.style.paddingLeft = '0';
6457
+ nextSibling.style.marginLeft = '0';
6458
+ }
6459
+ });
6450
6460
  }
6451
6461
  }, []);
6452
6462
 
@@ -6516,7 +6526,7 @@ var Media = function Media(_ref) {
6516
6526
  href: uploadDoc.asset.url + '?dl='
6517
6527
  } : { href: uploadDoc.asset.url, target: blank ? '_blank' : '_self', rel: 'noopener noreferrer' }, {
6518
6528
  style: { paddingLeft: '4px', paddingRight: '4px' },
6519
- id: 'media-link' }),
6529
+ className: 'media-link' }),
6520
6530
  caption
6521
6531
  );
6522
6532
  } else {
@@ -14341,6 +14351,11 @@ var getSerializers = function getSerializers() {
14341
14351
  return {
14342
14352
  types: {
14343
14353
  block: function block(props) {
14354
+ var _props$node$style = props.node.style,
14355
+ style = _props$node$style === undefined ? 'normal' : _props$node$style;
14356
+
14357
+ if (style === 'hr') return React__default.createElement('hr', { className: 'horizontal-rule' });
14358
+ if (style === 'br') return React__default.createElement('br', { className: 'line-break' });
14344
14359
  props = convertEntities(props);
14345
14360
  return BlockContent.defaultSerializers.types.block(props);
14346
14361
  },
@@ -14503,7 +14518,7 @@ var getSerializers = function getSerializers() {
14503
14518
  // feature_img { asset-> {url} }
14504
14519
  // }`
14505
14520
 
14506
- //Update* Added control toggle for features. Will default to off -
14521
+ //Update* Added control toggle for features. Will default to off -
14507
14522
  //<Feature controls dataset={props.features} /></div>
14508
14523
 
14509
14524
  var Feature = function Feature(props) {
@@ -14572,6 +14587,11 @@ var Feature = function Feature(props) {
14572
14587
  return React__default.createElement(
14573
14588
  'div',
14574
14589
  null,
14590
+ React__default.createElement(
14591
+ 'style',
14592
+ { jsx: true },
14593
+ '\n .carousel-indicators {\n visibility: hidden;\n }\n\n .carousel-control-prev-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M0 12c0 6.627 5.373 12 12 12s12-5.373 12-12-5.373-12-12-12-12 5.373-12 12zm7.58 0l5.988-5.995 1.414 1.416-4.574 4.579 4.574 4.59-1.414 1.416-5.988-6.006z\'/%3E%3C/svg%3E") !important;\n }\n .carousel-control-next-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm-1.218 19l-1.782-1.75 5.25-5.25-5.25-5.25 1.782-1.75 6.968 7-6.968 7z\'/%3E%3C/svg%3E") !important;\n }\n .carousel-item img {\n padding-left: 0 !important;\n max-height: 500px !important;\n min-height: 500px !important;\n }\n .carousel-item::after {\n content: \'\';\n position: absolute;\n width: 100%;\n height: 10px;\n bottom: 0;\n left: 0;\n z-index: 999;\n background: rgba(255, 255, 255, 0.6);\n }\n .carousel-caption {\n padding-right: 0 !important;\n justify-content: left !important;\n display: flex;\n flex-direction: row-reverse;\n justify-content: center !important;\n align-items: center;\n bottom: 5px;\n width: 100%;\n padding-top: 0px;\n left: 0 !important;\n padding-bottom: 0px;\n }\n .carousel-caption a {\n width: 100%;\n margin-top: auto;\n padding: 8%;\n margin-bottom: 0px;\n background: rgba(255, 255, 255, 0.6);\n }\n .carousel-caption a p,\n .carousel-caption a h3 {\n color: #3e3f3a !important;\n text-align: left;\n word-break: break-word;\n }\n\n .carousel-control-prev,\n .carousel-control-next {\n z-index: 999;\n }\n .carousel-caption h3,\n .carousel-caption p {\n font-family: Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica Neue, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;\n }\n .carousel-caption p {\n font-size: 1.2em;\n }\n .carousel-caption h3 {\n font-size: 1.6em;\n font-weight: 400;\n }\n .carousel-item {\n background: #eee !important;\n }\n\n .carousel-control-prev-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M0 12c0 6.627 5.373 12 12 12s12-5.373 12-12-5.373-12-12-12-12 5.373-12 12zm7.58 0l5.988-5.995 1.414 1.416-4.574 4.579 4.574 4.59-1.414 1.416-5.988-6.006z\'/%3E%3C/svg%3E") !important;\n }\n .carousel-control-next-icon {\n width: 25%;\n height: 100%;\n background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' fill=\'%23000000\' viewBox=\'0 0 24 24\'%3E%3Cpath d=\'M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm-1.218 19l-1.782-1.75 5.25-5.25-5.25-5.25 1.782-1.75 6.968 7-6.968 7z\'/%3E%3C/svg%3E") !important;\n }\n '
14594
+ ),
14575
14595
  React__default.createElement(
14576
14596
  Carousel$1,
14577
14597
  { touch: true, controls: controls },
@@ -14585,10 +14605,16 @@ var Feature = function Feature(props) {
14585
14605
  return React__default.createElement(
14586
14606
  Carousel$1.Item,
14587
14607
  { key: index, style: { background: 'var(--primary)' } },
14588
- React__default.createElement('img', { style: { maxHeight: '375px', minHeight: '300px', objectFit: 'cover', paddingLeft: '50%' }, className: 'd-block w-100', src: urlFor(feature_img).width(imageWidth).url(), alt: feature_alt }),
14608
+ React__default.createElement('img', {
14609
+ style: { maxHeight: '375px', minHeight: '300px', objectFit: 'cover', paddingLeft: '50%' },
14610
+ className: 'd-block w-100',
14611
+ src: urlFor(feature_img).width(imageWidth).url(),
14612
+ alt: feature_alt
14613
+ }),
14589
14614
  React__default.createElement(
14590
14615
  Carousel$1.Caption,
14591
- { style: { paddingRight: '50%', left: '3rem', right: '3rem', top: '0', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },
14616
+ {
14617
+ style: { paddingRight: '50%', left: '3rem', right: '3rem', top: '0', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' } },
14592
14618
  renderUrl(feature_link, feature_title, feature_body)
14593
14619
  )
14594
14620
  );
@@ -17738,7 +17764,9 @@ var Article = function Article(props) {
17738
17764
  parent.style.display = 'none';
17739
17765
  setContextualADFlag(false);
17740
17766
  } else {
17741
- setContextualADFlag(true);
17767
+ if (body[1]._type === 'figure') {
17768
+ setContextualADFlag(true);
17769
+ }
17742
17770
  }
17743
17771
  };
17744
17772
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.400",
3
+ "version": "1.0.402",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",