@elastic/eui 102.2.0 → 102.3.0

package/optimize/lib/themes/amsterdam/theme.js

@@ -36,7 +36,8 @@ var euiThemeAmsterdam = exports.euiThemeAmsterdam = {
   components: _components.components,
   flags: {
     hasGlobalFocusColor: false,
-    hasVisColorAdjustment: true
+    hasVisColorAdjustment: true,
+    buttonVariant: 'classic'
   }
 };
 var EuiThemeAmsterdam = exports.EuiThemeAmsterdam = (0, _utils.buildTheme)(euiThemeAmsterdam, AMSTERDAM_NAME_KEY);

package/optimize/lib/themes/json/eui_theme_borealis_dark.json

@@ -392,7 +392,7 @@
   "euiColorBackgroundLightWarning": "#3D3014",
   "euiColorBackgroundLightRisk": "#4A221C",
   "euiColorBackgroundLightDanger": "#491D27",
-  "euiColorBackgroundLightText": "#1D2A3E",
+  "euiColorBackgroundLightText": "#2B394F",
   "euiColorBackgroundFilledPrimary": "#61A2FF",
   "euiColorBackgroundFilledAccent": "#EE72A6",
   "euiColorBackgroundFilledAccentSecondary": "#16C5C0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elastic/eui",
   "description": "Elastic UI Component Library",
-  "version": "102.2.0",
+  "version": "102.3.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "lib",
   "module": "es",
