@mjhls/mjh-framework 1.0.284 → 1.0.286

package/dist/cjs/index.js

@@ -29,19 +29,18 @@ var index = require('./index-39beccb3.js');
 require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-e38fb29d.js');
-var AdSlot = require('./AdSlot-1886ea26.js');
+var AdSlot = require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-require('./ADInfeed-a33644bc.js');
+require('./ADInfeed-db54195d.js');
 var DeckContent = require('./DeckContent.js');
 var get$1 = require('./get-de2660c3.js');
-var GridContent = require('./GridContent-26572c38.js');
+var GridContent = require('./GridContent-02acbd72.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
 var ThumbnailCard = require('./ThumbnailCard.js');
 var TaxonomyCard = require('./TaxonomyCard-cf5bbc07.js');
 var GroupDeck = require('./GroupDeck.js');
-var YoutubeGroup = require('./YoutubeGroup-1ec66294.js');
-require('smoothscroll-polyfill');
+var YoutubeGroup = require('./YoutubeGroup-98ffbc57.js');
 var reactBootstrap = require('react-bootstrap');
 var QueueDeckExpanded = require('./QueueDeckExpanded.js');
 var index_esm = require('./index.esm-340d3792.js');
@@ -53,7 +52,7 @@ var IssueDeck = require('./IssueDeck.js');
 require('react-bootstrap/Badge');
 var IssueContentDeck = require('./IssueContentDeck.js');
 var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
-var TemplateNormal = require('./Normal-92be86eb.js');
+var TemplateNormal = require('./Normal-2514655c.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -64,7 +63,6 @@ require('react-bootstrap/Navbar');
 require('react-bootstrap/NavDropdown');
 require('react-bootstrap/Form');
 require('react-bootstrap/FormControl');
-var Modal = _interopDefault(require('react-bootstrap/Modal'));
 var Pagination = _interopDefault(require('react-bootstrap/Pagination'));
 var dynamic = _interopDefault(require('next/dynamic'));
 var Carousel = _interopDefault(require('react-bootstrap/Carousel'));
@@ -3030,14 +3028,21 @@ var ADWelcome = function ADWelcome(_ref) {
       adTargeting = _useState2[0],
       setTargeting = _useState2[1];
 
+  var adRef = React.useRef(null);
+
+  var _useState3 = React.useState(),
+      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
+      showAd = _useState4[0],
+      setShowAd = _useState4[1];
+
   var calculateTimeLeft = function calculateTimeLeft(timeLeft) {
     return --timeLeft;
   };
 
-  var _useState3 = React.useState(calculateTimeLeft(counter)),
-      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
-      timeLeft = _useState4[0],
-      setTimeLeft = _useState4[1];
+  var _useState5 = React.useState(calculateTimeLeft(counter + 1)),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      timeLeft = _useState6[0],
+      setTimeLeft = _useState6[1];
 
   React.useEffect(function () {
     if (timeLeft > 0) {
@@ -3049,9 +3054,17 @@ var ADWelcome = function ADWelcome(_ref) {
     }
   });
 
+  React.useEffect(function () {
+    if (typeof showAd !== 'undefined' && showAd) {
+      adRef.current.style.opacity = '1';
+    } else if (typeof showAd !== 'undefined' && !showAd) {
+      setFlag(true);
+    }
+  }, [showAd]);
+
   return React__default.createElement(
-    Modal,
-    { show: true, 'aria-labelledby': 'contained-modal-title-vcenter', backdrop: 'static', style: { outline: 'none' }, dialogClassName: 'welcome-modal' },
+    'div',
+    { ref: adRef, style: { outline: 'none', opacity: 0 }, className: 'welcome-modal' },
     React__default.createElement(
       'div',
       { className: 'right-top', style: { position: 'absolute', top: 0, right: 0, textAlign: 'center', margin: '2rem' } },
@@ -3086,14 +3099,14 @@ var ADWelcome = function ADWelcome(_ref) {
       React__default.createElement('img', { style: { width: '100%' }, src: Website.logo, alt: Website.title })
     ),
     React__default.createElement(
-      Modal.Body,
+      'div',
       { className: title, style: { position: 'relative', width: '300px', height: '250px', margin: 'auto', top: '10rem' } },
-      React__default.createElement(AdSlot.DFPAdSlot, { className: className, slotId: slotId, networkID: networkID, sizes: sizes, adUnit: adUnit, targeting: adTargeting, refreshFlag: false })
+      React__default.createElement(AdSlot.DFPAdSlot, { className: className, slotId: slotId, networkID: networkID, sizes: sizes, adUnit: adUnit, targeting: adTargeting, refreshFlag: false, setShowAd: setShowAd })
     ),
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .modal.show {\n          padding: 0px;\n        }\n        .continue-site:hover {\n          cursor: pointer;\n        }\n\n        .welcome-modal {\n          max-width: 100% !important;\n          margin: 0px !important;\n        }\n        @media (min-width: 1200px) {\n          .modal-backdrop {\n            display: block;\n          }\n          .modal-content {\n            display: block;\n            height: 100vh;\n          }\n        }\n      '
+      '\n        .continue-site:hover {\n          cursor: pointer;\n        }\n\n        .welcome-modal {\n          max-width: 100% !important;\n          margin: 0px !important;\n        }\n      '
     )
   );
 };
@@ -14114,46 +14127,63 @@ var RelatedTopicsDropdown = function RelatedTopicsDropdown(_ref) {
 };
 
 /*
-This dropdown is used inside Article body to display related content placement pages
- sample usage: <ArticleDetailDropdown contentPlacement={content_placement} exclude={['News',]} />
+This dropdown is used inside Article body to display related content placement and document group pages
+sample usage: <ArticleDetailDropdown article={props.article} exclude={['News']} style={{ backgroundColor: 'var(--primary)', border: 0 }} />
+
+- accepts any normal html arrtibute (style, id, class)
 
- in article query, need to add '...' to content_placement to retreive additional info needed
+- in article query, need to add '...' to content_placement to retreive additional info needed, and document_group to retrieve group data if available
 
- 'content_placement': taxonomyMapping[]-> {
+'content_placement': taxonomyMapping[]-> {
     ...,
     'ancestor': parent->parent->identifier,
     'parent': parent->identifier,
     'path': identifier
-  }
-
+},
+'document_group': documentGroup-> {
+    name,
+    'parent': parent->identifier,
+    'path': identifier.current
+}
 */
 
 var ArticleDetailDropdown = function ArticleDetailDropdown(props) {
-  var _props$contentPlaceme = props.contentPlacement,
-      contentPlacement = _props$contentPlaceme === undefined ? false : _props$contentPlaceme,
+  var article = props.article,
       _props$exclude = props.exclude,
-      exclude = _props$exclude === undefined ? [''] : _props$exclude;
-
-  if (contentPlacement.length == 1 && exclude.includes(contentPlacement[0].name) || contentPlacement == false) {
-    return null;
-  }
+      exclude = _props$exclude === undefined ? [] : _props$exclude;
 
+  var _props = _extends$2._extends({}, props);
+  delete _props.article;
+  delete _props.exclude;
   return React__default.createElement(
     Dropdown,
-    { style: { marginBottom: '1rem' } },
+    null,
     React__default.createElement(
       Dropdown.Toggle,
-      { variant: 'primary', id: 'partner-dropdown' },
+      _props,
       'Related Topics'
     ),
     React__default.createElement(
       Dropdown.Menu,
       null,
-      contentPlacement.map(function (cp, index) {
-        var href = cp.parent ? '/' + cp.parent + '/' + cp.path : '/' + cp.path;
-        return !exclude.includes(cp.name) && React__default.createElement(
+      article.document_group && React__default.createElement(
+        Dropdown.Item,
+        { href: '/' + article.document_group.parent.current + '/' + article.document_group.path },
+        article.document_group.name
+      ),
+      article.content_placement && article.content_placement.length > 0 && article.content_placement.map(function (cp, i) {
+        if (exclude.includes(cp.name)) return;
+        var href = '';
+        if (cp.ancestor) {
+          href = '/' + cp.ancestor + '/' + cp.identifier;
+        } else if (cp.parent) {
+          href = '/' + cp.parent + '/' + cp.identifier;
+        } else {
+          href = '/' + cp.identifier;
+        }
+        return React__default.createElement(
           Dropdown.Item,
-          { key: index, href: href },
+          { key: i, href: href },
           cp.name
         );
       })

package/dist/esm/{ADInfeed-fd816c1f.js → ADInfeed-ac3ac372.js}

@@ -1,7 +1,7 @@
 import React__default, { useState } from 'react';
 import Card from 'react-bootstrap/Card';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { D as DFPAdSlot } from './AdSlot-cc6a4f74.js';
+import { D as DFPAdSlot } from './AdSlot-03043ffb.js';
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/esm/{AdSlot-cc6a4f74.js → AdSlot-03043ffb.js}

@@ -1107,10 +1107,6 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
     }
   }, 500);
 
-  var matchAd = function matchAd(element) {
-    return slotId && slotId.includes(element);
-  };
-
   return React__default.createElement(
     'div',
     { className: className, style: { textAlign: 'center' } },
@@ -1121,8 +1117,12 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       sizeMapping: sizeMapping,
       targetingArguments: targeting,
       onSlotRender: function onSlotRender(eventData) {
-        if (['floating-ad', 'infeed'].some(matchAd) && eventData && eventData.event && eventData.event.creativeId == null) {
-          setShowAd(false);
+        if (eventData && eventData.slotId && ['floating-ad', 'infeed', 'welcome-ad'].includes(eventData.slotId)) {
+          if (eventData.event && eventData.event.creativeId == null) {
+            setShowAd(false);
+          } else {
+            setShowAd(true);
+          }
         }
         setAdRendered(true);
         if (eventData && eventData.event) {

package/dist/esm/DeckContent.js

@@ -21,9 +21,9 @@ import { i as imageUrlBuilder } from './index-3849e3fe.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
-import { A as ADInfeed } from './ADInfeed-fd816c1f.js';
+import { A as ADInfeed } from './ADInfeed-ac3ac372.js';
 
 var DeckContent = function (_React$Component) {
   _inherits(DeckContent, _React$Component);

package/dist/esm/{GridContent-2e9e7528.js → GridContent-96716e42.js}

@@ -14,7 +14,7 @@ import { withRouter } from 'next/router';
 import { i as imageUrlBuilder } from './index-3849e3fe.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
-import { A as ADInfeed } from './ADInfeed-fd816c1f.js';
+import { A as ADInfeed } from './ADInfeed-ac3ac372.js';
 import { g as get_1 } from './get-9c285a85.js';
 
 var Dfp = React__default.lazy(function () {

package/dist/esm/GridContent.js

@@ -21,8 +21,8 @@ import './index-3849e3fe.js';
 import './index-5f9f807a.js';
 import './entities-7cc3bf45.js';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
-import './ADInfeed-fd816c1f.js';
+import './ADInfeed-ac3ac372.js';
 import './get-9c285a85.js';
-export { G as default } from './GridContent-2e9e7528.js';
+export { G as default } from './GridContent-96716e42.js';

package/dist/esm/{Normal-319bc9fb.js → Normal-d27184f4.js}

@@ -7,7 +7,7 @@ import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Link from 'next/link';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { D as DFPAdSlot } from './AdSlot-cc6a4f74.js';
+import { D as DFPAdSlot } from './AdSlot-03043ffb.js';
 import { g as get_1 } from './get-9c285a85.js';
 import { Dropdown } from 'react-bootstrap';
 import { G as GenIcon, b as IoMdLogIn, c as IoIosHome } from './index.esm-536609db.js';

package/dist/esm/QueueDeckExpanded.js

@@ -17,9 +17,9 @@ import { i as imageUrlBuilder } from './index-3849e3fe.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import './AdSlot-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
-import { A as ADInfeed } from './ADInfeed-fd816c1f.js';
+import { A as ADInfeed } from './ADInfeed-ac3ac372.js';
 import { Container, Media } from 'react-bootstrap';
 
 var urlFor = function urlFor(source, builder) {

package/dist/esm/TemplateNormal.js

@@ -11,13 +11,13 @@ import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'next/link';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
 import './get-9c285a85.js';
 import 'react-bootstrap';
 import './index.esm-536609db.js';
 import 'react-bootstrap/Button';
-export { T as default } from './Normal-319bc9fb.js';
+export { T as default } from './Normal-d27184f4.js';
 import 'react-bootstrap/ListGroup';
 import 'next/head';
 import 'react-bootstrap/Nav';

package/dist/esm/VideoSeriesListing.js

@@ -12,8 +12,7 @@ import 'next/link';
 import { withRouter } from 'next/router';
 import 'react-dom';
 import './index-5f9f807a.js';
-import { Y as YoutubeGroup } from './YoutubeGroup-a87b8967.js';
-import 'smoothscroll-polyfill';
+import { Y as YoutubeGroup } from './YoutubeGroup-562ed456.js';
 import { a as IoIosArrowForward } from './index.esm-536609db.js';
 
 var VideoSeriesListing = function (_React$Component) {