@mjhls/mjh-framework 1.0.508 → 1.0.510

package/dist/cjs/InscreenSensor-3aec8492.js

@@ -0,0 +1,361 @@
+'use strict';
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
+var inherits = require('./inherits-14962339.js');
+var React = require('react');
+var React__default = _interopDefault(React);
+var isSymbol = require('./isSymbol-488934a7.js');
+
+/** Used as references for various `Number` constants. */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This method is loosely based on
+ * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ * @example
+ *
+ * _.isLength(3);
+ * // => true
+ *
+ * _.isLength(Number.MIN_VALUE);
+ * // => false
+ *
+ * _.isLength(Infinity);
+ * // => false
+ *
+ * _.isLength('3');
+ * // => false
+ */
+function isLength(value) {
+  return typeof value == 'number' &&
+    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+var isLength_1 = isLength;
+
+/** `Object#toString` result references. */
+var argsTag = '[object Arguments]';
+
+/**
+ * The base implementation of `_.isArguments`.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+ */
+function baseIsArguments(value) {
+  return isSymbol.isObjectLike_1(value) && isSymbol._baseGetTag(value) == argsTag;
+}
+
+var _baseIsArguments = baseIsArguments;
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/** Built-in value references. */
+var propertyIsEnumerable = objectProto.propertyIsEnumerable;
+
+/**
+ * Checks if `value` is likely an `arguments` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+ *  else `false`.
+ * @example
+ *
+ * _.isArguments(function() { return arguments; }());
+ * // => true
+ *
+ * _.isArguments([1, 2, 3]);
+ * // => false
+ */
+var isArguments = _baseIsArguments(function() { return arguments; }()) ? _baseIsArguments : function(value) {
+  return isSymbol.isObjectLike_1(value) && hasOwnProperty.call(value, 'callee') &&
+    !propertyIsEnumerable.call(value, 'callee');
+};
+
+var isArguments_1 = isArguments;
+
+/**
+ * This method returns `false`.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.13.0
+ * @category Util
+ * @returns {boolean} Returns `false`.
+ * @example
+ *
+ * _.times(2, _.stubFalse);
+ * // => [false, false]
+ */
+function stubFalse() {
+  return false;
+}
+
+var stubFalse_1 = stubFalse;
+
+var isBuffer_1 = _commonjsHelpers.createCommonjsModule(function (module, exports) {
+/** Detect free variable `exports`. */
+var freeExports =  exports && !exports.nodeType && exports;
+
+/** Detect free variable `module`. */
+var freeModule = freeExports && 'object' == 'object' && module && !module.nodeType && module;
+
+/** Detect the popular CommonJS extension `module.exports`. */
+var moduleExports = freeModule && freeModule.exports === freeExports;
+
+/** Built-in value references. */
+var Buffer = moduleExports ? isSymbol._root.Buffer : undefined;
+
+/* Built-in method references for those with the same name as other `lodash` methods. */
+var nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined;
+
+/**
+ * Checks if `value` is a buffer.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.3.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a buffer, else `false`.
+ * @example
+ *
+ * _.isBuffer(new Buffer(2));
+ * // => true
+ *
+ * _.isBuffer(new Uint8Array(2));
+ * // => false
+ */
+var isBuffer = nativeIsBuffer || stubFalse_1;
+
+module.exports = isBuffer;
+});
+
+/** `Object#toString` result references. */
+var argsTag$1 = '[object Arguments]',
+    arrayTag = '[object Array]',
+    boolTag = '[object Boolean]',
+    dateTag = '[object Date]',
+    errorTag = '[object Error]',
+    funcTag = '[object Function]',
+    mapTag = '[object Map]',
+    numberTag = '[object Number]',
+    objectTag = '[object Object]',
+    regexpTag = '[object RegExp]',
+    setTag = '[object Set]',
+    stringTag = '[object String]',
+    weakMapTag = '[object WeakMap]';
+
+var arrayBufferTag = '[object ArrayBuffer]',
+    dataViewTag = '[object DataView]',
+    float32Tag = '[object Float32Array]',
+    float64Tag = '[object Float64Array]',
+    int8Tag = '[object Int8Array]',
+    int16Tag = '[object Int16Array]',
+    int32Tag = '[object Int32Array]',
+    uint8Tag = '[object Uint8Array]',
+    uint8ClampedTag = '[object Uint8ClampedArray]',
+    uint16Tag = '[object Uint16Array]',
+    uint32Tag = '[object Uint32Array]';
+
+/** Used to identify `toStringTag` values of typed arrays. */
+var typedArrayTags = {};
+typedArrayTags[float32Tag] = typedArrayTags[float64Tag] =
+typedArrayTags[int8Tag] = typedArrayTags[int16Tag] =
+typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =
+typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =
+typedArrayTags[uint32Tag] = true;
+typedArrayTags[argsTag$1] = typedArrayTags[arrayTag] =
+typedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =
+typedArrayTags[dataViewTag] = typedArrayTags[dateTag] =
+typedArrayTags[errorTag] = typedArrayTags[funcTag] =
+typedArrayTags[mapTag] = typedArrayTags[numberTag] =
+typedArrayTags[objectTag] = typedArrayTags[regexpTag] =
+typedArrayTags[setTag] = typedArrayTags[stringTag] =
+typedArrayTags[weakMapTag] = false;
+
+/**
+ * The base implementation of `_.isTypedArray` without Node.js optimizations.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+ */
+function baseIsTypedArray(value) {
+  return isSymbol.isObjectLike_1(value) &&
+    isLength_1(value.length) && !!typedArrayTags[isSymbol._baseGetTag(value)];
+}
+
+var _baseIsTypedArray = baseIsTypedArray;
+
+/**
+ * The base implementation of `_.unary` without support for storing metadata.
+ *
+ * @private
+ * @param {Function} func The function to cap arguments for.
+ * @returns {Function} Returns the new capped function.
+ */
+function baseUnary(func) {
+  return function(value) {
+    return func(value);
+  };
+}
+
+var _baseUnary = baseUnary;
+
+var _nodeUtil = _commonjsHelpers.createCommonjsModule(function (module, exports) {
+/** Detect free variable `exports`. */
+var freeExports =  exports && !exports.nodeType && exports;
+
+/** Detect free variable `module`. */
+var freeModule = freeExports && 'object' == 'object' && module && !module.nodeType && module;
+
+/** Detect the popular CommonJS extension `module.exports`. */
+var moduleExports = freeModule && freeModule.exports === freeExports;
+
+/** Detect free variable `process` from Node.js. */
+var freeProcess = moduleExports && isSymbol._freeGlobal.process;
+
+/** Used to access faster Node.js helpers. */
+var nodeUtil = (function() {
+  try {
+    // Use `util.types` for Node.js 10+.
+    var types = freeModule && freeModule.require && freeModule.require('util').types;
+
+    if (types) {
+      return types;
+    }
+
+    // Legacy `process.binding('util')` for Node.js < 10.
+    return freeProcess && freeProcess.binding && freeProcess.binding('util');
+  } catch (e) {}
+}());
+
+module.exports = nodeUtil;
+});
+
+/* Node.js helper references. */
+var nodeIsTypedArray = _nodeUtil && _nodeUtil.isTypedArray;
+
+/**
+ * Checks if `value` is classified as a typed array.
+ *
+ * @static
+ * @memberOf _
+ * @since 3.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+ * @example
+ *
+ * _.isTypedArray(new Uint8Array);
+ * // => true
+ *
+ * _.isTypedArray([]);
+ * // => false
+ */
+var isTypedArray = nodeIsTypedArray ? _baseUnary(nodeIsTypedArray) : _baseIsTypedArray;
+
+var isTypedArray_1 = isTypedArray;
+
+var InscreenSensor = function (_React$Component) {
+  inherits._inherits(InscreenSensor, _React$Component);
+
+  function InscreenSensor(props) {
+    inherits._classCallCheck(this, InscreenSensor);
+
+    var _this = inherits._possibleConstructorReturn(this, (InscreenSensor.__proto__ || inherits._Object$getPrototypeOf(InscreenSensor)).call(this, props));
+
+    _this.scrollHandler = function () {
+      var visible = _this.checkInside();
+      if (visible !== _this.visible) {
+        _this.visible = visible;
+        _this.props.onChange(visible);
+      }
+    };
+
+    _this.checkInside = function () {
+      var rect = _this.wraperRef.current.getBoundingClientRect();
+      var _this$props$offSetTop = _this.props.offSetTop,
+          offSetTop = _this$props$offSetTop === undefined ? 0 : _this$props$offSetTop;
+      var top = rect.top,
+          bottom = rect.bottom;
+
+      var viewHeight = window.innerHeight;
+      var wrpElem = document.getElementsByClassName('inscreen-wrapper');
+
+      if (top > 0 && top <= offSetTop) {
+        if (wrpElem.length > 1 && top <= viewHeight && bottom > viewHeight) {
+          return 'top';
+        } else if (wrpElem.length > 1 && bottom < viewHeight) {
+          return 'small-top';
+        }
+      } else if (wrpElem.length > 1 && top < offSetTop && bottom + offSetTop >= viewHeight) {
+        return 'bottom';
+      }
+    };
+
+    _this.wraperRef = React__default.createRef();
+    _this.visible = false;
+    return _this;
+  }
+
+  inherits._createClass(InscreenSensor, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      this.visible = this.checkInside();
+      this.props.onChange(this.visible);
+      window.addEventListener('scroll', this.scrollHandler);
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      window.removeEventListener('scroll', this.scrollHandler);
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _props = this.props,
+          _props$className = _props.className,
+          className = _props$className === undefined ? '' : _props$className,
+          _props$style = _props.style,
+          style = _props$style === undefined ? {} : _props$style,
+          _props$id = _props.id,
+          id = _props$id === undefined ? '' : _props$id;
+
+      return React__default.createElement(
+        'div',
+        { ref: this.wraperRef, className: className, style: style, id: id },
+        this.props.children
+      );
+    }
+  }]);
+
+  return InscreenSensor;
+}(React__default.Component);
+
+exports.InscreenSensor = InscreenSensor;
+exports.isArguments_1 = isArguments_1;
+exports.isBuffer_1 = isBuffer_1;
+exports.isLength_1 = isLength_1;
+exports.isTypedArray_1 = isTypedArray_1;

package/dist/cjs/View.js

@@ -36,7 +36,6 @@ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-2745329b.js');
 var AdSlot = require('./AdSlot.js');
-require('./_arrayMap-3b4a0f75.js');
 var BlockContent = require('./BlockContent-f942392e.js');
 require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
@@ -52,9 +51,9 @@ require('react-share');
 var SocialShare = require('./SocialShare.js');
 var Form = _interopDefault(require('react-bootstrap/Form'));
 var FormControl = _interopDefault(require('react-bootstrap/FormControl'));
-var keys = require('./keys-a586b7a0.js');
+var keys$1 = require('./keys-a586b7a0.js');
 var Dropdown = _interopDefault(require('react-bootstrap/Dropdown'));
-var InscreenSensor = require('./InscreenSensor-f9989c04.js');
+var InscreenSensor = require('./InscreenSensor-3aec8492.js');
 var getKeywords = require('./getKeywords.js');
 var getSeriesDetail = require('./getSeriesDetail.js');
 var getQuery = require('./getQuery.js');
@@ -293,7 +292,8 @@ var Article = function Article(props) {
       lgContextAd = _props$lgContextAd === undefined ? false : _props$lgContextAd,
       queueData = props.queueData,
       _props$sponsoredFlag = props.sponsoredFlag,
-      sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag;
+      sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag,
+      Ads = props.Ads;
   var onChangeArticle = props.onChangeArticle;
 
   //If sponsored flag, disable contextual ads
@@ -302,6 +302,13 @@ var Article = function Article(props) {
     article.contextualVideoAD = false;
     article.contextualAD = 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) {
+    article.contextualAD = Ads.getNativeContextualAD(getTargeting.getTargeting(props, 'native-ad'));
+  }
 
   var _useState = React.useState(null),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -435,7 +442,7 @@ var Article = function Article(props) {
     if (indexes.length >= 2 && body.length > 3 && payload.contextualAD && payload.contextualVideoAD) {
       payload = _extends._extends({}, payload, {
         contextualAD: _extends._extends({}, payload.contextualAD, {
-          slotId: (payload.contextualAD.slotId || 'native-ad') + '-' + payload._id
+          slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id
         }),
         contextualVideoAD: _extends._extends({}, payload.contextualVideoAD, {
           slotId: (payload.contextualVideoAD.slotId || 'in-context_video') + '-' + payload._id
@@ -497,7 +504,8 @@ var Article = function Article(props) {
     } else if (indexes.length >= 2 && body.length > 3 && payload.contextualAD && !payload.contextualVideoAD) {
       payload = _extends._extends({}, payload, {
         contextualAD: _extends._extends({}, payload.contextualAD, {
-          slotId: (payload.contextualAD.slotId || 'native-ad') + '-' + payload._id,
+          slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id,
+          className: 'ADFluid',
           //  Fetching new contextual targeting based on the current active article.
           targeting: getTargeting.getTargeting(props, 'native-ad'),
           // Adding new ad size for large contextual ad for desktop screen width >= 1400
@@ -505,24 +513,37 @@ var Article = function Article(props) {
           sizeMapping: lgContextAd ? [{
             viewport: [1400, 0],
             sizes: [[728, 90], 'fluid', [300, 100]]
-          }, { viewport: [0, 0], sizes: ['fluid', [300, 100]] }] : ['fluid', [300, 100]]
+          }, { viewport: [0, 0], sizes: ['fluid', [300, 100]] }] : { viewport: [0, 0], sizes: ['fluid', [300, 100]] }
         })
       });
       var _selectedIndex = indexes[1] + 1;
 
-      var _checkIsAdFound = function _checkIsAdFound(isFound) {
-        var parent = document.getElementById('contextual-native-ad-' + payload._id);
+      var _checkIsAdFound = function _checkIsAdFound(isFound, adData) {
         if (!isFound) {
+          var parent = document.getElementById('contextual-native-ad-' + payload._id);
           parent.style.height = '0%';
           parent.style.width = '0%';
           parent.style.display = 'none';
           setContextualADFlag(false);
         } else {
-          if (body && body[1] && body[1]._type === 'figure') {
+          var _parent = document.getElementById('contextual-native-ad-' + payload._id);
+          if (adData && adData.event && adData.event.size && _parent) {
+            // Adding fix for fluid contextual ad to avoid from collapsing when size is [0,0]
+            var fluidSizes = [[0, 0]];
+            var checkAdSize = function checkAdSize(size) {
+              return stringify._JSON$stringify(size) === stringify._JSON$stringify(adData.event.size);
+            };
+            if (!fluidSizes.some(checkAdSize)) {
+              _parent.style.width = adData.event.size[0] + 'px';
+              _parent.style.height = adData.event.size[1] + 'px';
+            }
+            _parent.style.margin = 'auto';
+            //  Adding margin below to create a seperation from text.
+            _parent.style.marginBottom = '15px';
+          }
+          if (body[0]._type === 'figure' || body[1]._type === 'figure' || body[2]._type === 'figure' || body[3]._type === 'figure') {
             setContextualADFlag(true);
           }
-          //  Adding margin below to create a seperation from text.
-          if (parent && parent.style) parent.style.marginBottom = '15px';
         }
       };
 
@@ -535,9 +556,7 @@ var Article = function Article(props) {
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
         contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
-        (visibleFlag || queueData && queueData.length === 1) &&
-        //  Adding margin below to create a seperation from text.
-        React__default.createElement(
+        (visibleFlag || queueData && queueData.length === 1 || !props.infiniteScroll) && React__default.createElement(
           'div',
           { id: 'contextual-native-ad-' + payload._id, className: 'contextual-native-ad' },
           React__default.createElement(AdSlot, _extends._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound }))
@@ -705,24 +724,20 @@ var Article = function Article(props) {
                   ),
                   issue && React__default.createElement(
                     'div',
-                    null,
+                    { className: 'volume-issue' },
                     React__default.createElement(
-                      'div',
-                      { className: 'volume-issue' },
-                      React__default.createElement(
-                        'p',
+                      'p',
+                      null,
+                      issue.volume && React__default.createElement(
+                        'span',
+                        null,
+                        'Volume ' + issue.volume,
+                        ','
+                      ),
+                      issue.issueNumber && React__default.createElement(
+                        'span',
                         null,
-                        issue.volume && React__default.createElement(
-                          'span',
-                          null,
-                          'Volume ' + issue.volume,
-                          ','
-                        ),
-                        issue.issueNumber && React__default.createElement(
-                          'span',
-                          null,
-                          ' Issue ' + issue.issueNumber
-                        )
+                        ' Issue ' + issue.issueNumber
                       )
                     )
                   ),
@@ -896,7 +911,6 @@ var ArticleQueue = function ArticleQueue(props) {
       _props$maxListLength = props.maxListLength,
       maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
       _props$sponsoredTaxon = props.sponsoredTaxonomies,
-      sponsoredTaxonomies = _props$sponsoredTaxon === undefined ? [] : _props$sponsoredTaxon,
       _props$cpModification = props.cpModificationRequired,
       cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification,
       _props$authorPrefix = props.authorPrefix,
@@ -929,7 +943,7 @@ var ArticleQueue = function ArticleQueue(props) {
             var pos = slot.getTargeting('pos');
 
             slot.clearTargeting();
-            keys._Object$keys(targeting).forEach(function (key) {
+            keys$1._Object$keys(targeting).forEach(function (key) {
               slot.setTargeting(key, targeting[key]);
             });
             slot.setTargeting('pos', pos);
@@ -950,7 +964,7 @@ var ArticleQueue = function ArticleQueue(props) {
               //gets the slotId of the leaderboard ad to refresh
               leaderboardSlotId = slot.getSlotId().getDomId();
               slot.clearTargeting();
-              keys._Object$keys(targeting).forEach(function (key) {
+              keys$1._Object$keys(targeting).forEach(function (key) {
                 slot.setTargeting(key, targeting[key]);
               });
               slot.setTargeting('pos', pos);
@@ -962,19 +976,6 @@ var ArticleQueue = function ArticleQueue(props) {
     }
   };
 
-  var checkSponseredArticle = function checkSponseredArticle(article) {
-    var _article$taxonomyMapp = article.taxonomyMapping,
-        taxonomyMapping = _article$taxonomyMapp === undefined ? [] : _article$taxonomyMapp;
-
-    if (props.checkSponsered) {
-      return taxonomyMapping.some(function (item) {
-        return InscreenSensor.includes_1(sponsoredTaxonomies, item._ref);
-      });
-    } else {
-      return false;
-    }
-  };
-
   var preVscroll = 0;
   var isScrollDown = true;
 
@@ -1006,9 +1007,11 @@ var ArticleQueue = function ArticleQueue(props) {
 
   React.useEffect(function () {
     // Fetching related article after component mounted if vertical scroll not found
-    if (!hasVerticalScroll()) {
-      loadmore();
-    }
+    setTimeout(function () {
+      if (!hasVerticalScroll()) {
+        loadmore();
+      }
+    }, 1000);
   }, [queueData.length]);
 
   var loadmore = function loadmore() {
@@ -1079,12 +1082,6 @@ var ArticleQueue = function ArticleQueue(props) {
     index_es.InfiniteScroll,
     { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true, style: { overflow: 'hidden' } },
     queueData.map(function (article, index) {
-      if (!checkSponseredArticle(article) && Ads.getVideoContextualAD) {
-        article.contextualVideoAD = Ads.getVideoContextualAD(getTargeting.getTargeting(props, 'in-context_video'));
-      }
-      if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
-        article.contextualAD = Ads.getNativeContextualAD(getTargeting.getTargeting(props, 'native-ad'));
-      }
       return React__default.createElement(Article, _extends._extends({
         key: index
       }, props, {
@@ -1183,6 +1180,9 @@ var View = function View(props) {
   //disable infinite scroll
 
   var checkVideoSeries = function checkVideoSeries(article) {
+    if (!article || !article.body) {
+      return false;
+    }
     for (var i = 0; i < article.body.length; i++) {
       var row = article.body[i];
       if (typeof row.videos !== 'undefined') {
@@ -1240,7 +1240,7 @@ var View = function View(props) {
   );
 };
 
-//This should be called in /view/[url] getInitialProps to fetch the article data and related articles.  This will also set the sponsoredFlag to true if any taxonomies have disabled ads.  
+//This should be called in /view/[url] getInitialProps to fetch the article data and related articles.  This will also set the sponsoredFlag to true if any taxonomies have disabled ads.
 View.returnGetInitialProps = function () {
   var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee(url, prevUrl, seriesVid, client, sao) {
     var article, relatedArticleQuery, statusCode, sponsoredFlag;
@@ -1264,11 +1264,13 @@ View.returnGetInitialProps = function () {
             sponsoredFlag = false;
             //check for disableAds flag on each taxonomoy
 
-            article.content_placement.forEach(function (x) {
-              if (x.disableAds) {
-                sponsoredFlag = true;
-              }
-            });
+            if (article && article.content_placement) {
+              article.content_placement.forEach(function (x) {
+                if (x.disableAds) {
+                  sponsoredFlag = true;
+                }
+              });
+            }
             //check for disableAds flag on content category
             if (article.category && article.category.disableAds) {
               sponsoredFlag = true;

package/dist/cjs/getQuery.js

@@ -12,13 +12,13 @@ var getQuery = function getQuery(type) {
   var today = moment.moment().utc().format();
   switch (type) {
     case 'related':
-      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && published <= \'' + today + '\'\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[$index]{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                    documentGroup-> {\n                      name,\n                      thumbnail,\n                      parent->{...,parent->},\n                    \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
+      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && published <= \'' + today + '\'\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[$index]{\n                  ' + params + '\n                  title,\n                  published,\n                  \'showPublished\':select(contentCategory->name !=\'Webcasts\' => true,false),\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                    documentGroup-> {\n                      name,\n                      thumbnail,\n                      parent->{...,parent->},\n                    \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
     case 'article':
-      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                            documentGroup-> {\n                              name,\n                              thumbnail,\n                              parent->{...,parent->},\n                            \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
+      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          \'showPublished\':select(contentCategory->name !=\'Webcasts\' => true,false),\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                            documentGroup-> {\n                              name,\n                              thumbnail,\n                              parent->{...,parent->},\n                            \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
     case 'issue':
-      return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n            ' + params + '\n            ...,\n            \'issue\': *[_type == \'publication\'\n                && references(^._id)\n                && identifier.current == $issue][0] {\n                    ...,\n                    \'articles\': *[_type == \'article\'\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && is_visible\n                        && defined(url)\n                        && dateTime(published) <= dateTime($currentDate)\n                        && references(^._id)] {\n                          ...,\n                          authorMapping[0]->,\n                          contentCategory->,\n                          issueSection-> {\n                            name\n                          }\n                        }\n                }\n        }';
+      return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n            ' + params + '\n            ...,\n            \'issue\': *[_type == \'publication\'\n                && references(^._id)\n                && identifier.current == $issue][0] {\n                    ...,\n                    \'articles\': *[_type == \'article\'\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && is_visible\n                        && defined(url)\n                        && published <= $currentDate\n                        && references(^._id)] {\n                          ...,\n                          authorMapping[0]->,\n                          contentCategory->,\n                          issueSection-> {\n                            name\n                          }\n                        }\n                }\n        }';
     case 'externalResources':
       return '{\n        \'archived\': *[_type == "external" && archived && isVisible ' + conditions + '] | order(displayDate desc),\n        \'recent\': *[_type == "external" && archived != true && isVisible ' + conditions + '] | order(displayDate asc)\n      }';
   }