@@ -50,7 +50,7 @@
     "url": "https://github.com/elastic/eui.git"
   },
   "dependencies": {
-    "@elastic/eui-theme-common": "1.0.0",
+    "@elastic/eui-theme-common": "1.1.0",
     "@elastic/prismjs-esql": "^1.1.0",
     "@hello-pangea/dnd": "^16.6.0",
     "@types/lodash": "^4.14.202",
@@ -104,7 +104,7 @@
     "@cypress/webpack-dev-server": "^1.7.0",
     "@elastic/charts": "^64.1.0",
     "@elastic/datemath": "^5.0.3",
-    "@elastic/eui-theme-borealis": "1.0.0",
+    "@elastic/eui-theme-borealis": "1.1.0",
     "@emotion/babel-preset-css-prop": "^11.11.0",
     "@emotion/cache": "^11.11.0",
     "@emotion/css": "^11.11.0",
@@ -257,7 +257,7 @@
   },
   "peerDependencies": {
     "@elastic/datemath": "^5.0.2",
-    "@elastic/eui-theme-borealis": "1.0.0",
+    "@elastic/eui-theme-borealis": "1.1.0",
     "@emotion/css": "11.x",
     "@emotion/react": "11.x",
     "@types/react": "^16.9 || ^17.0 || ^18.0",

package/test-env/components/badge/color_utils.js

@@ -32,7 +32,6 @@ var euiBadgeColors = exports.euiBadgeColors = function euiBadgeColors(euiThemeCo
     risk: (0, _button.euiButtonFillColor)(euiThemeContext, 'risk'),
     danger: (0, _button.euiButtonFillColor)(euiThemeContext, 'danger'),
     accent: (0, _button.euiButtonFillColor)(euiThemeContext, 'accent'),
-    accentSecondary: (0, _button.euiButtonFillColor)(euiThemeContext, 'accentSecondary'),
     disabled: _objectSpread(_objectSpread({}, (0, _button.euiButtonColor)(euiThemeContext, 'disabled')), {}, {
       borderColor: highContrastMode ? euiTheme.colors.textDisabled : ''
     }),
@@ -50,8 +49,7 @@ var euiBadgeColors = exports.euiBadgeColors = function euiBadgeColors(euiThemeCo
     }),
     accentText: _objectSpread(_objectSpread({}, badgeColorsAccentText), {}, {
       borderColor: highContrastMode ? badgeColorsAccentText.backgroundColor : ''
-    }),
-    accentSecondaryText: getBadgeColors(euiThemeContext, euiTheme.colors.textAccentSecondary)
+    })
   };
 };
 var getBadgeColors = exports.getBadgeColors = function getBadgeColors(euiThemeContext, backgroundColor) {

package/test-env/components/badge/notification_badge/badge_notification.styles.js

@@ -7,6 +7,7 @@ exports.euiNotificationBadgeStyles = void 0;
 var _react = require("@emotion/react");
 var _global_styling = require("../../../global_styling");
 var _high_contrast = require("../../../global_styling/functions/high_contrast");
+var _services = require("../../../services");
 var _color_utils = require("../color_utils");
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -18,9 +19,13 @@ var _color_utils = require("../color_utils");
 
 var euiNotificationBadgeStyles = exports.euiNotificationBadgeStyles = function euiNotificationBadgeStyles(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
   var badgeColors = (0, _color_utils.euiBadgeColors)(euiThemeContext);
+  var borderRadius = isRefreshVariant ? (0, _global_styling.mathWithUnits)(euiTheme.border.radius.small, function (x) {
+    return x / 2;
+  }) : euiTheme.border.radius.small;
   return {
-    euiNotificationBadge: /*#__PURE__*/(0, _react.css)("flex-shrink:0;display:inline-flex;justify-content:center;align-items:center;vertical-align:middle;", (0, _global_styling.logicalCSS)('padding-horizontal', euiTheme.size.xs), " border-radius:", euiTheme.border.radius.small, ";", (0, _high_contrast.highContrastModeStyles)(euiThemeContext, {
+    euiNotificationBadge: /*#__PURE__*/(0, _react.css)("flex-shrink:0;display:inline-flex;justify-content:center;align-items:center;vertical-align:middle;", (0, _global_styling.logicalCSS)('padding-horizontal', euiTheme.size.xs), " border-radius:", borderRadius, ";", (0, _high_contrast.highContrastModeStyles)(euiThemeContext, {
       preferred: "\n          border: ".concat(euiTheme.border.thin, ";\n          overflow: hidden; /* Fix text clipping */\n        ")
     }), " cursor:default;font-size:", (0, _global_styling.euiFontSizeFromScale)('xs', euiTheme), ";font-weight:", euiTheme.font.weight.medium, ";", (0, _global_styling.euiNumberFormat)(euiThemeContext), " text-align:center;", _global_styling.euiCanAnimate, "{transition:all ", euiTheme.animation.fast, " ease-in;};label:euiNotificationBadge;"),
     // Sizes

package/test-env/components/basic_table/basic_table.js

@@ -1185,7 +1185,10 @@ EuiBasicTable.propTypes = {
       render: _propTypes.default.func
     }),
     /**
-       * Describe a custom renderer function for the content
+       * A custom renderer for this column's cell content.
+       * Unlike computed columns or `mobileOptions.render`, this function receives:
+       * - `value`: The value of the specified field for this row
+       * - `item`: The full data item (row object)
        */
     render: _propTypes.default.func,
     /**

package/test-env/components/basic_table/in_memory_table.js

@@ -686,7 +686,10 @@ EuiInMemoryTable.propTypes = {
       render: _propTypes.default.func
     }),
     /**
-       * Describe a custom renderer function for the content
+       * A custom renderer for this column's cell content.
+       * Unlike computed columns or `mobileOptions.render`, this function receives:
+       * - `value`: The value of the specified field for this row
+       * - `item`: The full data item (row object)
        */
     render: _propTypes.default.func,
     /**

package/test-env/components/breadcrumbs/_breadcrumb_content.styles.js

@@ -7,7 +7,6 @@ exports.euiBreadcrumbPopoverStyles = exports.euiBreadcrumbContentStyles = void 0
 var _react = require("@emotion/react");
 var _global_styling = require("../../global_styling");
 var _high_contrast = require("../../global_styling/functions/high_contrast");
-var _button = require("../../themes/amsterdam/global_styling/mixins/button");
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -24,7 +23,11 @@ var euiBreadcrumbContentStyles = exports.euiBreadcrumbContentStyles = function e
     highContrastMode = euiThemeContext.highContrastMode;
 
   // Reuse button colors for `type="application`" clickable breadcrumbs
-  var applicationButtonColors = (0, _button.euiButtonColor)(euiThemeContext, 'primary');
+  var buttonColors = (0, _global_styling.euiButtonColor)(euiThemeContext, 'primary');
+  var applicationButtonColors = {
+    backgroundColor: euiTheme.colors.backgroundLightPrimary,
+    color: buttonColors.color
+  };
 
   // Create custom darker gray colors for non-clickable application breadcrumbs
   // The numbers/ratios are fairly specific here to pass WCAG AA contrast minimums

package/test-env/components/button/button_display/_button_display.js

@@ -80,7 +80,7 @@ var EuiButtonDisplay = exports.EuiButtonDisplay = /*#__PURE__*/(0, _react.forwar
     isLoading: isLoading
   });
   var styles = (0, _services.useEuiMemoizedStyles)(_button_display.euiButtonDisplayStyles);
-  var cssStyles = [styles.euiButtonDisplay, styles[size], fullWidth && styles.fullWidth, minWidth == null && styles.defaultMinWidth, buttonIsDisabled && styles.isDisabled];
+  var cssStyles = [styles.euiButtonDisplay, styles[size], fullWidth && styles.fullWidth, minWidth == null && [styles.defaultMinWidth.defaultMinWidth, styles.defaultMinWidth[size]], buttonIsDisabled && styles.isDisabled];
   var innerNode = (0, _react2.jsx)(_button_display_content.EuiButtonDisplayContent, (0, _extends2.default)({
     isLoading: isLoading,
     isDisabled: buttonIsDisabled,

package/test-env/components/button/button_display/_button_display.styles.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.euiButtonDisplayStyles = exports.euiButtonBaseCSS = void 0;
 var _react = require("@emotion/react");
+var _services = require("../../../services");
 var _global_styling = require("../../../global_styling");
 var _mixins = require("../../../global_styling/mixins");
 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)."; } /*
@@ -29,18 +30,26 @@ var _ref = process.env.NODE_ENV === "production" ? {
 };
 var euiButtonDisplayStyles = exports.euiButtonDisplayStyles = function euiButtonDisplayStyles(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
   var sizes = (0, _mixins.euiButtonSizeMap)(euiThemeContext);
   var _buttonSize = function _buttonSize(sizeKey) {
     var size = sizes[sizeKey];
     return /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', size.height), " line-height:", size.height, ";", (0, _global_styling.euiFontSize)(euiThemeContext, size.fontScale), " border-radius:", size.radius, ";");
   };
+  var classicVariantStyles = "\n      &:hover:not(:disabled),\n      &:focus {\n        text-decoration: underline;\n      }\n  ";
   return {
     // Base
-    euiButtonDisplay: /*#__PURE__*/(0, _react.css)(euiButtonBaseCSS(), " font-weight:", euiTheme.font.weight.medium, ";", (0, _global_styling.logicalShorthandCSS)('padding', "0 ".concat(euiTheme.size.m)), " &:hover:not(:disabled),&:focus{text-decoration:underline;};label:euiButtonDisplay;"),
+    euiButtonDisplay: /*#__PURE__*/(0, _react.css)(euiButtonBaseCSS(), " font-weight:", euiTheme.font.weight.medium, ";", (0, _global_styling.logicalShorthandCSS)('padding', "0 ".concat(euiTheme.size.m)), " ", !isRefreshVariant && classicVariantStyles, ";;label:euiButtonDisplay;"),
     // States
     isDisabled: _ref,
     fullWidth: /*#__PURE__*/(0, _react.css)("display:block;", (0, _global_styling.logicalCSS)('width', '100%'), ";;label:fullWidth;"),
-    defaultMinWidth: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('min-width', "".concat(euiTheme.base * 7, "px")), ";;label:defaultMinWidth;"),
+    defaultMinWidth: {
+      defaultMinWidth: /*#__PURE__*/(0, _react.css)(";label:defaultMinWidth;"),
+      // Skip css`` for the sizes as we already add classes for sizes and defaultMinWidth
+      xs: "\n        ".concat((0, _global_styling.logicalCSS)('min-width', "".concat(sizes.xs.minWidth, "px")), "\n      "),
+      s: "\n        ".concat((0, _global_styling.logicalCSS)('min-width', "".concat(sizes.s.minWidth, "px")), "\n      "),
+      m: "\n        ".concat((0, _global_styling.logicalCSS)('min-width', "".concat(sizes.m.minWidth, "px")), "\n      ")
+    },
     // Sizes
     xs: /*#__PURE__*/(0, _react.css)(_buttonSize('xs'), ";label:xs;"),
     s: /*#__PURE__*/(0, _react.css)(_buttonSize('s'), ";label:s;"),

package/test-env/components/button/button_display/_button_display_content.styles.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.euiButtonDisplayContentStyles = void 0;
 var _react = require("@emotion/react");
+var _services = require("../../../services");
 var _global_styling = require("../../../global_styling");
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -14,10 +15,12 @@ var _global_styling = require("../../../global_styling");
  * Side Public License, v 1.
  */
 
-var euiButtonDisplayContentStyles = exports.euiButtonDisplayContentStyles = function euiButtonDisplayContentStyles(_ref) {
-  var euiTheme = _ref.euiTheme;
+var euiButtonDisplayContentStyles = exports.euiButtonDisplayContentStyles = function euiButtonDisplayContentStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
+  var refreshVariantStyles = "\n      /* ensure content stays ontop of hover pseudo element */\n      position: relative;\n    ";
   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;")
+    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, ";", isRefreshVariant && refreshVariantStyles, ";;label:euiButtonDisplayContent;")
   };
 };

package/test-env/components/button/button_empty/button_empty.styles.js

@@ -5,39 +5,38 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.euiButtonEmptyStyles = void 0;
 var _react = require("@emotion/react");
+var _services = require("../../../services");
 var _global_styling = require("../../../global_styling");
 var _button_display = require("../button_display/_button_display.styles");
-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)."; } /*
+/*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
  * 2.0 and the Server Side Public License, v 1; you may not use this file except
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-var _ref = process.env.NODE_ENV === "production" ? {
-  name: "1lywbid-flush",
-  styles: "padding-inline:0;label:flush;"
-} : {
-  name: "1lywbid-flush",
-  styles: "padding-inline:0;label:flush;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
+
 var euiButtonEmptyStyles = exports.euiButtonEmptyStyles = function euiButtonEmptyStyles(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
 
   // EuiButtonEmpty uses the same size/font styling as EuiButtonDisplay,
   // but does not share enough of the same colors/props to the point
   // of using the actual component - so we'll reuse its styles instead
   var displayStyles = (0, _button_display.euiButtonDisplayStyles)(euiThemeContext);
+  var refreshFlushStyles = "\n      /* using duplicate selector to ensure specificity */\n      &&:hover,\n      &&:active {\n        background-color: transparent;\n\n        /* removes hover overlay */\n        &::before {\n          display: none;\n        }\n      }\n\n      &:hover:not(:disabled),\n      &:focus {\n        text-decoration: underline;\n\n        ".concat((0, _global_styling.highContrastModeStyles)(euiThemeContext, {
+    forced: "\n            /* hides HCM hover border, flush buttons use text-decoration */\n            &::after {\n              display: none;\n            }\n          "
+  }), "\n      }\n  ");
   return {
     euiButtonEmpty: /*#__PURE__*/(0, _react.css)(displayStyles.euiButtonDisplay, " ", (0, _global_styling.logicalShorthandCSS)('padding', "0 ".concat(euiTheme.size.s)), _global_styling.euiCanAnimate, "{transition-timing-function:ease-in;transition-duration:", euiTheme.animation.fast, ";};label:euiButtonEmpty;"),
     isDisabled: displayStyles.isDisabled,
     // Sizes
     xs: displayStyles.xs,
     s: displayStyles.s,
-    m: displayStyles.m,
+    // uses array here to prevent adding duplicate "m" classname partial
+    m: [displayStyles.m, isRefreshVariant && "\n        ".concat((0, _global_styling.logicalCSS)('padding-horizontal', euiTheme.size.m), "\n      ")],
     // Flush sides
-    flush: _ref,
+    flush: /*#__PURE__*/(0, _react.css)("padding-inline:0;", isRefreshVariant && refreshFlushStyles, ";;label:flush;"),
     left: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-right', euiTheme.size.s), ";;label:left;"),
     right: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-left', euiTheme.size.s), ";;label:right;"),
     both: /*#__PURE__*/(0, _react.css)(";label:both;")

package/test-env/components/button/button_group/button_group.styles.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.euiButtonGroupStyles = exports.euiButtonGroupButtonsStyles = void 0;
 var _react = require("@emotion/react");
+var _services = require("../../../services");
 var _global_styling = require("../../../global_styling");
 var _high_contrast = require("../../../global_styling/functions/high_contrast");
 var _form = require("../../form/form.styles");
@@ -35,7 +36,7 @@ var euiButtonGroupButtonsStyles = exports.euiButtonGroupButtonsStyles = function
     borderColor = _euiFormVariables.borderColor;
   return {
     // Base
-    euiButtonGroup__buttons: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('max-width', '100%'), " display:flex;;label:euiButtonGroup__buttons;"),
+    euiButtonGroup__buttons: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('max-width', '100%'), " display:flex;align-items:center;;label:euiButtonGroup__buttons;"),
     fullWidth: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('width', '100%'), " .euiButtonGroupButton,.euiButtonGroup__tooltipWrapper{flex:1;", (0, _global_styling.logicalCSS)('width', '100%'), ";};label:fullWidth;"),
     // Sizes
     m: /*#__PURE__*/(0, _react.css)("border-radius:", euiTheme.border.radius.medium, ";", _highContrastStyles(euiThemeContext), ";;label:m;"),
@@ -45,6 +46,7 @@ var euiButtonGroupButtonsStyles = exports.euiButtonGroupButtonsStyles = function
 };
 var _highContrastStyles = function _highContrastStyles(euiThemeContext, compressed) {
   var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
 
   // Account for buttons within tooltip wrappers in selectors
   var getButtonChildSelectors = function getButtonChildSelectors(selector) {
@@ -54,7 +56,7 @@ var _highContrastStyles = function _highContrastStyles(euiThemeContext, compress
     preferred: compressed ? "\n        .euiButtonGroupButton {\n          border: none;\n        }\n      " : // Conditionally unset the high contrast borders passed by `euiButtonColor` -
     // faux borders between selected/unselected buttons are rendered by pseudo elements,
     // and can flip colors depending on selected/unselected siblings
-    "\n        ".concat(getButtonChildSelectors(':not(:first-child, :last-child)'), " {\n          ").concat((0, _global_styling.logicalCSS)('border-horizontal', 'none'), "\n        }\n        ").concat(getButtonChildSelectors(':first-child'), " {\n          ").concat((0, _global_styling.logicalCSS)('border-right', 'none'), "\n        }\n        ").concat(getButtonChildSelectors(':last-child'), " {\n          ").concat((0, _global_styling.logicalCSS)('border-left', 'none'), "\n        }\n      "),
-    forced: "\n      .euiButtonGroupButton-isSelected {\n        ".concat((0, _high_contrast.preventForcedColors)(euiThemeContext), "\n        color: ").concat(euiTheme.colors.emptyShade, ";\n        background-color: ").concat(euiTheme.colors.fullShade, ";\n      }\n\n      .euiButtonGroupButton[disabled] {\n        opacity: 0.5;\n      }\n    ")
+    "\n        ".concat(!isRefreshVariant && "\n              ".concat(getButtonChildSelectors(':not(:first-child, :last-child)'), " {\n                ").concat((0, _global_styling.logicalCSS)('border-horizontal', 'none'), "\n              }\n              ").concat(getButtonChildSelectors(':first-child'), " {\n                ").concat((0, _global_styling.logicalCSS)('border-right', 'none'), "\n              }\n              ").concat(getButtonChildSelectors(':last-child'), " {\n                ").concat((0, _global_styling.logicalCSS)('border-left', 'none'), "\n              }\n            "), "\n      "),
+    forced: "\n      .euiButtonGroupButton-isSelected {\n        ".concat((0, _high_contrast.preventForcedColors)(euiThemeContext), "\n        color: ").concat(euiTheme.colors.emptyShade, ";\n        background-color: ").concat(euiTheme.colors.fullShade, ";\n\n        ").concat(isRefreshVariant && "\n              &:is(:hover, :focus):not(:disabled) {\n                &::before {\n                  border-color: ".concat(euiTheme.colors.textInverse, ";\n                }\n              }\n            "), "\n      }\n\n      .euiButtonGroupButton[disabled] {\n        opacity: 0.5;\n      }\n    ")
   });
 };

