carbon-react 94.7.0 → 95.0.1

package/lib/__internal__/checkable-input/checkable-input.component.js

@@ -58,7 +58,7 @@ const CheckableInput = ({
   const {
     current: id
   } = (0, _react.useRef)(inputId || (0, _guid.default)());
-  const labelId = `${id}-label`;
+  const labelId = label ? `${id}-label` : undefined;
   const helpId = [error, warning, info, labelHelp].filter(validation => typeof validation === "string").length ? `${id}-help` : undefined;
   const fieldHelpId = fieldHelp ? `${id}-field-help` : undefined;
   const isRadio = type === "radio";

package/lib/__internal__/checkable-input/hidden-checkable-input.component.js

@@ -32,6 +32,7 @@ const HiddenCheckableInput = ({
   inputRef,
   onChange,
   autoFocus,
+  ariaLabelledBy,
   ...props
 }) => {
   const {
@@ -76,7 +77,7 @@ const HiddenCheckableInput = ({
     autoFocus: autoFocus,
     "aria-checked": checked,
     checked: checked,
-    "aria-labelledby": labelId,
+    "aria-labelledby": ariaLabelledBy || labelId,
     "aria-describedby": ariaDescribedBy,
     name: name,
     role: type,
@@ -135,7 +136,10 @@ HiddenCheckableInput.propTypes = {
   /** A callback to retrieve the input reference */
   inputRef: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.shape({
     current: _propTypes.default.instanceOf(Element)
-  })])
+  })]),
+
+  /** The id of the element that labels the input */
+  ariaLabelledBy: _propTypes.default.string
 };
 
 var _default = /*#__PURE__*/_react.default.memo(HiddenCheckableInput);

package/lib/__internal__/checkable-input/hidden-checkable-input.d.ts

@@ -37,6 +37,8 @@ export interface HiddenCheckableInputProps
   fieldHelpId?: string;
   /** Element id for aria-labelledby */
   labelId?: string;
+  /** The id of the element that labels the input */
+  ariaLabelledBy?: string;
 }
 
 declare function HiddenCheckableInput(

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

@@ -7,6 +7,8 @@ exports.default = exports.ButtonWithForwardRef = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _styledComponents = require("styled-components");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _propTypes2 = _interopRequireDefault(require("@styled-system/prop-types"));
@@ -17,6 +19,8 @@ var _button = _interopRequireWildcard(require("./button.style"));
 
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags/tags"));
 
+var _base = _interopRequireDefault(require("../../style/themes/base"));
+
 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; }
