@folklore/ads 0.0.110 → 0.0.111

package/dist/cjs.js

@@ -70,28 +70,21 @@ function getSortedViewports(viewports) {
   })), [viewport => viewport.size[0]]).reverse();
 }
 function buildSizeMappingFromViewports(sizeMapping, viewports) {
-  return isObject(sizeMapping) && !isArray(sizeMapping) ? getSortedViewports(viewports).reduce((newSizeMapping, _ref) => {
-    let {
-      name,
-      size: viewPortSize
-    } = _ref;
-    return typeof sizeMapping[name] !== 'undefined' ? [...newSizeMapping, [viewPortSize, sizeMapping[name]]] : newSizeMapping;
-  }, []) : sizeMapping;
+  return isObject(sizeMapping) && !isArray(sizeMapping) ? getSortedViewports(viewports).reduce((newSizeMapping, {
+    name,
+    size: viewPortSize
+  }) => typeof sizeMapping[name] !== 'undefined' ? [...newSizeMapping, [viewPortSize, sizeMapping[name]]] : newSizeMapping, []) : sizeMapping;
 }
 function buildSizeMappingFromSizes(sizes, viewports) {
-  return getSortedViewports(viewports).map(_ref2 => {
-    let {
-      name,
-      size: viewPortSize
-    } = _ref2;
-    return [viewPortSize, sizes.filter(size => sizeFitsInViewport(size, name === 'default' ? [300, 300] : viewPortSize))];
-  });
+  return getSortedViewports(viewports).map(({
+    name,
+    size: viewPortSize
+  }) => [viewPortSize, sizes.filter(size => sizeFitsInViewport(size, name === 'default' ? [300, 300] : viewPortSize))]);
 }