package/test-env/components/button/button_group/button_group_button.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EuiButtonGroupButton = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -19,7 +19,7 @@ var _button_display = require("../button_display/_button_display");
 var _button_group_button = require("./button_group_button.styles");
 var _tool_tip = require("../../../components/tool_tip");
 var _react2 = require("@emotion/react");
-var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "value", "size", "color", "toolTipContent", "toolTipProps"];
+var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "value", "size", "color", "toolTipContent", "toolTipProps", "contentProps"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -43,17 +43,21 @@ var EuiButtonGroupButton = exports.EuiButtonGroupButton = function EuiButtonGrou
     _color = _ref$color === void 0 ? 'primary' : _ref$color,
     toolTipContent = _ref.toolTipContent,
     toolTipProps = _ref.toolTipProps,
+    contentProps = _ref.contentProps,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var euiThemeContext = (0, _services.useEuiTheme)();
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
   var isCompressed = size === 'compressed';
   var color = isDisabled ? 'disabled' : _color;
-  var display = isSelected ? 'fill' : isCompressed ? 'empty' : 'base';
+  var hasBorder = isRefreshVariant && color !== 'text' && !isCompressed;
+  var display = isSelected ? 'fill' : isCompressed || hasBorder ? 'empty' : 'base';
   var hasToolTip = !!toolTipContent;
   var styles = (0, _services.useEuiMemoizedStyles)(_button_group_button.euiButtonGroupButtonStyles);
   var focusColorStyles = (0, _services.useEuiMemoizedStyles)(_button_group_button._compressedButtonFocusColors);
   var buttonColorStyles = (0, _button.useEuiButtonColorCSS)({
     display: display
   })[color];
