@folklore/ads 0.0.34 → 0.0.36

package/dist/cjs.js

@@ -11,8 +11,8 @@ var isArray = require('lodash/isArray');
 var sortBy = require('lodash/sortBy');
 var uniqBy = require('lodash/uniqBy');
 var debounce = require('lodash/debounce');
-var EventEmitter = require('wolfy87-eventemitter');
 var createDebug = require('debug');
+var EventEmitter = require('wolfy87-eventemitter');
 var jsxRuntime = require('react/jsx-runtime');
 var hooks = require('@folklore/hooks');
 var tracking = require('@folklore/tracking');
@@ -28,8 +28,8 @@ var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
 var sortBy__default = /*#__PURE__*/_interopDefaultLegacy(sortBy);
 var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
 var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
-var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 var createDebug__default = /*#__PURE__*/_interopDefaultLegacy(createDebug);
+var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 
 const adPath = PropTypes__default["default"].string;
 const adSize = PropTypes__default["default"].oneOfType([PropTypes__default["default"].arrayOf(PropTypes__default["default"].number), PropTypes__default["default"].arrayOf(PropTypes__default["default"].string), PropTypes__default["default"].string, PropTypes__default["default"].arrayOf(PropTypes__default["default"].oneOfType([PropTypes__default["default"].arrayOf(PropTypes__default["default"].number), PropTypes__default["default"].arrayOf(PropTypes__default["default"].string), PropTypes__default["default"].string]))]);
@@ -260,7 +260,8 @@ class AdSlot extends EventEmitter__default["default"] {
     } = this.renderEvent;
     return size !== null ? {
       width: size[0],
-      height: size[1]
+      height: size[1],
+      isFluid: size[0] === 0 && size[1] === 0
     } : null;
   }
 }
