@elastic/eui 89.1.0 → 91.0.0

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

@@ -7,14 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.SIZES = exports.EuiButton = exports.COLORS = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _button = require("../../themes/amsterdam/global_styling/mixins/button");
 var _button_display = require("./button_display/_button_display");
-var _services = require("../../services");
 var _react2 = require("@emotion/react");
-var _excluded = ["className", "buttonRef", "color", "fill"];
+var _excluded = ["className", "buttonRef", "size", "color", "fill"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -22,7 +20,7 @@ var _excluded = ["className", "buttonRef", "color", "fill"];
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-var COLORS = [].concat((0, _toConsumableArray2.default)(_button.BUTTON_COLORS), ['ghost']);
+var COLORS = _button.BUTTON_COLORS;
 exports.COLORS = COLORS;
 var SIZES = ['s', 'm'];
 exports.SIZES = SIZES;
@@ -30,47 +28,31 @@ exports.SIZES = SIZES;
  * EuiButton is largely responsible for providing relevant props
  * and the logic for element-specific attributes
  */
-var EuiButton = function EuiButton(props) {
-  var className = props.className,
-    buttonRef = props.buttonRef,
-    _props$color = props.color,
-    _color = _props$color === void 0 ? 'primary' : _props$color,
-    fill = props.fill,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var buttonIsDisabled = (0, _button_display.isButtonDisabled)({
+var EuiButton = function EuiButton(_ref) {
+  var className = _ref.className,
+    buttonRef = _ref.buttonRef,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 'm' : _ref$size,
+    _ref$color = _ref.color,
+    color = _ref$color === void 0 ? 'primary' : _ref$color,
+    fill = _ref.fill,
+    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var isDisabled = (0, _button_display.isButtonDisabled)({
     href: rest.href,
     isDisabled: rest.isDisabled || rest.disabled,
     isLoading: rest.isLoading
   });
-  var color = buttonIsDisabled ? 'disabled' : _color;
   var buttonColorStyles = (0, _button.useEuiButtonColorCSS)({
     display: fill ? 'fill' : 'base'
-  })[color === 'ghost' ? 'text' : color];
+  })[isDisabled ? 'disabled' : color];
   var buttonFocusStyle = (0, _button.useEuiButtonFocusCSS)();
   var classes = (0, _classnames.default)('euiButton', className);
   var cssStyles = [buttonColorStyles, buttonFocusStyle];
-  if (_color === 'ghost') {
-    // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
-    return (0, _react2.jsx)(_services.EuiThemeProvider, {
-      colorMode: "dark",
-      wrapperProps: {
-        cloneElement: true
-      }
-    }, (0, _react2.jsx)(EuiButton, (0, _extends2.default)({}, props, {
-      color: "text"
-    })));
-  }
   return (0, _react2.jsx)(_button_display.EuiButtonDisplay, (0, _extends2.default)({
     className: classes,
     css: cssStyles,
-    ref: buttonRef
+    ref: buttonRef,
+    size: size
   }, rest));
 };
-exports.EuiButton = EuiButton;
-EuiButton.displayName = 'EuiButton';
-
-// Use defaultProps for simple pass-through props
-EuiButton.defaultProps = {
-  size: 'm',
-  color: 'primary'
-};
+exports.EuiButton = EuiButton;

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -35,55 +35,43 @@ var FLUSH_TYPES = ['left', 'right', 'both'];
  * `iconType`, `iconSide`, and `textProps`
  */
 exports.FLUSH_TYPES = FLUSH_TYPES;
-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 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 isDisabled = (0, _button_display.isButtonDisabled)({
     isDisabled: _isDisabled || disabled,
     href: href,
     isLoading: isLoading
   });
-  var color = isDisabled ? 'disabled' : _color === 'ghost' ? 'text' : _color;
   var buttonColorStyles = (0, _button.useEuiButtonColorCSS)({
     display: 'empty'
   });
   var euiTheme = (0, _services.useEuiTheme)();
   var styles = (0, _button_empty.euiButtonEmptyStyles)(euiTheme);
-  var cssStyles = [styles.euiButtonEmpty, styles[size], buttonColorStyles[color], flush && styles.flush, flush && styles[flush], isDisabled && styles.isDisabled];
-  if (_color === 'ghost') {
-    // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
-    return (0, _react2.jsx)(_services.EuiThemeProvider, {
-      colorMode: "dark",
-      wrapperProps: {
-        cloneElement: true
-      }
-    }, (0, _react2.jsx)(EuiButtonEmpty, (0, _extends2.default)({}, props, {
-      color: "text"
-    })));
-  }
+  var cssStyles = [styles.euiButtonEmpty, styles[size], buttonColorStyles[isDisabled ? 'disabled' : color], flush && styles.flush, flush && styles[flush], isDisabled && styles.isDisabled];
   var classes = (0, _classnames.default)('euiButtonEmpty', className);
   var contentClassNames = (0, _classnames.default)('euiButtonEmpty__content', contentProps === null || contentProps === void 0 ? void 0 : contentProps.className);
   var textClassNames = (0, _classnames.default)('euiButtonEmpty__text', textProps === null || textProps === void 0 ? void 0 : textProps.className);

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

@@ -55,9 +55,6 @@ var EuiButtonGroup = function EuiButtonGroup(_ref) {
     'euiButtonGroup-isDisabled': isDisabled
   }, className);
   var typeIsSingle = type === 'single';
-  var nameIfSingle = (0, _services.useGeneratedHtmlId)({
-    conditionalId: name
-  });
   return (0, _react2.jsx)("fieldset", (0, _extends2.default)({
     css: wrapperCssStyles,
     className: classes
@@ -69,15 +66,17 @@ var EuiButtonGroup = function EuiButtonGroup(_ref) {
   }, options.map(function (option, index) {
     return (0, _react2.jsx)(_button_group_button.EuiButtonGroupButton, (0, _extends2.default)({
       key: index,
-      name: nameIfSingle,
       isDisabled: isDisabled
     }, option, {
-      element: typeIsSingle ? 'label' : 'button',
+      onClick: typeIsSingle ? function () {
+        return onChange(option.id, option.value);
+      } : function () {
+        return onChange(option.id);
+      },
       isSelected: typeIsSingle ? option.id === idSelected : idToSelectedMap[option.id],
       color: color,
       size: buttonSize,
-      isIconOnly: isIconOnly,
-      onChange: onChange
+      isIconOnly: isIconOnly
     }));
   })));
 };

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

@@ -16,7 +16,7 @@ var _inner_text = require("../../inner_text");
 var _button_display = require("../button_display/_button_display");
 var _button_group_button = require("./button_group_button.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "name", "onChange", "size", "value", "color", "element", "type"];
+var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "value", "size", "color"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -32,44 +32,11 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
     _ref$isSelected = _ref.isSelected,
     isSelected = _ref$isSelected === void 0 ? false : _ref$isSelected,
     label = _ref.label,
-    name = _ref.name,
-    _onChange = _ref.onChange,
-    size = _ref.size,
     value = _ref.value,
+    size = _ref.size,
     _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 element = isDisabled ? 'button' : _element;
-  var elementProps = {};
-  var singleInput;
-  if (element === 'label') {
-    singleInput = (0, _react2.jsx)("input", {
-      className: "euiScreenReaderOnly",
-      name: name,
-      checked: isSelected,
-      disabled: isDisabled,
-      value: value,
-      type: "radio",
-      onChange: function onChange() {
-        return _onChange(id, value);
-      },
-      "data-test-subj": id
-    });
-  } else {
-    elementProps = {
-      'data-test-subj': id,
-      isSelected: isSelected,
-      type: type,
-      onClick: function onClick() {
-        return _onChange(id);
-      }
-    };
-  }
   var isCompressed = size === 'compressed';
   var color = isDisabled ? 'disabled' : _color;
   var display = isSelected ? 'fill' : isCompressed ? 'empty' : 'base';
@@ -99,7 +66,6 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
   return (0, _react2.jsx)(_button_display.EuiButtonDisplay, (0, _extends2.default)({
     css: cssStyles,
     className: buttonClasses,
-    element: element,
     isDisabled: isDisabled,
     size: size === 'compressed' ? 's' : size,
     contentProps: {
@@ -110,7 +76,9 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
       ref: buttonTextRef,
       'data-text': innerText
     },
-    title: innerText
-  }, elementProps, rest), singleInput, label);
+    title: innerText,
+    "data-test-subj": id,
+    isSelected: isSelected
+  }, rest), label);
 };
 exports.EuiButtonGroupButton = EuiButtonGroupButton;

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