-  var cssStyles = [styles.euiButtonGroupButton, isIconOnly && styles.iconOnly, !isCompressed && (hasToolTip ? styles.uncompressed.hasToolTip : styles.uncompressed[size]), isCompressed ? styles.compressed : styles.uncompressed.uncompressed, isDisabled && isSelected ? styles.disabledAndSelected : buttonColorStyles, !isDisabled && isCompressed && focusColorStyles[color]];
+  var cssStyles = [styles.euiButtonGroupButton, isIconOnly && styles.iconOnly, !isCompressed && (hasToolTip ? styles.uncompressed.hasToolTip : styles.uncompressed[size]), isCompressed ? styles.compressed : styles.uncompressed.uncompressed, isDisabled && isSelected ? styles.disabledAndSelected : buttonColorStyles, !isDisabled && isCompressed && focusColorStyles[color], hasBorder && styles.hasBorder];
   var tooltipWrapperStyles = [styles.tooltipWrapper, !isCompressed && styles.uncompressed[size]];
   var contentStyles = [styles.content.euiButtonGroupButton__content, isCompressed && styles.content.compressed];
   var textStyles = [isIconOnly ? styles.text.euiButtonGroupButton__iconOnly : styles.text.euiButtonGroupButton__text];
@@ -81,9 +85,9 @@ var EuiButtonGroupButton = exports.EuiButtonGroupButton = function EuiButtonGrou
     className: buttonClasses,
     isDisabled: isDisabled,
     size: size === 'compressed' ? 's' : size,
