@elastic/eui 63.0.3 → 65.0.0

package/optimize/lib/components/button/button_display/_button_display.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EuiButtonDisplay = void 0;
+exports.isButtonDisabled = isButtonDisabled;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -25,7 +26,11 @@ var _button_display = require("./_button_display.styles");
 
 var _button_display_content = require("./_button_display_content");
 
-var _excluded = ["element", "children", "iconType", "iconSide", "size", "isDisabled", "isLoading", "isSelected", "fullWidth", "minWidth", "contentProps", "textProps"];
+var _href_validator = require("../../../services/security/href_validator");
+
+var _mixins = require("../../../themes/amsterdam/global_styling/mixins");
+
+var _excluded = ["children", "iconType", "iconSide", "size", "isDisabled", "disabled", "isLoading", "isSelected", "fullWidth", "minWidth", "contentProps", "textProps", "href", "target", "rel", "type"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -35,32 +40,51 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
+var SIZES = ['xs', 's', 'm'];
+
+function isButtonDisabled(_ref) {
+  var href = _ref.href,
+      isDisabled = _ref.isDisabled,
+      isLoading = _ref.isLoading;
+  var isHrefValid = !href || (0, _href_validator.validateHref)(href);
+  return isLoading || isDisabled || !isHrefValid;
+}
 /**
  * EuiButtonDisplay is an internal-only component used for displaying
  * any element as a button.
  */
-var EuiButtonDisplay = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var _ref$element = _ref.element,
-      element = _ref$element === void 0 ? 'button' : _ref$element,
-      children = _ref.children,
-      iconType = _ref.iconType,
-      iconSide = _ref.iconSide,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? 'm' : _ref$size,
-      _ref$isDisabled = _ref.isDisabled,
-      isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
-      isLoading = _ref.isLoading,
-      isSelected = _ref.isSelected,
-      fullWidth = _ref.fullWidth,
-      minWidth = _ref.minWidth,
-      contentProps = _ref.contentProps,
-      textProps = _ref.textProps,
-      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var buttonIsDisabled = isLoading || isDisabled;
-  var minWidthPx = minWidth === 'number' ? "".concat(minWidth, "px") : minWidth;
+
+
+var EuiButtonDisplay = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
+  var children = _ref2.children,
+      iconType = _ref2.iconType,
+      iconSide = _ref2.iconSide,
+      _ref2$size = _ref2.size,
+      size = _ref2$size === void 0 ? 'm' : _ref2$size,
+      isDisabled = _ref2.isDisabled,
+      disabled = _ref2.disabled,
+      isLoading = _ref2.isLoading,
+      isSelected = _ref2.isSelected,
+      fullWidth = _ref2.fullWidth,
+      minWidth = _ref2.minWidth,
+      contentProps = _ref2.contentProps,
+      textProps = _ref2.textProps,
+      href = _ref2.href,
+      target = _ref2.target,
+      rel = _ref2.rel,
+      _ref2$type = _ref2.type,
+      type = _ref2$type === void 0 ? 'button' : _ref2$type,
+      rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+  var buttonIsDisabled = isButtonDisabled({
+    href: href,
+    isDisabled: isDisabled || disabled,
+    isLoading: isLoading
+  });
+  var minWidthPx = typeof minWidth === 'number' ? "".concat(minWidth, "px") : minWidth;
   var theme = (0, _services.useEuiTheme)();
   var styles = (0, _button_display.euiButtonDisplayStyles)(theme, minWidthPx);
-  var cssStyles = [styles.euiButtonDisplay, styles[size], fullWidth && styles.fullWidth, isDisabled && styles.isDisabled];
+  var buttonRadiusStyle = (0, _mixins.useEuiButtonRadiusCSS)()[size];
+  var cssStyles = [styles.euiButtonDisplay, styles[size], fullWidth && styles.fullWidth, buttonIsDisabled && styles.isDisabled, buttonRadiusStyle];
   var innerNode = (0, _react2.jsx)(_button_display_content.EuiButtonDisplayContent, (0, _extends2.default)({
     isLoading: isLoading,
     isDisabled: buttonIsDisabled,
@@ -68,12 +92,34 @@ var EuiButtonDisplay = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     iconSide: iconSide,
     textProps: _objectSpread({}, textProps)
   }, contentProps), children);
-  return (0, _react2.createElement)(element, _objectSpread({
+  var element = href && !buttonIsDisabled ? 'a' : 'button';
+  var elementProps = {}; // Element-specific attributes
+
+  if (element === 'button') {
+    elementProps = _objectSpread(_objectSpread({}, elementProps), {}, {
+      disabled: buttonIsDisabled,
+      'aria-pressed': isSelected
+    });
+  }
+
+  var relObj = {};
+
+  if (href && !buttonIsDisabled) {
+    relObj.href = href;
+    relObj.rel = (0, _services.getSecureRelForTarget)({
+      href: href,
+      target: target,
+      rel: rel
+    });
+    relObj.target = target;
+  } else {
+    relObj.type = type;
+  }
+
+  return (0, _react2.createElement)(element, _objectSpread(_objectSpread(_objectSpread({
     css: cssStyles,
-    disabled: element === 'button' && buttonIsDisabled,
-    'aria-pressed': element === 'button' ? isSelected : undefined,
     ref: ref
-  }, rest), innerNode);
+  }, elementProps), relObj), rest), innerNode);
 });
 exports.EuiButtonDisplay = EuiButtonDisplay;
 EuiButtonDisplay.displayName = 'EuiButtonDisplay';

