@folklore/ads 0.0.41 → 0.0.43

package/dist/cjs.js

@@ -351,7 +351,7 @@ class AdsManager extends EventEmitter__default["default"] {
     };
     this.slots = [];
     this.index = 0;
-    if (this.options.autoInit) {
+    if (this.options.autoInit && !this.disabled) {
       this.init();
     }
   }
@@ -363,60 +363,73 @@ class AdsManager extends EventEmitter__default["default"] {
     this.index += 1;
     return newId;
   }
-  onGPTReady() {
+  init() {
     const {
       googletag
     } = this;
-    this.ready = true;
     googletag.cmd.push(() => {
-      const {
-        disabled,
-        personnalizedAdsDisabled
-      } = this;
-      const {
-        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 (!disableSingleRequest) {
-        debug('Enable single request');
-        googletag.pubads().enableSingleRequest();
-      }
-      if (personnalizedAdsDisabled) {
-        debug('Disable personalized ads');
-        googletag.pubads().setRequestNonPersonalizedAds(1);
-      }
-      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();
-      this.enabled = true;
-      debug('GPT is ready');
-      if (!disabled) {
-        this.emit('ready');
+      if (this.disabled) {
+        return;
       }
+      this.initGpt();
     });
   }
+  initGpt() {
+    const {
+      googletag
+    } = this;
+    if (this.disabled) {
+      return;
+    }
+    debug('Initializing GPT...');
+    const {
+      disabled,
+      personnalizedAdsDisabled
+    } = this;
+    const {
+      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 (!disableSingleRequest) {
+      debug('Enable single request');
+      googletag.pubads().enableSingleRequest();
+    }
+    if (personnalizedAdsDisabled) {
+      debug('Disable personalized ads');
+      googletag.pubads().setRequestNonPersonalizedAds(1);
+    }
+    if (!disableLazyLoad) {
+      debug('Enable lazy loading %o', {
+        fetchMarginPercent,
+        renderMarginPercent,
+        mobileScaling
+      });
+      googletag.pubads().enableLazyLoad({
+        fetchMarginPercent,
+        renderMarginPercent,
+        mobileScaling
+      });
+    }
+    if (!disableVideoAds) {
+      debug('Enable video ads');
+      googletag.pubads().enableVideoAds();
+    }
+    googletag.pubads().addEventListener('slotRenderEnded', this.onSlotRenderEnded);
+    googletag.pubads().addEventListener('impressionViewable', this.onSlotImpressionViewable);
+    googletag.enableServices();
+    debug('GPT is ready');
+    this.enabled = true;
+    this.ready = true;
+    this.emit('ready');
+  }
   onSlotRenderEnded(event) {
     const {
       slot: eventSlot,
@@ -452,15 +465,6 @@ class AdsManager extends EventEmitter__default["default"] {
   onSlotVisibleChange(visible, slot) {
     debug('Slot #%s(%s) visibility change to %s', slot.getElementId(), slot.getAdPath(), visible ? 'visible' : 'not visible');
   }
-  init() {
-    const {
-      googletag
-    } = this;
-    debug('Initializing ads manager...');
-    googletag.cmd.push(() => {
-      this.onGPTReady();
-    });
-  }
   isReady() {
     return this.ready && this.enabled && !this.disabled;
   }
@@ -468,14 +472,19 @@ class AdsManager extends EventEmitter__default["default"] {
     return this.disabled;
   }
   setDisabled(disabled) {
-    const shouldRefresh = this.disabled && !disabled;
+    // const shouldRefresh = this.disabled && !disabled;
     this.disabled = disabled;
-    if (shouldRefresh) {
-      this.refreshAllSlots();
-    }
-    if (this.enabled && !disabled) {
-      this.emit('ready');
+    if (!this.enabled && !disabled) {
+      this.init();
     }
+
+    // if (shouldRefresh) {
+    //     this.refreshAllSlots();
+    // }
+
+    // if (this.enabled && !disabled) {
+    //     this.emit('ready');
+    // }
   }
   disablePersonnalizedAds(disablePersonnalizedAds) {
     const {
@@ -885,7 +894,7 @@ function useAd(path, size) {
 
   // Create slot
   // const currentSlot = useRef(null);
-  const [slot, setSlot] = React.useState();
+  const [slot, setSlot] = React.useState(null);
   React.useEffect(() => {
     // if (currentSlot.current !== null) {
     //     adsManager.destroySlot(currentSlot.current);

package/dist/es.js

@@ -333,7 +333,7 @@ class AdsManager extends EventEmitter {
     };
     this.slots = [];
     this.index = 0;
-    if (this.options.autoInit) {
+    if (this.options.autoInit && !this.disabled) {
       this.init();
     }
   }
@@ -345,60 +345,73 @@ class AdsManager extends EventEmitter {
     this.index += 1;
     return newId;
   }
-  onGPTReady() {
+  init() {
     const {
       googletag
     } = this;
-    this.ready = true;
     googletag.cmd.push(() => {
-      const {
-        disabled,
-        personnalizedAdsDisabled
-      } = this;
-      const {
-        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 (!disableSingleRequest) {
-        debug('Enable single request');
-        googletag.pubads().enableSingleRequest();
-      }
-      if (personnalizedAdsDisabled) {
-        debug('Disable personalized ads');
-        googletag.pubads().setRequestNonPersonalizedAds(1);
-      }
-      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();
-      this.enabled = true;
-      debug('GPT is ready');
-      if (!disabled) {
-        this.emit('ready');
+      if (this.disabled) {
+        return;
       }
+      this.initGpt();
     });
   }
+  initGpt() {
+    const {
+      googletag
+    } = this;
+    if (this.disabled) {
+      return;
+    }
+    debug('Initializing GPT...');
+    const {
+      disabled,
+      personnalizedAdsDisabled
+    } = this;
+    const {
+      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 (!disableSingleRequest) {
+      debug('Enable single request');
+      googletag.pubads().enableSingleRequest();
+    }
+    if (personnalizedAdsDisabled) {
+      debug('Disable personalized ads');
+      googletag.pubads().setRequestNonPersonalizedAds(1);
+    }
+    if (!disableLazyLoad) {
+      debug('Enable lazy loading %o', {
+        fetchMarginPercent,
+        renderMarginPercent,
+        mobileScaling
+      });
+      googletag.pubads().enableLazyLoad({
+        fetchMarginPercent,
+        renderMarginPercent,
+        mobileScaling
+      });
+    }
+    if (!disableVideoAds) {
+      debug('Enable video ads');
+      googletag.pubads().enableVideoAds();
+    }
+    googletag.pubads().addEventListener('slotRenderEnded', this.onSlotRenderEnded);
+    googletag.pubads().addEventListener('impressionViewable', this.onSlotImpressionViewable);
+    googletag.enableServices();
+    debug('GPT is ready');
+    this.enabled = true;
+    this.ready = true;
+    this.emit('ready');
+  }
   onSlotRenderEnded(event) {
     const {
       slot: eventSlot,
@@ -434,15 +447,6 @@ class AdsManager extends EventEmitter {
   onSlotVisibleChange(visible, slot) {
     debug('Slot #%s(%s) visibility change to %s', slot.getElementId(), slot.getAdPath(), visible ? 'visible' : 'not visible');
   }
-  init() {
-    const {
-      googletag
-    } = this;
-    debug('Initializing ads manager...');
-    googletag.cmd.push(() => {
-      this.onGPTReady();
-    });
-  }
   isReady() {
     return this.ready && this.enabled && !this.disabled;
   }
@@ -450,14 +454,19 @@ class AdsManager extends EventEmitter {
     return this.disabled;
   }
   setDisabled(disabled) {
-    const shouldRefresh = this.disabled && !disabled;
+    // const shouldRefresh = this.disabled && !disabled;
     this.disabled = disabled;
-    if (shouldRefresh) {
-      this.refreshAllSlots();
-    }
-    if (this.enabled && !disabled) {
-      this.emit('ready');
+    if (!this.enabled && !disabled) {
+      this.init();
     }
+
+    // if (shouldRefresh) {
+    //     this.refreshAllSlots();
+    // }
+
+    // if (this.enabled && !disabled) {
+    //     this.emit('ready');
+    // }
   }
   disablePersonnalizedAds(disablePersonnalizedAds) {
     const {
@@ -867,7 +876,7 @@ function useAd(path, size) {
 
   // Create slot
   // const currentSlot = useRef(null);
-  const [slot, setSlot] = useState();
+  const [slot, setSlot] = useState(null);
   useEffect(() => {
     // if (currentSlot.current !== null) {
     //     adsManager.destroySlot(currentSlot.current);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/ads",
-    "version": "0.0.41",
+    "version": "0.0.43",
     "description": "Ads library",
     "keywords": [
         "javascript",
@@ -50,7 +50,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ee7a99e9a056e466320a99c43f1982d1d5900079",
+    "gitHead": "d4638f437512793501b8a132606d08abfd1782dd",
     "dependencies": {
         "@folklore/hooks": "^0.0.44",
         "@folklore/tracking": "^0.0.23",