@micromag/core 0.3.707 → 0.3.709

package/es/contexts.js

@@ -1,7 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import isString from 'lodash/isString';
 import PropTypes from 'prop-types';
-import React, { useContext, useMemo, useState, useEffect, useCallback, useRef } from 'react';
+import React, { useContext, useMemo, useState, useCallback, useEffect, useRef } from 'react';
 import { ComponentsManager, PropTypes as PropTypes$1, FieldsManager, ScreensManager, ColorsParser, Tracking } from '@micromag/core';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import JSCookie from 'js-cookie';
@@ -321,16 +321,29 @@ var ConsentProvider = function ConsentProvider(_ref) {
     initialConsented = _ref.consented,
     expiration = _ref.expiration,
     children = _ref.children;
-  var cookieConsented = JSCookie.get('has_consented') === 'true';
-  var _useState = useState(initialConsented || cookieConsented),
+  // Has consented or not to cookies
+  var initialCookieConsented = JSCookie.get('has_consented') === 'true';
+  var baseConsented = initialConsented || initialCookieConsented;
+  var _useState = useState(baseConsented),
     _useState2 = _slicedToArray(_useState, 2),
     consented = _useState2[0],
-    setConsented = _useState2[1];
+    setConsentedState = _useState2[1];
+  var setConsented = useCallback(function () {
+    var accept = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    var hasConsented = accept || false;
+    JSCookie.set('has_consented', hasConsented, {
+      secure: true,
+      expires: expiration
+    });
+    setConsentedState(hasConsented);
+  }, [expiration, setConsentedState]);
   useEffect(function () {
-    if (initialConsented) {
+    if (initialConsented === true || initialConsented === false) {
       setConsented(initialConsented);
     }
   }, [initialConsented, setConsented]);
+
+  // The consent state itself
   var baseConsent = useMemo(function () {
     return (providedConsent || consentStates || []).map(function (item) {
       if (isString(item)) {
@@ -349,47 +362,50 @@ var ConsentProvider = function ConsentProvider(_ref) {
       });
     });
   }, [providedConsent]);
-  var _useState3 = useState(baseConsent),
+  var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     consent = _useState4[0],
     setConsentState = _useState4[1];
-  useEffect(function () {
-    if (baseConsent) {
-      setConsentState(baseConsent);
-    }
-  }, [baseConsent, setConsentState]);
-  var setConsent = useCallback(function (values) {
-    var hasConsented = values !== null && typeof values !== 'undefined';
-    JSCookie.set('has_consented', hasConsented, {
-      secure: true,
-      expires: expiration
-    });
-    setConsented(hasConsented);
-    (values || []).forEach(function (it) {
+  var setConsent = useCallback(function () {
+    var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    var initial = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var tagManagerConsent = (values || []).reduce(function (acc, it) {
       if (it.value === true) {
         JSCookie.set(it.id, 'granted', {
           secure: true,
           expires: expiration
         });
+        acc[it.id] = 'granted';
       } else if (it.value === false) {
         JSCookie.set(it.id, 'denied', {
           secure: true,
           expires: expiration
         });
+        acc[it.id] = 'denied';
       } else {
         JSCookie.remove(it.id);
+        acc[it.id] = 'denied';
       }
-    });
+      return acc;
+    }, {});
+    if (typeof gtag === 'function') {
+      gtag('consent', initial === true ? 'default' : 'update', tagManagerConsent);
+    }
     setConsentState(values);
-    return values;
   }, [setConsentState, expiration]);
+  useEffect(function () {
+    if (baseConsent !== null && baseConsent.length > 0) {
+      setConsent(baseConsent);
+    }
+  }, [baseConsent, setConsent]);
   var value = useMemo(function () {
     return {
       consent: consent,
       setConsent: setConsent,
-      consented: consented
+      consented: consented,
+      setConsented: setConsented
     };
-  }, [consent, setConsent, consented]);
+  }, [consent, setConsent, consented, setConsented]);
   return /*#__PURE__*/React.createElement(ConsentContext.Provider, {
     value: value
   }, children);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.707",
+    "version": "0.3.709",
     "private": false,
     "description": "",
     "keywords": [
@@ -145,5 +145,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "e3afa5fe973a68bf83383fede41590a5e6428259"
+    "gitHead": "367f9fd8ecf298da947c017e9a0434e34c90e248"
 }