carbon-react 95.0.0 → 95.1.1

package/lib/__internal__/focus-trap/focus-trap.component.js

@@ -42,8 +42,9 @@ const FocusTrap = ({
     return Array.from(candidate).some((el, i) => el !== focusableElements[i]);
   }, [focusableElements]);
   const updateFocusableElements = (0, _react.useCallback)(() => {
-    if (wrapperRef) {
-      const ref = wrapperRef.current;
+    const ref = wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current;
+
+    if (ref) {
       const elements = Array.from(ref.querySelectorAll(_focusTrapUtils.defaultFocusableSelectors)).filter(el => Number(el.tabIndex) !== -1);
 
       if (hasNewInputs(elements)) {

package/lib/__internal__/tooltip-provider/index.d.ts

@@ -9,6 +9,8 @@ export interface TooltipProviderProps {
   tooltipPosition?: "top" | "bottom" | "left" | "right";
   /** Control whether the tooltip is visible */
   children: React.ReactNode;
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 declare const ToolbarContext: React.Context<ToolbarContextProps>;

package/lib/__internal__/tooltip-provider/index.js

@@ -17,15 +17,18 @@ exports.TooltipContext = TooltipContext;
 
 const TooltipProvider = ({
   children,
-  tooltipPosition
+  tooltipPosition,
+  helpAriaLabel
 }) => /*#__PURE__*/_react.default.createElement(TooltipContext.Provider, {
   value: {
-    tooltipPosition
+    tooltipPosition,
+    helpAriaLabel
   }
 }, children);
 
 exports.TooltipProvider = TooltipProvider;
 TooltipProvider.propTypes = {
   children: _propTypes.default.node.isRequired,
-  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"])
+  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"]),
+  helpAriaLabel: _propTypes.default.string
 };

package/lib/__internal__/validations/validation-icon.component.js

@@ -100,7 +100,9 @@ const ValidationIcon = ({
     tooltipVisible: hasFocus || hasMouseOver || groupHasFocus || groupHasMouseOver || triggeredByIcon,
     tooltipFlipOverrides: isPartOfInput && !tooltipFlipOverrides ? ["top", "bottom"] : tooltipFlipOverrides,
     isPartOfInput: isPartOfInput,
-    inputSize: size
+    inputSize: size,
+    "aria-hidden": "true",
+    focusable: false
   }));
 };
 

package/lib/components/button-toggle-group/button-toggle-group.component.js

@@ -25,6 +25,8 @@ var _inputBehaviour = require("../../__internal__/input-behaviour");
 
 var _utils = require("../../style/utils");
 
+var _tooltipProvider = require("../../__internal__/tooltip-provider");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -53,6 +55,7 @@ const ButtonToggleGroup = ({
   "data-component": dataComponent,
   "data-element": dataElement,
   "data-role": dataRole,
+  helpAriaLabel,
   ...props
 }) => {
   const validationProps = {
@@ -60,7 +63,9 @@ const ButtonToggleGroup = ({
     warning,
     info
   };
-  return /*#__PURE__*/_react.default.createElement(_inputBehaviour.InputGroupBehaviour, null, /*#__PURE__*/_react.default.createElement(_formField.default, _extends({
+  return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+    helpAriaLabel: helpAriaLabel
+  }, /*#__PURE__*/_react.default.createElement(_inputBehaviour.InputGroupBehaviour, null, /*#__PURE__*/_react.default.createElement(_formField.default, _extends({
     useValidationIcon: validationOnLabel,
     label: label,
     labelHelp: labelHelp,
@@ -84,7 +89,7 @@ const ButtonToggleGroup = ({
     value: value
   }, children), !validationOnLabel && /*#__PURE__*/_react.default.createElement(_validationIcon.default, _extends({}, validationProps, {
     tooltipFlipOverrides: ["top", "bottom"]
-  })))));
+  }))))));
 };
 
 ButtonToggleGroup.propTypes = { ...marginPropTypes,
@@ -171,7 +176,10 @@ ButtonToggleGroup.propTypes = { ...marginPropTypes,
   onBlur: _propTypes.default.func,
 
   /** The value of the Button Toggle Group */
-  value: _propTypes.default.string
+  value: _propTypes.default.string,
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 ButtonToggleGroup.defaultProps = {
   validationOnLabel: false,

package/lib/components/button-toggle-group/button-toggle-group.d.ts

@@ -49,6 +49,8 @@ export interface ButtonToggleGroupProps
   onChange?: (ev: React.ChangeEvent<HTMLInputElement>) => void;
   /** The value of the Button Toggle Group */
   value?: string;
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 declare function ButtonToggleGroup(props: ButtonToggleGroupProps): JSX.Element;

package/lib/components/checkbox/checkbox.component.js

@@ -60,6 +60,7 @@ const Checkbox = ({
   "data-component": dataComponent,
   "data-element": dataElement,
   "data-role": dataRole,
+  helpAriaLabel,
   ...props
 }) => {
   const largeScreen = (0, _useIsAboveBreakpoint.default)(adaptiveSpacingBreakpoint);
@@ -93,6 +94,7 @@ const Checkbox = ({
     ...props
   };
   return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+    helpAriaLabel: helpAriaLabel,
     tooltipPosition: tooltipPosition
   }, /*#__PURE__*/_react.default.createElement(_checkbox.default, _extends({
     "data-component": dataComponent,
@@ -206,7 +208,10 @@ Checkbox.propTypes = {
   required: _propTypes.default.bool,
 
   /** Overrides the default tooltip position */
-  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"])
+  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"]),
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 Checkbox.defaultProps = {
   reverse: false,

package/lib/components/checkbox/checkbox.d.ts

@@ -15,6 +15,8 @@ export interface CheckboxProps extends CommonCheckableInputProps, MarginProps {
   value?: string;
   /** Overrides the default tooltip position */
   tooltipPosition?: "top" | "bottom" | "left" | "right";
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 declare function Checkbox(props: CheckboxProps): JSX.Element;

package/lib/components/date/date.component.js

@@ -619,7 +619,8 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
         }),
         inputRef: this.assignInput,
         adaptiveLabelBreakpoint: adaptiveLabelBreakpoint,
-        tooltipPosition: tooltipPosition
+        tooltipPosition: tooltipPosition,
+        helpAriaLabel: this.props.helpAriaLabel
       }, events)), this.renderHiddenInput(), this.renderDatePicker({
         minDate,
         maxDate

package/lib/components/decimal/decimal.component.js

@@ -361,7 +361,10 @@ Decimal.propTypes = {
   /**
    * Override the locale string, default from I18nProvider
    */
-  locale: _propTypes.default.string
+  locale: _propTypes.default.string,
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 Decimal.defaultProps = {
   align: "right",

package/lib/components/grouped-character/grouped-character.component.js

@@ -164,7 +164,10 @@ GroupedCharacter.propTypes = { ...marginPropTypes,
   onBlur: _propTypes.default.func,
 
   /** Flag to configure component as mandatory */
-  required: _propTypes.default.bool
+  required: _propTypes.default.bool,
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 var _default = GroupedCharacter;
 exports.default = _default;

package/lib/components/heading/heading.component.js

@@ -71,7 +71,8 @@ let Heading = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/_react.default.createElement(_heading.StyledHeaderHelp, {
         "data-element": "help",
         tooltipPosition: "right",
-        href: this.props.helpLink
+        href: this.props.helpLink,
+        ariaLabel: this.props.helpAriaLabel
       }, this.props.help);
     }
     /**
@@ -255,7 +256,12 @@ Heading.propTypes = { ...marginPropTypes,
   /**
    * Pills that will be added after the title.
    */
-  pills: _propTypes.default.node
+  pills: _propTypes.default.node,
+
+  /**
+   * Aria label for rendered help component
+   */
+  helpAriaLabel: _propTypes.default.string
 };
 Heading.defaultProps = {
   divider: true,

package/lib/components/help/help.component.js

@@ -19,6 +19,8 @@ var _help = _interopRequireDefault(require("./help.style"));
 
 var _events = _interopRequireDefault(require("../../__internal__/utils/helpers/events"));
 
+var _tooltipProvider = require("../../__internal__/tooltip-provider");
+
 var _utils = require("../../style/utils");
 
 var _help2 = require("./help.config");
@@ -46,10 +48,14 @@ const Help = ({
   tooltipBgColor,
   tooltipFontColor,
   tooltipFlipOverrides,
+  ariaLabel,
   ...rest
 }) => {
   const helpElement = (0, _react.useRef)(null);
   const [isTooltipVisible, updateTooltipVisible] = (0, _react.useState)(false);
+  const {
+    helpAriaLabel
+  } = (0, _react.useContext)(_tooltipProvider.TooltipContext);
   (0, _react.useEffect)(() => {
     document.addEventListener("keydown", handleKeyPress);
     return function cleanup() {
@@ -72,13 +78,10 @@ const Help = ({
   }
 
   return /*#__PURE__*/_react.default.createElement(_help.default, _extends({
-    role: "tooltip",
     className: className,
     as: tagType,
     href: href,
     id: helpId,
-    target: "_blank",
-    rel: "noopener noreferrer",
     ref: helpElement,
     onClick: () => {
       helpElement.current.focus();
@@ -89,15 +92,26 @@ const Help = ({
     onMouseLeave: handleFocusBlur(false)
   }, (0, _tags.default)("help", rest), {
     tabIndex: tabIndex
-  }, (0, _utils.filterStyledSystemMarginProps)(rest), rest), /*#__PURE__*/_react.default.createElement(_icon.default, {
+  }, href ? {
+    target: "_blank",
+    rel: "noopener noreferrer"
+  } : {
+    role: "tooltip",
+    "aria-label": ariaLabel || helpAriaLabel
+  }, (0, _utils.filterStyledSystemMarginProps)(rest), rest), /*#__PURE__*/_react.default.createElement(_icon.default, _extends({
     type: type,
     tooltipMessage: children,
     tooltipPosition: tooltipPosition,
     tooltipVisible: isFocused || isTooltipVisible,
     tooltipBgColor: tooltipBgColor,
     tooltipFontColor: tooltipFontColor,
-    tooltipFlipOverrides: tooltipFlipOverrides
-  }));
+    tooltipFlipOverrides: tooltipFlipOverrides,
+    focusable: false,
+    "aria-hidden": "true"
+  }, href && {
+    role: "tooltip",
+    ariaLabel: ariaLabel || helpAriaLabel
+  })));
 };
 
 Help.propTypes = { ...marginPropTypes,
@@ -150,7 +164,10 @@ Help.propTypes = { ...marginPropTypes,
 
     return new Error( // eslint-disable-next-line max-len
     `The \`${propName}\` prop supplied to \`${componentName}\` must be an array containing some or all of ["top", "bottom", "left", "right"].`);
-  }
+  },
+
+  /** Aria label */
+  ariaLabel: _propTypes.default.string
 };
 Help.defaultProps = {
   tooltipPosition: "top",

package/lib/components/help/help.d.ts

@@ -30,6 +30,8 @@ export interface HelpProps extends MarginProps {
   tooltipPosition?: "top" | "bottom" | "left" | "right";
   /** Help Icon type */
   type?: IconType;
+  /** Aria label */
+  ariaLabel?: string;
 }
 
 declare function Help(props: HelpProps): JSX.Element;

package/lib/components/icon/icon-config.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.ICONS = exports.ICON_SIZES = exports.ICON_SHAPES = exports.ICON_TOOLTIP_POSITIONS = void 0;
+exports.default = exports.ICONS = exports.ICON_FONT_SIZES = exports.ICON_SIZES = exports.ICON_SHAPES = exports.ICON_TOOLTIP_POSITIONS = void 0;
 const dlsConfig = {
   backgroundSize: {
     "extra-small": "16px",
@@ -30,6 +30,8 @@ const ICON_SHAPES = ["circle", "rounded-rect", "square"];
 exports.ICON_SHAPES = ICON_SHAPES;
 const ICON_SIZES = ["extra-small", "small", "medium", "large", "extra-large"];
 exports.ICON_SIZES = ICON_SIZES;
+const ICON_FONT_SIZES = ["small", "medium", "large", "extra-large"];
+exports.ICON_FONT_SIZES = ICON_FONT_SIZES;
 const ICONS = ["add", "alert", "analysis", "arrow_down", "arrow_left", "arrow_left_boxed", "arrow_left_right_small", "arrow_left_small", "arrow_right", "arrow_right_small", "arrow_up", "attach", "bank", "basket", "basket_with_squares", "bin", "blocked", "blocked_square", "block_arrow_right", "bold", "boxed_shapes", "bulk_destroy", "bullet_list", "bullet_list_dotted", "bullet_list_numbers", "business", "calendar", "calendar_today", "call", "camera", "card_view", "caret_down", "caret_left", "caret_right", "caret_up", "caret_large_down", "caret_large_left", "caret_large_right", "caret_large_up", "cart", "chat", "chart_bar", "chart_line", "chart_pie", "chat_notes", "chevron_down", "chevron_left", "chevron_right", "chevron_up", "chevron_down_thick", "chevron_left_thick", "chevron_right_thick", "chevron_up_thick", "circle_with_dots", "circles_connection", "clock", "close", "coins", "collaborate", "computer_clock", "connect", "copy", "credit_card", "credit_card_slash", "cross", "cross_circle", "csv", "delete", "delivery", "disputed", "document_right_align", "document_tick", "document_vertical_lines", "download", "drag", "drag_vertical", "draft", "dropdown", "duplicate", "edit", "edited", "email", "email_switch", "ellipsis_horizontal", "ellipsis_vertical", "envelope_dollar", "envelope_euro", "error", "error_square", "euro", "expand", "factory", "favourite", "favourite_lined", "fax", "feedback", "file_excel", "file_generic", "file_image", "file_pdf", "file_word", "files_leaning", "filter", "filter_new", "fit_height", "fit_width", "flag", "folder", "gift", "graph", "grid", "help", "hide", "home", "image", "in_progress", "in_transit", "individual", "info", "italic", "key", "ledger", "ledger_arrow_left", "ledger_arrow_right", "link", "list_view", "locked", "location", "logout", "lookup", "marker", "message", "messages", "minus", "minus_large", "mobile", "money_bag", "pause", "pause_circle", "pdf", "people", "people_switch", "person", "person_info", "person_tick", "phone", "play", "play_circle", "plus", "plus_large", "pound", "print", "progress", "progressed", "question", "refresh", "refresh_clock", "remove", "sage_coin", "save", "scan", "search", "services", "settings", "share", "shop", "sort_down", "sort_up", "spanner", "split", "split_container", "square_dot", "squares_nine", "stacked_boxes", "stacked_squares", "submitted", "sync", "tag", "three_boxes", "tick", "tick_circle", "undo", "unlocked", "upload", "uploaded", "video", "view", "warning", "admin", "arrow", "contacts", "create", "disconnect", "entry", "go", "lightbulb_off", "lightbulb_on", "none", "old_warning", "piggy_bank", "question_hollow", "question_mark", "settings_old", "talk", "true_tick"];
 exports.ICONS = ICONS;
 var _default = dlsConfig;

package/lib/components/icon/icon.component.js

@@ -51,6 +51,9 @@ const Icon = /*#__PURE__*/_react.default.forwardRef(({
   tabIndex,
   isPartOfInput,
   inputSize,
+  role,
+  ariaLabel,
+  focusable = true,
   ...rest
 }, ref) => {
   const isInteractive = !!tooltipMessage && !disabled;
@@ -80,6 +83,7 @@ const Icon = /*#__PURE__*/_react.default.forwardRef(({
     }
   };
 
+  const hasTooltip = !disabled && tooltipMessage && focusable;
   const styleProps = {
     bg,
     bgSize,
@@ -88,8 +92,8 @@ const Icon = /*#__PURE__*/_react.default.forwardRef(({
     disabled,
     fontSize,
     isInteractive,
-    tabIndex,
     type: iconType(),
+    tabIndex: hasTooltip && tabIndex === undefined ? 0 : tabIndex,
     ...(0, _utils.filterStyledSystemMarginProps)(rest)
   };
 
@@ -98,7 +102,11 @@ const Icon = /*#__PURE__*/_react.default.forwardRef(({
     key: "icon",
     className: className || null,
     "data-element": iconType()
-  }, (0, _tags.default)("icon", rest), styleProps));
+  }, (0, _tags.default)("icon", rest), styleProps, {
+    hasTooltip: hasTooltip,
+    "aria-label": ariaLabel,
+    role: hasTooltip && role === undefined ? "tooltip" : role
+  }));
 
   const {
     tooltipPosition: tooltipPositionFromContext
@@ -197,7 +205,10 @@ Icon.propTypes = { ...marginPropTypes,
   inputSize: _propTypes.default.oneOf(["small", "medium", "large"]),
 
   /** @ignore @private */
-  tabIndex: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.number])
+  tabIndex: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+
+  /** @ignore @private */
+  focusable: _propTypes.default.bool
 };
 Icon.defaultProps = {
   bgSize: "small",

package/lib/components/icon/icon.style.js

@@ -65,7 +65,8 @@ const StyledIcon = _styledComponents.default.span`
   bgShape,
   type,
   fontSize,
-  disabled
+  disabled,
+  hasTooltip
 }) => {
   let finalColor;
   let finalHoverColor;
@@ -153,6 +154,12 @@ const StyledIcon = _styledComponents.default.span`
         display: block;
       }
 
+      ${hasTooltip && `
+        :focus {
+          outline: 2px solid ${theme.colors.focus};
+        }
+      `}
+
       ${_styledSystem.margin}
     `;
 }}

package/lib/components/numeral-date/numeral-date.component.js

@@ -29,6 +29,8 @@ var _formField = _interopRequireDefault(require("../../__internal__/form-field")
 
 var _inputBehaviour = require("../../__internal__/input-behaviour");
 
+var _tooltipProvider = require("../../__internal__/tooltip-provider");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -82,6 +84,7 @@ const NumeralDate = ({
   enableInternalError,
   enableInternalWarning,
   tooltipPosition,
+  helpAriaLabel,
   ...rest
 }) => {
   const l = (0, _useLocale.default)();
@@ -165,7 +168,9 @@ const NumeralDate = ({
   const internalMessage = Object.keys(internalMessages).reduce((string, key) => internalMessages[key] ? `${string + internalMessages[key]}\n` : string, "");
   const internalError = enableInternalError ? internalMessage + error : error;
   const internalWarning = enableInternalWarning ? internalMessage + warning : warning;
-  return /*#__PURE__*/_react.default.createElement(_inputBehaviour.InputGroupBehaviour, null, /*#__PURE__*/_react.default.createElement(_formField.default, _extends({
+  return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+    helpAriaLabel: helpAriaLabel
+  }, /*#__PURE__*/_react.default.createElement(_inputBehaviour.InputGroupBehaviour, null, /*#__PURE__*/_react.default.createElement(_formField.default, _extends({
     "data-component": dataComponent,
     "data-element": dataElement,
     "data-role": dataRole,
@@ -225,7 +230,7 @@ const NumeralDate = ({
       size: size,
       tooltipPosition: tooltipPosition
     })));
-  }))));
+  })))));
 };
 
 NumeralDate.propTypes = {
@@ -338,7 +343,10 @@ NumeralDate.propTypes = {
   size: _propTypes.default.oneOf(["small", "medium", "large"]),
 
   /** Overrides the default tooltip position */
-  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"])
+  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"]),
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 var _default = NumeralDate;
 exports.default = _default;

package/lib/components/numeral-date/numeral-date.d.ts

@@ -88,6 +88,8 @@ export interface NumeralDateProps extends ValidationPropTypes, MarginProps {
   validationOnLabel?: boolean;
   /** Overrides the default tooltip position */
   tooltipPosition?: "top" | "bottom" | "left" | "right";
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 declare function NumeralDate(props: NumeralDateProps): JSX.Element;

package/lib/components/radio-button/radio-button.component.js

@@ -68,6 +68,7 @@ const RadioButton = /*#__PURE__*/_react.default.forwardRef(({
   "data-component": dataComponent,
   "data-element": dataElement,
   "data-role": dataRole,
+  helpAriaLabel,
   ...props
 }, ref) => {
   const marginProps = (0, _utils.filterStyledSystemMarginProps)(props);
@@ -113,6 +114,7 @@ const RadioButton = /*#__PURE__*/_react.default.forwardRef(({
     ...props
   };
   return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+    helpAriaLabel: helpAriaLabel,
     tooltipPosition: tooltipPosition
   }, /*#__PURE__*/_react.default.createElement(_radioButton.default, _extends({
     "data-component": dataComponent,
@@ -209,6 +211,9 @@ RadioButton.propTypes = { ...marginPropTypes,
 
   /** Overrides the default tooltip position */
   tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"]),
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string,
   ...radioButtonGroupPassedProps
 };
 RadioButton.defaultProps = {

package/lib/components/radio-button/radio-button.d.ts

@@ -18,6 +18,8 @@ export interface RadioButtonProps
   value: string;
   /** Overrides the default tooltip position */
   tooltipPosition?: "top" | "bottom" | "left" | "right";
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 declare function RadioButton(

package/lib/components/switch/switch.component.js

@@ -59,6 +59,7 @@ const Switch = ({
   "data-component": dataComponent,
   "data-element": dataElement,
   "data-role": dataRole,
+  helpAriaLabel,
   ...rest
 }) => {
   const isControlled = checked !== undefined;
@@ -123,6 +124,7 @@ const Switch = ({
     ...rest
   };
   return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+    helpAriaLabel: helpAriaLabel,
     tooltipPosition: tooltipPosition
   }, /*#__PURE__*/_react.default.createElement(_switch.default, switchStyleProps, /*#__PURE__*/_react.default.createElement(_checkableInput.default, inputProps, /*#__PURE__*/_react.default.createElement(_switchSlider.default, switchSliderProps))));
 };
@@ -241,7 +243,10 @@ Switch.propTypes = {
   required: _propTypes.default.bool,
 
   /** Overrides the default tooltip position */
-  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"])
+  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"]),
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 Switch.defaultProps = {
   labelInline: false,

package/lib/components/switch/switch.d.ts

@@ -29,6 +29,8 @@ export interface SwitchProps extends CommonCheckableInputProps, MarginProps {
   value?: string;
   /** Overrides the default tooltip position */
   tooltipPosition?: "top" | "bottom" | "left" | "right";
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 declare function Switch(props: SwitchProps): JSX.Element;

package/lib/components/tabs/__internal__/tab-title/tab-title.style.js

@@ -90,7 +90,7 @@ const StyledTitleContent = _styledComponents.default.div`
     ${size === "large" && position === "left" && (0, _styledComponents.css)`
       font-size: 16px;
       padding: 22px 24px;
-      ${!isTabSelected && !alternateStyling && (error || warning || info) && `margin-right: -2px;`}
+      ${!isTabSelected && !alternateStyling && error && `margin-right: -2px;`}
     `}
 
     ${size === "default" && (0, _styledComponents.css)`
@@ -99,7 +99,7 @@ const StyledTitleContent = _styledComponents.default.div`
         padding-bottom: 8px;
       `}
 
-      ${position === "left" && !isTabSelected && !alternateStyling && (error || warning || info) && `margin-right: -2px;`}
+      ${position === "left" && !isTabSelected && !alternateStyling && error && `margin-right: -2px;`}
     `}
   `}
 
@@ -344,10 +344,6 @@ const StyledTabTitle = _styledComponents.default.li`
         padding-bottom: 0px;
       `}
 
-    &:focus {
-      outline: ${isInSidebar ? "none;" : `2px solid ${theme.colors.focus};`}
-    }
-
     &:hover {
       background-color: ${theme.colors.white};
       border-bottom-color: ${alternateStyling ? `${theme.tab.background};` : `${theme.colors.primary};`}
@@ -355,6 +351,16 @@ const StyledTabTitle = _styledComponents.default.li`
       cursor: default;
     }
   `}
+
+  ${({
+  theme,
+  isInSidebar
+}) => `
+    &:focus {
+      outline: ${isInSidebar ? "none;" : `2px solid ${theme.colors.focus};`}
+      z-index: 1;
+    }
+  `}
   
   ${({
   position,
@@ -364,21 +370,23 @@ const StyledTabTitle = _styledComponents.default.li`
   alternateStyling,
   error,
   warning,
-  info
+  info,
+  isInSidebar
 }) => position === "left" && (0, _styledComponents.css)`
       background-color: transparent;
       border-bottom: 0px;
 
+      ${!isInSidebar && (0, _styledComponents.css)`
+        border-right: ${alternateStyling ? "1px" : "2px"} solid
+          ${theme.tab.background};
+      `}
+
       ${!borders && (0, _styledComponents.css)`
         ${StyledTitleContent} {
           border-bottom: none;
         }
       `}
 
-      ${!alternateStyling && (0, _styledComponents.css)`
-        border-right: 2px solid ${theme.tab.background};
-      `}
-
       display: block;
       height: auto;
       margin-left: 0px;
@@ -391,6 +399,10 @@ const StyledTabTitle = _styledComponents.default.li`
         ${alternateStyling && `border-right-color: ${theme.tab.background};`}
       }
 
+      ${(warning || info) && (0, _styledComponents.css)`
+        border-right: none;
+      `}
+
       ${({
   isTabSelected
 }) => isTabSelected && (0, _styledComponents.css)`

package/lib/components/tabs/__internal__/tabs-header/tabs-header.style.js

@@ -75,11 +75,10 @@ const StyledTabsHeaderList = _styledComponents.default.ul`
 
   ${({
   position,
-  noRightBorder,
-  theme
+  noRightBorder
 }) => position === "left" && (0, _styledComponents.css)`
       flex-direction: column;
-      box-shadow: inset ${computeLineWidth} 0px 0px 0px ${theme.tab.background};
+      box-shadow: none;
 
       ${noRightBorder && (0, _styledComponents.css)`
         box-shadow: none;

package/lib/components/tabs/tabs.component.js

@@ -59,9 +59,22 @@ const Tabs = ({
   headerWidth,
   ...rest
 }) => {
-  const tabRefs = (0, _react.useRef)([]);
+  /** The children nodes converted into an Array */
+  const filteredChildren = (0, _react.useMemo)(() => _react.Children.toArray(children).filter(child => child), [children]);
+  /** Array of the tabIds for the child nodes */
+
+  const tabIds = () => {
+    return filteredChildren.map(child => child.props.tabId);
+  };
+  /** Array of refs to the TabTitle nodes */
+
+
+  const tabRefs = (0, _react.useMemo)(() => Array.from({
+    length: filteredChildren.length
+  }).map(() => /*#__PURE__*/(0, _react.createRef)()), [filteredChildren.length]);
   const previousSelectedTabId = (0, _react.useRef)(selectedTabId);
   const [selectedTabIdState, setSelectedTabIdState] = (0, _react.useState)();
+  const [tabStopId, setTabStopId] = (0, _react.useState)();
   const {
     isInSidebar
   } = (0, _react.useContext)(_drawer.DrawerSidebarContext);
@@ -69,7 +82,13 @@ const Tabs = ({
   const [tabsWarnings, setTabsWarnings] = (0, _react.useState)({});
   const [tabsInfos, setTabsInfos] = (0, _react.useState)({});
   (0, _react.useLayoutEffect)(() => {
-    const selectedTab = selectedTabId || _react.default.Children.toArray(children)[0].props.tabId;
+    const selectedTab = selectedTabId || _react.Children.toArray(children)[0].props.tabId;
+
+    if (!tabIds().includes(selectedTabId)) {
+      setTabStopId(_react.default.Children.toArray(children)[0].props.tabId);
+    } else {
+      setTabStopId(selectedTab);
+    }
 
     setSelectedTabIdState(selectedTab); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -94,15 +113,25 @@ const Tabs = ({
       });
     }
   }, [tabsInfos]);
+  /** Returns true/false for if the given tab id is selected. */
+
+  const isTabSelected = (0, _react.useCallback)(tabId => tabId === selectedTabIdState, [selectedTabIdState]);
+  const hasTabStop = (0, _react.useCallback)(tabId => tabId === tabStopId, [tabStopId]);
   /** Updates the currently visible tab */
 
   const updateVisibleTab = (0, _react.useCallback)(tabid => {
-    setSelectedTabIdState(tabid);
+    if (!isTabSelected(tabid)) {
+      setSelectedTabIdState(tabid);
+    }
+
+    if (!hasTabStop(tabid)) {
+      setTabStopId(tabid);
+    }
 
     if (onTabChange) {
       onTabChange(tabid);
     }
-  }, [onTabChange]);
+  }, [onTabChange, isTabSelected, hasTabStop]);
   /** Determines if the tab titles are in a vertical format. */
 
   const isVertical = currentPosition => currentPosition === "left";
@@ -122,17 +151,7 @@ const Tabs = ({
   /** Focuses the tab for the reference specified */
 
 
-  const focusTab = ref => ref.focus();
-  /** The children nodes converted into an Array */
-
-
-  const filteredChildren = _react.default.useMemo(() => _react.default.Children.toArray(children).filter(child => child), [children]);
-  /** Array of the tabIds for the child nodes */
-
-
-  const tabIds = () => {
-    return filteredChildren.map(child => child.props.tabId);
-  };
+  const focusTab = ref => ref.current.focus();
   /** Will trigger the tab at the given index. */
 
 
@@ -148,7 +167,7 @@ const Tabs = ({
     }
 
     const nextTabId = ids[newIndex];
-    const nextRef = tabRefs.current[newIndex];
+    const nextRef = tabRefs[newIndex];
     updateVisibleTab(nextTabId);
     focusTab(nextRef);
   };
@@ -174,16 +193,6 @@ const Tabs = ({
       }
     };
   };
-  /** Returns true/false for if the given tab id is selected. */
-
-
-  const isTabSelected = tabId => tabId === selectedTabIdState;
-
-  const addRef = ref => {
-    if (ref && !tabRefs.current.includes(ref)) {
-      tabRefs.current.push(ref);
-    }
-  };
   /** Build the headers for the tab component */
 
 
@@ -220,8 +229,8 @@ const Tabs = ({
         key: tabId,
         onClick: handleTabClick,
         onKeyDown: handleKeyDown(index),
-        ref: node => addRef(node),
-        tabIndex: isTabSelected(tabId) ? "0" : "-1",
+        ref: tabRefs[index],
+        tabIndex: isTabSelected(tabId) || hasTabStop(tabId) ? "0" : "-1",
         title: title,
         href: href,
         isTabSelected: isTabSelected(tabId),
@@ -239,7 +248,16 @@ const Tabs = ({
         noLeftBorder: ["no left side", "no sides"].includes(borders),
         noRightBorder: ["no right side", "no sides"].includes(borders),
         customLayout: customLayout,
-        isInSidebar: isInSidebar
+        isInSidebar: isInSidebar,
+        onFocus: () => {
+          if (!hasTabStop(tabId)) {
+            setTabStopId(tabId);
+          }
+
+          if (!isTabSelected(tabId)) {
+            updateVisibleTab(tabId);
+          }
+        }
       });
 
       return tabTitle;
@@ -264,7 +282,7 @@ const Tabs = ({
         tab = child;
       }
     });
-    return tab ? /*#__PURE__*/_react.default.cloneElement(tab, {
+    return tab ? /*#__PURE__*/(0, _react.cloneElement)(tab, {
       isTabSelected: isTabSelected(tab.props.tabId)
     }) : null;
   };
@@ -279,7 +297,7 @@ const Tabs = ({
     }
 
     const tabs = filteredChildren.map(child => {
-      return /*#__PURE__*/_react.default.cloneElement(child, { ...child.props,
+      return /*#__PURE__*/(0, _react.cloneElement)(child, { ...child.props,
         role: "tabpanel",
         position,
         isTabSelected: isTabSelected(child.props.tabId),

package/lib/components/textarea/textarea.component.js

@@ -190,9 +190,11 @@ let Textarea = /*#__PURE__*/function (_React$Component) {
         "data-component": dataComponent,
         "data-element": dataElement,
         "data-role": dataRole,
+        helpAriaLabel,
         ...props
       } = this.props;
       return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+        helpAriaLabel: helpAriaLabel,
         tooltipPosition: tooltipPosition
       }, /*#__PURE__*/_react.default.createElement(_inputBehaviour.InputBehaviour, null, /*#__PURE__*/_react.default.createElement(_textarea.default, _extends({
         labelInline: labelInline,
@@ -374,7 +376,10 @@ Textarea.propTypes = { ...marginPropTypes,
   required: _propTypes.default.bool,
 
   /** Overrides the default tooltip position */
-  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"])
+  tooltipPosition: _propTypes.default.oneOf(["top", "bottom", "left", "right"]),
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 Textarea.defaultProps = {
   labelWidth: 30,

package/lib/components/textarea/textarea.d.ts

@@ -70,6 +70,8 @@ export interface TextareaProps
   warnOverLimit?: boolean;
   /** Overrides the default tooltip position */
   tooltipPosition?: "top" | "bottom" | "left" | "right";
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 declare class Textarea extends React.Component<TextareaProps> {}

package/lib/components/textbox/textbox.component.js

@@ -86,10 +86,12 @@ const Textbox = ({
   enforceCharacterLimit = true,
   characterLimit,
   warnOverLimit = false,
+  helpAriaLabel,
   ...props
 }) => {
   const [maxLength, characterCount] = (0, _useCharacterCount.default)(value, characterLimit, warnOverLimit, enforceCharacterLimit);
   return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+    helpAriaLabel: helpAriaLabel,
     tooltipPosition: tooltipPosition
   }, /*#__PURE__*/_react.default.createElement(_inputBehaviour.InputBehaviour, null, /*#__PURE__*/_react.default.createElement(_formField.default, _extends({
     disabled: disabled,
@@ -218,10 +220,10 @@ Textbox.propTypes = {
   /** Event handler for the mouse down event */
   onMouseDown: _propTypes.default.func,
 
-  /** Defered callback called after the onChange event */
+  /** Deferred callback called after the onChange event */
   onChangeDeferred: _propTypes.default.func,
 
-  /** Integer to determine timeout for defered callback */
+  /** Integer to determine timeout for deferred callback */
   deferTimeout: _propTypes.default.number,
 
   /** Unique identifier for the input. Will use a randomly generated GUID if none is provided */
@@ -347,7 +349,10 @@ Textbox.propTypes = {
   characterLimit: _propTypes.default.string,
 
   /** Whether to display the character count message in red */
-  warnOverLimit: _propTypes.default.bool
+  warnOverLimit: _propTypes.default.bool,
+
+  /** Aria label for rendered help component */
+  helpAriaLabel: _propTypes.default.string
 };
 Textbox.defaultProps = {
   labelWidth: 30,

package/lib/components/textbox/textbox.d.ts

@@ -57,7 +57,7 @@ export interface CommonTextboxProps
   labelWidth?: number;
   /** Specify a callback triggered on change */
   onChange?: (ev: React.ChangeEvent<HTMLInputElement>) => void;
-  /** Defered callback to be called after the onChange event */
+  /** Deferred callback to be called after the onChange event */
   onChangeDeferred?: () => void;
   /** Specify a callback triggered on click */
   onClick?: (ev: React.MouseEvent<HTMLElement>) => void;
@@ -95,6 +95,8 @@ export interface CommonTextboxProps
   inputRef?: (input: React.RefObject<HTMLInputElement>) => void;
   /** Overrides the default tooltip position */
   tooltipPosition?: "top" | "bottom" | "left" | "right";
+  /** Aria label for rendered help component */
+  helpAriaLabel?: string;
 }
 
 export interface TextboxProps extends CommonTextboxProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "95.0.0",
+  "version": "95.1.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {