@mjhls/mjh-framework 1.0.347 → 1.0.348

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.347
+# mjh-framework v. 1.0.348
 
 
 > Foundation Framework

package/dist/cjs/index.js

@@ -2112,7 +2112,7 @@ var EventsDeck = function EventsDeck(_ref) {
                   )
                 )
               ),
-              venues && venues.length && React__default.createElement(
+              venues && venues.length && venues[0].name && React__default.createElement(
                 Row,
                 null,
                 React__default.createElement(
@@ -2121,7 +2121,7 @@ var EventsDeck = function EventsDeck(_ref) {
                   React__default.createElement(
                     'p',
                     { className: 'venue', style: { padding: 0, margin: 0 } },
-                    venues[0].address.country
+                    venues[0].name
                   )
                 )
               ),
@@ -8314,11 +8314,19 @@ var Video = function Video(_ref) {
       accountIDs = _ref.accountIDs;
   var source = node.source,
       videoID = node.videoID,
+      playlistID = node.playlistID,
       experienceID = node.experienceID;
 
   if (source === 'brightcove' && accountIDs.brightcove) {
     if (videoID) {
       return React__default.createElement(ReactPlayerLoader, { accountId: accountIDs.brightcove.accountId, videoId: videoID, playerId: accountIDs.brightcove.playerId, attrs: { className: 'brightcove' } });
+    } else if (playlistID) {
+      return React__default.createElement(ReactPlayerLoader, {
+        accountId: accountIDs.brightcove.accountId,
+        playlistId: playlistID,
+        playerId: accountIDs.brightcove.playerId,
+        attrs: { className: 'brightcove brightcove-playlist' }
+      });
     } else if (experienceID) {
       return React__default.createElement(
         'div',
@@ -13416,11 +13424,13 @@ var numberOfPaginations = main.main_38 ? 4 : 10;
 
 var Quiz = function Quiz(_ref) {
   var quizzes = _ref.quizzes,
-      getSerializers = _ref.getSerializers;
+      getSerializers = _ref.getSerializers,
+      pageview = _ref.pageview,
+      pageNumberFromURL = _ref.currentPage;
 
   var pageCount = quizzes.length;
 
-  var _useState = React.useState(1),
+  var _useState = React.useState(pageNumberFromURL ? parseInt(pageNumberFromURL) : 1),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       currentPage = _useState2[0],
       setCurrentPage = _useState2[1];
@@ -13459,16 +13469,25 @@ var Quiz = function Quiz(_ref) {
 
   var changePage = function changePage(control) {
     setShowAnswer(false);
+    var newPath = '';
     switch (control) {
       case 'first':
         setCurrentPage(1);
         setStartIndex(0);
         setEndIndex(numberOfPaginations - 1);
+        newPath = window.location.pathname;
+        window.history.pushState(null, null, newPath);
+        debounce.lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       case 'last':
         setCurrentPage(pageCount);
         setStartIndex(pageCount - pageCount % numberOfPaginations);
         setEndIndex(pageCount - pageCount % numberOfPaginations + numberOfPaginations - 1);
+        newPath = window.location.pathname + '?page=' + pageCount;
+        window.history.pushState(null, null, newPath);
+        debounce.lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       case 'next':
         setCurrentPage(currentPage + 1);
@@ -13476,6 +13495,10 @@ var Quiz = function Quiz(_ref) {
           setStartIndex(startIndex + numberOfPaginations);
           setEndIndex(endIndex + numberOfPaginations);
         }
+        newPath = window.location.pathname + '?page=' + (currentPage + 1);
+        window.history.pushState(null, null, newPath);
+        debounce.lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       case 'prev':
         setCurrentPage(currentPage - 1);
@@ -13483,9 +13506,17 @@ var Quiz = function Quiz(_ref) {
           setStartIndex(startIndex - numberOfPaginations);
           setEndIndex(endIndex - numberOfPaginations);
         }
+        newPath = window.location.pathname + '?page=' + (currentPage - 1);
+        window.history.pushState(null, null, newPath);
+        debounce.lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       default:
         setCurrentPage(control);
+        newPath = window.location.pathname + '?page=' + control;
+        window.history.pushState(null, null, newPath);
+        debounce.lib_3.refresh();
+        if (pageview) pageview(newPath);
     }
   };
 
@@ -13707,7 +13738,8 @@ var getSerializers = function getSerializers() {
       videoAccountIDs = props[2],
       onVote = props[3],
       showVotes = props[4],
-      drupalLeadSettings = props[5];
+      drupalLeadSettings = props[5],
+      currentPage = props[6];
 
   return {
     types: {
@@ -13779,7 +13811,7 @@ var getSerializers = function getSerializers() {
         var node = _ref12.node;
         var quizzes = node.quizzes;
 
-        return React__default.createElement(Quiz, { quizzes: quizzes, getSerializers: getSerializers(props) });
+        return React__default.createElement(Quiz, { quizzes: quizzes, getSerializers: getSerializers(props), pageview: pageview, currentPage: currentPage });
       },
       leads: function leads(_ref13) {
         var node = _ref13.node;
@@ -16323,6 +16355,7 @@ var Article = function Article(props) {
       pageview = props.pageview,
       videoAccountIDs = props.videoAccountIDs,
       drupalLeadSettings = props.drupalLeadSettings,
+      currentPage = props.currentPage,
       _props$article = props.article,
       title = _props$article.title,
       passwordLock = _props$article.passwordLock,
@@ -16460,7 +16493,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),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -16470,7 +16503,7 @@ 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),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -16681,7 +16714,7 @@ var ArticleQueue = function ArticleQueue(props) {
       cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification;
 
 
-  var getTargeting = function getTargeting(article) {
+  var getTargeting = function getTargeting(article, position) {
     var _article$internalTag = article.internalTag,
         internalTag = _article$internalTag === undefined ? [] : _article$internalTag,
         _article$userDefinedT = article.userDefinedTag,
@@ -16751,6 +16784,9 @@ var ArticleQueue = function ArticleQueue(props) {
       targeting = _extends$2._extends({}, targeting, { campaign_id: props.cache.hyperTargeting });
     }
 
+    if (position && position.length) {
+      targeting['pos'] = position;
+    }
     return targeting;
   };
 
@@ -16884,7 +16920,7 @@ var ArticleQueue = function ArticleQueue(props) {
     { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true },
     queueData.map(function (article, index) {
       if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
-        article.contextualAD = Ads.getNativeContextualAD(getTargeting(article));
+        article.contextualAD = Ads.getNativeContextualAD(getTargeting(article, 'native-ad'));
       }
       return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
     })

package/dist/esm/index.js

@@ -2109,7 +2109,7 @@ var EventsDeck = function EventsDeck(_ref) {
                   )
                 )
               ),
-              venues && venues.length && React__default.createElement(
+              venues && venues.length && venues[0].name && React__default.createElement(
                 Row,
                 null,
                 React__default.createElement(
@@ -2118,7 +2118,7 @@ var EventsDeck = function EventsDeck(_ref) {
                   React__default.createElement(
                     'p',
                     { className: 'venue', style: { padding: 0, margin: 0 } },
-                    venues[0].address.country
+                    venues[0].name
                   )
                 )
               ),
@@ -8311,11 +8311,19 @@ var Video = function Video(_ref) {
       accountIDs = _ref.accountIDs;
   var source = node.source,
       videoID = node.videoID,
+      playlistID = node.playlistID,
       experienceID = node.experienceID;
 
   if (source === 'brightcove' && accountIDs.brightcove) {
     if (videoID) {
       return React__default.createElement(ReactPlayerLoader, { accountId: accountIDs.brightcove.accountId, videoId: videoID, playerId: accountIDs.brightcove.playerId, attrs: { className: 'brightcove' } });
+    } else if (playlistID) {
+      return React__default.createElement(ReactPlayerLoader, {
+        accountId: accountIDs.brightcove.accountId,
+        playlistId: playlistID,
+        playerId: accountIDs.brightcove.playerId,
+        attrs: { className: 'brightcove brightcove-playlist' }
+      });
     } else if (experienceID) {
       return React__default.createElement(
         'div',
@@ -13413,11 +13421,13 @@ var numberOfPaginations = main_38 ? 4 : 10;
 
 var Quiz = function Quiz(_ref) {
   var quizzes = _ref.quizzes,
-      getSerializers = _ref.getSerializers;
+      getSerializers = _ref.getSerializers,
+      pageview = _ref.pageview,
+      pageNumberFromURL = _ref.currentPage;
 
   var pageCount = quizzes.length;
 
-  var _useState = useState(1),
+  var _useState = useState(pageNumberFromURL ? parseInt(pageNumberFromURL) : 1),
       _useState2 = _slicedToArray(_useState, 2),
       currentPage = _useState2[0],
       setCurrentPage = _useState2[1];
@@ -13456,16 +13466,25 @@ var Quiz = function Quiz(_ref) {
 
   var changePage = function changePage(control) {
     setShowAnswer(false);
+    var newPath = '';
     switch (control) {
       case 'first':
         setCurrentPage(1);
         setStartIndex(0);
         setEndIndex(numberOfPaginations - 1);
+        newPath = window.location.pathname;
+        window.history.pushState(null, null, newPath);
+        lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       case 'last':
         setCurrentPage(pageCount);
         setStartIndex(pageCount - pageCount % numberOfPaginations);
         setEndIndex(pageCount - pageCount % numberOfPaginations + numberOfPaginations - 1);
+        newPath = window.location.pathname + '?page=' + pageCount;
+        window.history.pushState(null, null, newPath);
+        lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       case 'next':
         setCurrentPage(currentPage + 1);
@@ -13473,6 +13492,10 @@ var Quiz = function Quiz(_ref) {
           setStartIndex(startIndex + numberOfPaginations);
           setEndIndex(endIndex + numberOfPaginations);
         }
+        newPath = window.location.pathname + '?page=' + (currentPage + 1);
+        window.history.pushState(null, null, newPath);
+        lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       case 'prev':
         setCurrentPage(currentPage - 1);
@@ -13480,9 +13503,17 @@ var Quiz = function Quiz(_ref) {
           setStartIndex(startIndex - numberOfPaginations);
           setEndIndex(endIndex - numberOfPaginations);
         }
+        newPath = window.location.pathname + '?page=' + (currentPage - 1);
+        window.history.pushState(null, null, newPath);
+        lib_3.refresh();
+        if (pageview) pageview(newPath);
         break;
       default:
         setCurrentPage(control);
+        newPath = window.location.pathname + '?page=' + control;
+        window.history.pushState(null, null, newPath);
+        lib_3.refresh();
+        if (pageview) pageview(newPath);
     }
   };
 
@@ -13704,7 +13735,8 @@ var getSerializers = function getSerializers() {
       videoAccountIDs = props[2],
       onVote = props[3],
       showVotes = props[4],
-      drupalLeadSettings = props[5];
+      drupalLeadSettings = props[5],
+      currentPage = props[6];
 
   return {
     types: {
@@ -13776,7 +13808,7 @@ var getSerializers = function getSerializers() {
         var node = _ref12.node;
         var quizzes = node.quizzes;
 
-        return React__default.createElement(Quiz, { quizzes: quizzes, getSerializers: getSerializers(props) });
+        return React__default.createElement(Quiz, { quizzes: quizzes, getSerializers: getSerializers(props), pageview: pageview, currentPage: currentPage });
       },
       leads: function leads(_ref13) {
         var node = _ref13.node;
@@ -16320,6 +16352,7 @@ var Article = function Article(props) {
       pageview = props.pageview,
       videoAccountIDs = props.videoAccountIDs,
       drupalLeadSettings = props.drupalLeadSettings,
+      currentPage = props.currentPage,
       _props$article = props.article,
       title = _props$article.title,
       passwordLock = _props$article.passwordLock,
@@ -16457,7 +16490,7 @@ var Article = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent, _extends$2({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
           blocks: [].concat(_toConsumableArray(body.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -16467,7 +16500,7 @@ 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),
+          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage),
           blocks: [].concat(_toConsumableArray(body.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -16678,7 +16711,7 @@ var ArticleQueue = function ArticleQueue(props) {
       cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification;
 
 
-  var getTargeting = function getTargeting(article) {
+  var getTargeting = function getTargeting(article, position) {
     var _article$internalTag = article.internalTag,
         internalTag = _article$internalTag === undefined ? [] : _article$internalTag,
         _article$userDefinedT = article.userDefinedTag,
@@ -16748,6 +16781,9 @@ var ArticleQueue = function ArticleQueue(props) {
       targeting = _extends$2({}, targeting, { campaign_id: props.cache.hyperTargeting });
     }
 
+    if (position && position.length) {
+      targeting['pos'] = position;
+    }
     return targeting;
   };
 
@@ -16881,7 +16917,7 @@ var ArticleQueue = function ArticleQueue(props) {
     { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true },
     queueData.map(function (article, index) {
       if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
-        article.contextualAD = Ads.getNativeContextualAD(getTargeting(article));
+        article.contextualAD = Ads.getNativeContextualAD(getTargeting(article, 'native-ad'));
       }
       return React__default.createElement(Article, _extends$2({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
     })

package/package.json

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