@@ -56,25 +56,15 @@ var euiButtonGroupButtonStyles = function euiButtonGroupButtonStyles(euiThemeCon
     }
   };
 };
-
-/**
- * Focus utilities - made complex by the two different button styles
- * and the fact that `label`/`input` combos need :focus-within,
- * but `button` does not
- */
 exports.euiButtonGroupButtonStyles = euiButtonGroupButtonStyles;
-var _outlineSelectors = function _outlineSelectors(outlineCss) {
-  return /*#__PURE__*/(0, _react.css)("&:is(button){&:focus-visible{", outlineCss, ";}}&:is(label){&:focus-within{", outlineCss, ";}@supports selector(:has(*)){/* Once all evergreen browsers support :has, we can remove\n           @supports and the outline: none reset just use this selector */&:focus-within{outline:none;}&:has(:focus-visible){", outlineCss, ";}}}");
-};
 var _compressedButtonFocusColor = function _compressedButtonFocusColor(euiThemeContext, color) {
-  var euiTheme = euiThemeContext.euiTheme;
   var _euiButtonFillColor = (0, _button.euiButtonFillColor)(euiThemeContext, color),
     backgroundColor = _euiButtonFillColor.backgroundColor;
-  return _outlineSelectors("outline: ".concat(euiTheme.focus.width, " solid ").concat(backgroundColor, ";"));
+  return /*#__PURE__*/(0, _react.css)("&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, 'center', backgroundColor), " &:is(.euiButtonGroupButton-isSelected){outline-offset:0;}}");
 };
 exports._compressedButtonFocusColor = _compressedButtonFocusColor;
 var _uncompressedButtonFocus = function _uncompressedButtonFocus(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
-  return _outlineSelectors((0, _global_styling.euiOutline)(euiThemeContext, 'inset', euiTheme.colors.fullShade));
+  return /*#__PURE__*/(0, _react.css)("&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, 'inset', euiTheme.colors.fullShade), ";}");
 };
 exports._uncompressedButtonFocus = _uncompressedButtonFocus;

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

