@mjhls/mjh-framework 1.0.319 → 1.0.321

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.319
+# mjh-framework v. 1.0.321
 
 > Foundation Framework
 

package/dist/cjs/index.js

@@ -14092,8 +14092,6 @@ var AlphabeticList = function AlphabeticList(_ref) {
       'div',
       { className: 'd-flex flex-wrap mb-3' },
       alphabet.map(function (letter, i) {
-        console.log('letter:', letter);
-        console.log('dataList', dataList[letter]);
         if (dataList[letter]) {
           return React__default.createElement(
             'a',
@@ -16288,6 +16286,59 @@ var Article = function Article(props) {
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
 
+  //Native Ads
+  var findIndex = function findIndex(arr) {
+    var indexes = [];
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = slicedToArray._getIterator(arr), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var ele = _step.value;
+
+        if (ele['_type'] === 'block' && ele.children.some(function (child) {
+          return child.text.trim().length > 0;
+        }) && ele['listItem'] != 'bullet' && ele['style'] === 'normal') {
+          indexes.push(arr.indexOf(ele));
+        }
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+
+    return indexes;
+  };
+
+  var insert = function insert(arr, index, newElement) {
+    return [].concat(toConsumableArray._toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray._toConsumableArray(arr.slice(index)));
+  };
+  var newBody = [];
+  if (props.article.contextualAD) {
+    var indexes = findIndex(articleBody);
+
+    if (indexes.length >= 2 && articleBody.length > 3) {
+      var setIndex = indexes[1];
+      newBody = insert(articleBody, setIndex + 1, props.article.contextualAD);
+    } else {
+      newBody = articleBody;
+    }
+  } else {
+    newBody = articleBody;
+  }
+  //End Native Ads
+
   return React__default.createElement(
     React__default.Fragment,
     null,
@@ -16399,12 +16450,21 @@ var Article = function Article(props) {
             React__default.createElement('br', null),
             React__default.createElement('br', null)
           ),
+          main.main_39 && props.article.Ads.map(function (ad, index) {
+            if (index == 0) {
+              return React__default.createElement(
+                'div',
+                { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto', marginTop: '-1rem', marginBottom: '1rem' } },
+                ad.component
+              );
+            }
+          }),
           React__default.createElement(
             'div',
             { className: 'block-content' },
             React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
               serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true),
-              blocks: articleBody,
+              blocks: newBody,
               imageOptions: { w: 320, h: 240, fit: 'max' }
             }, client.config())),
             issue && issue.url && React__default.createElement(
@@ -16419,13 +16479,14 @@ var Article = function Article(props) {
         renderIsiContent(props.article)
       )
     ),
-    main.main_39 && React__default.createElement('hr', { className: 'add-seperater' }),
     main.main_39 && props.article.Ads.map(function (ad, index) {
-      return React__default.createElement(
-        'div',
-        { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto' } },
-        ad.component
-      );
+      if (index > 0) {
+        return React__default.createElement(
+          'div',
+          { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto' } },
+          ad.component
+        );
+      }
     }),
     React__default.createElement('hr', { className: 'article-seperater' })
   );
@@ -16566,7 +16627,7 @@ var ArticleQueue = function ArticleQueue(props) {
     horizontalAD: {},
     isLiveSite: isLiveSite
   };
-  props.article.Ads = [];
+  props.article.Ads = Ads.getRightItems(targeting);
 
   var _useState9 = React.useState(config),
       _useState10 = slicedToArray._slicedToArray(_useState9, 2),
@@ -16707,6 +16768,9 @@ var ArticleQueue = function ArticleQueue(props) {
       visibilitySensor.InfiniteScroll,
       { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
       queueData.map(function (article, index) {
+        if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
+          article.contextualAD = Ads.getNativeContextualAD(getTargeting(article));
+        }
         return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
       })
     );

package/dist/esm/index.js

@@ -14090,8 +14090,6 @@ var AlphabeticList = function AlphabeticList(_ref) {
       'div',
       { className: 'd-flex flex-wrap mb-3' },
       alphabet.map(function (letter, i) {
-        console.log('letter:', letter);
-        console.log('dataList', dataList[letter]);
         if (dataList[letter]) {
           return React__default.createElement(
             'a',
@@ -16286,6 +16284,59 @@ var Article = function Article(props) {
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
 
+  //Native Ads
+  var findIndex = function findIndex(arr) {
+    var indexes = [];
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = _getIterator(arr), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var ele = _step.value;
+
+        if (ele['_type'] === 'block' && ele.children.some(function (child) {
+          return child.text.trim().length > 0;
+        }) && ele['listItem'] != 'bullet' && ele['style'] === 'normal') {
+          indexes.push(arr.indexOf(ele));
+        }
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+
+    return indexes;
+  };
+
+  var insert = function insert(arr, index, newElement) {
+    return [].concat(_toConsumableArray(arr.slice(0, index)), [newElement], _toConsumableArray(arr.slice(index)));
+  };
+  var newBody = [];
+  if (props.article.contextualAD) {
+    var indexes = findIndex(articleBody);
+
+    if (indexes.length >= 2 && articleBody.length > 3) {
+      var setIndex = indexes[1];
+      newBody = insert(articleBody, setIndex + 1, props.article.contextualAD);
+    } else {
+      newBody = articleBody;
+    }
+  } else {
+    newBody = articleBody;
+  }
+  //End Native Ads
+
   return React__default.createElement(
     React__default.Fragment,
     null,
@@ -16397,12 +16448,21 @@ var Article = function Article(props) {
             React__default.createElement('br', null),
             React__default.createElement('br', null)
           ),
+          main_39 && props.article.Ads.map(function (ad, index) {
+            if (index == 0) {
+              return React__default.createElement(
+                'div',
+                { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto', marginTop: '-1rem', marginBottom: '1rem' } },
+                ad.component
+              );
+            }
+          }),
           React__default.createElement(
             'div',
             { className: 'block-content' },
             React__default.createElement(BlockContent, _extends$2({
               serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true),
-              blocks: articleBody,
+              blocks: newBody,
               imageOptions: { w: 320, h: 240, fit: 'max' }
             }, client.config())),
             issue && issue.url && React__default.createElement(
@@ -16417,13 +16477,14 @@ var Article = function Article(props) {
         renderIsiContent(props.article)
       )
     ),
-    main_39 && React__default.createElement('hr', { className: 'add-seperater' }),
     main_39 && props.article.Ads.map(function (ad, index) {
-      return React__default.createElement(
-        'div',
-        { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto' } },
-        ad.component
-      );
+      if (index > 0) {
+        return React__default.createElement(
+          'div',
+          { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto' } },
+          ad.component
+        );
+      }
     }),
     React__default.createElement('hr', { className: 'article-seperater' })
   );
@@ -16564,7 +16625,7 @@ var ArticleQueue = function ArticleQueue(props) {
     horizontalAD: {},
     isLiveSite: isLiveSite
   };
-  props.article.Ads = [];
+  props.article.Ads = Ads.getRightItems(targeting);
 
   var _useState9 = useState(config),
       _useState10 = _slicedToArray(_useState9, 2),
@@ -16705,6 +16766,9 @@ var ArticleQueue = function ArticleQueue(props) {
       InfiniteScroll,
       { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
       queueData.map(function (article, index) {
+        if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
+          article.contextualAD = Ads.getNativeContextualAD(getTargeting(article));
+        }
         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.319",
+  "version": "1.0.321",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",