@elastic/eui 89.1.0 → 90.0.1

package/optimize/es/components/accordion/accordion.js

@@ -44,7 +44,19 @@ export var EuiAccordionClass = /*#__PURE__*/function (_Component) {
       var forceState = _this.props.forceState;
       if (forceState) {
         var _this$props$onToggle, _this$props;
-        (_this$props$onToggle = (_this$props = _this.props).onToggle) === null || _this$props$onToggle === void 0 ? void 0 : _this$props$onToggle.call(_this$props, forceState === 'open' ? false : true);
+        var nextState = !_this.isOpen;
+        (_this$props$onToggle = (_this$props = _this.props).onToggle) === null || _this$props$onToggle === void 0 ? void 0 : _this$props$onToggle.call(_this$props, nextState);
+
+        // If the accordion should theoretically be opened, wait a tick (allows
+        // consumer state to update) and attempt to focus the child content.
+        // NOTE: Even if the accordion does not actually open, this is fine -
+        // the `inert` property on the hidden children will prevent focus
+        if (nextState === true) {
+          requestAnimationFrame(function () {
+            var _this$accordionChildr;
+            (_this$accordionChildr = _this.accordionChildrenEl) === null || _this$accordionChildr === void 0 ? void 0 : _this$accordionChildr.focus();
+          });
+        }
       } else {
         _this.setState(function (prevState) {
           return {
@@ -53,9 +65,21 @@ export var EuiAccordionClass = /*#__PURE__*/function (_Component) {
         }, function () {
           var _this$props$onToggle2, _this$props2;
           (_this$props$onToggle2 = (_this$props2 = _this.props).onToggle) === null || _this$props$onToggle2 === void 0 ? void 0 : _this$props$onToggle2.call(_this$props2, _this.state.isOpen);
+
+          // If the accordion is open, programmatically move focus
+          // from the accordion trigger to the child content
+          if (_this.state.isOpen) {
+            var _this$accordionChildr2;
+            (_this$accordionChildr2 = _this.accordionChildrenEl) === null || _this$accordionChildr2 === void 0 ? void 0 : _this$accordionChildr2.focus();
+          }
         });
       }
     });
+    // Used to focus the accordion children on user trigger click only (vs controlled/programmatic open)
+    _defineProperty(_assertThisInitialized(_this), "accordionChildrenEl", null);
+    _defineProperty(_assertThisInitialized(_this), "accordionChildrenRef", function (node) {
+      _this.accordionChildrenEl = node;
+    });
     _defineProperty(_assertThisInitialized(_this), "generatedId", htmlIdGenerator()());
     return _this;
   }
@@ -122,7 +146,8 @@ export var EuiAccordionClass = /*#__PURE__*/function (_Component) {
         paddingSize: paddingSize,
         isLoading: isLoading,
         isLoadingMessage: isLoadingMessage,
-        isOpen: this.isOpen
+        isOpen: this.isOpen,
+        accordionChildrenRef: this.accordionChildrenRef
       }, children));
     }
   }]);

package/optimize/es/components/accordion/accordion_children/accordion_children.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "paddingSize", "isLoading", "isLoadingMessage", "isOpen"];
+var _excluded = ["children", "accordionChildrenRef", "paddingSize", "isLoading", "isLoadingMessage", "isOpen"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -10,15 +10,16 @@ var _excluded = ["children", "paddingSize", "isLoading", "isLoadingMessage", "is
  * Side Public License, v 1.
  */
 
-import React, { useRef, useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import classNames from 'classnames';
-import { useEuiTheme, useUpdateEffect } from '../../../services';
+import { useEuiTheme } from '../../../services';
 import { EuiResizeObserver } from '../../observer/resize_observer';
 import { EuiAccordionChildrenLoading } from './accordion_children_loading';
 import { euiAccordionChildrenStyles, euiAccordionChildWrapperStyles } from './accordion_children.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiAccordionChildren = function EuiAccordionChildren(_ref) {
   var children = _ref.children,
+    accordionChildrenRef = _ref.accordionChildrenRef,
     paddingSize = _ref.paddingSize,
     isLoading = _ref.isLoading,
     isLoadingMessage = _ref.isLoadingMessage,
@@ -39,7 +40,6 @@ export var EuiAccordionChildren = function EuiAccordionChildren(_ref) {
    */
   var wrapperStyles = euiAccordionChildWrapperStyles(euiTheme);
   var wrapperCssStyles = [wrapperStyles.euiAccordion__childWrapper, isOpen ? wrapperStyles.isOpen : wrapperStyles.isClosed];
-  var wrapperRef = useRef(null);
 
   /**
    * Update the accordion wrapper height whenever the accordion opens, and also
@@ -58,20 +58,11 @@ export var EuiAccordionChildren = function EuiAccordionChildren(_ref) {
       blockSize: isOpen ? contentHeight : 0
     };
   }, [isOpen, contentHeight]);
-
-  /**
-   * Focus the children wrapper when the accordion is opened,
-   * but not if the accordion is initially open on mount
-   */
-  useUpdateEffect(function () {
-    var _wrapperRef$current;
-    if (isOpen) (_wrapperRef$current = wrapperRef.current) === null || _wrapperRef$current === void 0 ? void 0 : _wrapperRef$current.focus();
-  }, [isOpen]);
   return ___EmotionJSX("div", _extends({}, rest, {
     className: "euiAccordion__childWrapper",
     css: wrapperCssStyles,
     style: heightInlineStyle,
-    ref: wrapperRef,
+    ref: accordionChildrenRef,
     role: "region",
     tabIndex: -1
     // @ts-expect-error - inert property not yet available in React TS defs. TODO: Remove this once https://github.com/DefinitelyTyped/DefinitelyTyped/pull/60822 is merged

package/optimize/es/components/basic_table/basic_table.js

@@ -218,18 +218,27 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
       var _ref5, _this$props$paginatio, _this$props$paginatio2, _this$context$EuiTabl;
       return (_ref5 = (_this$props$paginatio = (_this$props$paginatio2 = this.props.pagination) === null || _this$props$paginatio2 === void 0 ? void 0 : _this$props$paginatio2.pageSize) !== null && _this$props$paginatio !== void 0 ? _this$props$paginatio : (_this$context$EuiTabl = this.context.EuiTablePagination) === null || _this$context$EuiTabl === void 0 ? void 0 : _this$context$EuiTabl.itemsPerPage) !== null && _ref5 !== void 0 ? _ref5 : euiTablePaginationDefaults.itemsPerPage;
     }
+  }, {
+    key: "isSelectionControlled",
+    get: function get() {
+      var _this$props$selection;
+      return !!((_this$props$selection = this.props.selection) !== null && _this$props$selection !== void 0 && _this$props$selection.selected);
+    }
   }, {
     key: "getInitialSelection",
     value: function getInitialSelection() {
+      if (this.isSelectionControlled) return;
       if (this.props.selection && this.props.selection.initialSelected && !this.state.initialSelectionRendered && this.props.items.length > 0) {
         this.setState({
-          selection: this.props.selection.initialSelected
-        });
-        this.setState({
+          selection: this.props.selection.initialSelected,
           initialSelectionRendered: true
         });
       }
     }
+
+    /**
+     * @deprecated Use `selection.selected` instead to declaratively control table selection
+     */
   }, {
     key: "setSelection",
     value: function setSelection(newSelection) {
@@ -252,15 +261,15 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "changeSelection",
-    value: function changeSelection(selection) {
-      if (!this.props.selection) {
-        return;
-      }
-      this.setState({
-        selection: selection
-      });
-      if (this.props.selection.onSelectionChange) {
-        this.props.selection.onSelectionChange(selection);
+    value: function changeSelection(changedSelection) {
+      var _selection$onSelectio;
+      var selection = this.props.selection;
+      if (!selection) return;
+      (_selection$onSelectio = selection.onSelectionChange) === null || _selection$onSelectio === void 0 ? void 0 : _selection$onSelectio.call(selection, changedSelection);
+      if (!this.isSelectionControlled) {
+        this.setState({
+          selection: changedSelection
+        });
       }
     }
   }, {
@@ -948,16 +957,30 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
           selection: []
         };
       }
-      var itemId = nextProps.itemId;
-      var selection = prevState.selection.filter(function (selectedItem) {
-        return nextProps.items.findIndex(function (item) {
+      var controlledSelection = nextProps.selection.selected;
+      var unfilteredSelection = controlledSelection !== null && controlledSelection !== void 0 ? controlledSelection : prevState.selection;
+
+      // Ensure we're not including selections that aren't in the
+      // current `items` array (affected by pagination)
+      var itemId = nextProps.itemId,
+        items = nextProps.items;
+      var selection = unfilteredSelection.filter(function (selectedItem) {
+        return items.findIndex(function (item) {
           return getItemId(item, itemId) === getItemId(selectedItem, itemId);
         }) !== -1;
       });
-      if (selection.length !== prevState.selection.length) {
-        if (nextProps.selection.onSelectionChange) {
-          nextProps.selection.onSelectionChange(selection);
-        }
+
+      // If some selected items were filtered out, update state and callback
+      if (selection.length !== unfilteredSelection.length) {
+        var _nextProps$selection$, _nextProps$selection;
+        (_nextProps$selection$ = (_nextProps$selection = nextProps.selection).onSelectionChange) === null || _nextProps$selection$ === void 0 ? void 0 : _nextProps$selection$.call(_nextProps$selection, selection);
+        return {
+          selection: selection
+        };
+      }
+
+      // Always update selection state from props if controlled
+      if (controlledSelection) {
         return {
           selection: selection
         };

package/optimize/es/components/button/button.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-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
@@ -14,54 +13,37 @@ import React from 'react';
 import classNames from 'classnames';
 import { BUTTON_COLORS, useEuiButtonColorCSS, useEuiButtonFocusCSS } from '../../themes/amsterdam/global_styling/mixins/button';
 import { EuiButtonDisplay, isButtonDisabled } from './button_display/_button_display';
-import { EuiThemeProvider } from '../../services';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-export var COLORS = [].concat(_toConsumableArray(BUTTON_COLORS), ['ghost']);
+export var COLORS = BUTTON_COLORS;
 export var SIZES = ['s', 'm'];
 /**
  * EuiButton is largely responsible for providing relevant props
  * and the logic for element-specific attributes
  */
-export 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 = _objectWithoutProperties(props, _excluded);
-  var buttonIsDisabled = isButtonDisabled({
+export 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 = _objectWithoutProperties(_ref, _excluded);
+  var isDisabled = isButtonDisabled({
     href: rest.href,
     isDisabled: rest.isDisabled || rest.disabled,
     isLoading: rest.isLoading
   });
-  var color = buttonIsDisabled ? 'disabled' : _color;
   var buttonColorStyles = useEuiButtonColorCSS({
     display: fill ? 'fill' : 'base'
-  })[color === 'ghost' ? 'text' : color];
+  })[isDisabled ? 'disabled' : color];
   var buttonFocusStyle = useEuiButtonFocusCSS();
   var classes = classNames('euiButton', className);
   var cssStyles = [buttonColorStyles, buttonFocusStyle];
-  if (_color === 'ghost') {
-    // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
-    return ___EmotionJSX(EuiThemeProvider, {
-      colorMode: "dark",
-      wrapperProps: {
-        cloneElement: true
-      }
-    }, ___EmotionJSX(EuiButton, _extends({}, props, {
-      color: "text"
-    })));
-  }
   return ___EmotionJSX(EuiButtonDisplay, _extends({
     className: classes,
     css: cssStyles,
-    ref: buttonRef
+    ref: buttonRef,
+    size: size
   }, rest));
-};
-EuiButton.displayName = 'EuiButton';
-
-// Use defaultProps for simple pass-through props
-EuiButton.defaultProps = {
-  size: 'm',
-  color: 'primary'
 };

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

@@ -1,5 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["children", "className", "iconType", "iconSide", "iconSize", "color", "size", "flush", "isDisabled", "disabled", "isLoading", "href", "target", "rel", "type", "buttonRef", "contentProps", "textProps", "isSelected"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -14,7 +14,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React from 'react';
 import classNames from 'classnames';
-import { useEuiTheme, EuiThemeProvider, getSecureRelForTarget } from '../../../services';
+import { useEuiTheme, getSecureRelForTarget } from '../../../services';
 import { EuiButtonDisplayContent } from '../button_display/_button_display_content';
 import { useEuiButtonColorCSS } from '../../../themes/amsterdam/global_styling/mixins/button';
 import { isButtonDisabled } from '../button_display/_button_display';
@@ -28,55 +28,43 @@ export var FLUSH_TYPES = ['left', 'right', 'both'];
  * `iconType`, `iconSide`, and `textProps`
  */
 
-export 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 = _objectWithoutProperties(props, _excluded);
+export 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 = _objectWithoutProperties(_ref, _excluded);
   var isDisabled = isButtonDisabled({
     isDisabled: _isDisabled || disabled,
     href: href,
     isLoading: isLoading
   });
-  var color = isDisabled ? 'disabled' : _color === 'ghost' ? 'text' : _color;
   var buttonColorStyles = useEuiButtonColorCSS({
     display: 'empty'
   });
   var euiTheme = useEuiTheme();
   var styles = 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 ___EmotionJSX(EuiThemeProvider, {
-      colorMode: "dark",
-      wrapperProps: {
-        cloneElement: true
-      }
-    }, ___EmotionJSX(EuiButtonEmpty, _extends({}, props, {
-      color: "text"
-    })));
-  }
+  var cssStyles = [styles.euiButtonEmpty, styles[size], buttonColorStyles[isDisabled ? 'disabled' : color], flush && styles.flush, flush && styles[flush], isDisabled && styles.isDisabled];
   var classes = classNames('euiButtonEmpty', className);
   var contentClassNames = classNames('euiButtonEmpty__content', contentProps === null || contentProps === void 0 ? void 0 : contentProps.className);
   var textClassNames = classNames('euiButtonEmpty__text', textProps === null || textProps === void 0 ? void 0 : textProps.className);

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

@@ -11,7 +11,7 @@ var _excluded = ["className", "iconType", "iconSize", "color", "isDisabled", "di
 
 import React from 'react';
 import classNames from 'classnames';
-import { EuiThemeProvider, getSecureRelForTarget, useEuiTheme } from '../../../services';
+import { getSecureRelForTarget, useEuiTheme } from '../../../services';
 import { EuiIcon } from '../../icon';
 import { EuiLoadingSpinner } from '../../loading';
 import { useEuiButtonColorCSS, useEuiButtonFocusCSS } from '../../../themes/amsterdam/global_styling/mixins/button';
@@ -20,28 +20,28 @@ import { euiButtonIconStyles, _emptyHoverStyles } from './button_icon.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var SIZES = ['xs', 's', 'm'];
 export var DISPLAYS = ['base', 'empty', 'fill'];
-export 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 = _objectWithoutProperties(props, _excluded);
+export 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 = _objectWithoutProperties(_ref, _excluded);
   var euiThemeContext = useEuiTheme();
   var isDisabled = isButtonDisabled({
     isDisabled: _isDisabled || disabled,
@@ -53,26 +53,14 @@ export 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 = useEuiButtonColorCSS({
     display: display
   });
   var buttonFocusStyle = useEuiButtonFocusCSS();
+  var emptyHoverStyles = display === 'empty' && !isDisabled && _emptyHoverStyles(euiThemeContext, color);
   var styles = euiButtonIconStyles(euiThemeContext);
-  var emptyHoverStyles = _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 = classNames('euiButtonIcon', className);
-  if (_color === 'ghost') {
-    // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
-    return ___EmotionJSX(EuiThemeProvider, {
-      colorMode: "dark",
-      wrapperProps: {
-        cloneElement: true
-      }
-    }, ___EmotionJSX(EuiButtonIcon, _extends({}, props, {
-      color: "text"
-    })));
-  }
 
   // Add an icon to the button if one exists.
   var buttonIcon;

package/optimize/es/components/collapsible_nav_beta/collapsible_nav_beta.js

@@ -71,6 +71,15 @@ var _EuiCollapsibleNavBeta = function _EuiCollapsibleNavBeta(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     isOverlayFullWidth = _useState6[0],
     setIsOverlayFullWidth = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isOverlayOpen = _useState8[0],
+    setIsOverlayOpen = _useState8[1];
+  var toggleOverlayFlyout = useCallback(function () {
+    setIsOverlayOpen(function (isOpen) {
+      return !isOpen;
+    });
+  }, []);
   var flyoutType = isOverlay ? 'overlay' : 'push';
   var isPush = !isOverlay;
 
@@ -87,12 +96,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
-  useEffect(function () {
-    if (isOverlay) setIsCollapsed(true);
-  }, [isOverlay]);
   var width = useMemo(function () {
     if (isOverlayFullWidth) return '100%';
     if (isPush && isCollapsed) return headerHeight;
@@ -141,16 +144,17 @@ var _EuiCollapsibleNavBeta = function _EuiCollapsibleNavBeta(_ref) {
     onClose: onClose,
     hideCloseButton: true
   }), children);
-  var hideFlyout = isOverlay && isCollapsed;
+  var hideFlyout = isOverlay && !isOverlayOpen;
   return ___EmotionJSX(EuiCollapsibleNavContext.Provider, {
     value: {
       isPush: isPush,
       isCollapsed: isCollapsed,
+      isOverlayOpen: isOverlayOpen,
       side: side
     }
   }, ___EmotionJSX(EuiCollapsibleNavButton, {
     ref: buttonRef,
-    onClick: toggleCollapsed,
+    onClick: isPush ? toggleCollapsed : toggleOverlayFlyout,
     "aria-controls": flyoutID
   }), !hideFlyout && flyout);
 };

package/optimize/es/components/collapsible_nav_beta/collapsible_nav_beta.styles.js

@@ -10,7 +10,7 @@ import { css } from '@emotion/react';
 import { logicalCSS } from '../../global_styling';
 import { euiShadowFlat } from '../../themes';
 import { euiHeaderVariables } from '../header/header.styles';
-import { euiCollapsibleNavBodyStyles } from './collapsible_nav_body_footer.styles';
+import { hideScrollbars } from './collapsible_nav_body_footer.styles';
 export var euiCollapsibleNavBetaStyles = function euiCollapsibleNavBetaStyles(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
 
@@ -24,7 +24,7 @@ export var euiCollapsibleNavBetaStyles = function euiCollapsibleNavBetaStyles(eu
     left: /*#__PURE__*/css(logicalCSS('border-right', euiTheme.border.thin), ";;label:left;"),
     right: /*#__PURE__*/css(logicalCSS('border-left', euiTheme.border.thin), ";;label:right;"),
     isPush: /*#__PURE__*/css(euiShadowFlat(euiThemeContext), ";;label:isPush;"),
-    isPushCollapsed: /*#__PURE__*/css(euiCollapsibleNavBodyStyles._isPushCollapsed, ";;label:isPushCollapsed;"),
+    isPushCollapsed: /*#__PURE__*/css(hideScrollbars, ";;label:isPushCollapsed;"),
     isOverlayFullWidth: /*#__PURE__*/css("&.euiFlyout{", logicalCSS('max-width', '100% !important'), ";};label:isOverlayFullWidth;")
   };
 };

package/optimize/es/components/collapsible_nav_beta/collapsible_nav_body_footer.js

@@ -46,9 +46,12 @@ export var EuiCollapsibleNavFooter = function EuiCollapsibleNavFooter(_ref2) {
   var className = _ref2.className,
     props = _objectWithoutProperties(_ref2, _excluded2);
   var classes = classNames('euiCollapsibleNav__footer', className);
+  var _useContext2 = useContext(EuiCollapsibleNavContext),
+    isCollapsed = _useContext2.isCollapsed,
+    isPush = _useContext2.isPush;
   var euiTheme = useEuiTheme();
   var styles = euiCollapsibleNavFooterStyles(euiTheme);
-  var cssStyles = [styles.euiCollapsibleNav__footer];
+  var cssStyles = [styles.euiCollapsibleNav__footer, isCollapsed && isPush && styles.isPushCollapsed];
   return ___EmotionJSX(EuiFlyoutFooter, _extends({
     className: classes,
     css: cssStyles

package/optimize/es/components/collapsible_nav_beta/collapsible_nav_body_footer.styles.js

@@ -7,19 +7,23 @@
  */
 
 import { css } from '@emotion/react';
-import { logicalCSS } from '../../global_styling';
+import { logicalCSS, euiYScrollWithShadows } from '../../global_styling';
+
+// Hide the scrollbar for docked mode (while still keeping the nav scrollable)
+// Otherwise if scrollbars are visible, button icon visibility suffers.
+export var hideScrollbars = "\n  scrollbar-width: none; /* Firefox */\n\n  &::-webkit-scrollbar {\n    display: none; /* Chrome, Edge, & Safari */\n  }\n";
 export var euiCollapsibleNavBodyStyles = {
   // In case things get really dire responsively, ensure the footer doesn't overtake the body
   euiCollapsibleNav__body: /*#__PURE__*/css(logicalCSS('min-height', '50%'), ";;label:euiCollapsibleNav__body;"),
-  get isPushCollapsed() {
-    return /*#__PURE__*/css(".euiFlyoutBody__overflow{", this._isPushCollapsed, ";};label:isPushCollapsed;");
-  },
-  // CSS is reused by main euiCollapsibleNav styles in case the body component isn't used
-  _isPushCollapsed: "\n    /* Hide the scrollbar for docked mode (while still keeping the nav scrollable)\n       Otherwise if scrollbars are visible, button icon visibility suffers. */\n    scrollbar-width: none; /* Firefox */\n\n    &::-webkit-scrollbar {\n      display: none; /* Chrome, Edge, & Safari */\n    }\n  "
+  isPushCollapsed: /*#__PURE__*/css(".euiFlyoutBody__overflow{", hideScrollbars, ";};label:isPushCollapsed;")
 };
-export var euiCollapsibleNavFooterStyles = function euiCollapsibleNavFooterStyles(_ref) {
-  var euiTheme = _ref.euiTheme;
+export var euiCollapsibleNavFooterStyles = function euiCollapsibleNavFooterStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
   return {
-    euiCollapsibleNav__footer: /*#__PURE__*/css("background-color:", euiTheme.colors.emptyShade, ";", logicalCSS('border-top', euiTheme.border.thin), ";;label:euiCollapsibleNav__footer;")
+    euiCollapsibleNav__footer: /*#__PURE__*/css("background-color:", euiTheme.colors.emptyShade, ";", logicalCSS('border-top', euiTheme.border.thin), " ", euiYScrollWithShadows(euiThemeContext, {
+      side: 'end',
+      height: 'auto'
+    }), " flex-shrink:0;;label:euiCollapsibleNav__footer;"),
+    isPushCollapsed: /*#__PURE__*/css(hideScrollbars, ";;label:isPushCollapsed;")
   };
 };

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

@@ -24,25 +24,30 @@ export var EuiCollapsibleNavButton = /*#__PURE__*/forwardRef(function (_ref, ref
   var _useContext = useContext(EuiCollapsibleNavContext),
     side = _useContext.side,
     isPush = _useContext.isPush,
-    isCollapsed = _useContext.isCollapsed;
+    isCollapsed = _useContext.isCollapsed,
+    isOverlayOpen = _useContext.isOverlayOpen;
   var euiTheme = useEuiTheme();
   var styles = euiCollapsibleNavButtonWrapperStyles(euiTheme);
   var cssStyles = [styles.euiCollapsibleNavButtonWrapper, styles[side]];
   var buttonStyles = [styles.euiCollapsibleNavButton, css];
   var classes = classNames('euiCollapsibleNavButton', className);
+  var toggleExpandLabel = useEuiI18n('euiCollapsibleNavButton.ariaLabelExpand', 'Expand navigation');
+  var toggleCollapseLabel = useEuiI18n('euiCollapsibleNavButton.ariaLabelCollapse', 'Collapse navigation');
+  var toggleOpenLabel = useEuiI18n('euiCollapsibleNavButton.ariaLabelOpen', 'Open navigation');
+  var toggleCloseLabel = 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 = useEuiI18n('euiCollapsibleNavButton.ariaLabelOpen', 'Toggle navigation open');
-  var toggleCloselLabel = useEuiI18n('euiCollapsibleNavButton.ariaLabelClose', 'Toggle navigation closed');
-  var ariaLabel = isCollapsed ? toggleOpenLabel : toggleCloselLabel;
   return ___EmotionJSX("div", {
     className: "euiCollapsibleNavButtonWrapper",
     css: cssStyles,
@@ -55,8 +60,8 @@ export var EuiCollapsibleNavButton = /*#__PURE__*/forwardRef(function (_ref, 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)));
 });
 EuiCollapsibleNavButton.displayName = 'EuiCollapsibleNavButton';