@@ -320,7 +321,9 @@ class AdsManager extends EventEmitter__default["default"] {
     this.options = {
       disabled: false,
       disablePersonnalizedAds: false,
-      enableSingleRequest: false,
+      disableSingleRequest: false,
+      disableLazyLoad: false,
+      disableVideoAds: false,
       autoInit: false,
       ...opts
     };
@@ -351,30 +354,39 @@ class AdsManager extends EventEmitter__default["default"] {
         personnalizedAdsDisabled
       } = this;
       const {
-        enableSingleRequest
+        disableSingleRequest = false,
+        disableLazyLoad = false,
+        disableVideoAds = false,
+        mobileScaling = 1.0,
+        renderMarginPercent = 100,
+        fetchMarginPercent = 300
       } = this.options;
       if (disabled) {
         debug('Disable initial load');
         googletag.pubads().disableInitialLoad();
       }
-      if (enableSingleRequest) {
+      if (!disableSingleRequest) {
         debug('Enable single request');
-        googletag.pubads().enableSingleRequest();
+        googletag.pubads().disableSingleRequest();
       }
       if (personnalizedAdsDisabled) {
         debug('Disable personalized ads');
         googletag.pubads().setRequestNonPersonalizedAds(1);
       }
-      googletag.pubads().enableLazyLoad({
-        // Fetch slots within 5 viewports.
-        fetchMarginPercent: 300,
-        // Render slots within 2 viewports.
-        renderMarginPercent: 100,
-        // Double the above values on mobile, where viewports are smaller
-        // and users tend to scroll faster.
-        mobileScaling: 1.0
-      });
-      googletag.pubads().enableVideoAds();
+      if (!disableLazyLoad) {
+        googletag.pubads().enableLazyLoad({
+          // Fetch slots within 5 viewports.
+          fetchMarginPercent,
+          // Render slots within 2 viewports.
+          renderMarginPercent,
+          // Double the above values on mobile, where viewports are smaller
+          // and users tend to scroll faster.
+          mobileScaling
+        });
+      }
+      if (!disableVideoAds) {
+        googletag.pubads().enableVideoAds();
+      }
       googletag.pubads().addEventListener('slotRenderEnded', this.onSlotRenderEnded);
       googletag.pubads().addEventListener('impressionViewable', this.onSlotImpressionViewable);
       googletag.enableServices();
@@ -633,10 +645,15 @@ const propTypes$2 = {
   children: PropTypes__default["default"].node.isRequired,
   defaultSlotPath: PropTypes__default["default"].string,
   slotsPath: PropTypes__default["default"].objectOf(PropTypes__default["default"].string),
-  enableSingleRequest: PropTypes__default["default"].bool,
+  disableSingleRequest: PropTypes__default["default"].bool,
+  disableVideoAds: PropTypes__default["default"].bool,
+  disableLazyLoad: PropTypes__default["default"].bool,
   autoInit: PropTypes__default["default"].bool,
   resizeDebounceDelay: PropTypes__default["default"].number,
   refreshOnResize: PropTypes__default["default"].bool,
+  mobileScaling: PropTypes__default["default"].number,
+  renderMarginPercent: PropTypes__default["default"].number,
+  fetchMarginPercent: PropTypes__default["default"].number,
   slots: adSlots,
   viewports: adViewports,
   disabled: PropTypes__default["default"].bool,
@@ -645,10 +662,15 @@ const propTypes$2 = {
 const defaultProps$2 = {
   defaultSlotPath: null,
   slotsPath: null,
-  enableSingleRequest: true,
+  disableSingleRequest: false,
+  disableVideoAds: false,
+  disableLazyLoad: false,
   autoInit: true,
   resizeDebounceDelay: 500,
   refreshOnResize: false,
+  mobileScaling: 1.0,
+  renderMarginPercent: 100,
+  fetchMarginPercent: 300,
   slots: slots,
   viewports: viewports,
   disabled: false,
@@ -659,10 +681,15 @@ function AdsProvider(_ref) {
     children,
     defaultSlotPath,
     slotsPath,
-    enableSingleRequest,
+    disableSingleRequest,
+    disableVideoAds,
+    disableLazyLoad,
     autoInit,
     resizeDebounceDelay,
     refreshOnResize,
+    mobileScaling,
+    renderMarginPercent,
+    fetchMarginPercent,
     viewports,
     slots,
     disabled,
@@ -673,15 +700,20 @@ function AdsProvider(_ref) {
   const ads = React.useMemo(() => {
     if (adsRef.current === null) {
       adsRef.current = new AdsManager({
-        enableSingleRequest,
         autoInit,
-        disabled
+        disabled,
+        disableSingleRequest,
+        disableVideoAds,
+        disableLazyLoad,
+        mobileScaling,
+        renderMarginPercent,
+        fetchMarginPercent
       });
     } else {
       adsRef.current.setDisabled(disabled);
     }
     return adsRef.current;
-  }, [enableSingleRequest, autoInit, disabled]);
+  }, [autoInit, disabled, disableSingleRequest, disableVideoAds, disableLazyLoad, mobileScaling, renderMarginPercent, fetchMarginPercent]);
   React.useEffect(() => {
     let onReady = null;
     if (!ads.isReady()) {
@@ -1072,6 +1104,7 @@ function Ad(_ref) {
     id,
     width,
     height,
+    isFluid = false,
     isEmpty,
     isRendered,
     refObserver,
@@ -1103,10 +1136,10 @@ function Ad(_ref) {
   }
   let adStyle = null;
   if (isRendered) {
-    adStyle = {
+    adStyle = !isFluid ? {
       width,
       height
-    };
+    } : null;
   } else if (shouldKeepSize && (finalDisabled || waitingNextRender)) {
     adStyle = lastRenderedSize.current;
   } else if (!withoutMinimumSize) {

package/dist/es.js

@@ -7,8 +7,8 @@ import isArray from 'lodash/isArray';
 import sortBy from 'lodash/sortBy';
 import uniqBy from 'lodash/uniqBy';
 import debounce from 'lodash/debounce';
-import EventEmitter from 'wolfy87-eventemitter';
 import createDebug from 'debug';
+import EventEmitter from 'wolfy87-eventemitter';
 import { jsx } from 'react/jsx-runtime';
 import { useIntersectionObserver, useWindowEvent } from '@folklore/hooks';
 import { useTracking } from '@folklore/tracking';
@@ -242,7 +242,8 @@ class AdSlot extends EventEmitter {
     } = this.renderEvent;
     return size !== null ? {
       width: size[0],
-      height: size[1]
+      height: size[1],
+      isFluid: size[0] === 0 && size[1] === 0
     } : null;
   }
 }
@@ -302,7 +303,9 @@ class AdsManager extends EventEmitter {
     this.options = {
       disabled: false,
       disablePersonnalizedAds: false,
-      enableSingleRequest: false,
+      disableSingleRequest: false,
+      disableLazyLoad: false,
+      disableVideoAds: false,
       autoInit: false,
       ...opts
     };
@@ -333,30 +336,39 @@ class AdsManager extends EventEmitter {
         personnalizedAdsDisabled
       } = this;
       const {
-        enableSingleRequest
+        disableSingleRequest = false,
+        disableLazyLoad = false,
+        disableVideoAds = false,
+        mobileScaling = 1.0,
+        renderMarginPercent = 100,
+        fetchMarginPercent = 300
       } = this.options;
       if (disabled) {
         debug('Disable initial load');
         googletag.pubads().disableInitialLoad();
       }
-      if (enableSingleRequest) {
+      if (!disableSingleRequest) {
         debug('Enable single request');
-        googletag.pubads().enableSingleRequest();
+        googletag.pubads().disableSingleRequest();
       }
       if (personnalizedAdsDisabled) {
         debug('Disable personalized ads');
         googletag.pubads().setRequestNonPersonalizedAds(1);
       }
-      googletag.pubads().enableLazyLoad({
-        // Fetch slots within 5 viewports.
-        fetchMarginPercent: 300,
-        // Render slots within 2 viewports.
-        renderMarginPercent: 100,
-        // Double the above values on mobile, where viewports are smaller
-        // and users tend to scroll faster.
-        mobileScaling: 1.0
-      });
-      googletag.pubads().enableVideoAds();
+      if (!disableLazyLoad) {
+        googletag.pubads().enableLazyLoad({
+          // Fetch slots within 5 viewports.
+          fetchMarginPercent,
+          // Render slots within 2 viewports.
+          renderMarginPercent,
+          // Double the above values on mobile, where viewports are smaller
+          // and users tend to scroll faster.
+          mobileScaling
+        });
+      }
+      if (!disableVideoAds) {
+        googletag.pubads().enableVideoAds();
+      }
       googletag.pubads().addEventListener('slotRenderEnded', this.onSlotRenderEnded);
       googletag.pubads().addEventListener('impressionViewable', this.onSlotImpressionViewable);
       googletag.enableServices();
@@ -615,10 +627,15 @@ const propTypes$2 = {
   children: PropTypes.node.isRequired,
   defaultSlotPath: PropTypes.string,
   slotsPath: PropTypes.objectOf(PropTypes.string),
-  enableSingleRequest: PropTypes.bool,
+  disableSingleRequest: PropTypes.bool,
+  disableVideoAds: PropTypes.bool,
+  disableLazyLoad: PropTypes.bool,
   autoInit: PropTypes.bool,
   resizeDebounceDelay: PropTypes.number,
   refreshOnResize: PropTypes.bool,
+  mobileScaling: PropTypes.number,
+  renderMarginPercent: PropTypes.number,
+  fetchMarginPercent: PropTypes.number,
   slots: adSlots,
   viewports: adViewports,
   disabled: PropTypes.bool,
@@ -627,10 +644,15 @@ const propTypes$2 = {
 const defaultProps$2 = {
   defaultSlotPath: null,
   slotsPath: null,
-  enableSingleRequest: true,
+  disableSingleRequest: false,
+  disableVideoAds: false,
+  disableLazyLoad: false,
   autoInit: true,
   resizeDebounceDelay: 500,
   refreshOnResize: false,
+  mobileScaling: 1.0,
+  renderMarginPercent: 100,
+  fetchMarginPercent: 300,
   slots: slots,
   viewports: viewports,
   disabled: false,
@@ -641,10 +663,15 @@ function AdsProvider(_ref) {
     children,
     defaultSlotPath,
     slotsPath,
-    enableSingleRequest,
+    disableSingleRequest,
+    disableVideoAds,
+    disableLazyLoad,
     autoInit,
     resizeDebounceDelay,
     refreshOnResize,
+    mobileScaling,
+    renderMarginPercent,
+    fetchMarginPercent,
     viewports,
     slots,
     disabled,
@@ -655,15 +682,20 @@ function AdsProvider(_ref) {
   const ads = useMemo(() => {
     if (adsRef.current === null) {
       adsRef.current = new AdsManager({
-        enableSingleRequest,
         autoInit,
-        disabled
+        disabled,
+        disableSingleRequest,
+        disableVideoAds,
+        disableLazyLoad,
+        mobileScaling,
+        renderMarginPercent,
+        fetchMarginPercent
       });
     } else {
       adsRef.current.setDisabled(disabled);
     }
     return adsRef.current;
-  }, [enableSingleRequest, autoInit, disabled]);
+  }, [autoInit, disabled, disableSingleRequest, disableVideoAds, disableLazyLoad, mobileScaling, renderMarginPercent, fetchMarginPercent]);
   useEffect(() => {
     let onReady = null;
     if (!ads.isReady()) {
@@ -1054,6 +1086,7 @@ function Ad(_ref) {
     id,
     width,
     height,
+    isFluid = false,
     isEmpty,
     isRendered,
     refObserver,
@@ -1085,10 +1118,10 @@ function Ad(_ref) {
   }
   let adStyle = null;
   if (isRendered) {
-    adStyle = {
+    adStyle = !isFluid ? {
       width,
       height
-    };
+    } : null;
   } else if (shouldKeepSize && (finalDisabled || waitingNextRender)) {
     adStyle = lastRenderedSize.current;
   } else if (!withoutMinimumSize) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/ads",
-    "version": "0.0.34",
+    "version": "0.0.36",
     "description": "Ads library",
     "keywords": [
         "javascript",
@@ -50,7 +50,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d17ece8ec14646ba798b01cc8e022d4b8f6bc9f1",
+    "gitHead": "95d101938ccd8aa13a418623d38f30793191e0a7",
     "dependencies": {
         "@folklore/hooks": "^0.0.44",
         "@folklore/tracking": "^0.0.23",