package/optimize/lib/components/button/button_display/_button_display.styles.js

@@ -24,20 +24,11 @@ var _buttonSize = function _buttonSize(size) {
 };
 
 var _ref = process.env.NODE_ENV === "production" ? {
-  name: "15xpz7k-fullWidth",
-  styles: "display:block;width:100%;label:fullWidth;"
+  name: "vifhyf-isDisabled",
+  styles: "pointer-events:none;cursor:not-allowed;label:isDisabled;"
 } : {
-  name: "15xpz7k-fullWidth",
-  styles: "display:block;width:100%;label:fullWidth;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-
-var _ref2 = process.env.NODE_ENV === "production" ? {
-  name: "8595p9-isDisabled",
-  styles: "cursor:not-allowed;label:isDisabled;"
-} : {
-  name: "8595p9-isDisabled",
-  styles: "cursor:not-allowed;label:isDisabled;",
+  name: "vifhyf-isDisabled",
+  styles: "pointer-events:none;cursor:not-allowed;label:isDisabled;",
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 
@@ -45,10 +36,10 @@ var euiButtonDisplayStyles = function euiButtonDisplayStyles(euiThemeContext, mi
   var euiTheme = euiThemeContext.euiTheme;
   return {
     // Base
-    euiButtonDisplay: /*#__PURE__*/(0, _react.css)(euiButtonBaseCSS(), ";", minWidth && (0, _global_styling.logicalCSS)('min-width', minWidth), ";;label:euiButtonDisplay;"),
+    euiButtonDisplay: /*#__PURE__*/(0, _react.css)(euiButtonBaseCSS(), ";", minWidth && (0, _global_styling.logicalCSS)('min-width', minWidth), ";font-weight:", euiTheme.font.weight.medium, ";padding:0 ", euiTheme.size.m, ";&:hover:not(:disabled),&:focus{text-decoration:underline;};label:euiButtonDisplay;"),
     // States
-    isDisabled: _ref2,
-    fullWidth: _ref,
+    isDisabled: _ref,
+    fullWidth: /*#__PURE__*/(0, _react.css)("display:block;", (0, _global_styling.logicalCSS)('width', '100%'), ";;label:fullWidth;"),
     // Sizes
     xs: /*#__PURE__*/(0, _react.css)(_buttonSize(euiTheme.size.l), (0, _global_styling.euiFontSize)(euiThemeContext, 'xs'), ";label:xs;"),
     s: /*#__PURE__*/(0, _react.css)(_buttonSize(euiTheme.size.xl), (0, _global_styling.euiFontSize)(euiThemeContext, 's'), ";label:s;"),

package/optimize/lib/components/button/button_display/_button_display_content.js

@@ -21,6 +21,8 @@ var _icon = require("../../icon");
 
 var _button_display_content = require("./_button_display_content.styles");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _react2 = require("@emotion/react");
 
 var _excluded = ["children", "textProps", "isLoading", "isDisabled", "iconType", "iconSize", "iconSide"];
@@ -39,7 +41,7 @@ var EuiButtonDisplayContent = function EuiButtonDisplayContent(_ref) {
       contentProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var theme = (0, _services.useEuiTheme)();
   var styles = (0, _button_display_content.euiButtonDisplayContentStyles)(theme);
-  var cssStyles = [styles.euiButtonDisplayContent, iconSide && styles[iconSide], isDisabled && styles.isDisabled];
+  var cssStyles = [styles.euiButtonDisplayContent, iconSide && styles[iconSide]];
   var cssSpinnerStyles = [styles.euiButtonDisplayContent__spinner];
   var cssIconStyles = [styles.euiButtonDisplayContent__icon]; // Add an icon to the button if one exists.
 
@@ -72,7 +74,9 @@ var EuiButtonDisplayContent = function EuiButtonDisplayContent(_ref) {
   var isText = typeof children === 'string';
   return (0, _react2.jsx)("span", (0, _extends2.default)({}, contentProps, {
     css: cssStyles
-  }), icon, isText ? (0, _react2.jsx)("span", textProps, children) : children);
+  }), icon, isText ? (0, _react2.jsx)("span", (0, _extends2.default)({}, textProps, {
+    className: (0, _classnames.default)('eui-textTruncate', textProps === null || textProps === void 0 ? void 0 : textProps.className)
+  }), children) : children);
 };
 
 exports.EuiButtonDisplayContent = EuiButtonDisplayContent;

package/optimize/lib/components/button/button_display/_button_display_content.styles.js

@@ -12,15 +12,6 @@ var _global_styling = require("../../../global_styling");
 function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
 
 var _ref = process.env.NODE_ENV === "production" ? {
-  name: "ske5nx-isDisabled",
-  styles: "pointer-events:auto;cursor:not-allowed;label:isDisabled;"
-} : {
-  name: "ske5nx-isDisabled",
-  styles: "pointer-events:auto;cursor:not-allowed;label:isDisabled;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-
-var _ref2 = process.env.NODE_ENV === "production" ? {
   name: "gtg6j-euiButtonDisplayContent__icon",
   styles: "flex-shrink:0;label:euiButtonDisplayContent__icon;"
 } : {
@@ -29,7 +20,7 @@ var _ref2 = process.env.NODE_ENV === "production" ? {
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 
-var _ref3 = process.env.NODE_ENV === "production" ? {
+var _ref2 = process.env.NODE_ENV === "production" ? {
   name: "10wlo76-euiButtonDisplayContent__spinner",
   styles: "flex-shrink:0;label:euiButtonDisplayContent__spinner;"
 } : {
@@ -38,7 +29,7 @@ var _ref3 = process.env.NODE_ENV === "production" ? {
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 
-var _ref4 = process.env.NODE_ENV === "production" ? {
+var _ref3 = process.env.NODE_ENV === "production" ? {
   name: "qfl6yj-right",
   styles: "flex-direction:row-reverse;label:right;"
 } : {
@@ -47,17 +38,16 @@ var _ref4 = process.env.NODE_ENV === "production" ? {
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 
-var euiButtonDisplayContentStyles = function euiButtonDisplayContentStyles(_ref5) {
-  var euiTheme = _ref5.euiTheme;
+var euiButtonDisplayContentStyles = function euiButtonDisplayContentStyles(_ref4) {
+  var euiTheme = _ref4.euiTheme;
   return {
     // Base
     euiButtonDisplayContent: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', '100%'), ";", (0, _global_styling.logicalCSS)('width', '100%'), ";display:flex;justify-content:center;align-items:center;vertical-align:middle;gap:", euiTheme.size.s, ";;label:euiButtonDisplayContent;"),
     // Icon side
     left: /*#__PURE__*/(0, _react.css)(";label:left;"),
-    right: _ref4,
-    euiButtonDisplayContent__spinner: _ref3,
-    euiButtonDisplayContent__icon: _ref2,
-    isDisabled: _ref
+    right: _ref3,
+    euiButtonDisplayContent__spinner: _ref2,
+    euiButtonDisplayContent__icon: _ref
   };
 };
 

package/optimize/lib/components/button/button_empty/button_empty.js

@@ -5,12 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SIZES = exports.FLUSH_TYPES = exports.EuiButtonEmpty = exports.COLORS = void 0;
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+exports.SIZES = exports.FLUSH_TYPES = exports.EuiButtonEmpty = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -23,7 +23,9 @@ var _services = require("../../../services");
 
 var _button_content_deprecated = require("../_button_content_deprecated");
 
-var _href_validator = require("../../../services/security/href_validator");
+var _button = require("../../../themes/amsterdam/global_styling/mixins/button");
+
+var _button_display = require("../button_display/_button_display");
 
 var _react2 = require("@emotion/react");
 
@@ -33,16 +35,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var colorToClassNameMap = {
-  primary: 'euiButtonEmpty--primary',
-  danger: 'euiButtonEmpty--danger',
-  text: 'euiButtonEmpty--text',
-  ghost: 'euiButtonEmpty--ghost',
-  success: 'euiButtonEmpty--success',
-  warning: 'euiButtonEmpty--warning'
-};
-var COLORS = (0, _common.keysOf)(colorToClassNameMap);
-exports.COLORS = COLORS;
 var sizeToClassNameMap = {
   xs: 'euiButtonEmpty--xSmall',
   s: 'euiButtonEmpty--small',
@@ -63,42 +55,57 @@ var FLUSH_TYPES = (0, _common.keysOf)(flushTypeToClassNameMap);
 
 exports.FLUSH_TYPES = FLUSH_TYPES;
 
-var EuiButtonEmpty = function EuiButtonEmpty(_ref) {
-  var children = _ref.children,
-      className = _ref.className,
-      iconType = _ref.iconType,
-      _ref$iconSide = _ref.iconSide,
-      iconSide = _ref$iconSide === void 0 ? 'left' : _ref$iconSide,
-      _ref$iconSize = _ref.iconSize,
-      iconSize = _ref$iconSize === void 0 ? 'm' : _ref$iconSize,
-      _ref$color = _ref.color,
-      color = _ref$color === void 0 ? 'primary' : _ref$color,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? 'm' : _ref$size,
-      flush = _ref.flush,
-      _isDisabled = _ref.isDisabled,
-      _disabled = _ref.disabled,
-      isLoading = _ref.isLoading,
-      href = _ref.href,
-      target = _ref.target,
-      rel = _ref.rel,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'button' : _ref$type,
-      buttonRef = _ref.buttonRef,
-      contentProps = _ref.contentProps,
-      textProps = _ref.textProps,
-      isSelected = _ref.isSelected,
-      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var isHrefValid = !href || (0, _href_validator.validateHref)(href);
-  var disabled = _disabled || !isHrefValid;
-  var isDisabled = _isDisabled || !isHrefValid; // If in the loading state, force disabled to true
-
-  var buttonIsDisabled = isLoading || isDisabled || disabled;
-  var classes = (0, _classnames.default)('euiButtonEmpty', colorToClassNameMap[color], size ? sizeToClassNameMap[size] : null, flush ? flushTypeToClassNameMap[flush] : null, {
-    'euiButtonEmpty-isDisabled': buttonIsDisabled
-  }, className);
+var EuiButtonEmpty = function EuiButtonEmpty(props) {
+  var children = props.children,
+      className = props.className,
+      iconType = props.iconType,
+      _props$iconSide = props.iconSide,
+      iconSide = _props$iconSide === void 0 ? 'left' : _props$iconSide,
+      _props$iconSize = props.iconSize,
+      iconSize = _props$iconSize === void 0 ? 'm' : _props$iconSize,
+      _props$color = props.color,
+      _color = _props$color === void 0 ? 'primary' : _props$color,
+      _props$size = props.size,
+      size = _props$size === void 0 ? 'm' : _props$size,
+      flush = props.flush,
+      _isDisabled = props.isDisabled,
+      disabled = props.disabled,
+      isLoading = props.isLoading,
+      href = props.href,
+      target = props.target,
+      rel = props.rel,
+      _props$type = props.type,
+      type = _props$type === void 0 ? 'button' : _props$type,
+      buttonRef = props.buttonRef,
+      contentProps = props.contentProps,
+      textProps = props.textProps,
+      isSelected = props.isSelected,
+      rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+
+  var isDisabled = (0, _button_display.isButtonDisabled)({
+    isDisabled: _isDisabled || disabled,
+    href: href,
+    isLoading: isLoading
+  }); // eslint-disable-next-line no-nested-ternary
+
+  var color = isDisabled ? 'disabled' : _color === 'ghost' ? 'text' : _color;
+  var buttonColorStyles = (0, _button.useEuiButtonColorCSS)({
+    display: 'empty'
+  })[color];
+
+  if (_color === 'ghost') {
+    // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
+    return (0, _react2.jsx)(_services.EuiThemeProvider, {
+      colorMode: "dark"
+    }, (0, _react2.jsx)(EuiButtonEmpty, (0, _extends2.default)({}, props, {
+      color: "text"
+    })));
+  }
+
+  var classes = (0, _classnames.default)('euiButtonEmpty', size ? sizeToClassNameMap[size] : null, flush ? flushTypeToClassNameMap[flush] : null, className);
   var contentClassNames = (0, _classnames.default)('euiButtonEmpty__content', contentProps && contentProps.className);
   var textClassNames = (0, _classnames.default)('euiButtonEmpty__text', textProps && textProps.className);
+  var cssStyles = [buttonColorStyles];
   var innerNode = (0, _react2.jsx)(_button_content_deprecated.EuiButtonContentDeprecated, (0, _extends2.default)({
     isLoading: isLoading,
     iconType: iconType,
@@ -113,7 +120,7 @@ var EuiButtonEmpty = function EuiButtonEmpty(_ref) {
   }), children); // <a> elements don't respect the `disabled` attribute. So if we're disabled, we'll just pretend
   // this is a button and piggyback off its disabled styles.
 
-  if (href && !buttonIsDisabled) {
+  if (href && !isDisabled) {
     var secureRel = (0, _services.getSecureRelForTarget)({
       href: href,
       target: target,
@@ -121,6 +128,7 @@ var EuiButtonEmpty = function EuiButtonEmpty(_ref) {
     });
     return (0, _react2.jsx)("a", (0, _extends2.default)({
       className: classes,
+      css: cssStyles,
       href: href,
       target: target,
       rel: secureRel,
@@ -129,8 +137,9 @@ var EuiButtonEmpty = function EuiButtonEmpty(_ref) {
   }
 
   return (0, _react2.jsx)("button", (0, _extends2.default)({
-    disabled: buttonIsDisabled,
+    disabled: isDisabled,
     className: classes,
+    css: cssStyles,
     type: type,
     ref: buttonRef,
     "aria-pressed": isSelected

package/optimize/lib/components/button/button_empty/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "COLORS", {
-  enumerable: true,
-  get: function get() {
-    return _button_empty.COLORS;
-  }
-});
 Object.defineProperty(exports, "EuiButtonEmpty", {
   enumerable: true,
   get: function get() {

package/optimize/lib/components/button/button_group/button_group.js

@@ -56,15 +56,7 @@ var EuiButtonGroup = function EuiButtonGroup(_ref) {
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'single' : _ref$type,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  // Compressed style can't support `ghost` color because it's more like a form field than a button
-  var badColorCombo = buttonSize === 'compressed' && color === 'ghost';
-  var resolvedColor = badColorCombo ? 'text' : color;
-
-  if (badColorCombo) {
-    console.warn('EuiButtonGroup of compressed size does not support the ghost color. It will render as text instead.');
-  }
-
-  var classes = (0, _classnames.default)('euiButtonGroup', "euiButtonGroup".concat(groupSizeToClassNameMap[buttonSize]), "euiButtonGroup".concat(_button.colorToClassNameMap[resolvedColor]), {
+  var classes = (0, _classnames.default)('euiButtonGroup', "euiButtonGroup".concat(groupSizeToClassNameMap[buttonSize]), "euiButtonGroup".concat(_button.colorToClassNameMap[color]), {
     'euiButtonGroup--fullWidth': isFullWidth,
     'euiButtonGroup--isDisabled': isDisabled
   }, className);
@@ -86,7 +78,7 @@ var EuiButtonGroup = function EuiButtonGroup(_ref) {
     }, option, {
       element: typeIsSingle ? 'label' : 'button',
       isSelected: typeIsSingle ? option.id === idSelected : idToSelectedMap[option.id],
-      color: resolvedColor,
+      color: color,
       size: buttonSize,
       isIconOnly: isIconOnly,
       onChange: onChange

package/optimize/lib/components/button/button_group/button_group_button.js

@@ -25,9 +25,11 @@ var _inner_text = require("../../inner_text");
 
 var _services = require("../../../services");
 
+var _button2 = require("../../../themes/amsterdam/global_styling/mixins/button");
+
 var _react2 = require("@emotion/react");
 
-var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "name", "onChange", "size", "value", "element", "type"];
+var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "name", "onChange", "size", "value", "color", "element", "type"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -45,11 +47,14 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
       _onChange = _ref.onChange,
       size = _ref.size,
       value = _ref.value,
+      _ref$color = _ref.color,
+      _color = _ref$color === void 0 ? 'primary' : _ref$color,
       _ref$element = _ref.element,
       element = _ref$element === void 0 ? 'button' : _ref$element,
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'button' : _ref$type,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+
   // Force element to be a button if disabled
   var el = isDisabled ? 'button' : element;
   var newId = (0, _services.useGeneratedHtmlId)();
@@ -83,8 +88,15 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
         return _onChange(id);
       }
     });
-  }
+  } // eslint-disable-next-line no-nested-ternary
+
+
+  var color = isDisabled ? 'disabled' : _color; // eslint-disable-next-line no-nested-ternary
 
+  var display = isSelected ? 'fill' : size === 'compressed' ? 'empty' : 'base';
+  var buttonColorStyles = (0, _button2.useEuiButtonColorCSS)({
+    display: display
+  })[color];
   var buttonClasses = (0, _classnames.default)({
     'euiButtonGroupButton-isSelected': isSelected,
     'euiButtonGroupButton-isIconOnly': isIconOnly
@@ -101,10 +113,10 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
       innerText = _useInnerText2[1];
 
   return (0, _react2.jsx)(_button.EuiButtonDisplayDeprecated, (0, _extends2.default)({
+    css: [buttonColorStyles, ";label:EuiButtonGroupButton;"],
     baseClassName: "euiButtonGroupButton",
     className: buttonClasses,
     element: el,
-    fill: size !== 'compressed' && isSelected,
     isDisabled: isDisabled,
     size: size === 'compressed' ? 's' : size,
     textProps: {