@folklore/ads 0.0.102 → 0.0.104

package/dist/cjs.js

@@ -40,6 +40,15 @@ var propTypes$4 = /*#__PURE__*/Object.freeze({
     adViewports: adViewports
 });
 
+function normalizeAdSizes(size) {
+  if (size === null) {
+    return [];
+  }
+  if (isArray(size) && size.length > 0 && isArray(size[0])) {
+    return size;
+  }
+  return [size];
+}
 function getAdSizes(sizes) {
   return uniqBy(sizes, size => isArray(size) ? size.join('x') : size);
 }
@@ -1210,7 +1219,7 @@ function Ad(_ref) {
   // Size
   const size = providedSize || slotSize;
   const sizeMapping = providedSizeMapping || slotSizeMapping;
-  const minimumSize = React.useMemo(() => getMinimumAdSize(sizeMapping !== null ? sizeMapping.reduce((allSizes, sizeMap) => [...allSizes, ...sizeMap[1]], [size]) : [size]), [sizeMapping, size]);
+  const minimumSize = React.useMemo(() => getMinimumAdSize([...(getSizeFromSizeMapping(sizeMapping) || []), ...normalizeAdSizes(size)]), [sizeMapping, size]);
 
   // Targeting
   const contextTargeting = useAdsTargeting();
@@ -1239,7 +1248,7 @@ function Ad(_ref) {
       viewport: providedViewport || contextViewport || targetingViewport,
       targeting: otherProps || {}
     };
-  }, [contextTargeting, providedTargeting, slotName, providedRefreshInterval]);
+  }, [slotName, contextTargeting, providedTargeting, providedRefreshInterval, providedDisabled, providedViewport, contextViewport]);
   const lastRenderedSize = React.useRef(null);
   const wasDisabled = React.useRef(disabled);
   React.useEffect(() => {}, []);
@@ -1388,6 +1397,7 @@ exports.getMinimumAdSize = getMinimumAdSize;
 exports.getSizeFromSizeMapping = getSizeFromSizeMapping;
 exports.getSizeMappingFromSlot = getSizeMappingFromSlot;
 exports.getSortedViewports = getSortedViewports;
+exports.normalizeAdSizes = normalizeAdSizes;
 exports.sizeFitsInViewport = sizeFitsInViewport;
 exports.slots = slots;
 exports.useAd = useAd;

package/dist/es.js

@@ -38,6 +38,15 @@ var propTypes$4 = /*#__PURE__*/Object.freeze({
     adViewports: adViewports
 });
 
+function normalizeAdSizes(size) {
+  if (size === null) {
+    return [];
+  }
+  if (isArray(size) && size.length > 0 && isArray(size[0])) {
+    return size;
+  }
+  return [size];
+}
 function getAdSizes(sizes) {
   return uniqBy(sizes, size => isArray(size) ? size.join('x') : size);
 }
@@ -1208,7 +1217,7 @@ function Ad(_ref) {
   // Size
   const size = providedSize || slotSize;
   const sizeMapping = providedSizeMapping || slotSizeMapping;
-  const minimumSize = useMemo(() => getMinimumAdSize(sizeMapping !== null ? sizeMapping.reduce((allSizes, sizeMap) => [...allSizes, ...sizeMap[1]], [size]) : [size]), [sizeMapping, size]);
+  const minimumSize = useMemo(() => getMinimumAdSize([...(getSizeFromSizeMapping(sizeMapping) || []), ...normalizeAdSizes(size)]), [sizeMapping, size]);
 
   // Targeting
   const contextTargeting = useAdsTargeting();
@@ -1237,7 +1246,7 @@ function Ad(_ref) {
       viewport: providedViewport || contextViewport || targetingViewport,
       targeting: otherProps || {}
     };
-  }, [contextTargeting, providedTargeting, slotName, providedRefreshInterval]);
+  }, [slotName, contextTargeting, providedTargeting, providedRefreshInterval, providedDisabled, providedViewport, contextViewport]);
   const lastRenderedSize = useRef(null);
   const wasDisabled = useRef(disabled);
   useEffect(() => {}, []);
@@ -1372,4 +1381,4 @@ function Ad(_ref) {
 }
 Ad.propTypes = propTypes;
 
-export { Ad, AdSlot, AdsManager, AdsProvider, AdsTargetingProvider, propTypes$4 as PropTypes, RichAd, buildSizeMappingFromSizes, buildSizeMappingFromViewports, getAdSizes, getMinimumAdSize, getSizeFromSizeMapping, getSizeMappingFromSlot, getSortedViewports, sizeFitsInViewport, slots, useAd, useAdsContext, useAdsTargeting, useAdsTracking, useRichAd, viewports };
+export { Ad, AdSlot, AdsManager, AdsProvider, AdsTargetingProvider, propTypes$4 as PropTypes, RichAd, buildSizeMappingFromSizes, buildSizeMappingFromViewports, getAdSizes, getMinimumAdSize, getSizeFromSizeMapping, getSizeMappingFromSlot, getSortedViewports, normalizeAdSizes, sizeFitsInViewport, slots, useAd, useAdsContext, useAdsTargeting, useAdsTracking, useRichAd, viewports };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/ads",
-    "version": "0.0.102",
+    "version": "0.0.104",
     "description": "Ads library",
     "keywords": [
         "javascript",
@@ -50,7 +50,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "88bd18e811d5872888c552e78c10b169d5ab0b3b",
+    "gitHead": "2d8bb885c7367b26f1b384e30ef8fe9c2ccfee08",
     "dependencies": {
         "@folklore/hooks": "^0.0.72",
         "@folklore/tracking": "^0.0.29",