-function getSizeMappingFromSlot(_ref3, viewports) {
-  let {
-    size: allSizes = [],
-    sizeMapping = null
-  } = _ref3;
+function getSizeMappingFromSlot({
+  size: allSizes = [],
+  sizeMapping = null
+}, viewports) {
   if (sizeMapping === true) {
     return buildSizeMappingFromSizes(allSizes, viewports);
   }
@@ -116,8 +109,7 @@ function getSizeFromSizeMapping(sizeMapping) {
 }
 
 class AdSlot extends EventEmitter {
-  constructor(id, path, size) {
-    let opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  constructor(id, path, size, opts = {}) {
     super();
     this.options = {
       sizeMapping: null,
@@ -345,8 +337,7 @@ class AdsManager extends EventEmitter {
       [index.id]: [item.slug]
     } : null;
   }
-  constructor() {
-    let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(opts = {}) {
     super();
     this.options = {
       disabled: false,
@@ -514,8 +505,7 @@ class AdsManager extends EventEmitter {
       googletag.pubads().setRequestNonPersonalizedAds(disablePersonnalizedAds ? 1 : 0);
     });
   }
-  createSlot(path, size) {
-    let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  createSlot(path, size, opts = {}) {
     const {
       id: providedId = null
     } = opts;
@@ -692,27 +682,26 @@ const AdsContext = /*#__PURE__*/React.createContext({
   ready: false
 });
 const useAdsContext = () => React.useContext(AdsContext);
-function AdsProvider(_ref) {
-  let {
-    children,
-    defaultSlotPath = null,
-    slotsPath = null,
-    disableSingleRequest = false,
-    disableVideoAds = false,
-    disableLazyLoad = false,
-    autoInit = true,
-    resizeDebounceDelay = 500,
-    refreshOnResize = false,
-    mobileScaling = 1.0,
-    renderMarginPercent = 100,
-    fetchMarginPercent = 300,
-    viewport = null,
-    viewports: viewports$1 = viewports,
-    slots: slots$1 = slots,
-    richAdComponents = null,
-    disabled = false,
-    disableTracking = false
-  } = _ref;
+function AdsProvider({
+  children,
+  defaultSlotPath = null,
+  slotsPath = null,
+  disableSingleRequest = false,
+  disableVideoAds = false,
+  disableLazyLoad = false,
+  autoInit = true,
+  resizeDebounceDelay = 500,
+  refreshOnResize = false,
+  mobileScaling = 1.0,
+  renderMarginPercent = 100,
+  fetchMarginPercent = 300,
+  viewport = null,
+  viewports: viewports$1 = viewports,
+  slots: slots$1 = slots,
+  richAdComponents = null,
+  disabled = false,
+  disableTracking = false
+}) {
   const [ready, setReady] = React.useState(false);
   const adsRef = React.useRef(null);
   const ads = React.useMemo(() => {
@@ -810,12 +799,11 @@ const defaultTargeting = {
 };
 const AdsTargetingContext = /*#__PURE__*/React.createContext(defaultTargeting);
 const useAdsTargeting = () => React.useContext(AdsTargetingContext);
-function AdsTargetingProvider(_ref) {
-  let {
-    children,
-    targeting = defaultTargeting,
-    replace = false
-  } = _ref;
+function AdsTargetingProvider({
+  children,
+  targeting = defaultTargeting,
+  replace = false
+}) {
   const previousTargeting = useAdsTargeting();
   const mergedTargeting = React.useMemo(() => replace ? targeting : {
     ...previousTargeting,
@@ -828,11 +816,10 @@ function AdsTargetingProvider(_ref) {
 }
 
 /* eslint-disable react/jsx-props-no-spreading */
-function RichAd(_ref) {
-  let {
-    richAd,
-    ...props
-  } = _ref;
+function RichAd({
+  richAd,
+  ...props
+}) {
   const {
     type = null,
     ...richAdProps
@@ -849,9 +836,7 @@ function RichAd(_ref) {
 
 function useAdsTracking() {
   const tracking$1 = tracking.useTracking() || null;
-  const trackEvent = React.useCallback(function (action) {
-    let slot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    let renderEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  const trackEvent = React.useCallback((action, slot = null, renderEvent = null) => {
     if (tracking$1 !== null && typeof tracking$1.trackAd !== 'undefined') {
       tracking$1.trackAd(action, slot, renderEvent);
     }
@@ -859,21 +844,20 @@ function useAdsTracking() {
   return trackEvent;
 }
 
-function useAd(path, size) {
-  let {
-    id,
-    sizeMapping = null,
-    viewport = null,
-    targeting = null,
-    categoryExclusions = null,
-    refreshInterval = null,
-    alwaysRender = false,
-    onRender = null,
-    onDestroy = null,
-    disabled = false,
-    disableTracking = false,
-    rootMargin = '300px'
-  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+function useAd(path, size, {
+  id,
+  sizeMapping = null,
+  viewport = null,
+  targeting = null,
+  categoryExclusions = null,
+  refreshInterval = null,
+  alwaysRender = false,
+  onRender = null,
+  onDestroy = null,
+  disabled = false,
+  disableTracking = false,
+  rootMargin = '300px'
+} = {}) {
   const {
     ads: adsManager,
     viewports,
@@ -881,9 +865,7 @@ function useAd(path, size) {
     trackingDisabled: globalTrackingDisabled = false
   } = useAdsContext();
   const trackAd = useAdsTracking();
-  const track = React.useCallback(function (action) {
-    let slot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    let renderEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  const track = React.useCallback((action, slot = null, renderEvent = null) => {
     if (!disableTracking && !globalTrackingDisabled) {
       trackAd(action, slot, renderEvent);
     }
@@ -893,7 +875,7 @@ function useAd(path, size) {
   const {
     ref: refObserver,
     entry: {
-      isIntersecting
+      isIntersecting = false
     }
   } = hooks.useIntersectionObserver({
     rootMargin,
@@ -923,10 +905,7 @@ function useAd(path, size) {
       adsManager.destroySlot(currentSlot);
     }
     const viewportSize = viewport !== null ? viewports[viewport] || null : null;
-    const [, viewportFixedSize = null] = sizeMapping !== null && viewportSize !== null ? sizeMapping.find(_ref => {
-      let [itViewport] = _ref;
-      return itViewport.join('x') === viewportSize.join('x');
-    }) || [] : [];
+    const [, viewportFixedSize = null] = sizeMapping !== null && viewportSize !== null ? sizeMapping.find(([itViewport]) => itViewport.join('x') === viewportSize.join('x')) || [] : [];
     const newSlot = path !== null && !disabled ? adsManager.createSlot(path, viewportFixedSize || size, {
       id,
       visible: isVisible,
@@ -1073,8 +1052,7 @@ function parseRichAd(data) {
   } catch (e) {}
   return richAd;
 }
-function useRichAd(containerRef, id) {
-  let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+function useRichAd(containerRef, id, opts = {}) {
   const [richAd, setRichAd] = React.useState(null);
   const {
     onRichAd = null
@@ -1112,32 +1090,31 @@ function useRichAd(containerRef, id) {
 }
 
 /* eslint-disable react/require-default-props */
-function Ad(_ref) {
-  let {
-    slot: slotName,
-    path: providedPath = null,
-    size: providedSize = null,
-    sizeMapping: providedSizeMapping = null,
-    viewport: providedViewport = null,
-    targeting: providedTargeting = null,
-    refreshInterval: providedRefreshInterval = null,
-    alwaysRender = true,
-    disabled: providedDisabled = false,
-    disableTracking = false,
-    shouldKeepSize = false,
-    withoutStyle = false,
-    withoutMinimumSize = false,
-    withReactId = false,
-    className = null,
-    emptyClassName = null,
-    adClassName = null,
-    richAdClassName = null,
-    richAdIframeClassName = null,
-    onRender = null,
-    onDestroy = null,
-    onRichAd = null,
-    slotRef = null
-  } = _ref;
+function Ad({
+  slot: slotName,
+  path: providedPath = null,
+  size: providedSize = null,
+  sizeMapping: providedSizeMapping = null,
+  viewport: providedViewport = null,
+  targeting: providedTargeting = null,
+  refreshInterval: providedRefreshInterval = null,
+  alwaysRender = true,
+  disabled: providedDisabled = false,
+  disableTracking = false,
+  shouldKeepSize = false,
+  withoutStyle = false,
+  withoutMinimumSize = false,
+  withReactId = false,
+  className = null,
+  emptyClassName = null,
+  adClassName = null,
+  richAdClassName = null,
+  richAdIframeClassName = null,
+  onRender = null,
+  onDestroy = null,
+  onRichAd = null,
+  slotRef = null
+}) {
   const {
     slots = null,
     slotsPath = null,

package/dist/es.js

@@ -68,28 +68,21 @@ function getSortedViewports(viewports) {
   })), [viewport => viewport.size[0]]).reverse();
 }
 function buildSizeMappingFromViewports(sizeMapping, viewports) {
-  return isObject(sizeMapping) && !isArray(sizeMapping) ? getSortedViewports(viewports).reduce((newSizeMapping, _ref) => {
-    let {
-      name,
-      size: viewPortSize
-    } = _ref;
-    return typeof sizeMapping[name] !== 'undefined' ? [...newSizeMapping, [viewPortSize, sizeMapping[name]]] : newSizeMapping;
-  }, []) : sizeMapping;
+  return isObject(sizeMapping) && !isArray(sizeMapping) ? getSortedViewports(viewports).reduce((newSizeMapping, {
+    name,
+    size: viewPortSize
+  }) => typeof sizeMapping[name] !== 'undefined' ? [...newSizeMapping, [viewPortSize, sizeMapping[name]]] : newSizeMapping, []) : sizeMapping;
 }
 function buildSizeMappingFromSizes(sizes, viewports) {
-  return getSortedViewports(viewports).map(_ref2 => {
-    let {
-      name,
-      size: viewPortSize
-    } = _ref2;
-    return [viewPortSize, sizes.filter(size => sizeFitsInViewport(size, name === 'default' ? [300, 300] : viewPortSize))];
-  });
+  return getSortedViewports(viewports).map(({
+    name,
+    size: viewPortSize
+  }) => [viewPortSize, sizes.filter(size => sizeFitsInViewport(size, name === 'default' ? [300, 300] : viewPortSize))]);
 }
-function getSizeMappingFromSlot(_ref3, viewports) {
-  let {
-    size: allSizes = [],
-    sizeMapping = null
-  } = _ref3;
+function getSizeMappingFromSlot({
+  size: allSizes = [],
+  sizeMapping = null
+}, viewports) {
   if (sizeMapping === true) {
     return buildSizeMappingFromSizes(allSizes, viewports);
   }
@@ -114,8 +107,7 @@ function getSizeFromSizeMapping(sizeMapping) {
 }
 
 class AdSlot extends EventEmitter {
-  constructor(id, path, size) {
-    let opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  constructor(id, path, size, opts = {}) {
     super();
     this.options = {
       sizeMapping: null,
@@ -343,8 +335,7 @@ class AdsManager extends EventEmitter {
       [index.id]: [item.slug]
     } : null;
   }
-  constructor() {
-    let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(opts = {}) {
     super();
     this.options = {
       disabled: false,
@@ -512,8 +503,7 @@ class AdsManager extends EventEmitter {
       googletag.pubads().setRequestNonPersonalizedAds(disablePersonnalizedAds ? 1 : 0);
     });
   }
-  createSlot(path, size) {
-    let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  createSlot(path, size, opts = {}) {
     const {
       id: providedId = null
     } = opts;
@@ -690,27 +680,26 @@ const AdsContext = /*#__PURE__*/React.createContext({
   ready: false
 });
 const useAdsContext = () => useContext(AdsContext);
-function AdsProvider(_ref) {
-  let {
-    children,
-    defaultSlotPath = null,
-    slotsPath = null,
-    disableSingleRequest = false,
-    disableVideoAds = false,
-    disableLazyLoad = false,
-    autoInit = true,
-    resizeDebounceDelay = 500,
-    refreshOnResize = false,
-    mobileScaling = 1.0,
-    renderMarginPercent = 100,
-    fetchMarginPercent = 300,
-    viewport = null,
-    viewports: viewports$1 = viewports,
-    slots: slots$1 = slots,
-    richAdComponents = null,
-    disabled = false,
-    disableTracking = false
-  } = _ref;
+function AdsProvider({
+  children,
+  defaultSlotPath = null,
+  slotsPath = null,
+  disableSingleRequest = false,
+  disableVideoAds = false,
+  disableLazyLoad = false,
+  autoInit = true,
+  resizeDebounceDelay = 500,
+  refreshOnResize = false,
+  mobileScaling = 1.0,
+  renderMarginPercent = 100,
+  fetchMarginPercent = 300,
+  viewport = null,
+  viewports: viewports$1 = viewports,
+  slots: slots$1 = slots,
+  richAdComponents = null,
+  disabled = false,
+  disableTracking = false
+}) {
   const [ready, setReady] = useState(false);
   const adsRef = useRef(null);
   const ads = useMemo(() => {
@@ -808,12 +797,11 @@ const defaultTargeting = {
 };
 const AdsTargetingContext = /*#__PURE__*/createContext(defaultTargeting);
 const useAdsTargeting = () => useContext(AdsTargetingContext);
-function AdsTargetingProvider(_ref) {
-  let {
-    children,
-    targeting = defaultTargeting,
-    replace = false
-  } = _ref;
+function AdsTargetingProvider({
+  children,
+  targeting = defaultTargeting,
+  replace = false
+}) {
   const previousTargeting = useAdsTargeting();
   const mergedTargeting = useMemo(() => replace ? targeting : {
     ...previousTargeting,
@@ -826,11 +814,10 @@ function AdsTargetingProvider(_ref) {
 }
 
 /* eslint-disable react/jsx-props-no-spreading */
-function RichAd(_ref) {
-  let {
-    richAd,
-    ...props
-  } = _ref;
+function RichAd({
+  richAd,
+  ...props
+}) {
   const {
     type = null,
     ...richAdProps
@@ -847,9 +834,7 @@ function RichAd(_ref) {
 
 function useAdsTracking() {
   const tracking = useTracking() || null;
-  const trackEvent = useCallback(function (action) {
-    let slot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    let renderEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  const trackEvent = useCallback((action, slot = null, renderEvent = null) => {
     if (tracking !== null && typeof tracking.trackAd !== 'undefined') {
       tracking.trackAd(action, slot, renderEvent);
     }
@@ -857,21 +842,20 @@ function useAdsTracking() {
   return trackEvent;
 }
 
-function useAd(path, size) {
-  let {
-    id,
-    sizeMapping = null,
-    viewport = null,
-    targeting = null,
-    categoryExclusions = null,
-    refreshInterval = null,
-    alwaysRender = false,
-    onRender = null,
-    onDestroy = null,
-    disabled = false,
-    disableTracking = false,
-    rootMargin = '300px'
-  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+function useAd(path, size, {
+  id,
+  sizeMapping = null,
+  viewport = null,
+  targeting = null,
+  categoryExclusions = null,
+  refreshInterval = null,
+  alwaysRender = false,
+  onRender = null,
+  onDestroy = null,
+  disabled = false,
+  disableTracking = false,
+  rootMargin = '300px'
+} = {}) {
   const {
     ads: adsManager,
     viewports,
@@ -879,9 +863,7 @@ function useAd(path, size) {
     trackingDisabled: globalTrackingDisabled = false
   } = useAdsContext();
   const trackAd = useAdsTracking();
-  const track = useCallback(function (action) {
-    let slot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    let renderEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  const track = useCallback((action, slot = null, renderEvent = null) => {
     if (!disableTracking && !globalTrackingDisabled) {
       trackAd(action, slot, renderEvent);
     }
@@ -891,7 +873,7 @@ function useAd(path, size) {
   const {
     ref: refObserver,
     entry: {
-      isIntersecting
+      isIntersecting = false
     }
   } = useIntersectionObserver({
     rootMargin,
@@ -921,10 +903,7 @@ function useAd(path, size) {
       adsManager.destroySlot(currentSlot);
     }
     const viewportSize = viewport !== null ? viewports[viewport] || null : null;
-    const [, viewportFixedSize = null] = sizeMapping !== null && viewportSize !== null ? sizeMapping.find(_ref => {
-      let [itViewport] = _ref;
-      return itViewport.join('x') === viewportSize.join('x');
-    }) || [] : [];
+    const [, viewportFixedSize = null] = sizeMapping !== null && viewportSize !== null ? sizeMapping.find(([itViewport]) => itViewport.join('x') === viewportSize.join('x')) || [] : [];
     const newSlot = path !== null && !disabled ? adsManager.createSlot(path, viewportFixedSize || size, {
       id,
       visible: isVisible,
@@ -1071,8 +1050,7 @@ function parseRichAd(data) {
   } catch (e) {}
   return richAd;
 }
-function useRichAd(containerRef, id) {
-  let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+function useRichAd(containerRef, id, opts = {}) {
   const [richAd, setRichAd] = useState(null);
   const {
     onRichAd = null
@@ -1110,32 +1088,31 @@ function useRichAd(containerRef, id) {
 }
 
 /* eslint-disable react/require-default-props */
-function Ad(_ref) {
-  let {
-    slot: slotName,
-    path: providedPath = null,
-    size: providedSize = null,
-    sizeMapping: providedSizeMapping = null,
-    viewport: providedViewport = null,
-    targeting: providedTargeting = null,
-    refreshInterval: providedRefreshInterval = null,
-    alwaysRender = true,
-    disabled: providedDisabled = false,
-    disableTracking = false,
-    shouldKeepSize = false,
-    withoutStyle = false,
-    withoutMinimumSize = false,
-    withReactId = false,
-    className = null,
-    emptyClassName = null,
-    adClassName = null,
-    richAdClassName = null,
-    richAdIframeClassName = null,
-    onRender = null,
-    onDestroy = null,
-    onRichAd = null,
-    slotRef = null
-  } = _ref;
+function Ad({
+  slot: slotName,
+  path: providedPath = null,
+  size: providedSize = null,
+  sizeMapping: providedSizeMapping = null,
+  viewport: providedViewport = null,
+  targeting: providedTargeting = null,
+  refreshInterval: providedRefreshInterval = null,
+  alwaysRender = true,
+  disabled: providedDisabled = false,
+  disableTracking = false,
+  shouldKeepSize = false,
+  withoutStyle = false,
+  withoutMinimumSize = false,
+  withReactId = false,
+  className = null,
+  emptyClassName = null,
+  adClassName = null,
+  richAdClassName = null,
+  richAdIframeClassName = null,
+  onRender = null,
+  onDestroy = null,
+  onRichAd = null,
+  slotRef = null
+}) {
   const {
     slots = null,
     slotsPath = null,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/ads",
-    "version": "0.0.110",
+    "version": "0.0.111",
     "description": "Ads library",
     "keywords": [
         "javascript",
@@ -38,7 +38,7 @@
         "clean": "rm -rf dist && rm -rf types",
         "build:types": "tsc --p tsconfig.json",
         "build": "npm run build:types && rollup --bundleConfigAsCjs --config ../../rollup.config.js",
-        "prepare": "npm run clean && npm run build"
+        "prepublishOnly": "npm run clean && npm run build"
     },
     "devDependencies": {
         "prop-types": "^15.7.2",
@@ -53,11 +53,11 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "94ad547d193769ed8f6a056adee68f1b2b5c8120",
+    "gitHead": "a04cfaacb364f3b35307d65d8778b078dace4491",
     "dependencies": {
-        "@folklore/hooks": "^0.0.73",
-        "@folklore/tracking": "^0.0.29",
-        "@folklore/utils": "^0.1.3",
+        "@folklore/hooks": "^0.0.74",
+        "@folklore/tracking": "^0.0.30",
+        "@folklore/utils": "^0.1.4",
         "classnames": "^2.5.1",
         "debug": "^4.3.4",
         "lodash": "^4.17.21",