-    contentProps: {
-      css: contentStyles
-    },
+    contentProps: _objectSpread(_objectSpread({}, contentProps), {}, {
+      css: [contentStyles, contentProps === null || contentProps === void 0 ? void 0 : contentProps.css]
+    }),
     textProps: {
       css: textStyles,
       ref: buttonTextRef,
@@ -172,7 +176,13 @@ EuiButtonGroupButton.propTypes = {
   /**
      * Inherit from EuiButtonGroup
      */
-  onClick: _propTypes.default.func.isRequired
+  onClick: _propTypes.default.func.isRequired,
+  contentProps: _propTypes.default.shape({
+    className: _propTypes.default.string,
+    "aria-label": _propTypes.default.string,
+    "data-test-subj": _propTypes.default.string,
+    css: _propTypes.default.any
+  })
 };
 var EuiButtonGroupButtonWithToolTip = function EuiButtonGroupButtonWithToolTip(_ref2) {
   var _toolTipProps$anchorP, _toolTipProps$anchorP2;

package/test-env/components/button/button_group/button_group_button.styles.js

@@ -23,11 +23,11 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringif
  * Side Public License, v 1.
  */
 var _ref = process.env.NODE_ENV === "production" ? {
-  name: "nwv4a2-tooltipWrapper",
-  styles: "overflow:hidden;label:tooltipWrapper;"
+  name: "m6ysua-tooltipWrapper",
+  styles: "overflow:hidden;&:has(:focus-visible){z-index:1;};label:tooltipWrapper;"
 } : {
-  name: "nwv4a2-tooltipWrapper",
-  styles: "overflow:hidden;label:tooltipWrapper;",
+  name: "m6ysua-tooltipWrapper",
+  styles: "overflow:hidden;&:has(:focus-visible){z-index:1;};label:tooltipWrapper;",
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 var _ref2 = process.env.NODE_ENV === "production" ? {
@@ -41,48 +41,70 @@ var _ref2 = process.env.NODE_ENV === "production" ? {
 var euiButtonGroupButtonStyles = exports.euiButtonGroupButtonStyles = function euiButtonGroupButtonStyles(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme,
     highContrastMode = euiThemeContext.highContrastMode;
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
   var _euiFormVariables = (0, _form.euiFormVariables)(euiThemeContext),
     controlCompressedHeight = _euiFormVariables.controlCompressedHeight,
     controlCompressedBorderRadius = _euiFormVariables.controlCompressedBorderRadius;
   var compressedButtonHeight = (0, _global_styling.mathWithUnits)([controlCompressedHeight, euiTheme.border.width.thin], function (x, y) {
-    return x - y * 2;
+    return isRefreshVariant ? x - y * 6 : x - y * 2;
   });
+  var selectedSelectors = '.euiButtonGroupButton-isSelected, .euiButtonGroup__tooltipWrapper-isSelected';
   var uncompressedBorderRadii = function uncompressedBorderRadii(radiusSize) {
-    return "\n    border-radius: 0;\n\n    &:first-child {\n      ".concat((0, _global_styling.logicalShorthandCSS)('border-radius', "".concat(radiusSize, " 0 0 ").concat(radiusSize)), "\n    }\n\n    &:last-child {\n      ").concat((0, _global_styling.logicalShorthandCSS)('border-radius', "0 ".concat(radiusSize, " ").concat(radiusSize, " 0")), "\n    }\n  ");
+    return "\n    border-radius: 0;\n\n    &:first-child {\n      ".concat((0, _global_styling.logicalShorthandCSS)('border-radius', "".concat(radiusSize, " 0 0 ").concat(radiusSize)), "\n    }\n\n    &:last-child {\n      ").concat((0, _global_styling.logicalShorthandCSS)('border-radius', "0 ".concat(radiusSize, " ").concat(radiusSize, " 0")), "\n    }\n\n    &:first-child:last-child {\n      ").concat((0, _global_styling.logicalShorthandCSS)('border-radius', "".concat(radiusSize)), "\n    }\n  ");
   };
+  var refreshVariantStyles = "\n      &:is(".concat(selectedSelectors, ") {\n        ").concat((0, _global_styling.highContrastModeStyles)(euiThemeContext, {
+    forced: "\n            --highContrastHoverIndicatorColor: ".concat(euiTheme.colors.textInverse, ";\n            border: none;\n\n            /* styles the content manually instead of the button itself to preserve the system\n            focus style, as otherwise preventForcedColors() would require manual styling */\n            > [class*=\"euiButtonDisplayContent\"] {\n              ").concat((0, _global_styling.preventForcedColors)(euiThemeContext), "\n              color: ").concat(euiTheme.colors.emptyShade, ";\n              border: none;\n            }\n          ")
+  }), "\n      }\n    ");
+  var uncompressedStyles = isRefreshVariant ? "\n      &:is(".concat(selectedSelectors, "):not(:disabled) {\n        z-index: 1;\n        /* prevent layout jumps due to missing border for selected/filled buttons */\n        border: ").concat(euiTheme.border.width.thin, " solid transparent;\n\n        ").concat((0, _global_styling.highContrastModeStyles)(euiThemeContext, {
+    forced: "\n            /* use inset focus outline to ensure visibility, same as custom hover.\n            NOTE: temp solution - this will be revisited once we handle global focus styles */\n            &:focus-visible {\n              outline-color: ".concat(euiTheme.colors.textInverse, ";\n              /* has to be inset due to overflow: hidden */\n              outline-offset: -").concat((0, _global_styling.mathWithUnits)(euiTheme.border.width.thin, function (x) {
+      return x * 4;
+    }), ";\n            }\n          ")
+  }), "\n      }\n    ") : "\n      &:is(.euiButtonGroupButton-isSelected) {\n        font-weight: ".concat(euiTheme.font.weight.bold, ";\n      }\n    ");
+  var compressedStyles = isRefreshVariant ? "\n      margin: ".concat(euiTheme.size.xxs, ";\n      border-radius: ").concat((0, _global_styling.mathWithUnits)(euiTheme.border.radius.small, function (x) {
+    return x / 2;
+  }), ";\n\n      & + .euiButtonGroupButton {\n        ").concat((0, _global_styling.logicalCSS)('margin-left', '0'), "\n      }\n\n      &:is(").concat(selectedSelectors, "):not(:disabled) {\n        /* prevent layout jumps due to missing border for non-selected buttons */\n        border: none;\n\n        ").concat((0, _global_styling.highContrastModeStyles)(euiThemeContext, {
+    forced: "\n            /* use inset focus outline to ensure visibility, same as custom hover.\n            NOTE: temp solution - this will be revisited once we handle global focus styles */\n            &:focus-visible {\n              outline-color: ".concat(euiTheme.colors.textInverse, ";\n              /* has to be inset due to overflow: hidden */\n              outline-offset: -").concat((0, _global_styling.mathWithUnits)(euiTheme.border.width.thin, function (x) {
+      return x * 3;
+    }), ";\n            }\n          ")
+  }), "\n      }\n    ") : "\n      background-clip: content-box;\n      /* Tweak border radius to account for the padding & background-clip */\n      border-radius: ".concat((0, _global_styling.mathWithUnits)([controlCompressedBorderRadius, euiTheme.border.width.thin], function (x, y) {
+    return x + y;
+  }), ";\n\n      &:is(.euiButtonGroupButton-isSelected) {\n        font-weight: ").concat(euiTheme.font.weight.semiBold, ";\n      }\n    ");
   return {
     // Base
-    euiButtonGroupButton: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('min-width', 0), " flex-shrink:1;flex-grow:0;z-index:0;&:focus-visible{z-index:1;}", _global_styling.euiCanAnimate, "{transition:background-color ", euiTheme.animation.normal, " ease-in-out,color ", euiTheme.animation.normal, " ease-in-out;};label:euiButtonGroupButton;"),
+    euiButtonGroupButton: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('min-width', 0), " flex-shrink:1;flex-grow:0;z-index:0;&:focus-visible{z-index:2;}", _global_styling.euiCanAnimate, "{transition:background-color ", euiTheme.animation.normal, " ease-in-out,color ", euiTheme.animation.normal, " ease-in-out;}", isRefreshVariant && refreshVariantStyles, ";;label:euiButtonGroupButton;"),
     iconOnly: /*#__PURE__*/(0, _react.css)("padding-inline:", euiTheme.size.s, ";;label:iconOnly;"),
     // Sizes
     uncompressed: {
-      uncompressed: /*#__PURE__*/(0, _react.css)("&:is(.euiButtonGroupButton-isSelected){font-weight:", euiTheme.font.weight.bold, ";}&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, 'inset', euiTheme.components.buttonGroupFocusColor), ";};label:uncompressed;"),
+      uncompressed: /*#__PURE__*/(0, _react.css)("&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, 'inset', euiTheme.components.buttonGroupFocusColor), ";}", uncompressedStyles, ";;label:uncompressed;"),
       get borders() {
         // We use pseudo elements to avoid affecing button width, and to allow
         // inheriting high contrast border colors
-        var selectors = '.euiButtonGroupButton-isSelected, .euiButtonGroup__tooltipWrapper-isSelected';
+        var selectors = selectedSelectors;
         var selectedColor = highContrastMode ? euiTheme.colors.emptyShade : euiTheme.components.buttonGroupBorderColorSelected;
         var unselectedColor = highContrastMode ? 'inherit' : euiTheme.components.buttonGroupBorderColor;
+        var borderWidth = euiTheme.border.width.thin;
+        var borderStyles = isRefreshVariant ? "\n            &:not(:first-child) {\n              margin-inline-start: -".concat(borderWidth, ";\n            }\n\n            &:is(").concat(selectors, ") {\n              &::before {\n                position: absolute;\n                z-index: 1;\n                ").concat((0, _global_styling.logicalCSS)('left', 0), "\n                ").concat((0, _global_styling.logicalCSS)('vertical', "-".concat(euiTheme.border.width.thin)), "\n                ").concat((0, _global_styling.logicalCSS)('border-left-style', 'solid'), "\n                ").concat((0, _global_styling.logicalCSS)('border-left-width', euiTheme.border.width.thin), "\n                pointer-events: none;\n\n                ").concat((0, _global_styling.preventForcedColors)(euiThemeContext), "\n              }\n            }\n          ") : "\n              &::before {\n                position: absolute;\n                ".concat((0, _global_styling.logicalCSS)('left', 0), "\n                ").concat((0, _global_styling.logicalCSS)('vertical', highContrastMode ? "-".concat(euiTheme.border.width.thin) : 0), "\n                ").concat((0, _global_styling.logicalCSS)('border-left-style', 'solid'), "\n                ").concat((0, _global_styling.logicalCSS)('border-left-width', euiTheme.border.width.thin), "\n                pointer-events: none;\n              }\n          ");
 
         // "Borders" between buttons should be present between two of the same colored buttons,
         // and absent between selected vs non-selected buttons (different colors)
-        return "\n          position: relative;\n\n          &::before {\n            position: absolute;\n            ".concat((0, _global_styling.logicalCSS)('left', 0), "\n            ").concat((0, _global_styling.logicalCSS)('vertical', highContrastMode ? "-".concat(euiTheme.border.width.thin) : 0), "\n            ").concat((0, _global_styling.logicalCSS)('border-left-style', 'solid'), "\n            ").concat((0, _global_styling.logicalCSS)('border-left-width', euiTheme.border.width.thin), "\n            pointer-events: none;\n          }\n        \n          &:not(").concat(selectors, ") + *:not(").concat(selectors, ") {\n            &::before {\n              content: '';\n              border-color: ").concat(unselectedColor, ";\n            }\n          }\n\n          &:is(").concat(selectors, ") + *:is(").concat(selectors, ") {\n            &::before {\n              content: '';\n              border-color: ").concat(selectedColor, ";\n            }\n          }\n        ");
+        return "\n          position: relative;\n\n          ".concat(borderStyles, "\n\n          &:not(").concat(selectors, ") + *:not(").concat(selectors, ") {\n            &::before {\n              content: '';\n              border-color: ").concat(unselectedColor, ";\n            }\n          }\n\n          &:is(").concat(selectors, ") + *:is(").concat(selectors, ") {\n            &::before {\n              content: '';\n              border-color: ").concat(selectedColor, ";\n            }\n          }\n        ");
       },
       get s() {
         return /*#__PURE__*/(0, _react.css)(this.borders, " ", uncompressedBorderRadii(euiTheme.border.radius.small), ";;label:s;");
       },
       get m() {
-        return /*#__PURE__*/(0, _react.css)(this.borders, " ", uncompressedBorderRadii(euiTheme.border.radius.medium), ";;label:m;");
+        var radius = isRefreshVariant ? euiTheme.border.radius.small : euiTheme.border.radius.medium;
+        return /*#__PURE__*/(0, _react.css)(this.borders, " ", uncompressedBorderRadii(radius), ";;label:m;");
       },
       hasToolTip: _ref2
     },
-    compressed: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', compressedButtonHeight), " line-height:", compressedButtonHeight, ";padding:", (0, _global_styling.mathWithUnits)(euiTheme.border.width.thin, function (x) {
+    compressed: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', compressedButtonHeight), " line-height:", compressedButtonHeight, ";font-weight:", euiTheme.font.weight.regular, ";padding:", isRefreshVariant ? '0' : (0, _global_styling.mathWithUnits)(euiTheme.border.width.thin, function (x) {
       return x * 2;
-    }), ";background-clip:content-box;border-radius:", (0, _global_styling.mathWithUnits)([controlCompressedBorderRadius, euiTheme.border.width.thin], function (x, y) {
-      return x + y;
-    }), ";font-weight:", euiTheme.font.weight.regular, ";&:is(.euiButtonGroupButton-isSelected){font-weight:", euiTheme.font.weight.semiBold, ";};label:compressed;"),
+    }), ";", compressedStyles, ";;label:compressed;"),
     // States
