@thecb/components 9.2.10-beta.10 → 9.2.10-beta.11

package/dist/index.cjs.js

@@ -22146,7 +22146,9 @@ var Checkbox = function Checkbox(_ref4) {
       extraStyles = _ref4.extraStyles,
       textExtraStyles = _ref4.textExtraStyles,
       _ref4$dataQa = _ref4.dataQa,
-      dataQa = _ref4$dataQa === void 0 ? null : _ref4$dataQa;
+      dataQa = _ref4$dataQa === void 0 ? null : _ref4$dataQa,
+      _ref4$checkboxAriaLab = _ref4.checkboxAriaLabel,
+      checkboxAriaLabel = _ref4$checkboxAriaLab === void 0 ? "" : _ref4$checkboxAriaLab;
 
   var _useState = React.useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -22159,6 +22161,10 @@ var Checkbox = function Checkbox(_ref4) {
     }
   };
 
+  var checkboxProps = _objectSpread2({}, checkboxAriaLabel ? {
+    "aria-label": checkboxAriaLabel
+  } : {});
+
   return /*#__PURE__*/React__default.createElement(Box, {
     padding: "0",
     tabIndex: "0",
@@ -22175,23 +22181,26 @@ var Checkbox = function Checkbox(_ref4) {
     background: themeValues.backgroundColor,
     extraStyles: "outline: none; ".concat(extraStyles, "; margin: ").concat(checkboxMargin, ";")
   }, /*#__PURE__*/React__default.createElement(CheckboxLabelContainer, {
-    "data-qa": dataQa,
-    id: "".concat(name, "_label_container")
+    "data-qa": dataQa
   }, /*#__PURE__*/React__default.createElement(CheckboxContainer, {
     "data-qa": "Checkbox"
   }, /*#__PURE__*/React__default.createElement(HiddenCheckbox, {
     id: "checkbox-".concat(name),
     disabled: disabled,
     name: name,
+    "aria-label": checkboxAriaLabel || "".concat(title, " checkbox"),
     checked: checked,
     onChange: onChange,
     tabIndex: "-1",
     "aria-invalid": error,
     "aria-describedby": error ? "".concat(name, "-error-message") : ""
-  }), /*#__PURE__*/React__default.createElement(StyledCheckbox, {
+  }), /*#__PURE__*/React__default.createElement(StyledCheckbox, _extends({
     role: "checkbox",
+    name: name,
     error: error,
+    "aria-invalid": error,
     disabled: disabled,
+    "aria-disabled": disabled,
     checked: checked,
     "aria-checked": checked,
     focused: focused,
@@ -22200,9 +22209,8 @@ var Checkbox = function Checkbox(_ref4) {
     errorStyles: themeValues.errorStyles,
     disabledStyles: themeValues.disabledStyles,
     disabledCheckedStyles: themeValues.disabledCheckedStyles,
-    focusedStyles: themeValues.focusedStyles,
-    "aria-labelledby": title ? "".concat(name, "_title_id") : "".concat(name, "_label_container")
-  }, /*#__PURE__*/React__default.createElement(CheckboxIcon, {
+    focusedStyles: themeValues.focusedStyles
+  }, checkboxProps), /*#__PURE__*/React__default.createElement(CheckboxIcon, {
     viewBox: "0 0 24 24",
     disabled: disabled,
     disabledCheckColor: themeValues.disabledCheckColor,
@@ -22213,7 +22221,6 @@ var Checkbox = function Checkbox(_ref4) {
     variant: "p",
     weight: themeValues.textFontWeight,
     color: themeValues.textColor,
-    id: "".concat(name, "_title_id"),
     extraStyles: textExtraStyles ? "".concat(textExtraStyles, " ").concat(disabled && "color: #6e727e; background-color: #f7f7f7;", " ") : "margin-left: 1rem ".concat(disabled && "color: #6e727e; background-color: #f7f7f7;")
   }, title)));
 };
@@ -47864,12 +47871,8 @@ var TermsAndConditionsControlV1 = function TermsAndConditionsControlV1(_ref) {
       linkVariant = _ref.linkVariant,
       _ref$initialFocusSele = _ref.initialFocusSelector,
       initialFocusSelector = _ref$initialFocusSele === void 0 ? "" : _ref$initialFocusSele,
-      _ref$id = _ref.id,
-      id = _ref$id === void 0 ? "terms-and-conditions" : _ref$id,
-      _ref$screenReaderChec = _ref.screenReaderCheckboxLabel,
-      screenReaderCheckboxLabel = _ref$screenReaderChec === void 0 ? "" : _ref$screenReaderChec,
-      _ref$ariaLabelledBy = _ref.ariaLabelledBy,
-      ariaLabelledBy = _ref$ariaLabelledBy === void 0 ? "" : _ref$ariaLabelledBy;
+      _ref$checkboxAriaLabe = _ref.checkboxAriaLabel,
+      checkboxAriaLabel = _ref$checkboxAriaLabe === void 0 ? "" : _ref$checkboxAriaLabe;
 
   var _useState = React.useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -47882,15 +47885,11 @@ var TermsAndConditionsControlV1 = function TermsAndConditionsControlV1(_ref) {
     error: error,
     checked: isChecked,
     onChange: onCheck,
-    "aria-labelledby": ariaLabelledBy || (screenReaderCheckboxLabel ? "".concat(id, "_sr_only_label") : "".concat(id, "_html_label"))
+    "aria-label": checkboxAriaLabel
   }), /*#__PURE__*/React__default.createElement(Box, {
     padding: "0 0 0 58px"
-  }, screenReaderCheckboxLabel && /*#__PURE__*/React__default.createElement("span", {
-    className: "sr-only-text",
-    id: "".concat(id, "_sr_only_label")
-  }, screenReaderCheckboxLabel), /*#__PURE__*/React__default.createElement(Stack, null, /*#__PURE__*/React__default.createElement(Box, {
-    padding: "0",
-    id: "".concat(id, "_html_label")
+  }, /*#__PURE__*/React__default.createElement(Stack, null, /*#__PURE__*/React__default.createElement(Box, {
+    padding: "0"
   }, html), terms && /*#__PURE__*/React__default.createElement(TermsAndConditionsModal$1, {
     link: "Learn More",
     terms: terms,
@@ -47929,10 +47928,8 @@ var TermsAndConditionsControlV2 = function TermsAndConditionsControlV2(_ref) {
       modalTitle = _ref$modalTitle === void 0 ? "Terms and Conditions" : _ref$modalTitle,
       _ref$initialFocusSele = _ref.initialFocusSelector,
       initialFocusSelector = _ref$initialFocusSele === void 0 ? "" : _ref$initialFocusSele,
-      _ref$screenReaderChec = _ref.screenReaderCheckboxLabel,
-      screenReaderCheckboxLabel = _ref$screenReaderChec === void 0 ? "" : _ref$screenReaderChec,
-      _ref$ariaLabelledBy = _ref.ariaLabelledBy,
-      ariaLabelledBy = _ref$ariaLabelledBy === void 0 ? "" : _ref$ariaLabelledBy;
+      _ref$checkboxAriaLabe = _ref.checkboxAriaLabel,
+      checkboxAriaLabel = _ref$checkboxAriaLabe === void 0 ? "" : _ref$checkboxAriaLabe;
 
   var _useState = React.useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -47958,24 +47955,20 @@ var TermsAndConditionsControlV2 = function TermsAndConditionsControlV2(_ref) {
   }, /*#__PURE__*/React__default.createElement(Stack, {
     childGap: "0"
   }, html && /*#__PURE__*/React__default.createElement(Box, {
-    padding: "0",
-    id: "".concat(id, "_html_label")
+    padding: "0"
   }, html), /*#__PURE__*/React__default.createElement(Cluster, {
     justify: "flex-start",
     align: "center",
     nowrap: true
-  }, showCheckbox && /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(Checkbox$1, {
+  }, showCheckbox && /*#__PURE__*/React__default.createElement(Checkbox$1, {
     name: id,
     error: hasError,
     checked: isChecked,
     onChange: onCheck,
     checkboxMargin: checkboxMargin,
     extraStyles: "align-self: flex-start;",
-    "aria-labelledby": ariaLabelledBy || (screenReaderCheckboxLabel ? "".concat(id, "_sr_only_label") : "".concat(id, "_html_label"))
-  }), screenReaderCheckboxLabel && /*#__PURE__*/React__default.createElement("span", {
-    className: "sr-only-text",
-    id: "".concat(id, "_sr_only_label")
-  }, screenReaderCheckboxLabel)), /*#__PURE__*/React__default.createElement(Stack, {
+    "aria-label": checkboxAriaLabel
+  }), /*#__PURE__*/React__default.createElement(Stack, {
     childGap: "0.25rem",
     fullHeight: true
   }, /*#__PURE__*/React__default.createElement(Cluster, {