@mjhls/mjh-framework 1.0.378 → 1.0.380

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.378
+# mjh-framework v. 1.0.380
 
 
 > Foundation Framework

package/dist/cjs/{Figure-68977d29.js → Figure-04b8dbbe.js}

@@ -34,7 +34,8 @@ var FigureComponent = function FigureComponent(props) {
       setOpenImgSrc = _useState4[1];
 
   var node = props.node,
-      client = props.client;
+      client = props.client,
+      contextualADFlag = props.contextualADFlag;
   var caption = node.caption,
       alt = node.alt,
       blank = node.blank,
@@ -121,7 +122,7 @@ var FigureComponent = function FigureComponent(props) {
         caption && React__default.createElement('div', { dangerouslySetInnerHTML: { __html: '<span class=\'figure-caption\'>' + caption + '</span>' } })
       )
     ),
-    React__default.createElement('p', { className: 'clearfix' }),
+    contextualADFlag && React__default.createElement('p', { className: 'clearfix' }),
     React__default.createElement(
       'div',
       { className: 'lightbox-target ' + (openImg ? 'open' : 'close') },

package/dist/cjs/index.js

@@ -8910,7 +8910,9 @@ function (_React$Component) {
 
 var Video = function Video(_ref) {
   var node = _ref.node,
-      accountIDs = _ref.accountIDs;
+      accountIDs = _ref.accountIDs,
+      _ref$autoplay = _ref.autoplay,
+      autoplay = _ref$autoplay === undefined ? false : _ref$autoplay;
   var source = node.source,
       videoID = node.videoID,
       playlistID = node.playlistID,
@@ -8930,6 +8932,19 @@ var Video = function Video(_ref) {
       var queue = Math.floor(duration / 10);
       var segment = Math.floor(current / queue);
 
+      // try to auto play first with no-mute
+      if (autoplay) {
+        player.play().then(function () {
+          player.muted(false);
+        }).catch(function (error) {
+          // then try to auto play with mute
+          player.muted(true);
+          player.play();
+        });
+      } else {
+        player.pause();
+      }
+
       AdSlot.Beam.report_beam_video('Ready', main.main_16, duration, current, segment, 'BrightCove', accountIDs.brightcove.playerId, accountIDs.brightcove.accountId, videoID);
     });
 
@@ -8992,14 +9007,14 @@ var Video = function Video(_ref) {
 
   if (source === 'brightcove' && accountIDs.brightcove) {
     if (videoID) {
-      return React__default.createElement(ReactPlayerLoader, { onSuccess: onVideoSuccess, accountId: accountIDs.brightcove.accountId, videoId: videoID, playerId: accountIDs.brightcove.playerId, attrs: { className: 'brightcove' } });
+      return React__default.createElement(ReactPlayerLoader, { onSuccess: onVideoSuccess, accountId: accountIDs.brightcove.accountId, videoId: videoID, playerId: accountIDs.brightcove.playerId, attrs: { className: 'brightcove', autoplay: 'muted' } });
     } else if (playlistID) {
       return React__default.createElement(ReactPlayerLoader, {
         accountId: accountIDs.brightcove.accountId,
         playlistId: playlistID,
         playerId: accountIDs.brightcove.playerId,
         onSuccess: onVideoSuccess,
-        attrs: { className: 'brightcove brightcove-playlist' }
+        attrs: { className: 'brightcove brightcove-playlist', autoplay: 'muted' }
       });
     } else if (experienceID) {
       return React__default.createElement(
@@ -14385,7 +14400,7 @@ var NativeAd = function NativeAd(props) {
 };
 
 var Figure = dynamic(function () {
-  return Promise.resolve().then(function () { return require('./Figure-68977d29.js'); });
+  return Promise.resolve().then(function () { return require('./Figure-04b8dbbe.js'); });
 }, { ssr: false });
 
 var checkUrlIsExternal = function checkUrlIsExternal(url) {
@@ -14422,7 +14437,11 @@ var getSerializers = function getSerializers() {
       onVote = props[3],
       showVotes = props[4],
       drupalLeadSettings = props[5],
-      currentPage = props[6];
+      currentPage = props[6],
+      _props$ = props[7],
+      autoplay = _props$ === undefined ? false : _props$,
+      _props$2 = props[8],
+      contextualADFlag = _props$2 === undefined ? false : _props$2;
 
   return {
     types: {
@@ -14444,7 +14463,7 @@ var getSerializers = function getSerializers() {
       figure: function figure(_ref3) {
         var node = _ref3.node;
 
-        return React__default.createElement(Figure, { node: node, client: client });
+        return React__default.createElement(Figure, { node: node, client: client, contextualADFlag: contextualADFlag });
       },
       slideshow: function slideshow(_ref4) {
         var node = _ref4.node;
@@ -14478,7 +14497,7 @@ var getSerializers = function getSerializers() {
       video: function video(_ref9) {
         var node = _ref9.node;
 
-        return React__default.createElement(Video, { node: node, accountIDs: videoAccountIDs || {} });
+        return React__default.createElement(Video, { node: node, autoplay: autoplay, accountIDs: videoAccountIDs || {} });
       },
       audio: function audio(_ref10) {
         var node = _ref10.node;
@@ -17070,6 +17089,10 @@ var Article = function Article(props) {
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired;
 
+  var _useState = React.useState(null),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
+      contextualADFlag = _useState2[0],
+      setContextualADFlag = _useState2[1];
 
   var summary = getArticleSummary(props.article);
 
@@ -17178,6 +17201,11 @@ var Article = function Article(props) {
           parent.style.height = '0%';
           parent.style.width = '0%';
           parent.style.display = 'none';
+          setContextualADFlag(false);
+        } else {
+          if (body && body[1] && body[1]._type === 'figure') {
+            setContextualADFlag(true);
+          }
         }
       };
 
@@ -17185,7 +17213,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false, contextualADFlag),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -17195,14 +17223,14 @@ var Article = function Article(props) {
           React__default.createElement(AdSlot.DFPAdSlot, _extends$2._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: checkIsAdFound }))
         ),
         React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else {
       return React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-        serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings),
+        serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
       }, client.config()));
@@ -17490,10 +17518,10 @@ var ArticleQueue = function ArticleQueue(props) {
     return article;
   };
 
-  var _useState = React.useState([firstArticle()]),
-      _useState2 = slicedToArray._slicedToArray(_useState, 2),
-      queueData = _useState2[0],
-      setQueueData = _useState2[1];
+  var _useState3 = React.useState([firstArticle()]),
+      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
+      queueData = _useState4[0],
+      setQueueData = _useState4[1];
 
   var refreshAD = function refreshAD(path) {
     if (!main.main_39) {

package/dist/esm/{Figure-d0930225.js → Figure-aa16a017.js}

@@ -29,7 +29,8 @@ var FigureComponent = function FigureComponent(props) {
       setOpenImgSrc = _useState4[1];
 
   var node = props.node,
-      client = props.client;
+      client = props.client,
+      contextualADFlag = props.contextualADFlag;
   var caption = node.caption,
       alt = node.alt,
       blank = node.blank,
@@ -116,7 +117,7 @@ var FigureComponent = function FigureComponent(props) {
         caption && React__default.createElement('div', { dangerouslySetInnerHTML: { __html: '<span class=\'figure-caption\'>' + caption + '</span>' } })
       )
     ),
-    React__default.createElement('p', { className: 'clearfix' }),
+    contextualADFlag && React__default.createElement('p', { className: 'clearfix' }),
     React__default.createElement(
       'div',
       { className: 'lightbox-target ' + (openImg ? 'open' : 'close') },

package/dist/esm/index.js

@@ -8907,7 +8907,9 @@ function (_React$Component) {
 
 var Video = function Video(_ref) {
   var node = _ref.node,
-      accountIDs = _ref.accountIDs;
+      accountIDs = _ref.accountIDs,
+      _ref$autoplay = _ref.autoplay,
+      autoplay = _ref$autoplay === undefined ? false : _ref$autoplay;
   var source = node.source,
       videoID = node.videoID,
       playlistID = node.playlistID,
@@ -8927,6 +8929,19 @@ var Video = function Video(_ref) {
       var queue = Math.floor(duration / 10);
       var segment = Math.floor(current / queue);
 
+      // try to auto play first with no-mute
+      if (autoplay) {
+        player.play().then(function () {
+          player.muted(false);
+        }).catch(function (error) {
+          // then try to auto play with mute
+          player.muted(true);
+          player.play();
+        });
+      } else {
+        player.pause();
+      }
+
       Beam.report_beam_video('Ready', main_16, duration, current, segment, 'BrightCove', accountIDs.brightcove.playerId, accountIDs.brightcove.accountId, videoID);
     });
 
@@ -8989,14 +9004,14 @@ var Video = function Video(_ref) {
 
   if (source === 'brightcove' && accountIDs.brightcove) {
     if (videoID) {
-      return React__default.createElement(ReactPlayerLoader, { onSuccess: onVideoSuccess, accountId: accountIDs.brightcove.accountId, videoId: videoID, playerId: accountIDs.brightcove.playerId, attrs: { className: 'brightcove' } });
+      return React__default.createElement(ReactPlayerLoader, { onSuccess: onVideoSuccess, accountId: accountIDs.brightcove.accountId, videoId: videoID, playerId: accountIDs.brightcove.playerId, attrs: { className: 'brightcove', autoplay: 'muted' } });
     } else if (playlistID) {
       return React__default.createElement(ReactPlayerLoader, {
         accountId: accountIDs.brightcove.accountId,
         playlistId: playlistID,
         playerId: accountIDs.brightcove.playerId,
         onSuccess: onVideoSuccess,
-        attrs: { className: 'brightcove brightcove-playlist' }
+        attrs: { className: 'brightcove brightcove-playlist', autoplay: 'muted' }
       });
     } else if (experienceID) {
       return React__default.createElement(
@@ -14382,7 +14397,7 @@ var NativeAd = function NativeAd(props) {
 };
 
 var Figure = dynamic(function () {
-  return import('./Figure-d0930225.js');
+  return import('./Figure-aa16a017.js');
 }, { ssr: false });
 
 var checkUrlIsExternal = function checkUrlIsExternal(url) {
@@ -14419,7 +14434,11 @@ var getSerializers = function getSerializers() {
       onVote = props[3],
       showVotes = props[4],
       drupalLeadSettings = props[5],
-      currentPage = props[6];
+      currentPage = props[6],
+      _props$ = props[7],
+      autoplay = _props$ === undefined ? false : _props$,
+      _props$2 = props[8],
+      contextualADFlag = _props$2 === undefined ? false : _props$2;
 
   return {
     types: {
@@ -14441,7 +14460,7 @@ var getSerializers = function getSerializers() {
       figure: function figure(_ref3) {
         var node = _ref3.node;
 
-        return React__default.createElement(Figure, { node: node, client: client });
+        return React__default.createElement(Figure, { node: node, client: client, contextualADFlag: contextualADFlag });
       },
       slideshow: function slideshow(_ref4) {
         var node = _ref4.node;
@@ -14475,7 +14494,7 @@ var getSerializers = function getSerializers() {
       video: function video(_ref9) {
         var node = _ref9.node;
 
-        return React__default.createElement(Video, { node: node, accountIDs: videoAccountIDs || {} });
+        return React__default.createElement(Video, { node: node, autoplay: autoplay, accountIDs: videoAccountIDs || {} });
       },
       audio: function audio(_ref10) {
         var node = _ref10.node;
@@ -17067,6 +17086,10 @@ var Article = function Article(props) {
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired;
 
+  var _useState = useState(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      contextualADFlag = _useState2[0],
+      setContextualADFlag = _useState2[1];
 
   var summary = getArticleSummary(props.article);
 
@@ -17175,6 +17198,11 @@ var Article = function Article(props) {
           parent.style.height = '0%';
           parent.style.width = '0%';
           parent.style.display = 'none';
+          setContextualADFlag(false);
+        } else {
+          if (body && body[1] && body[1]._type === 'figure') {
+            setContextualADFlag(true);
+          }
         }
       };
 
@@ -17182,7 +17210,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent, _extends$2({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false, contextualADFlag),
           blocks: [].concat(_toConsumableArray(body.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -17192,14 +17220,14 @@ var Article = function Article(props) {
           React__default.createElement(DFPAdSlot, _extends$2({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: checkIsAdFound }))
         ),
         React__default.createElement(BlockContent, _extends$2({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
           blocks: [].concat(_toConsumableArray(body.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else {
       return React__default.createElement(BlockContent, _extends$2({
-        serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings),
+        serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
       }, client.config()));
@@ -17487,10 +17515,10 @@ var ArticleQueue = function ArticleQueue(props) {
     return article;
   };
 
-  var _useState = useState([firstArticle()]),
-      _useState2 = _slicedToArray(_useState, 2),
-      queueData = _useState2[0],
-      setQueueData = _useState2[1];
+  var _useState3 = useState([firstArticle()]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      queueData = _useState4[0],
+      setQueueData = _useState4[1];
 
   var refreshAD = function refreshAD(path) {
     if (!main_39) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.378",
+  "version": "1.0.380",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",