@mjhls/mjh-framework 1.0.1030 → 1.0.1031

package/README.md

@@ -1,4 +1,4 @@
-# mjh-framework v. 1.0.1028
+# mjh-framework v. 1.0.1031
 
 [![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 

package/dist/cjs/View.js

@@ -1087,19 +1087,19 @@ var Article = React__default["default"].memo(React.forwardRef(function (props, r
   }
 
   // If sponsored flag, disable contextual ads
-  if (sponsoredFlag) {
+  if (sponsoredFlag || article.disableNativeAds) {
     article.contextualVideoAD = false;
     article.contextualAD = false;
-    showRelatedArticles = false;
   }
-  if (article.disableRelatedContent) {
+
+  if (article.disableRelatedContent || sponsoredFlag) {
     showRelatedArticles = false;
   }
   // This was being done in ArticleQueue2 which wasnt effecting articles excluded from infinite scroll, moved inside article component
   if (!sponsoredFlag && Ads.getVideoContextualAD) {
     article.contextualVideoAD = Ads.getVideoContextualAD(getTargeting.getTargeting(props, 'in-context_video'));
   }
-  if (!sponsoredFlag && Ads.getNativeContextualAD) {
+  if (!sponsoredFlag && Ads.getNativeContextualAD && !article.disableNativeAds) {
     article.contextualAD = Ads.getNativeContextualAD(getTargeting.getTargeting(props, 'native-ad'));
   }
 
@@ -1751,7 +1751,8 @@ var Article = React__default["default"].memo(React.forwardRef(function (props, r
             ),
             React__default["default"].createElement(
               'div',
-              { className: 'mb-3 doc-group-container',
+              {
+                className: 'mb-3 doc-group-container',
                 style: {
                   display: 'flex',
                   justifyContent: 'space-between',
@@ -2692,6 +2693,33 @@ View.returnGetInitialProps = function () {
             article.relatedArticle = _context.sent;
 
           case 35:
+
+            //check documentGroup and documentGroupMapping for disableNativeAds:true
+            if (article.documentGroup && article.documentGroup.length) {
+              article.documentGroup.forEach(function (docGroup) {
+                var node = docGroup.parent ? docGroup.parent : null;
+                if (docGroup.disableNativeAds) {
+                  article.disableNativeAds = true;
+                }
+                while (node) {
+                  if (node.disableNativeAds) [article.disableNativeAds = true];
+                  node = node.parent || null;
+                }
+              });
+            }
+            if (article.documentGroupMapping && article.documentGroupMapping.length) {
+              article.documentGroupMapping.forEach(function (docGroup) {
+                var node = docGroup.parent ? docGroup.parent : null;
+                if (docGroup.disableNativeAds) {
+                  article.disableNativeAds = true;
+                }
+                while (node) {
+                  if (node.disableNativeAds) [article.disableNativeAds = true];
+                  node = node.parent || null;
+                }
+              });
+            }
+
             return _context.abrupt('return', {
               url: url,
               sao: sao,
@@ -2703,7 +2731,7 @@ View.returnGetInitialProps = function () {
               sponsoredFlag: sponsoredFlag
             });
 
-          case 36:
+          case 38:
           case 'end':
             return _context.stop();
         }

package/dist/esm/View.js

@@ -1077,19 +1077,19 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
   }
 
   // If sponsored flag, disable contextual ads
-  if (sponsoredFlag) {
+  if (sponsoredFlag || article.disableNativeAds) {
     article.contextualVideoAD = false;
     article.contextualAD = false;
-    showRelatedArticles = false;
   }
-  if (article.disableRelatedContent) {
+
+  if (article.disableRelatedContent || sponsoredFlag) {
     showRelatedArticles = false;
   }
   // This was being done in ArticleQueue2 which wasnt effecting articles excluded from infinite scroll, moved inside article component
   if (!sponsoredFlag && Ads.getVideoContextualAD) {
     article.contextualVideoAD = Ads.getVideoContextualAD(getTargeting(props, 'in-context_video'));
   }
-  if (!sponsoredFlag && Ads.getNativeContextualAD) {
+  if (!sponsoredFlag && Ads.getNativeContextualAD && !article.disableNativeAds) {
     article.contextualAD = Ads.getNativeContextualAD(getTargeting(props, 'native-ad'));
   }
 
@@ -1741,7 +1741,8 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
             ),
             React__default.createElement(
               'div',
-              { className: 'mb-3 doc-group-container',
+              {
+                className: 'mb-3 doc-group-container',
                 style: {
                   display: 'flex',
                   justifyContent: 'space-between',
@@ -2682,6 +2683,33 @@ View.returnGetInitialProps = function () {
             article.relatedArticle = _context.sent;
 
           case 35:
+
+            //check documentGroup and documentGroupMapping for disableNativeAds:true
+            if (article.documentGroup && article.documentGroup.length) {
+              article.documentGroup.forEach(function (docGroup) {
+                var node = docGroup.parent ? docGroup.parent : null;
+                if (docGroup.disableNativeAds) {
+                  article.disableNativeAds = true;
+                }
+                while (node) {
+                  if (node.disableNativeAds) [article.disableNativeAds = true];
+                  node = node.parent || null;
+                }
+              });
+            }
+            if (article.documentGroupMapping && article.documentGroupMapping.length) {
+              article.documentGroupMapping.forEach(function (docGroup) {
+                var node = docGroup.parent ? docGroup.parent : null;
+                if (docGroup.disableNativeAds) {
+                  article.disableNativeAds = true;
+                }
+                while (node) {
+                  if (node.disableNativeAds) [article.disableNativeAds = true];
+                  node = node.parent || null;
+                }
+              });
+            }
+
             return _context.abrupt('return', {
               url: url,
               sao: sao,
@@ -2693,7 +2721,7 @@ View.returnGetInitialProps = function () {
               sponsoredFlag: sponsoredFlag
             });
 
-          case 36:
+          case 38:
           case 'end':
             return _context.stop();
         }

package/package.json

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