@mjhls/mjh-framework 1.0.320 → 1.0.322

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.320
+# mjh-framework v. 1.0.322
 
 > Foundation Framework
 

package/dist/cjs/{Normal-972b1cc8.js → Normal-ead4243d.js}

@@ -1860,7 +1860,8 @@ var TemplateNormal = function TemplateNormal(props) {
       filterParams = props.filterParams,
       filters = props.filters,
       defaultFilter = props.defaultFilter,
-      showRightAd = props.showRightAd;
+      showRightAd = props.showRightAd,
+      sponsoredFlag = props.sponsoredFlag;
 
 
   var navigation = function navigation() {
@@ -1933,10 +1934,14 @@ var TemplateNormal = function TemplateNormal(props) {
     null,
     React__default.createElement(Header$1, { title: title ? title + ' | ' + website.title : '' + website.title, isLiveSite: config.isLiveSite, keyword: keywords, description: description }),
     navigation(),
-    horizontalAD && horizontalAD.networkID && horizontalAD.adUnit && React__default.createElement(
-      Container,
+    sponsoredFlag ? React__default.createElement('div', { style: { height: '50px' } }) : React__default.createElement(
+      React__default.Fragment,
       null,
-      React__default.createElement(AD728x90, { networkID: horizontalAD.networkID, adUnit: horizontalAD.adUnit, targeting: adTargeting })
+      horizontalAD && horizontalAD.networkID && horizontalAD.adUnit && React__default.createElement(
+        Container,
+        null,
+        React__default.createElement(AD728x90, { networkID: horizontalAD.networkID, adUnit: horizontalAD.adUnit, targeting: adTargeting })
+      )
     ),
     React__default.createElement(
       Container,

package/dist/cjs/{TaxonomyCard-22b72261.js → TaxonomyCard-d8eed035.js}

@@ -1030,7 +1030,7 @@ var TaxonomyCard = function TaxonomyCard(props) {
                       Row,
                       null,
                       React__default.createElement(
-                        Col,
+                        'div',
                         null,
                         row.url ? React__default.createElement(
                           'a',
@@ -1047,7 +1047,7 @@ var TaxonomyCard = function TaxonomyCard(props) {
                         )
                       ),
                       React__default.createElement(
-                        Col,
+                        'div',
                         null,
                         (address && address.length || companyDetails && companyDetails.length) && React__default.createElement(
                           'div',

package/dist/cjs/TaxonomyCard.js

@@ -12,7 +12,7 @@ require('react-bootstrap/Card');
 require('react-dom');
 require('./index-b5eb3ff8.js');
 require('./index-fa0fb52c.js');
-var TaxonomyCard = require('./TaxonomyCard-22b72261.js');
+var TaxonomyCard = require('./TaxonomyCard-d8eed035.js');
 require('./react-social-icons-cd0d9d3b.js');
 
 

package/dist/cjs/TemplateNormal.js

@@ -20,7 +20,7 @@ require('./react-social-icons-cd0d9d3b.js');
 require('react-bootstrap');
 require('./index.esm-340d3792.js');
 require('react-bootstrap/Button');
-var TemplateNormal = require('./Normal-972b1cc8.js');
+var TemplateNormal = require('./Normal-ead4243d.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');

package/dist/cjs/index.js

@@ -38,7 +38,7 @@ var GridContent = require('./GridContent-98e9ab78.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
 var ThumbnailCard = require('./ThumbnailCard.js');
-var TaxonomyCard = require('./TaxonomyCard-22b72261.js');
+var TaxonomyCard = require('./TaxonomyCard-d8eed035.js');
 require('./react-social-icons-cd0d9d3b.js');
 var GroupDeck = require('./GroupDeck.js');
 var YoutubeGroup = require('./YoutubeGroup-24ec8af9.js');
@@ -53,7 +53,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-972b1cc8.js');
+var TemplateNormal = require('./Normal-ead4243d.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -16286,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,
@@ -16347,7 +16400,39 @@ var Article = function Article(props) {
                 { key: index },
                 renderAuthor(authorDetail.displayName, authorDetail.url, index, authorDetails.length)
               );
-            })
+            }),
+            issue && React__default.createElement(
+              'div',
+              null,
+              React__default.createElement(
+                'div',
+                null,
+                issue.articleSource && React__default.createElement(
+                  'p',
+                  null,
+                  'Source: ' + issue.articleSource
+                )
+              ),
+              React__default.createElement(
+                'div',
+                { className: 'volume-issue' },
+                React__default.createElement(
+                  'p',
+                  null,
+                  issue.issueNumber && React__default.createElement(
+                    'span',
+                    null,
+                    'Issue ' + issue.issueNumber,
+                    ','
+                  ),
+                  issue.volume && React__default.createElement(
+                    'span',
+                    null,
+                    'Volume ' + issue.volume
+                  )
+                )
+              )
+            )
           ),
           React__default.createElement(
             'p',
@@ -16397,12 +16482,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(
@@ -16417,13 +16511,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' })
   );
@@ -16564,7 +16659,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),
@@ -16705,6 +16800,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/{Normal-ed829d1e.js → Normal-252dd706.js}

@@ -1855,7 +1855,8 @@ var TemplateNormal = function TemplateNormal(props) {
       filterParams = props.filterParams,
       filters = props.filters,
       defaultFilter = props.defaultFilter,
-      showRightAd = props.showRightAd;
+      showRightAd = props.showRightAd,
+      sponsoredFlag = props.sponsoredFlag;
 
 
   var navigation = function navigation() {
@@ -1928,10 +1929,14 @@ var TemplateNormal = function TemplateNormal(props) {
     null,
     React__default.createElement(Header$1, { title: title ? title + ' | ' + website.title : '' + website.title, isLiveSite: config.isLiveSite, keyword: keywords, description: description }),
     navigation(),
-    horizontalAD && horizontalAD.networkID && horizontalAD.adUnit && React__default.createElement(
-      Container,
+    sponsoredFlag ? React__default.createElement('div', { style: { height: '50px' } }) : React__default.createElement(
+      React__default.Fragment,
       null,
-      React__default.createElement(AD728x90, { networkID: horizontalAD.networkID, adUnit: horizontalAD.adUnit, targeting: adTargeting })
+      horizontalAD && horizontalAD.networkID && horizontalAD.adUnit && React__default.createElement(
+        Container,
+        null,
+        React__default.createElement(AD728x90, { networkID: horizontalAD.networkID, adUnit: horizontalAD.adUnit, targeting: adTargeting })
+      )
     ),
     React__default.createElement(
       Container,

package/dist/esm/{TaxonomyCard-7e9aae2d.js → TaxonomyCard-35127639.js}

@@ -1025,7 +1025,7 @@ var TaxonomyCard = function TaxonomyCard(props) {
                       Row,
                       null,
                       React__default.createElement(
-                        Col,
+                        'div',
                         null,
                         row.url ? React__default.createElement(
                           'a',
@@ -1042,7 +1042,7 @@ var TaxonomyCard = function TaxonomyCard(props) {
                         )
                       ),
                       React__default.createElement(
-                        Col,
+                        'div',
                         null,
                         (address && address.length || companyDetails && companyDetails.length) && React__default.createElement(
                           'div',

package/dist/esm/TaxonomyCard.js

@@ -10,5 +10,5 @@ import 'react-bootstrap/Card';
 import 'react-dom';
 import './index-51a80699.js';
 import './index-5f9f807a.js';
-export { T as default } from './TaxonomyCard-7e9aae2d.js';
+export { T as default } from './TaxonomyCard-35127639.js';
 import './react-social-icons-a7d5c5c7.js';

package/dist/esm/TemplateNormal.js

@@ -18,7 +18,7 @@ import './react-social-icons-a7d5c5c7.js';
 import 'react-bootstrap';
 import './index.esm-536609db.js';
 import 'react-bootstrap/Button';
-export { T as default } from './Normal-ed829d1e.js';
+export { T as default } from './Normal-252dd706.js';
 import 'react-bootstrap/ListGroup';
 import 'next/head';
 import 'react-bootstrap/Nav';

package/dist/esm/index.js

@@ -31,8 +31,8 @@ export { A as AD, G as GridContent } from './GridContent-dd8fe8d1.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
 export { default as ThumbnailCard } from './ThumbnailCard.js';
-import { B as BlockContent } from './TaxonomyCard-7e9aae2d.js';
-export { T as TaxonomyCard } from './TaxonomyCard-7e9aae2d.js';
+import { B as BlockContent } from './TaxonomyCard-35127639.js';
+export { T as TaxonomyCard } from './TaxonomyCard-35127639.js';
 import './react-social-icons-a7d5c5c7.js';
 import GroupDeck from './GroupDeck.js';
 export { default as GroupDeck } from './GroupDeck.js';
@@ -49,8 +49,8 @@ export { default as IssueDeck } from './IssueDeck.js';
 import 'react-bootstrap/Badge';
 export { default as IssueContentDeck } from './IssueContentDeck.js';
 import Spinner from 'react-bootstrap/Spinner';
-import { M as MdPictureAsPdf } from './Normal-ed829d1e.js';
-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-ed829d1e.js';
+import { M as MdPictureAsPdf } from './Normal-252dd706.js';
+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-252dd706.js';
 import 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -16284,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,
@@ -16345,7 +16398,39 @@ var Article = function Article(props) {
                 { key: index },
                 renderAuthor(authorDetail.displayName, authorDetail.url, index, authorDetails.length)
               );
-            })
+            }),
+            issue && React__default.createElement(
+              'div',
+              null,
+              React__default.createElement(
+                'div',
+                null,
+                issue.articleSource && React__default.createElement(
+                  'p',
+                  null,
+                  'Source: ' + issue.articleSource
+                )
+              ),
+              React__default.createElement(
+                'div',
+                { className: 'volume-issue' },
+                React__default.createElement(
+                  'p',
+                  null,
+                  issue.issueNumber && React__default.createElement(
+                    'span',
+                    null,
+                    'Issue ' + issue.issueNumber,
+                    ','
+                  ),
+                  issue.volume && React__default.createElement(
+                    'span',
+                    null,
+                    'Volume ' + issue.volume
+                  )
+                )
+              )
+            )
           ),
           React__default.createElement(
             'p',
@@ -16395,12 +16480,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(
@@ -16415,13 +16509,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' })
   );
@@ -16562,7 +16657,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),
@@ -16703,6 +16798,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.320",
+  "version": "1.0.322",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",