@@ -28,28 +28,28 @@ var SIZES = ['xs', 's', 'm'];
 exports.SIZES = SIZES;
 var DISPLAYS = ['base', 'empty', 'fill'];
 exports.DISPLAYS = DISPLAYS;
-var EuiButtonIcon = function EuiButtonIcon(props) {
-  var className = props.className,
-    iconType = props.iconType,
-    _props$iconSize = props.iconSize,
-    iconSize = _props$iconSize === void 0 ? 'm' : _props$iconSize,
-    _props$color = props.color,
-    _color = _props$color === void 0 ? 'primary' : _props$color,
-    _isDisabled = props.isDisabled,
-    disabled = props.disabled,
-    href = props.href,
-    _props$type = props.type,
-    type = _props$type === void 0 ? 'button' : _props$type,
-    _props$display = props.display,
-    display = _props$display === void 0 ? 'empty' : _props$display,
-    target = props.target,
-    rel = props.rel,
-    _props$size = props.size,
-    size = _props$size === void 0 ? 'xs' : _props$size,
-    buttonRef = props.buttonRef,
-    isSelected = props.isSelected,
-    isLoading = props.isLoading,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+var EuiButtonIcon = function EuiButtonIcon(_ref) {
+  var className = _ref.className,
+    iconType = _ref.iconType,
+    _ref$iconSize = _ref.iconSize,
+    iconSize = _ref$iconSize === void 0 ? 'm' : _ref$iconSize,
+    _ref$color = _ref.color,
+    color = _ref$color === void 0 ? 'primary' : _ref$color,
+    _isDisabled = _ref.isDisabled,
+    disabled = _ref.disabled,
+    href = _ref.href,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? 'button' : _ref$type,
+    _ref$display = _ref.display,
+    display = _ref$display === void 0 ? 'empty' : _ref$display,
+    target = _ref.target,
+    rel = _ref.rel,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 'xs' : _ref$size,
+    buttonRef = _ref.buttonRef,
+    isSelected = _ref.isSelected,
+    isLoading = _ref.isLoading,
+    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var euiThemeContext = (0, _services.useEuiTheme)();
   var isDisabled = (0, _button_display.isButtonDisabled)({
     isDisabled: _isDisabled || disabled,
@@ -61,26 +61,14 @@ var EuiButtonIcon = function EuiButtonIcon(props) {
   if (!rest['aria-label'] && !rest['aria-labelledby'] && !isAriaHidden) {
     console.warn("EuiButtonIcon requires aria-label or aria-labelledby to be specified because icon-only\n      buttons are screen-reader-inaccessible without them.");
   }
-  var color = isDisabled ? 'disabled' : _color === 'ghost' ? 'text' : _color;
   var buttonColorStyles = (0, _button.useEuiButtonColorCSS)({
     display: display
   });
   var buttonFocusStyle = (0, _button.useEuiButtonFocusCSS)();
+  var emptyHoverStyles = display === 'empty' && !isDisabled && (0, _button_icon._emptyHoverStyles)(euiThemeContext, color);
   var styles = (0, _button_icon.euiButtonIconStyles)(euiThemeContext);
-  var emptyHoverStyles = (0, _button_icon._emptyHoverStyles)(euiThemeContext, color);
-  var cssStyles = [styles.euiButtonIcon, styles[size], buttonColorStyles[color], buttonFocusStyle, display === 'empty' && emptyHoverStyles, isDisabled && styles.isDisabled];
+  var cssStyles = [styles.euiButtonIcon, styles[size], buttonColorStyles[isDisabled ? 'disabled' : color], buttonFocusStyle, emptyHoverStyles, isDisabled && styles.isDisabled];
   var classes = (0, _classnames.default)('euiButtonIcon', className);
-  if (_color === 'ghost') {
-    // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
-    return (0, _react2.jsx)(_services.EuiThemeProvider, {
-      colorMode: "dark",
-      wrapperProps: {
-        cloneElement: true
-      }
-    }, (0, _react2.jsx)(EuiButtonIcon, (0, _extends2.default)({}, props, {
-      color: "text"
-    })));
-  }
 
   // Add an icon to the button if one exists.
   var buttonIcon;

package/optimize/lib/components/collapsible_nav_beta/collapsible_nav_beta.js

@@ -84,6 +84,15 @@ var _EuiCollapsibleNavBeta = function _EuiCollapsibleNavBeta(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     isOverlayFullWidth = _useState6[0],
     setIsOverlayFullWidth = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    isOverlayOpen = _useState8[0],
+    setIsOverlayOpen = _useState8[1];
+  var toggleOverlayFlyout = (0, _react.useCallback)(function () {
+    setIsOverlayOpen(function (isOpen) {
+      return !isOpen;
+    });
+  }, []);
   var flyoutType = isOverlay ? 'overlay' : 'push';
   var isPush = !isOverlay;
 
@@ -100,12 +109,6 @@ var _EuiCollapsibleNavBeta = function _EuiCollapsibleNavBeta(_ref) {
       return window.removeEventListener('resize', onWindowResize);
     };
   }, [_width]);
-
-  // If the nav was previously uncollapsed and shrinks down to the
-  // overlay flyout, default to its hidden/collapsed state
-  (0, _react.useEffect)(function () {
-    if (isOverlay) setIsCollapsed(true);
-  }, [isOverlay]);
   var width = (0, _react.useMemo)(function () {
     if (isOverlayFullWidth) return '100%';
     if (isPush && isCollapsed) return headerHeight;
@@ -154,16 +157,17 @@ var _EuiCollapsibleNavBeta = function _EuiCollapsibleNavBeta(_ref) {
     onClose: onClose,
     hideCloseButton: true
   }), children);
-  var hideFlyout = isOverlay && isCollapsed;
+  var hideFlyout = isOverlay && !isOverlayOpen;
   return (0, _react2.jsx)(_context.EuiCollapsibleNavContext.Provider, {
     value: {
       isPush: isPush,
       isCollapsed: isCollapsed,
+      isOverlayOpen: isOverlayOpen,
       side: side
     }
   }, (0, _react2.jsx)(_collapsible_nav_button.EuiCollapsibleNavButton, {
     ref: buttonRef,
-    onClick: toggleCollapsed,
+    onClick: isPush ? toggleCollapsed : toggleOverlayFlyout,
     "aria-controls": flyoutID
   }), !hideFlyout && flyout);
 };

package/optimize/lib/components/collapsible_nav_beta/collapsible_nav_button/collapsible_nav_button.js

@@ -33,25 +33,30 @@ var EuiCollapsibleNavButton = /*#__PURE__*/(0, _react.forwardRef)(function (_ref
   var _useContext = (0, _react.useContext)(_context.EuiCollapsibleNavContext),
     side = _useContext.side,
     isPush = _useContext.isPush,
-    isCollapsed = _useContext.isCollapsed;
+    isCollapsed = _useContext.isCollapsed,
+    isOverlayOpen = _useContext.isOverlayOpen;
   var euiTheme = (0, _services.useEuiTheme)();
   var styles = (0, _collapsible_nav_button.euiCollapsibleNavButtonWrapperStyles)(euiTheme);
   var cssStyles = [styles.euiCollapsibleNavButtonWrapper, styles[side]];
   var buttonStyles = [styles.euiCollapsibleNavButton, css];
   var classes = (0, _classnames.default)('euiCollapsibleNavButton', className);
+  var toggleExpandLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavButton.ariaLabelExpand', 'Expand navigation');
+  var toggleCollapseLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavButton.ariaLabelCollapse', 'Collapse navigation');
+  var toggleOpenLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavButton.ariaLabelOpen', 'Open navigation');
+  var toggleCloseLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavButton.ariaLabelClose', 'Close navigation');
+  var ariaLabel;
   var iconType;
   if (isPush) {
+    ariaLabel = isCollapsed ? toggleExpandLabel : toggleCollapseLabel;
     if (side === 'left') {
       iconType = isCollapsed ? 'menuRight' : 'menuLeft';
     } else {
       iconType = isCollapsed ? 'menuLeft' : 'menuRight';
     }
   } else {
-    iconType = isCollapsed ? 'menu' : 'cross';
+    ariaLabel = isOverlayOpen ? toggleCloseLabel : toggleOpenLabel;
+    iconType = isOverlayOpen ? 'cross' : 'menu';
   }
-  var toggleOpenLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavButton.ariaLabelOpen', 'Toggle navigation open');
-  var toggleCloselLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavButton.ariaLabelClose', 'Toggle navigation closed');
-  var ariaLabel = isCollapsed ? toggleOpenLabel : toggleCloselLabel;
   return (0, _react2.jsx)("div", {
     className: "euiCollapsibleNavButtonWrapper",
     css: cssStyles,
@@ -64,8 +69,8 @@ var EuiCollapsibleNavButton = /*#__PURE__*/(0, _react.forwardRef)(function (_ref
     color: "text",
     iconType: iconType,
     "aria-label": ariaLabel,
-    "aria-pressed": !isCollapsed,
-    "aria-expanded": !isCollapsed
+    "aria-pressed": isPush ? !isCollapsed : isOverlayOpen,
+    "aria-expanded": isPush ? !isCollapsed : isOverlayOpen
   }, rest)));
 });
 exports.EuiCollapsibleNavButton = EuiCollapsibleNavButton;

package/optimize/lib/components/collapsible_nav_beta/collapsible_nav_group/collapsible_nav_group.js

@@ -42,17 +42,22 @@ var EuiCollapsibleNavGroup = function EuiCollapsibleNavGroup(_ref) {
   var euiTheme = (0, _services.useEuiTheme)();
   var styles = (0, _collapsible_nav_group.euiCollapsibleNavGroupStyles)(euiTheme);
   var cssStyles = [styles.euiCollapsibleNavGroup, isPush && isCollapsed ? styles.euiCollapsibleNavGroup__title : styles.isWrapper, wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.css];
+  var labelledById = (0, _services.useGeneratedHtmlId)();
   return (0, _react2.jsx)("div", (0, _extends2.default)({}, wrapperProps, {
     className: classes,
     css: cssStyles
   }), isCollapsed && isPush ? (0, _react2.jsx)(_collapsed_nav_popover.EuiCollapsedNavPopover, (0, _extends2.default)({
     className: classes,
     items: items
-  }, props)) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavItem, (0, _extends2.default)({}, props, {
+  }, props)) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavItem, (0, _extends2.default)({
+    id: labelledById
+  }, props, {
     css: styles.euiCollapsibleNavGroup__title
   })), (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavSubItems, {
     items: items,
-    isGroup: true
+    isGroup: true,
+    role: "group",
+    "aria-labelledby": props.id || labelledById
   })));
 };
 exports.EuiCollapsibleNavGroup = EuiCollapsibleNavGroup;

