@folklore/ads 0.0.28 → 0.0.30

package/dist/cjs.js

@@ -637,6 +637,7 @@ const propTypes$2 = {
   refreshOnResize: PropTypes__default["default"].bool,
   slots: adSlots,
   viewports: adViewports,
+  disabled: PropTypes__default["default"].bool,
   trackingDisabled: PropTypes__default["default"].bool
 };
 const defaultProps$2 = {
@@ -648,6 +649,7 @@ const defaultProps$2 = {
   refreshOnResize: false,
   slots: slots,
   viewports: viewports,
+  disabled: false,
   trackingDisabled: false
 };
 function AdsProvider(_ref) {
@@ -661,6 +663,7 @@ function AdsProvider(_ref) {
     refreshOnResize,
     viewports,
     slots,
+    disabled,
     trackingDisabled
   } = _ref;
   const [ready, setReady] = React.useState(false);
@@ -669,11 +672,14 @@ function AdsProvider(_ref) {
     if (adsRef.current === null) {
       adsRef.current = new AdsManager({
         enableSingleRequest,
-        autoInit
+        autoInit,
+        disabled
       });
+    } else {
+      adsRef.current.setDisabled(disabled);
     }
     return adsRef.current;
-  }, [enableSingleRequest, autoInit]);
+  }, [enableSingleRequest, autoInit, disabled]);
   React.useEffect(() => {
     let onReady = null;
     if (!ads.isReady()) {
@@ -723,7 +729,7 @@ function AdsProvider(_ref) {
       ...slotsPath
     },
     trackingDisabled
-  }), [ready, ads, viewports, slots, slotsPath, defaultSlotPath, trackingDisabled]);
+  }), [ready, ads, viewports, slots, slotsPath, defaultSlotPath, trackingDisabled, disabled]);
   return /*#__PURE__*/jsxRuntime.jsx(AdsContext.Provider, {
     value: value,
     children: children
@@ -996,13 +1002,23 @@ function Ad(_ref) {
 
   // Targeting
   const contextTargeting = useAdsTargeting();
-  const allTargeting = React.useMemo(() => ({
-    ...(slotName !== null ? {
-      slot: slotName
-    } : null),
-    ...contextTargeting,
-    ...targeting
-  }), [contextTargeting, targeting, slotName]);
+  const {
+    disabled: targetingDisabled = false
+  } = contextTargeting || {};
+  const finalDisabled = disabled || targetingDisabled;
+  const allTargeting = React.useMemo(() => {
+    const {
+      disabled: removedDisabled,
+      ...otherTargeting
+    } = contextTargeting || {};
+    return {
+      ...(slotName !== null ? {
+        slot: slotName
+      } : null),
+      ...otherTargeting,
+      ...targeting
+    };
+  }, [contextTargeting, targeting, slotName]);
   const finalAdTargeting = React.useMemo(() => {
     const {
       refreshAds = null,
@@ -1014,16 +1030,16 @@ function Ad(_ref) {
     };
   }, [allTargeting, refreshInterval]);
   const lastRenderedSize = React.useRef(null);
-  const wasDisabled = React.useRef(disabled);
+  const wasDisabled = React.useRef(finalDisabled);
   const onAdRender = React.useCallback(event => {
     const {
       isEmpty: newIsEmpty = true,
       width: newWidth,
       height: newHeight
     } = event || {};
-    if (disabled) {
+    if (finalDisabled) {
       wasDisabled.current = true;
-    } else if (!disabled && !newIsEmpty) {
+    } else if (!finalDisabled && !newIsEmpty) {
       wasDisabled.current = false;
     }
     lastRenderedSize.current = !newIsEmpty ? {
@@ -1033,7 +1049,7 @@ function Ad(_ref) {
     if (onRender !== null) {
       onRender(event);
     }
-  }, [onRender, shouldKeepSize, disabled]);
+  }, [onRender, shouldKeepSize, finalDisabled]);
 
   // useEffect(() => {
   //     if (!disabled) {
@@ -1064,7 +1080,7 @@ function Ad(_ref) {
     refreshInterval: finalAdTargeting.refreshInterval,
     alwaysRender,
     onRender: onAdRender,
-    disabled,
+    disabled: finalDisabled,
     trackingDisabled
   });
   if (slotRef !== null && isFunction__default["default"](slotRef)) {
@@ -1073,13 +1089,13 @@ function Ad(_ref) {
     // eslint-disable-next-line no-param-reassign
     slotRef.current = slotObject;
   }
-  if (disabled) {
+  if (finalDisabled) {
     wasDisabled.current = true;
-  } else if (!disabled && isRendered) {
+  } else if (!finalDisabled && isRendered) {
     wasDisabled.current = false;
   }
   const waitingNextRender = wasDisabled.current && !isRendered;
-  const keepSize = shouldKeepSize && (disabled || waitingNextRender) && lastRenderedSize.current !== null;
+  const keepSize = shouldKeepSize && (finalDisabled || waitingNextRender) && lastRenderedSize.current !== null;
   if (id === null && !keepSize) {
     return null;
   }
@@ -1089,7 +1105,7 @@ function Ad(_ref) {
       width,
       height
     };
-  } else if (shouldKeepSize && (disabled || waitingNextRender)) {
+  } else if (shouldKeepSize && (finalDisabled || waitingNextRender)) {
     adStyle = lastRenderedSize.current;
   } else if (!withoutMinimumSize) {
     adStyle = minimumSize;

package/dist/es.js

@@ -619,6 +619,7 @@ const propTypes$2 = {
   refreshOnResize: PropTypes.bool,
   slots: adSlots,
   viewports: adViewports,
+  disabled: PropTypes.bool,
   trackingDisabled: PropTypes.bool
 };
 const defaultProps$2 = {
@@ -630,6 +631,7 @@ const defaultProps$2 = {
   refreshOnResize: false,
   slots: slots,
   viewports: viewports,
+  disabled: false,
   trackingDisabled: false
 };
 function AdsProvider(_ref) {
@@ -643,6 +645,7 @@ function AdsProvider(_ref) {
     refreshOnResize,
     viewports,
     slots,
+    disabled,
     trackingDisabled
   } = _ref;
   const [ready, setReady] = useState(false);
@@ -651,11 +654,14 @@ function AdsProvider(_ref) {
     if (adsRef.current === null) {
       adsRef.current = new AdsManager({
         enableSingleRequest,
-        autoInit
+        autoInit,
+        disabled
       });
+    } else {
+      adsRef.current.setDisabled(disabled);
     }
     return adsRef.current;
-  }, [enableSingleRequest, autoInit]);
+  }, [enableSingleRequest, autoInit, disabled]);
   useEffect(() => {
     let onReady = null;
     if (!ads.isReady()) {
@@ -705,7 +711,7 @@ function AdsProvider(_ref) {
       ...slotsPath
     },
     trackingDisabled
-  }), [ready, ads, viewports, slots, slotsPath, defaultSlotPath, trackingDisabled]);
+  }), [ready, ads, viewports, slots, slotsPath, defaultSlotPath, trackingDisabled, disabled]);
   return /*#__PURE__*/jsx(AdsContext.Provider, {
     value: value,
     children: children
@@ -978,13 +984,23 @@ function Ad(_ref) {
 
   // Targeting
   const contextTargeting = useAdsTargeting();
-  const allTargeting = useMemo(() => ({
-    ...(slotName !== null ? {
-      slot: slotName
-    } : null),
-    ...contextTargeting,
-    ...targeting
-  }), [contextTargeting, targeting, slotName]);
+  const {
+    disabled: targetingDisabled = false
+  } = contextTargeting || {};
+  const finalDisabled = disabled || targetingDisabled;
+  const allTargeting = useMemo(() => {
+    const {
+      disabled: removedDisabled,
+      ...otherTargeting
+    } = contextTargeting || {};
+    return {
+      ...(slotName !== null ? {
+        slot: slotName
+      } : null),
+      ...otherTargeting,
+      ...targeting
+    };
+  }, [contextTargeting, targeting, slotName]);
   const finalAdTargeting = useMemo(() => {
     const {
       refreshAds = null,
@@ -996,16 +1012,16 @@ function Ad(_ref) {
     };
   }, [allTargeting, refreshInterval]);
   const lastRenderedSize = useRef(null);
-  const wasDisabled = useRef(disabled);
+  const wasDisabled = useRef(finalDisabled);
   const onAdRender = useCallback(event => {
     const {
       isEmpty: newIsEmpty = true,
       width: newWidth,
       height: newHeight
     } = event || {};
-    if (disabled) {
+    if (finalDisabled) {
       wasDisabled.current = true;
-    } else if (!disabled && !newIsEmpty) {
+    } else if (!finalDisabled && !newIsEmpty) {
       wasDisabled.current = false;
     }
     lastRenderedSize.current = !newIsEmpty ? {
@@ -1015,7 +1031,7 @@ function Ad(_ref) {
     if (onRender !== null) {
       onRender(event);
     }
-  }, [onRender, shouldKeepSize, disabled]);
+  }, [onRender, shouldKeepSize, finalDisabled]);
 
   // useEffect(() => {
   //     if (!disabled) {
@@ -1046,7 +1062,7 @@ function Ad(_ref) {
     refreshInterval: finalAdTargeting.refreshInterval,
     alwaysRender,
     onRender: onAdRender,
-    disabled,
+    disabled: finalDisabled,
     trackingDisabled
   });
   if (slotRef !== null && isFunction(slotRef)) {
@@ -1055,13 +1071,13 @@ function Ad(_ref) {
     // eslint-disable-next-line no-param-reassign
     slotRef.current = slotObject;
   }
-  if (disabled) {
+  if (finalDisabled) {
     wasDisabled.current = true;
-  } else if (!disabled && isRendered) {
+  } else if (!finalDisabled && isRendered) {
     wasDisabled.current = false;
   }
   const waitingNextRender = wasDisabled.current && !isRendered;
-  const keepSize = shouldKeepSize && (disabled || waitingNextRender) && lastRenderedSize.current !== null;
+  const keepSize = shouldKeepSize && (finalDisabled || waitingNextRender) && lastRenderedSize.current !== null;
   if (id === null && !keepSize) {
     return null;
   }
@@ -1071,7 +1087,7 @@ function Ad(_ref) {
       width,
       height
     };
-  } else if (shouldKeepSize && (disabled || waitingNextRender)) {
+  } else if (shouldKeepSize && (finalDisabled || waitingNextRender)) {
     adStyle = lastRenderedSize.current;
   } else if (!withoutMinimumSize) {
     adStyle = minimumSize;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/ads",
-    "version": "0.0.28",
+    "version": "0.0.30",
     "description": "Ads library",
     "keywords": [
         "javascript",
@@ -50,7 +50,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "76f400a041038b006a93161398d46ba0c921c12e",
+    "gitHead": "af57f5d2a4d695deb8f676557d66e0cc24540e49",
     "dependencies": {
         "@folklore/hooks": "^0.0.43",
         "@folklore/tracking": "^0.0.21",