-    disabledAndSelected: /*#__PURE__*/(0, _react.css)("color:", (0, _services.makeDisabledContrastColor)(euiTheme.colors.textDisabled)(euiTheme.components.buttonGroupBackgroundDisabledSelected), ";background-color:", euiTheme.components.buttonGroupBackgroundDisabledSelected, ";border:", highContrastMode && "".concat(euiTheme.border.width.thin, " solid ").concat(euiTheme.components.buttonGroupBackgroundDisabledSelected), ";;label:disabledAndSelected;"),
+    disabledAndSelected: /*#__PURE__*/(0, _react.css)("color:", isRefreshVariant ? euiTheme.colors.textDisabled : (0, _services.makeDisabledContrastColor)(euiTheme.colors.textDisabled)(euiTheme.components.buttonGroupBackgroundDisabledSelected), ";background-color:", euiTheme.components.buttonGroupBackgroundDisabledSelected, ";border:", highContrastMode ? "".concat(euiTheme.border.width.thin, " solid ").concat(euiTheme.components.buttonGroupBackgroundDisabledSelected) : isRefreshVariant ? "".concat(euiTheme.border.width.thin, " solid ").concat(euiTheme.colors.borderBasePlain) : '', ";;label:disabledAndSelected;"),
+    // Skip css`` to avoid generating a className
+    hasBorder: "\n      border: ".concat(euiTheme.border.width.thin, " solid\n        ").concat(euiTheme.colors.borderBasePlain, ";\n    "),
     // Tooltip anchor wrapper
     tooltipWrapper: _ref,
     // Content wrapper