package/optimize/lib/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_accordion.styles.js

@@ -24,7 +24,7 @@ var euiCollapsibleNavAccordionStyles = function euiCollapsibleNavAccordionStyles
     euiCollapsibleNavAccordion: /*#__PURE__*/(0, _react.css)(".euiAccordion__button{overflow:hidden;&:hover,&:focus{cursor:default;text-decoration:none;}}.euiAccordion__triggerWrapper{border-radius:", sharedStyles.borderRadius, ";", _global_styling.euiCanAnimate, "{transition:background-color ", sharedStyles.animation, ";}}.euiAccordion__buttonContent{", (0, _global_styling.logicalCSS)('max-width', '100%'), " flex-basis:100%;display:flex;align-items:center;}.euiCollapsibleNavLink{", (0, _global_styling.logicalCSS)('width', '100%'), ";};label:euiCollapsibleNavAccordion;"),
     isTopItem: /*#__PURE__*/(0, _react.css)("margin:", sharedStyles.padding, ";&>.euiAccordion__triggerWrapper{&:hover{background-color:", sharedStyles.backgroundHoverColor, ";}};label:isTopItem;"),
     isSelected: /*#__PURE__*/(0, _react.css)("&>.euiAccordion__triggerWrapper{background-color:", sharedStyles.backgroundSelectedColor, ";&:hover{background-color:", sharedStyles.backgroundSelectedColor, ";}};label:isSelected;"),
