@uncinc/uncinc-react-kitchen-sink 2.20.14 → 2.21.1

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

@@ -1,6 +1,3 @@
 import React from 'react';
-export interface AccessibleLinkDescriptionProps {
-    id: string;
-}
-declare const AccessibleLinkDescription: React.FC<AccessibleLinkDescriptionProps>;
+declare const AccessibleLinkDescription: React.FC;
 export default AccessibleLinkDescription;

package/dist/components/AccessibleLinkDescription/index.js

@@ -1,12 +1,10 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-var AccessibleLinkDescription = function AccessibleLinkDescription(_ref) {
-  var id = _ref.id;
+var AccessibleLinkDescription = function AccessibleLinkDescription() {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return /*#__PURE__*/React.createElement("span", {
-    className: "visually-hidden",
-    id: id
+    className: "visually-hidden"
   }, t(['atoms.accessible_link_description', 'Opens in a new tab']));
 };
 export default AccessibleLinkDescription;

package/dist/components/Button/index.js

@@ -6,7 +6,6 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { v4 as uuidv4 } from 'uuid';
 import gtm from '../../helpers/gtm';
 import { isExternalLink, isHashLink } from '../../helpers/link';
 import withMapping from '../../Context/withMapping';
@@ -26,7 +25,6 @@ export var Button = function Button(_ref) {
     target = _ref.target,
     forwardRef = _ref.forwardRef,
     props = _objectWithoutProperties(_ref, _excluded);
-  var accessibleLinkDescriptionId = "accessible-link-description-".concat(uuidv4());
   var classes = classNames('Button', className, {
     'Button--primary': primary,
     'Button--inverted': inverted,
@@ -57,44 +55,35 @@ export var Button = function Button(_ref) {
     );
   }
   if (isExternalLink(href)) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", _extends({
+    return /*#__PURE__*/React.createElement("a", _extends({
       className: classes,
       href: href,
       target: "_blank",
       rel: "noreferrer noopener"
     }, props, {
       ref: forwardRef,
-      onClick: onClick,
-      "aria-describedby": accessibleLinkDescriptionId
-    }), children), /*#__PURE__*/React.createElement(AccessibleLinkDescription, {
-      id: accessibleLinkDescriptionId
-    }));
+      onClick: onClick
+    }), children, /*#__PURE__*/React.createElement(AccessibleLinkDescription, null));
   }
   if (isHashLink(href)) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", _extends({
+    return /*#__PURE__*/React.createElement("a", _extends({
       className: classes,
       href: href,
       target: target,
       rel: "noreferrer noopener"
     }, props, {
       ref: forwardRef,
-      onClick: onClick,
-      "aria-describedby": target === '_blank' ? accessibleLinkDescriptionId : undefined
-    }), children), target === '_blank' && /*#__PURE__*/React.createElement(AccessibleLinkDescription, {
-      id: accessibleLinkDescriptionId
-    }));
+      onClick: onClick
+    }), children, target === '_blank' && /*#__PURE__*/React.createElement(AccessibleLinkDescription, null));
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Link, _extends({
+  return /*#__PURE__*/React.createElement(Link, _extends({
     to: href,
     className: classes,
     target: target
   }, props, {
     ref: forwardRef,
-    onClick: onClick,
-    "aria-describedby": target === '_blank' ? accessibleLinkDescriptionId : undefined
-  }), children), target === '_blank' && /*#__PURE__*/React.createElement(AccessibleLinkDescription, {
-    id: accessibleLinkDescriptionId
-  }));
+    onClick: onClick
+  }), children, target === '_blank' && /*#__PURE__*/React.createElement(AccessibleLinkDescription, null));
 };
 Button.defaultProps = {
   primary: true,

package/dist/components/Form/GenericFormElement/index.js

@@ -48,10 +48,11 @@ var GenericFormElement = function GenericFormElement(props) {
     property: "schema:text",
     html: description,
     className: "FormElement__description ".concat(className, "__description")
-  }), error && touched ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
     "aria-live": "assertive",
-    id: errorId,
+    id: errorId
+  }, error && touched ? /*#__PURE__*/React.createElement("div", {
     className: "FormElement__error ".concat(className, "__error")
-  }, error) : null);
+  }, error) : null));
 };
 export default withMapping(GenericFormElement);

package/dist/components/GoogleConsentCookieBanner/index.js

@@ -104,6 +104,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     defaultValues = _props$defaultValues === void 0 ? categoryDefaultValues : _props$defaultValues,
     _props$manualHeader = props.manualHeader,
     manualHeader = _props$manualHeader === void 0 ? '' : _props$manualHeader,
+    manualBody = props.manualBody,
     _props$manualButtonCl = props.manualButtonClassname,
     manualButtonClassname = _props$manualButtonCl === void 0 ? 'Button' : _props$manualButtonCl,
     _props$necessaryButto = props.necessaryButtonInverted,
@@ -297,10 +298,13 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
   // This function renders the different options of checkboxes,
   // allowing us to add more checkboxes eventually.
   var renderChoices = function renderChoices() {
-    return /*#__PURE__*/React.createElement("fieldset", {
-      className: "GoogleConsentCookieBanner__choices",
-      "aria-labelledby": labelId
-    }, cookieLevels.map(function (choice) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, manualBody && /*#__PURE__*/React.createElement("p", {
+      className: "GoogleConsentCookieBanner__manual-body"
+    }, manualBody), /*#__PURE__*/React.createElement("fieldset", {
+      className: "GoogleConsentCookieBanner__choices"
+    }, manualHeader && /*#__PURE__*/React.createElement("legend", {
+      className: "manualHeader"
+    }, manualHeader), cookieLevels.map(function (choice) {
       return /*#__PURE__*/React.createElement("div", {
         className: "GoogleConsentCookieBanner__category",
         key: choice.value
@@ -325,7 +329,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
       }, /*#__PURE__*/React.createElement("div", {
         className: "GoogleConsentCookieBanner__category__description"
       }, choice.contents()))));
-    }));
+    })));
   };
   return /*#__PURE__*/React.createElement("div", {
     className: classes,
@@ -377,9 +381,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
     className: "GoogleConsentCookieBanner__content__message"
   }, /*#__PURE__*/React.createElement("div", {
     className: "GoogleConsentCookieBanner__checkboxes-container"
-  }, manualHeader && /*#__PURE__*/React.createElement("div", {
-    className: "manualHeader"
-  }, manualHeader), renderChoices())), /*#__PURE__*/React.createElement("div", {
+  }, renderChoices())), /*#__PURE__*/React.createElement("div", {
     className: "GoogleConsentCookieBanner__content__buttons"
   }, /*#__PURE__*/React.createElement(Button, {
     className: "Button--cta",

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

@@ -58,6 +58,7 @@ export interface CookieCompliancePopupProps {
     cookieContentsShowLess?: string;
     manualText?: string;
     manualHeader?: string;
+    manualBody?: string;
     onAgree?: Function;
     showAcceptOnlyNeeded?: boolean;
     showAcceptOnlyNeededSelections?: boolean;

package/package.json

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