@@ -35,21 +39,23 @@ function renderChildren({
   disabled,
   buttonType,
   iconTooltipMessage,
-  iconTooltipPosition
+  iconTooltipPosition,
+  theme
   /* eslint-enable */
 
 }) {
   const iconColorMap = {
-    primary: "on-dark-background",
-    secondary: "business-color",
-    tertiary: "business-color",
-    darkBackground: "business-color"
+    primary: theme.colors.white,
+    secondary: theme.colors.primary,
+    tertiary: theme.colors.primary,
+    darkBackground: theme.colors.primary
   };
   const iconProps = {
     type: iconType,
     disabled,
-    bgTheme: "none",
-    iconColor: iconColorMap[buttonType]
+    bgSize: "extra-small",
+    color: iconColorMap[buttonType],
+    bg: "transparent"
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconType && iconPosition === "before" && children && /*#__PURE__*/_react.default.createElement(_icon.default, iconProps), /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("span", {
     "data-element": "main-text"
@@ -129,6 +135,8 @@ const renderStyledButton = buttonProps => {
 };
 
 const Button = props => {
+  const theme = (0, _react.useContext)(_styledComponents.ThemeContext) || _base.default;
+
   const {
     size,
     subtext
@@ -142,7 +150,8 @@ const Button = props => {
   } = props;
   const propsWithoutAs = { ...rest,
     buttonType: buttonType || as,
-    ref: forwardRef || linkRef
+    ref: forwardRef || linkRef,
+    theme
   };
 
   if (subtext.length > 0 && size !== "large") {

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

@@ -19,10 +19,9 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 const ButtonToggleIcon = props => /*#__PURE__*/_react.default.createElement(_buttonToggle.StyledButtonToggleIcon, props, /*#__PURE__*/_react.default.createElement(_icon.default, _extends({
   type: props.buttonIcon,
-  fontSize: props.buttonIconSize
-}, props, {
-  bgTheme: "none"
-})));
+  fontSize: props.buttonIconSize,
+  bgSize: "extra-small"
+}, props)));
 
 ButtonToggleIcon.propTypes = {
   /**

package/lib/components/button-toggle/button-toggle.style.js

@@ -144,6 +144,8 @@ const StyledButtonToggleIcon = _styledComponents.default.div`
       ${_icon.default} {
         margin-right: 0;
         margin-bottom: 8px;
+        height: ${`${iconFontSizes.largeIcon}px`};
+        width: ${`${iconFontSizes.largeIcon}px`};
       }
 
       ${_icon.default}::before {

package/lib/components/flat-table/flat-table-checkbox/flat-table-checkbox.component.js

@@ -27,7 +27,8 @@ const FlatTableCheckbox = ({
   onClick,
   leftPosition,
   cellIndex,
-  reportCellWidth
+  reportCellWidth,
+  ariaLabelledBy
 }) => {
   const ref = (0, _react.useRef)(null);
   (0, _react.useLayoutEffect)(() => {
@@ -47,7 +48,8 @@ const FlatTableCheckbox = ({
     checked: checked,
     onChange: onChange,
     name: "flat-table-checkbox",
-    mb: 0
+    mb: 0,
+    ariaLabelledBy: ariaLabelledBy
   }));
 };
 
@@ -67,6 +69,9 @@ FlatTableCheckbox.propTypes = {
   /** Whether to render the checkbox or not, defaults to true */
   selectable: _propTypes.default.bool,
 
+  /** The id of the element that labels the input */
+  ariaLabelledBy: _propTypes.default.string,
+
   /**
    * @private
    * @ignore

package/lib/components/flat-table/flat-table-checkbox/flat-table-checkbox.d.ts

@@ -11,6 +11,8 @@ export interface FlatTableCheckboxProps {
   selectable?: boolean;
   /** Callback function to be called when click event received */
   onClick?: (ev: React.MouseEvent<HTMLElement>) => void;
+  /** The id of the element that labels the input */
+  ariaLabelledBy?: string;
 }
 
 declare function FlatTableCheckbox(props: FlatTableCheckboxProps): JSX.Element;

package/lib/components/heading/heading.style.js

@@ -85,6 +85,7 @@ const StyledHeadingBackButton = (0, _styledComponents.default)(_link.default)`
 
     ${_icon2.default} {
       margin-right: 0;
+      display: inline-flex;
     }
   }
 `;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.ICONS = exports.ICON_COLORS = exports.ICON_BACKGROUNDS = exports.ICON_SIZES = exports.ICON_SHAPES = exports.ICON_TOOLTIP_POSITIONS = void 0;
+exports.default = exports.ICONS = exports.ICON_SIZES = exports.ICON_SHAPES = exports.ICON_TOOLTIP_POSITIONS = void 0;
 const dlsConfig = {
   backgroundSize: {
     "extra-small": "16px",
@@ -30,10 +30,6 @@ 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_BACKGROUNDS = ["info", "error", "success", "warning", "business", "none"];
-exports.ICON_BACKGROUNDS = ICON_BACKGROUNDS;
-const ICON_COLORS = ["default", "on-light-background", "on-dark-background", "business-color"];
-exports.ICON_COLORS = ICON_COLORS;
 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

@@ -19,8 +19,6 @@ var _tooltip = _interopRequireDefault(require("../tooltip"));
 
 var _utils = require("../../style/utils");
 
-var _logger = _interopRequireDefault(require("../../__internal__/utils/logger"));
-
 var _iconConfig = require("./icon-config");
 
 var _tooltipProvider = require("../../__internal__/tooltip-provider");
@@ -33,19 +31,16 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return 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); }
 
-let deprecatedWarnTriggered = false;
 const marginPropTypes = (0, _utils.filterStyledSystemMarginProps)(_propTypes2.default.space);
 
 const Icon = /*#__PURE__*/_react.default.forwardRef(({
   bg,
   bgShape,
   bgSize,
-  bgTheme,
   className,
   color,
   disabled,
   fontSize,
-  iconColor,
   type,
   tooltipMessage,
   tooltipPosition,
@@ -58,12 +53,6 @@ const Icon = /*#__PURE__*/_react.default.forwardRef(({
   inputSize,
   ...rest
 }, ref) => {
-  if (!deprecatedWarnTriggered && (iconColor || bgTheme)) {
-    deprecatedWarnTriggered = true;
-
-    _logger.default.deprecate("`iconColor` and `bgTheme` props are deprecated and will soon be removed");
-  }
-
   const isInteractive = !!tooltipMessage && !disabled;
   /** Return Icon type with overrides */
 
@@ -93,14 +82,12 @@ const Icon = /*#__PURE__*/_react.default.forwardRef(({
 
   const styleProps = {
     bg,
-    bgTheme,
     bgSize,
     bgShape,
     color,
     disabled,
     fontSize,
     isInteractive,
-    iconColor,
     tabIndex,
     type: iconType(),
     ...(0, _utils.filterStyledSystemMarginProps)(rest)
@@ -157,19 +144,13 @@ Icon.propTypes = { ...marginPropTypes,
   /** Background shape */
   bgShape: _propTypes.default.oneOf(["circle", "rounded-rect", "square"]),
 
-  /** Background color theme */
-  bgTheme: _propTypes.default.oneOf(["info", "error", "success", "warning", "business", "none"]),
-
   /** Icon font size */
   fontSize: _propTypes.default.oneOf(["small", "medium", "large", "extra-large"]),
 
-  /** Icon color */
-  iconColor: _propTypes.default.oneOf(["default", "on-light-background", "on-dark-background", "business-color"]),
-
-  /** Override iconColor, provide any color from palette or any valid css color value. */
+  /** Icon colour, provide any color from palette or any valid css color value. */
   color: _propTypes.default.string,
 
-  /** Override bgTheme, provide any color from palette or any valid css color value. */
+  /** Background colour, provide any color from palette or any valid css color value. */
   bg: _propTypes.default.string,
 
   /** Sets the icon in the disabled state */

package/lib/components/icon/icon.d.ts

@@ -15,13 +15,7 @@ export type FontSize =
   | "large"
   | "extra-large";
 export type BackgroundShape = "circle" | "rounded-rect" | "square";
-export type BackgroundTheme =
-  | "info"
-  | "error"
-  | "success"
-  | "warning"
-  | "business"
-  | "none";
+
 export type IconType =
   | "add"
   | "alert"
@@ -209,11 +203,6 @@ export type IconType =
   | "video"
   | "view"
   | "warning";
-export type IconColor =
-  | "default"
-  | "on-light-background"
-  | "on-dark-background"
-  | "business-color";
 
 export interface IconProps extends MarginProps {
   /** Icon type */
@@ -222,15 +211,11 @@ export interface IconProps extends MarginProps {
   bgSize?: BgSize;
   /** Background shape */
   bgShape?: BackgroundShape;
-  /** Background color theme */
-  bgTheme?: BackgroundTheme;
   /** Icon font size */
   fontSize?: FontSize;
-  /** Icon color */
-  iconColor?: IconColor;
-  /** Override iconColor, provide any color from palette or any valid css color value. */
+  /** Icon colour, provide any color from palette or any valid css color value. */
   color?: string;
-  /** Override bgTheme, provide any color from palette or any valid css color value. */
+  /** Background colour, provide any color from palette or any valid css color value. */
   bg?: string;
   /** Sets the icon in the disabled state */
   disabled?: boolean;

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

@@ -17,8 +17,6 @@ var _iconUnicodes = _interopRequireDefault(require("./icon-unicodes"));
 
 var _base = _interopRequireDefault(require("../../style/themes/base"));
 
-var _palette = _interopRequireDefault(require("../../style/palette"));
-
 var _iconConfig = _interopRequireWildcard(require("./icon-config"));
 
 var _browserTypeCheck = _interopRequireWildcard(require("../../__internal__/utils/helpers/browser-type-check"));
@@ -31,60 +29,6 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-const getBackgroundColor = (theme, bgTheme, disabled, isHover) => {
-  if (bgTheme !== "none") {
-    if (disabled) return theme.icon.disabled;
-  }
-
-  const palette = (0, _palette.default)({
-    statusColor: theme.colors[bgTheme],
-    businessColor: theme.colors.primary
-  });
-  const statuses = ["info", "error", "success", "warning"];
-
-  if (statuses.includes(bgTheme)) {
-    return isHover ? palette.statusColorShade(20) : theme.colors[bgTheme];
-  }
-
-  if (bgTheme === "business") {
-    return isHover ? palette.businessColorShade(20) : theme.colors.primary;
-  }
-
-  return "transparent";
-};
-
-const getIconColor = (bgTheme, theme, iconColor, disabled, isHover) => {
-  if (disabled) return theme.icon.disabled;
-
-  if (bgTheme !== "none") {
-    const whiteIconBackgrounds = ["error", "info", "business"];
-    const darkIconBackgrounds = ["success", "warning"];
-    if (whiteIconBackgrounds.includes(bgTheme)) return theme.colors.white;
-
-    if (darkIconBackgrounds.includes(bgTheme)) {
-      return isHover ? theme.icon.defaultHover : theme.icon.default;
-    }
-  }
-
-  const palette = (0, _palette.default)({
-    businessColor: theme.colors.primary
-  });
-
-  switch (iconColor) {
-    case "on-dark-background":
-      return theme.colors.white;
-
-    case "on-light-background":
-      return isHover ? theme.icon.onLightBackgroundHover : theme.icon.onLightBackground;
-
-    case "business-color":
-      return isHover ? palette.businessColorShade(20) : theme.colors.primary;
-
-    default:
-      return isHover ? theme.icon.defaultHover : theme.icon.default;
-  }
-};
-
 function adjustIconBgSize(fontSize, bgSize) {
   var _replacements$fontSiz;
 
@@ -113,12 +57,10 @@ function adjustIconBgSize(fontSize, bgSize) {
 
 const StyledIcon = _styledComponents.default.span`
   ${({
-  bgTheme,
   theme,
   color,
   bg,
   isInteractive,
-  iconColor,
   bgSize,
   bgShape,
   type,
@@ -131,7 +73,10 @@ const StyledIcon = _styledComponents.default.span`
   let bgHoverColor;
 
   try {
-    if (color) {
+    if (disabled) {
+      finalColor = theme.icon.disabled;
+      finalHoverColor = theme.icon.disabled;
+    } else if (color) {
       const {
         color: renderedColor
       } = (0, _color.default)({
@@ -141,8 +86,8 @@ const StyledIcon = _styledComponents.default.span`
       finalColor = renderedColor;
       finalHoverColor = (0, _polished.shade)(0.2, renderedColor);
     } else {
-      finalColor = getIconColor(bgTheme, theme, iconColor, disabled, false);
-      finalHoverColor = getIconColor(bgTheme, theme, iconColor, disabled, true);
+      finalColor = theme.icon.default;
+      finalHoverColor = theme.icon.defaultHover;
     }
 
     if (bg) {
@@ -154,9 +99,12 @@ const StyledIcon = _styledComponents.default.span`
       });
       bgColor = backgroundColor;
       bgHoverColor = (0, _polished.shade)(0.2, backgroundColor);
+    } else if (disabled) {
+      bgColor = theme.icon.disabled;
+      bgHoverColor = theme.icon.disabled;
     } else {
-      bgColor = getBackgroundColor(theme, bgTheme, disabled, false);
-      bgHoverColor = getBackgroundColor(theme, bgTheme, disabled, true);
+      bgColor = "transparent";
+      bgHoverColor = "transparent";
     }
   } catch (e) {
     // eslint-disable-next-line no-console
@@ -164,11 +112,16 @@ const StyledIcon = _styledComponents.default.span`
   }
 
   return (0, _styledComponents.css)`
-      display: inline-block;
       position: relative;
       color: ${finalColor};
       background-color: ${bgColor};
       vertical-align: middle;
+      align-items: center;
+      display: inline-flex;
+      justify-content: center;
+      height: ${adjustIconBgSize(fontSize, bgSize)};
+      width: ${adjustIconBgSize(fontSize, bgSize)};
+      border-radius: ${_iconConfig.default.backgroundShape[bgShape]};
 
       ${isInteractive && (0, _styledComponents.css)`
         &:hover {
@@ -177,15 +130,6 @@ const StyledIcon = _styledComponents.default.span`
         }
       `}
 
-      ${bgTheme !== "none" && (0, _styledComponents.css)`
-        align-items: center;
-        display: inline-flex;
-        justify-content: center;
-        height: ${adjustIconBgSize(fontSize, bgSize)};
-        width: ${adjustIconBgSize(fontSize, bgSize)};
-        border-radius: ${_iconConfig.default.backgroundShape[bgShape]};
-      `}
-
       &::before {
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
@@ -220,9 +164,7 @@ StyledIcon.propTypes = {
   disabled: _propTypes.default.bool,
   bgSize: _propTypes.default.oneOf(["extra-small", "small", "medium", "large", "extra-large"]),
   bgShape: _propTypes.default.oneOf(_iconConfig.ICON_SHAPES),
-  bgTheme: _propTypes.default.oneOf([..._iconConfig.ICON_COLORS, ..._iconConfig.ICON_BACKGROUNDS, ""]),
-  fontSize: _propTypes.default.oneOf(["small", "medium", "large", "extra-large"]),
-  iconColor: _propTypes.default.oneOf(_iconConfig.ICON_COLORS)
+  fontSize: _propTypes.default.oneOf(["small", "medium", "large", "extra-large"])
 };
 StyledIcon.defaultProps = {
   theme: _base.default

package/lib/components/link/link.component.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _styledComponents = require("styled-components");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _icon = _interopRequireDefault(require("../icon"));
@@ -17,6 +19,8 @@ var _link = require("./link.style");
 
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags/tags"));
 
+var _themes = require("../../style/themes");
+
 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; }
@@ -44,6 +48,8 @@ const Link = /*#__PURE__*/_react.default.forwardRef(({
   target,
   ...rest
 }, ref) => {
+  const theme = (0, _react.useContext)(_styledComponents.ThemeContext) || _themes.baseTheme;
+
   const tabIndex = tabbable && !disabled ? "0" : "-1";
 
   const handleOnKeyDown = ev => {
@@ -66,8 +72,8 @@ const Link = /*#__PURE__*/_react.default.forwardRef(({
     const hasProperAlignment = icon && iconAlign === currentAlignment;
     return hasProperAlignment ? /*#__PURE__*/_react.default.createElement(_icon.default, {
       type: icon,
-      bgTheme: "none",
-      iconColor: "business-color",
+      bgSize: "extra-small",
+      color: theme.colors.primary,
       disabled: disabled,
       ariaLabel: ariaLabel,
       tooltipMessage: tooltipMessage,

package/lib/components/link/link.style.js

@@ -54,6 +54,7 @@ const StyledLink = _styledComponents.default.span`
       color: ${isSkipLink ? theme.text.color : theme.colors.primary};
       display: inline-block;
       ${_icon.default} {
+        display: inline-block;
         position: relative;
         vertical-align: middle;
         ${iconAlign === "left" && (0, _styledComponents.css)`

package/lib/components/message/type-icon/type-icon.component.js

@@ -23,8 +23,7 @@ const TypeIcon = ({
     variant: variant,
     transparent: transparent
   }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-    type: variant,
-    bgTheme: "none"
+    type: variant
   }));
 };
 

package/lib/components/pill/pill.component.js

@@ -32,9 +32,7 @@ const renderCloseIcon = onDelete => /*#__PURE__*/_react.default.createElement(_i
   "data-element": "close",
   "aria-label": "close"
 }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-  type: "cross",
-  bgSize: "small",
-  bgTheme: "none"
+  type: "cross"
 }));
 
 const Pill = ({

package/lib/components/pill/pill.style.js

@@ -173,6 +173,8 @@ const PillStyle = _styledComponents.default.span`
           ${_icon.default} {
             font-size: 12px;
             padding: 0 4px;
+            height: unset;
+            width: unset;
 
             &:hover,
             &:focus {

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

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _styledComponents = require("styled-components");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _propTypes2 = _interopRequireDefault(require("@styled-system/prop-types"));
@@ -29,6 +31,8 @@ var _popover = _interopRequireDefault(require("../../__internal__/popover"));
 
 var _utils = require("../../style/utils");
 
+var _themes = require("../../style/themes");
+
 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; }
@@ -54,6 +58,8 @@ const SplitButton = ({
   text,
   ...rest
 }) => {
+  const theme = (0, _react.useContext)(_styledComponents.ThemeContext) || _themes.baseTheme;
+
   const isToggleButtonFocused = (0, _react.useRef)(false);
   const buttonLabelId = (0, _react.useRef)((0, _guid.default)());
   const additionalButtons = (0, _react.useRef)([]);
@@ -161,8 +167,8 @@ const SplitButton = ({
 
   function getIconColor() {
     const colorsMap = {
-      primary: "on-dark-background",
-      secondary: "business-color"
+      primary: theme.colors.white,
+      secondary: theme.colors.primary
     };
     return colorsMap[buttonType || as];
   }
@@ -180,8 +186,9 @@ const SplitButton = ({
       key: "toggle-button"
     }, toggleButtonProps()), /*#__PURE__*/_react.default.createElement(_icon.default, {
       type: "dropdown",
-      bgTheme: "none",
-      iconColor: getIconColor(),
+      bgSize: "extra-small",
+      color: getIconColor(),
+      bg: "transparent",
       disabled: disabled
     }))];
   }

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

@@ -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,

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/style/design-tokens/theme-compatibility.util.js

@@ -23,6 +23,10 @@ var _default = theme => ({ ...theme,
   metaName: "Base Theme",
   metaPublic: "true",
   colorsLogo: "#00D639",
+  colorsYin030: "rgba(0,0,0,0.3)",
+  colorsYin055: "rgba(0,0,0,0.55)",
+  colorsYin065: "rgba(0,0,0,0.65)",
+  colorsYin090: "rgba(0,0,0,0.9)",
   colorsComponentsNavigation500: "#008146",
   colorsComponentsNavigation600: "#006738",
   colorsComponentsNavigation700: "#004D2A",
@@ -126,31 +130,31 @@ var _default = theme => ({ ...theme,
   sizing050: "4px",
   sizing075: "6px",
   sizingLogowidth: "40px",
-  spacing000: theme.space[0],
+  spacing000: `${theme.space[0]}px`,
   // 0px
   spacing025: "2px",
   spacing050: "4px",
   spacing075: "6px",
-  spacing100: theme.space[1],
+  spacing100: `${theme.space[1]}px`,
   // 8px
   spacing125: "10px",
   spacing150: "12px",
-  spacing200: theme.space[2],
+  spacing200: `${theme.space[2]}px`,
   // 16px
   spacing250: "20px",
-  spacing300: theme.space[3],
+  spacing300: `${theme.space[3]}px`,
   // 24px
-  spacing400: theme.space[4],
+  spacing400: `${theme.space[4]}px`,
   // 32px
-  spacing500: theme.space[5],
+  spacing500: `${theme.space[5]}px`,
   // 40px
-  spacing600: theme.space[6],
+  spacing600: `${theme.space[6]}px`,
   // 48px
-  spacing700: theme.space[7],
+  spacing700: `${theme.space[7]}px`,
   // 56px
-  spacing800: theme.space[8],
+  spacing800: `${theme.space[8]}px`,
   // 64px
-  spacing900: theme.space[9],
+  spacing900: `${theme.space[9]}px`,
   // 72px
   borderWidth100: "1px",
   borderWidth200: "2px",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "94.7.0",
+  "version": "95.0.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {
@@ -133,7 +133,7 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.9.0",
-    "@sage/design-tokens": "^1.65.0",
+    "@sage/design-tokens": "^1.73.0",
     "@styled-system/prop-types": "^5.1.5",
     "@tippyjs/react": "^4.2.5",
     "classnames": "~2.2.6",