-    isSubItem: /*#__PURE__*/(0, _react.css)("&.euiAccordion-isOpen{", (0, _global_styling.logicalCSS)('margin-bottom', euiTheme.size.m), ";};label:isSubItem;"),
+    isSubItem: /*#__PURE__*/(0, _react.css)("&.euiAccordion-isOpen .euiAccordion__children::after{content:'';display:block;", (0, _global_styling.logicalCSS)('height', euiTheme.size.m), ";};label:isSubItem;"),
     // Arrow element
     euiCollapsibleNavAccordion__arrow: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-right', euiTheme.size.xs), _global_styling.euiCanAnimate, "{transition:background-color ", sharedStyles.animation, ";}&:hover,&:focus-visible{background-color:", euiTheme.colors.lightShade, ";&>.euiIcon{color:", sharedStyles.color, ";}}transform:none!important;&>.euiIcon{color:", sharedStyles.rightIconColor, ";transform:rotate(90deg);", _global_styling.euiCanAnimate, "{transition:transform ", sharedStyles.animation, ",color ", sharedStyles.animation, ";}}&.euiAccordion__arrow[aria-expanded='true']>.euiIcon{color:", sharedStyles.color, ";transform:rotate(-90deg);};label:euiCollapsibleNavAccordion__arrow;")
   };

