@uncinc/uncinc-react-kitchen-sink 2.16.13 → 2.16.15

package/dist/components/GoogleConsentCookieBanner/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
+import { type CookieCompliancePopupProps } from './types';
 import './style.scss';
-import { CookieCompliancePopupProps } from './types';
 export declare const COOKIE_CONSENT_CATEGORIES = "cookie_consent_categories";
 export declare const COOKIE_CONSENT_STATE = "cookie_consent_state";
 export declare const DEFAULT_COOKIE_EXPIRATION_DAYS = 365;

package/dist/components/GoogleConsentCookieBanner/index.js

@@ -10,22 +10,28 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import Cookies from 'js-cookie';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
+import useCookieStore from '../../hooks/useCookieStore';
 import Accordion from '../Accordion';
 import AccordionItemVariant from '../Accordion/AccordionItemVariant';
 import Button from '../Button';
 import Container from '../Layout/Container';
 import Checkbox from './Checkbox';
-import './style.scss';
 import { LocalConsentStatus, AvailableConsentPermissions } from './types';
-import useCookieStore from '../../hooks/useCookieStore';
+import './style.scss';
 export var COOKIE_CONSENT_CATEGORIES = 'cookie_consent_categories';
 export var COOKIE_CONSENT_STATE = 'cookie_consent_state';
 export var DEFAULT_COOKIE_EXPIRATION_DAYS = 365;
 export var CONSENT_UPDATE_EVENT = 'consentUpdate';
+var categoryDefaultValues = {
+  necessary: true,
+  preferences: false,
+  statistics: false,
+  marketing: false
+};
 var CookieCompliancePopup = function CookieCompliancePopup(props) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -39,6 +45,8 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     acceptAllText = _props$acceptAllText === void 0 ? t('cookies.acceptAll') : _props$acceptAllText,
     _props$acceptSelectio = props.acceptSelectionText,
     acceptSelectionText = _props$acceptSelectio === void 0 ? t('cookies.acceptSelection') : _props$acceptSelectio,
+    _props$acceptAllSelec = props.acceptAllSelectionsText,
+    acceptAllSelectionsText = _props$acceptAllSelec === void 0 ? t(['cookies.acceptAllSelections', 'cookies.acceptAll']) : _props$acceptAllSelec,
     _props$onlyNecessaryT = props.onlyNecessaryText,
     onlyNecessaryText = _props$onlyNecessaryT === void 0 ? t('cookies.acceptOnlyNecessary') : _props$onlyNecessaryT,
     _props$cookieContents = props.cookieContentsShowMore,
@@ -47,6 +55,8 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     cookieContentsShowLess = _props$cookieContents2 === void 0 ? /*#__PURE__*/React.createElement("div", null, t('cookies.hideDetails')) : _props$cookieContents2,
     _props$showAcceptOnly = props.showAcceptOnlyNeeded,
     showAcceptOnlyNeeded = _props$showAcceptOnly === void 0 ? true : _props$showAcceptOnly,
+    _props$showAcceptOnly2 = props.showAcceptOnlyNeededSelections,
+    showAcceptOnlyNeededSelections = _props$showAcceptOnly2 === void 0 ? false : _props$showAcceptOnly2,
     _props$onAgree = props.onAgree,
     onAgree = _props$onAgree === void 0 ? function () {} : _props$onAgree,
     _props$cookieLevels = props.cookieLevels,
@@ -86,12 +96,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     _props$cookieDomain = props.cookieDomain,
     cookieDomain = _props$cookieDomain === void 0 ? null : _props$cookieDomain,
     _props$defaultValues = props.defaultValues,
-    defaultValues = _props$defaultValues === void 0 ? {
-      necessary: true,
-      preferences: false,
-      statistics: false,
-      marketing: false
-    } : _props$defaultValues,
+    defaultValues = _props$defaultValues === void 0 ? categoryDefaultValues : _props$defaultValues,
     _props$manualHeader = props.manualHeader,
     manualHeader = _props$manualHeader === void 0 ? '' : _props$manualHeader,
     _props$manualButtonCl = props.manualButtonClassname,
@@ -183,34 +188,33 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     setManualChoiceVisible(true);
   };
 
-  // Build an object of passed consent, send that to google via "update"
-  // Set the cookie containing the consent categories and version
-  var handleGoogleConsent = function handleGoogleConsent() {
-    var selectedConsent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var selectedCategories = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var consentEventObject = {};
-    Object.values(AvailableConsentPermissions).forEach(function (consentOption) {
-      consentEventObject[consentOption] = selectedConsent.indexOf(consentOption) > -1 ? 'granted' : 'denied';
-    });
-    window.gtag('consent', 'update', consentEventObject);
-    window.gtag('event', CONSENT_UPDATE_EVENT);
-    Cookies.set(COOKIE_CONSENT_CATEGORIES, JSON.stringify({
-      categories: selectedCategories,
-      consent: consentEventObject
-    }), {
-      expires: cookieOptions.days,
-      domain: cookieDomain
-    });
-    setDidConsent(JSON.stringify({
-      status: LocalConsentStatus.STATUS_ACCEPTED,
-      version: version
-    }), cookieOptions);
-    setAnsweredInCurrentSession(true);
-  };
-
   // On agree clicked, send consent for categories to Google
   // Update cookie and fire agree callback
-  var onInternalAgree = function onInternalAgree(choices) {
+  var onInternalAgree = useCallback(function (choices) {
+    // Build an object of passed consent, send that to google via "update"
+    // Set the cookie containing the consent categories and version
+    var handleGoogleConsent = function handleGoogleConsent() {
+      var selectedConsent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var selectedCategories = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      var consentEventObject = {};
+      Object.values(AvailableConsentPermissions).forEach(function (consentOption) {
+        consentEventObject[consentOption] = selectedConsent.indexOf(consentOption) > -1 ? 'granted' : 'denied';
+      });
+      window.gtag('consent', 'update', consentEventObject);
+      window.gtag('event', CONSENT_UPDATE_EVENT);
+      Cookies.set(COOKIE_CONSENT_CATEGORIES, JSON.stringify({
+        categories: selectedCategories,
+        consent: consentEventObject
+      }), {
+        expires: cookieOptions.days,
+        domain: cookieDomain
+      });
+      setDidConsent(JSON.stringify({
+        status: LocalConsentStatus.STATUS_ACCEPTED,
+        version: version
+      }), cookieOptions);
+      setAnsweredInCurrentSession(true);
+    };
     var selectedCategories = Object.keys(choices).filter(function (key) {
       return choices[key];
     });
@@ -225,10 +229,10 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
       selectedCategories: selectedCategories,
       consent: selectedConsent
     });
-  };
+  }, [cookieDomain, cookieLevels, cookieOptions, onAgree, setDidConsent, version]);
 
   // Function for accepting al categories at once.
-  var onConsentAll = function onConsentAll() {
+  var onConsentAll = useCallback(function () {
     var allCategoriesSelected = categories.reduce(function (prev, category) {
       var newPartialState = prev;
       newPartialState[category] = true;
@@ -236,19 +240,17 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     }, {});
     setChoicesSelected(allCategoriesSelected);
     onInternalAgree(allCategoriesSelected);
-  };
+  }, [categories, onInternalAgree]);
+  var onConsentOnlyNecessary = useCallback(function () {
+    setChoicesSelected(defaultValues);
+    onInternalAgree(defaultValues);
+  }, [defaultValues, onInternalAgree]);
 
   // This function is fired when the accept button is pressed.
   // Also has eventual support for a false case.
-  var onConsent = function onConsent(onlyNecessary) {
-    return function () {
-      if (onlyNecessary === true) {
-        onInternalAgree(defaultValues);
-      } else {
-        onInternalAgree(choicesSelected);
-      }
-    };
-  };
+  var onConsent = useCallback(function () {
+    onInternalAgree(choicesSelected);
+  }, [choicesSelected, onInternalAgree]);
 
   // This function sets the value of the checkmark in the form state.
   var handleChoiceState = function handleChoiceState(event) {
@@ -322,7 +324,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     id: "only-necessary-agree",
     className: "Button--cta",
     inverted: necessaryButtonInverted,
-    onClick: onConsent(true)
+    onClick: onConsentOnlyNecessary
   }, onlyNecessaryText), /*#__PURE__*/React.createElement("button", {
     type: "button",
     className: "GoogleConsentCookieBanner__content__buttons__manual GoogleConsentCookieBanner__content__buttons__manual-agree ".concat(manualButtonClassname),
@@ -340,12 +342,17 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
   }, /*#__PURE__*/React.createElement(Button, {
     className: "Button--cta",
     primary: true,
-    onClick: onConsent(false)
-  }, acceptSelectionText), /*#__PURE__*/React.createElement(Button, {
+    onClick: onConsent
+  }, acceptSelectionText), showAcceptOnlyNeededSelections && /*#__PURE__*/React.createElement(Button, {
+    id: "only-necessary-agree-selections",
+    className: "Button--cta",
+    inverted: necessaryButtonInverted,
+    onClick: onConsentOnlyNecessary
+  }, onlyNecessaryText), /*#__PURE__*/React.createElement(Button, {
     className: "Button--cta",
     inverted: necessaryButtonInverted,
     onClick: onConsentAll
-  }, acceptAllText))))));
+  }, acceptAllSelectionsText))))));
 };
 
 /**

package/dist/components/GoogleConsentCookieBanner/types.d.ts

@@ -51,6 +51,7 @@ export interface CookieCompliancePopupProps {
     children?: any;
     acceptAllText?: string;
     acceptSelectionText?: string;
+    acceptAllSelectionsText?: string;
     onlyNecessaryText?: string;
     title?: string;
     cookieContentsShowMore?: string;
@@ -59,6 +60,7 @@ export interface CookieCompliancePopupProps {
     manualHeader?: string;
     onAgree?: Function;
     showAcceptOnlyNeeded?: boolean;
+    showAcceptOnlyNeededSelections?: boolean;
     manualButtonClassname?: string;
     necessaryButtonInverted?: boolean;
     cookieLevels?: Array<CookieLevel>;

package/dist/hooks/useDialogHelpers.d.ts

@@ -15,7 +15,7 @@ export default function useDialogHelpers<T extends HTMLElement>(options: UseDial
     readonly id: string;
     readonly labelId: string;
     readonly dialogHelpersProps: {
-        'aria-role': string;
+        role: string;
         'aria-labelledby': string;
     };
 };

package/dist/hooks/useDialogHelpers.js

@@ -73,7 +73,7 @@ export default function useDialogHelpers(options) {
    */
   var labelId = "".concat(id, "-label");
   var dialogHelpersProps = {
-    'aria-role': 'dialog',
+    role: 'dialog',
     'aria-labelledby': labelId
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uncinc/uncinc-react-kitchen-sink",
-  "version": "2.16.13",
+  "version": "2.16.15",
   "description": "Default React components that are easily extended.",
   "author": "uncinc",
   "license": "MIT",