@@ -98,10 +120,12 @@ var euiButtonGroupButtonStyles = exports.euiButtonGroupButtonStyles = function e
   };
 };
 var _compressedButtonFocusColors = exports._compressedButtonFocusColors = function _compressedButtonFocusColors(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
   var colors = [].concat((0, _toConsumableArray2.default)(_button.BUTTON_COLORS), ['disabled']);
   return colors.reduce(function (acc, color) {
     var _euiButtonFillColor = (0, _button.euiButtonFillColor)(euiThemeContext, color),
       backgroundColor = _euiButtonFillColor.backgroundColor;
-    return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, color, /*#__PURE__*/(0, _react.css)("&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, 'center', backgroundColor), " &:is(.euiButtonGroupButton-isSelected){outline-offset:0;}}")));
+    return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, color, /*#__PURE__*/(0, _react.css)("&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, isRefreshVariant ? 'outset' : 'center', isRefreshVariant ? euiTheme.focus.color : backgroundColor), " ", !isRefreshVariant && "\n            &:is(.euiButtonGroupButton-isSelected) {\n              outline-offset: 0;\n            }\n          ", ";}")));
   }, {});
 };

package/test-env/components/button/button_icon/button_icon.js

@@ -49,6 +49,8 @@ var EuiButtonIcon = exports.EuiButtonIcon = function EuiButtonIcon(_ref) {
     isSelected = _ref.isSelected,
     isLoading = _ref.isLoading,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var euiThemeContext = (0, _services.useEuiTheme)();
+  var isRefreshVariant = (0, _services.isEuiThemeRefreshVariant)(euiThemeContext, 'buttonVariant');
   var isDisabled = (0, _button_display.isButtonDisabled)({
     isDisabled: _isDisabled || disabled,
     href: href,
@@ -65,7 +67,7 @@ var EuiButtonIcon = exports.EuiButtonIcon = function EuiButtonIcon(_ref) {
   var buttonFocusStyle = (0, _button.useEuiButtonFocusCSS)();
   var emptyHoverStyles = (0, _services.useEuiMemoizedStyles)(_button_icon._emptyHoverStyles);
   var styles = (0, _services.useEuiMemoizedStyles)(_button_icon.euiButtonIconStyles);
-  var cssStyles = [styles.euiButtonIcon, styles[size], buttonColorStyles[isDisabled ? 'disabled' : color], buttonFocusStyle, display === 'empty' && !isDisabled && emptyHoverStyles[color], isDisabled && styles.isDisabled];
+  var cssStyles = [styles.euiButtonIcon, styles[size], buttonColorStyles[isDisabled ? 'disabled' : color], buttonFocusStyle, !isRefreshVariant && display === 'empty' && !isDisabled && emptyHoverStyles[color], isDisabled && styles.isDisabled];
   var classes = (0, _classnames.default)('euiButtonIcon', className);
 
   // Add an icon to the button if one exists.

package/test-env/components/collapsible_nav/collapsible_nav.js

@@ -206,6 +206,7 @@ EuiCollapsibleNav.propTypes = {
      * Object of props passed to EuiFocusTrap.
      * `shards` specifies an array of elements that will be considered part of the flyout, preventing the flyout from being closed when clicked.
      * `closeOnMouseup` will delay the close callback, allowing time for external toggle buttons to handle close behavior.
+     * `returnFocus` defines the return focus behavior and provides the possibility to check the available target element or opt out of the behavior in favor of manually returning focus
      */
   focusTrapProps: _propTypes.default.any,
   /**

package/test-env/components/datagrid/controls/data_grid_toolbar_control.js

@@ -11,6 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react2 = require("@emotion/react");
+var _services = require("../../../services");
 var _button = require("../../button");
 var _badge = require("../../badge");
 var _i18n = require("../../i18n");
@@ -28,7 +29,12 @@ var EuiDataGridToolbarControl = exports.EuiDataGridToolbarControl = function Eui
     badgeContent = _ref.badgeContent,
     textProps = _ref.textProps,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var euiThemeContext = (0, _services.useEuiTheme)();
+  var isRefreshVariant = (0, _services.useEuiThemeRefreshVariant)('buttonVariant');
   var classes = (0, _classnames.default)('euiDataGridToolbarControl', className);
+  var cssStyles = isRefreshVariant ?
+  // passes euiThemeContext here instead via `css` to ensure legacy Enzyme tests work
+  interactiveStyles(euiThemeContext) : underlineStyles;
   var badgeAriaLabel = (0, _i18n.useEuiI18n)('euiDataGridToolbarControl.badgeAriaLabel', 'Active: {count}', {
     count: typeof badgeContent === 'string' ? betterScreenReaderSlashes(badgeContent) : badgeContent
   });
@@ -37,7 +43,7 @@ var EuiDataGridToolbarControl = exports.EuiDataGridToolbarControl = function Eui
     size: "xs",
     color: "text",
     textProps: false,
-    css: underlineStyles
+    css: cssStyles
   }, rest), (0, _react2.jsx)("span", (0, _extends2.default)({}, textProps, {
     className: (0, _classnames.default)('euiDataGridToolbarControl__text', 'eui-textTruncate', textProps && textProps.className)
   }), children), Boolean(badgeContent) && (0, _react2.jsx)(_badge.EuiNotificationBadge, {
@@ -154,6 +160,10 @@ var underlineStyles = process.env.NODE_ENV === "production" ? {
   styles: "&:focus,&:hover:not(:disabled){text-decoration:none;.euiDataGridToolbarControl__text{text-decoration:underline;}};label:underlineStyles;",
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
+var interactiveStyles = function interactiveStyles(_ref2) {
+  var euiTheme = _ref2.euiTheme;
+  return /*#__PURE__*/(0, _react2.css)("&:focus,&:hover:not(:disabled){.euiDataGridToolbarControl__badge{background-color:", euiTheme.components.filterButtonBadgeBackgroundHover, ";}};label:interactiveStyles;");
+};
 var badgeStyles = process.env.NODE_ENV === "production" ? {
   name: "1968nw3-badgeStyles",
   styles: "cursor:inherit;label:badgeStyles;"

package/test-env/components/datagrid/utils/focus.js

@@ -62,7 +62,7 @@ var useFocus = exports.useFocus = function useFocus() {
     });
   }, []);
   var previousCell = (0, _react.useRef)(undefined);
-  (0, _react.useEffect)(function () {
+  (0, _react.useLayoutEffect)(function () {
     if (previousCell.current) {
       notifyCellOfFocusState(cellsUpdateFocus.current, previousCell.current, false);
     }