package/optimize/lib/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_group.js

@@ -0,0 +1,71 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EuiCollapsibleNavGroup = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireDefault(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _services = require("../../../services");
+var _collapsible_nav_item = require("./collapsible_nav_item");
+var _collapsible_nav_item2 = require("./collapsible_nav_item.styles");
+var _collapsible_nav_link = require("./collapsible_nav_link");
+var _react2 = require("@emotion/react");
+var _excluded = ["className", "header", "href", "items", "isSubItem", "isSelected", "linkProps", "children"];
+/*
+ * 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.
+ */
+/**
+ * Internal nav group. Should look the same as an open accordion,
+ * but not be toggle-able to close.
+ *
+ * Yes, I know this is the 3rd component in EUI named EuiCollapsibleNavGroup :|
+ * I'm waiting for serverless's design architecture to settle before untangling
+ * this pasghetti
+ */
+var EuiCollapsibleNavGroup = function EuiCollapsibleNavGroup(_ref) {
+  var className = _ref.className,
+    header = _ref.header,
+    href = _ref.href,
+    items = _ref.items,
+    isSubItem = _ref.isSubItem,
+    isSelected = _ref.isSelected,
+    linkProps = _ref.linkProps,
+    _children = _ref.children,
+    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var classes = (0, _classnames.default)('euiCollapsibleNavGroup', className);
+  var euiTheme = (0, _services.useEuiTheme)();
+  var sharedStyles = (0, _collapsible_nav_item2.euiCollapsibleNavItemVariables)(euiTheme);
+  var cssStyles = !isSubItem ? {
+    css: {
+      margin: sharedStyles.padding,
+      label: 'euiCollapsibleNavGroup-isTopItem'
+    }
+  } : undefined; // Prevents Emotion from generating a selector if no styles need to be applied
+
+  var labelledById = (0, _services.useGeneratedHtmlId)();
+  return (0, _react2.jsx)("div", (0, _extends2.default)({
+    className: classes
+  }, cssStyles, rest), (0, _react2.jsx)(_collapsible_nav_link.EuiCollapsibleNavLink, (0, _extends2.default)({
+    href: href,
+    id: labelledById
+  }, linkProps, {
+    isSelected: isSelected,
+    isSubItem: isSubItem,
+    isInteractive: !!(href || rest.onClick || linkProps !== null && linkProps !== void 0 && linkProps.onClick)
+  }), header), (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavSubItems, {
+    items: items,
+    isSubItem: isSubItem,
+    className: "euiCollapsibleNavGroup__children",
+    role: "group",
+    "aria-labelledby": (linkProps === null || linkProps === void 0 ? void 0 : linkProps.id) || labelledById
+  }));
+};
+exports.EuiCollapsibleNavGroup = EuiCollapsibleNavGroup;