@uncinc/uncinc-react-kitchen-sink 2.20.6 → 2.20.8

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

@@ -81,7 +81,7 @@ export var Checkbox = function Checkbox(props) {
       disabled: disabled,
       className: className,
       required: required,
-      "aria-describedby": "".concat(errorId, " ").concat(descriptionId),
+      "aria-describedby": "".concat(error ? errorId : '', " ").concat(description ? descriptionId : '').trim() || undefined,
       "aria-invalid": Boolean(error)
     })), typeof title === 'string' ? ReactHtmlParser(title) : title);
   }));

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

@@ -37,7 +37,7 @@ var GenericFormElement = function GenericFormElement(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "FormElement__inner ".concat(className, "__inner")
   }, includeFieldSet && /*#__PURE__*/React.createElement("fieldset", {
-    "aria-describedby": "".concat(errorId, " ").concat(descriptionId),
+    "aria-describedby": "".concat(error && touched ? errorId : '', " ").concat(description ? descriptionId : '').trim() || undefined,
     "aria-invalid": Boolean(error && touched)
   }, title && /*#__PURE__*/React.createElement("legend", null, title, !required && displayRequiredIndicator === 'optional' && /*#__PURE__*/React.createElement("span", {
     className: "FormElement__optional ".concat(className, "__optional")

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

@@ -97,7 +97,7 @@ export var TextField = function TextField(props) {
     name: fieldName,
     validate: handleValidation,
     onKeyUp: handleChange,
-    "aria-describedby": "".concat(errorId, " ").concat(descriptionId),
+    "aria-describedby": "".concat(error && isTouched ? errorId : '', " ").concat(description ? descriptionId : '').trim() || undefined,
     "aria-invalid": Boolean(error && isTouched),
     autoComplete: autoCompleteField ? fieldName : undefined,
     type: revealPassword ? 'text' : inputType,

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

@@ -72,7 +72,7 @@ var Textarea = function Textarea(props) {
         onChange(event);
       }
     },
-    "aria-describedby": "".concat(errorId, " ").concat(descriptionId),
+    "aria-describedby": "".concat(error && isTouched ? errorId : '', " ").concat(description ? descriptionId : '').trim() || undefined,
     "aria-invalid": Boolean(error && isTouched)
   })));
 };

package/dist/components/GoogleConsentCookieBanner/index.js

@@ -277,7 +277,8 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
       isOpen: !isAnswered,
       disableClosers: true
     }),
-    dialogHelpersProps = _useDialogHelpers.dialogHelpersProps;
+    dialogHelpersProps = _useDialogHelpers.dialogHelpersProps,
+    labelId = _useDialogHelpers.labelId;
 
   // Enable only Escape key to close, not click outside
   useEscape({
@@ -298,7 +299,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
   var renderChoices = function renderChoices() {
     return /*#__PURE__*/React.createElement("fieldset", {
       className: "GoogleConsentCookieBanner__choices",
-      "aria-labelledby": "cookie-banner-title"
+      "aria-labelledby": labelId
     }, cookieLevels.map(function (choice) {
       return /*#__PURE__*/React.createElement("div", {
         className: "GoogleConsentCookieBanner__category",
@@ -333,6 +334,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
   }, /*#__PURE__*/React.createElement(Container, {
     fluid: fluid
   }, /*#__PURE__*/React.createElement("div", _extends({}, dialogHelpersProps, {
+    "aria-labelledby": labelId,
     ref: wrapperElement,
     className: "GoogleConsentCookieBanner__content ".concat(manualChoiceVisible ? 'GoogleConsentCookieBanner__content--full-height' : '')
   }), /*#__PURE__*/React.createElement("div", {
@@ -340,7 +342,7 @@ var CookieCompliancePopup = function CookieCompliancePopup(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "col-12 GoogleConsentCookieBanner__content_header"
   }, title && /*#__PURE__*/React.createElement("h3", {
-    id: "cookie-banner-title"
+    id: labelId
   }, title), /*#__PURE__*/React.createElement("button", {
     type: "button",
     className: "GoogleConsentCookieBanner__close-button",

package/dist/components/Image/AdaptivePicture/index.d.ts

@@ -6,6 +6,7 @@ interface Props extends Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src'> {
     objectFit?: 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';
     aspectRatio?: number | string;
     resizeDelay?: number;
+    role?: 'presentation' | 'none';
 }
 declare const AdaptivePicture: React.FC<Props>;
 export default AdaptivePicture;

package/dist/components/Image/AdaptivePicture/index.js

@@ -20,7 +20,8 @@ var AdaptivePicture = function AdaptivePicture(_ref) {
     _ref$aspectRatio = _ref.aspectRatio,
     aspectRatio = _ref$aspectRatio === void 0 ? 1 : _ref$aspectRatio,
     _ref$resizeDelay = _ref.resizeDelay,
-    resizeDelay = _ref$resizeDelay === void 0 ? 100 : _ref$resizeDelay;
+    resizeDelay = _ref$resizeDelay === void 0 ? 100 : _ref$resizeDelay,
+    role = _ref.role;
   var sourcesAsArray = Array.isArray(src) ? src : [src];
   var validatedSources = sourcesAsArray.filter(isValidImage);
   var fallbackImage = validatedSources[0];
@@ -129,7 +130,8 @@ var AdaptivePicture = function AdaptivePicture(_ref) {
     },
     src: loadedUrl,
     ref: imageRef,
-    alt: alt
+    alt: role === 'presentation' ? '' : alt,
+    role: role
   });
 };
 export default AdaptivePicture;

package/dist/components/Image/Picture/index.js

@@ -4,7 +4,6 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
 import Immutable from 'immutable';
-import path from 'path';
 import PropTypes from 'prop-types';
 import mimeTypes from './data/ext-to-mime-types.json';
 import './style.scss';
@@ -19,15 +18,17 @@ var Picture = function Picture(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   var width = props.width,
     height = props.height,
-    alt = props.alt,
-    title = props.title;
+    title = props.title,
+    role = props.role;
+  var alt = role === 'presentation' ? '' : props.alt;
   var attrs = {
     className: className,
     typeof: 'foaf:Image',
     width: width,
     height: height,
     alt: alt,
-    title: title
+    title: title,
+    role: role
   };
   var getMimeType = function getMimeType(url) {
     var extension = getImageExtension(url);

package/package.json

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