@elastic/eui 93.5.2 → 93.6.0

package/es/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_link.js

@@ -19,7 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useEuiTheme } from '../../../services';
+import { useEuiMemoizedStyles } from '../../../services';
 import { EuiLink } from '../../link';
 import { euiCollapsibleNavLinkStyles } from './collapsible_nav_link.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -47,8 +47,7 @@ export var EuiCollapsibleNavLink = function EuiCollapsibleNavLink(_ref) {
     linkProps = _ref.linkProps,
     rest = _objectWithoutProperties(_ref, _excluded);
   var classes = classNames('euiCollapsibleNavLink', className, isInteractive && (linkProps === null || linkProps === void 0 ? void 0 : linkProps.className));
-  var euiTheme = useEuiTheme();
-  var styles = euiCollapsibleNavLinkStyles(euiTheme);
+  var styles = useEuiMemoizedStyles(euiCollapsibleNavLinkStyles);
   var cssStyles = [styles.euiCollapsibleNavLink, isSelected && styles.isSelected, isSubItem ? styles.isSubItem : styles.isTopItem.isTopItem, isNotAccordion && !isSubItem && styles.isTopItem.isNotAccordion, isInteractive && !isSelected && !isSubItem && styles.isTopItem.isInteractive, isInteractive && (linkProps === null || linkProps === void 0 ? void 0 : linkProps.css)];
   return isInteractive ? ___EmotionJSX(EuiLink, _extends({
     href: href,

package/es/components/color_picker/color_palette_picker/color_palette_picker.js

@@ -93,6 +93,7 @@ EuiColorPalettePicker.propTypes = {
   "aria-label": PropTypes.string,
   "data-test-subj": PropTypes.string,
   css: PropTypes.any,
+  buttonRef: PropTypes.any,
   /**
      * @default false
      */

package/es/components/combo_box/combo_box.js

@@ -158,10 +158,9 @@ export var EuiComboBox = /*#__PURE__*/function (_Component) {
         options = _this$props2.options,
         selectedOptions = _this$props2.selectedOptions,
         singleSelection = _this$props2.singleSelection;
-      var matchingOptions = _this.state.matchingOptions;
-      if (_this.doesSearchMatchOnlyOption()) {
-        _this.onAddOption(matchingOptions[0], isContainerBlur);
-        return;
+      var matchedOption = _this.doesSearchMatchOnlyOption();
+      if (matchedOption) {
+        return _this.onAddOption(matchedOption, isContainerBlur);
       }
       if (!onCreateOption) {
         return;
@@ -195,13 +194,20 @@ export var EuiComboBox = /*#__PURE__*/function (_Component) {
       }
     });
     _defineProperty(_assertThisInitialized(_this), "doesSearchMatchOnlyOption", function () {
-      var searchValue = _this.state.searchValue;
-      if (_this.state.matchingOptions.length !== 1) {
-        return false;
+      var isCaseSensitive = _this.props.isCaseSensitive;
+      var _this$state = _this.state,
+        matchingOptions = _this$state.matchingOptions,
+        searchValue = _this$state.searchValue;
+      if (!matchingOptions.length) return;
+      var isMatchWithGroup = matchingOptions[0].isGroupLabelOption;
+      var isOnlyOption = matchingOptions.length === (isMatchWithGroup ? 2 : 1);
+      if (!isOnlyOption) return;
+      var matchedOption = matchingOptions[isMatchWithGroup ? 1 : 0];
+      var normalizedSearchSubject = transformForCaseSensitivity(matchedOption.label, isCaseSensitive);
+      var normalizedSearchValue = transformForCaseSensitivity(searchValue, isCaseSensitive);
+      if (normalizedSearchSubject === normalizedSearchValue) {
+        return matchedOption;
       }
-      var normalizedSearchSubject = transformForCaseSensitivity(_this.state.matchingOptions[0].label, _this.props.isCaseSensitive);
-      var normalizedSearchValue = transformForCaseSensitivity(searchValue, _this.props.isCaseSensitive);
-      return normalizedSearchSubject === normalizedSearchValue;
     });
     _defineProperty(_assertThisInitialized(_this), "areAllOptionsSelected", function () {
       var _this$props3 = _this.props,
@@ -468,12 +474,12 @@ export var EuiComboBox = /*#__PURE__*/function (_Component) {
         ariaLabel = _this$props11['aria-label'],
         ariaLabelledby = _this$props11['aria-labelledby'],
         rest = _objectWithoutProperties(_this$props11, _excluded);
-      var _this$state = this.state,
-        activeOptionIndex = _this$state.activeOptionIndex,
-        hasFocus = _this$state.hasFocus,
-        isListOpen = _this$state.isListOpen,
-        searchValue = _this$state.searchValue,
-        matchingOptions = _this$state.matchingOptions;
+      var _this$state2 = this.state,
+        activeOptionIndex = _this$state2.activeOptionIndex,
+        hasFocus = _this$state2.hasFocus,
+        isListOpen = _this$state2.isListOpen,
+        searchValue = _this$state2.searchValue,
+        matchingOptions = _this$state2.matchingOptions;
 
       // Make sure we have a valid ID if users don't pass one as a prop
       var inputId = id !== null && id !== void 0 ? id : this.rootId('_eui-combobox-id');

package/es/components/comment_list/comment_event.js

@@ -9,7 +9,7 @@
 import React, { useMemo } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useEuiTheme } from '../../services';
+import { useEuiMemoizedStyles } from '../../services';
 import { useEuiBorderColorCSS } from '../../global_styling';
 import { EuiPanel } from '../panel';
 import { EuiAvatar } from '../avatar';
@@ -64,13 +64,12 @@ export var EuiCommentEvent = function EuiCommentEvent(_ref) {
   /**
    * Styles
    */
-  var euiTheme = useEuiTheme();
   var borderStyles = useEuiBorderColorCSS();
-  var styles = euiCommentEventStyles(euiTheme);
+  var styles = useEuiMemoizedStyles(euiCommentEventStyles);
   var cssStyles = [styles.euiCommentEvent, showEventBorders && styles.border, showEventBorders && borderStyles[eventColor]];
-  var headerStyles = euiCommentEventHeaderStyles(euiTheme);
+  var headerStyles = useEuiMemoizedStyles(euiCommentEventHeaderStyles);
   var cssHeaderStyles = [headerStyles.euiCommentEvent__header, showEventBorders && headerStyles.border, showEventBorders && borderStyles[eventColor]];
-  var bodyStyles = euiCommentEventBodyStyles(euiTheme);
+  var bodyStyles = useEuiMemoizedStyles(euiCommentEventBodyStyles);
   var cssBodyStyles = [bodyStyles.euiCommentEvent__body, bodyStyles[type]];
   return ___EmotionJSX(Element, {
     className: classes,

package/es/components/context_menu/context_menu.js

@@ -1,6 +1,6 @@
 var _excluded = ["isSeparator", "key"],
   _excluded2 = ["panel", "name", "key", "icon", "onClick"],
-  _excluded3 = ["theme", "panels", "onPanelChange", "className", "initialPanelId", "size"];
+  _excluded3 = ["stylesMemoizer", "panels", "onPanelChange", "className", "initialPanelId", "size"];
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -29,7 +29,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React, { Component, Fragment } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { withEuiTheme } from '../../services';
+import { withEuiStylesMemoizer } from '../../services';
 import { EuiHorizontalRule } from '../horizontal_rule';
 import { EuiContextMenuPanel } from './context_menu_panel';
 import { EuiContextMenuItem } from './context_menu_item';
@@ -288,7 +288,7 @@ export var EuiContextMenuClass = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
-        theme = _this$props2.theme,
+        stylesMemoizer = _this$props2.stylesMemoizer,
         panels = _this$props2.panels,
         onPanelChange = _this$props2.onPanelChange,
         className = _this$props2.className,
@@ -302,10 +302,9 @@ export var EuiContextMenuClass = /*#__PURE__*/function (_Component) {
       }
       var width = this.state.idToPanelMap[this.state.incomingPanelId] && this.state.idToPanelMap[this.state.incomingPanelId].width ? this.state.idToPanelMap[this.state.incomingPanelId].width : undefined;
       var classes = classNames('euiContextMenu', className);
-      var styles = euiContextMenuStyles(theme);
-      var cssStyles = [styles.euiContextMenu];
+      var styles = stylesMemoizer(euiContextMenuStyles);
       return ___EmotionJSX("div", _extends({
-        css: cssStyles,
+        css: styles.euiContextMenu,
         className: classes,
         style: {
           height: this.state.height,
@@ -383,4 +382,4 @@ EuiContextMenuClass.propTypes = {
        */
   size: PropTypes.any
 };
-export var EuiContextMenu = withEuiTheme(EuiContextMenuClass);
+export var EuiContextMenu = withEuiStylesMemoizer(EuiContextMenuClass);

package/es/components/context_menu/context_menu_item.js

@@ -13,7 +13,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useEuiTheme, getSecureRelForTarget, cloneElementWithCss } from '../../services';
+import { useEuiMemoizedStyles, getSecureRelForTarget, cloneElementWithCss } from '../../services';
 import { validateHref } from '../../services/security/href_validator';
 import { keysOf } from '../common';
 import { EuiIcon } from '../icon';
@@ -47,8 +47,7 @@ export var EuiContextMenuItem = function EuiContextMenuItem(_ref) {
   var isHrefValid = !href || validateHref(href);
   var disabled = _disabled || !isHrefValid;
   var classes = classNames('euiContextMenuItem', className);
-  var euiTheme = useEuiTheme();
-  var styles = euiContextMenuItemStyles(euiTheme);
+  var styles = useEuiMemoizedStyles(euiContextMenuItemStyles);
   var cssStyles = [styles.euiContextMenuItem, styles.sizes[size], styles.layoutAlign[layoutAlign], disabled && styles.disabled];
   var iconInstance = icon && (typeof icon === 'string' ? ___EmotionJSX(EuiIcon, {
     type: icon,

package/es/components/context_menu/context_menu_panel.js

@@ -1,4 +1,4 @@
-var _excluded = ["theme", "children", "className", "onClose", "title", "onHeightChange", "transitionType", "transitionDirection", "onTransitionComplete", "onUseKeyboardToNavigate", "items", "initialFocusedItemIndex", "showNextPanel", "showPreviousPanel", "size"];
+var _excluded = ["stylesMemoizer", "children", "className", "onClose", "title", "onHeightChange", "transitionType", "transitionDirection", "onTransitionComplete", "onUseKeyboardToNavigate", "items", "initialFocusedItemIndex", "showNextPanel", "showPreviousPanel", "size"];
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -28,7 +28,7 @@ import React, { cloneElement, Component } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
 import { tabbable } from 'tabbable';
-import { withEuiTheme, keys } from '../../services';
+import { withEuiStylesMemoizer, keys } from '../../services';
 import { EuiResizeObserver } from '../observer/resize_observer';
 import { EuiContextMenuItem } from './context_menu_item';
 import { euiContextMenuPanelStyles } from './context_menu_panel.styles';
@@ -318,7 +318,7 @@ export var EuiContextMenuPanelClass = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this3 = this;
       var _this$props2 = this.props,
-        theme = _this$props2.theme,
+        stylesMemoizer = _this$props2.stylesMemoizer,
         children = _this$props2.children,
         className = _this$props2.className,
         onClose = _this$props2.onClose,
@@ -335,7 +335,7 @@ export var EuiContextMenuPanelClass = /*#__PURE__*/function (_Component) {
         size = _this$props2.size,
         rest = _objectWithoutProperties(_this$props2, _excluded);
       var classes = classNames('euiContextMenuPanel', className);
-      var styles = euiContextMenuPanelStyles(theme);
+      var styles = stylesMemoizer(euiContextMenuPanelStyles);
       var cssStyles = [styles.euiContextMenuPanel, transitionDirection && transitionType && styles[transitionDirection][transitionType]];
       var panelTitle = title && ___EmotionJSX(EuiContextMenuItem, {
         css: styles.euiContextMenuPanel__title,
@@ -417,4 +417,4 @@ EuiContextMenuPanelClass.propTypes = {
        */
   size: PropTypes.any
 };
-export var EuiContextMenuPanel = withEuiTheme(EuiContextMenuPanelClass);
+export var EuiContextMenuPanel = withEuiStylesMemoizer(EuiContextMenuPanelClass);

package/es/components/description_list/description_list.js

@@ -19,7 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useMemo } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useEuiTheme, useIsWithinBreakpoints } from '../../services';
+import { useEuiMemoizedStyles, useIsWithinBreakpoints } from '../../services';
 import { EuiDescriptionListContext } from './description_list_context';
 import { EuiDescriptionListTitle } from './description_list_title';
 import { EuiDescriptionListDescription } from './description_list_description';
@@ -54,8 +54,7 @@ export var EuiDescriptionList = function EuiDescriptionList(_ref) {
       return _type;
     }
   }, [_type, showResponsiveColumns]);
-  var euiTheme = useEuiTheme();
-  var styles = euiDescriptionListStyles(euiTheme);
+  var styles = useEuiMemoizedStyles(euiDescriptionListStyles);
   var cssStyles = [styles.euiDescriptionList, styles[type], styles[align], type === 'column' && styles.rowGap[rowGutterSize], type === 'column' && styles.columnGap[columnGutterSize]];
   var inlineStyles = useMemo(function () {
     if (type === 'column' && columnWidths) {
@@ -72,18 +71,17 @@ export var EuiDescriptionList = function EuiDescriptionList(_ref) {
     return style;
   }, [style, type, columnWidths]);
   var classes = classNames('euiDescriptionList', className);
-  var childrenOrListItems = null;
-  if (listItems) {
-    childrenOrListItems = listItems.map(function (item, index) {
-      return [___EmotionJSX(EuiDescriptionListTitle, _extends({
-        key: "title-".concat(index)
-      }, titleProps), item.title), ___EmotionJSX(EuiDescriptionListDescription, _extends({
-        key: "description-".concat(index)
-      }, descriptionProps), item.description)];
-    });
-  } else {
-    childrenOrListItems = children;
-  }
+  var renderedListItems = useMemo(function () {
+    if (listItems) {
+      return listItems.map(function (item, index) {
+        return [___EmotionJSX(EuiDescriptionListTitle, _extends({
+          key: "title-".concat(index)
+        }, titleProps), item.title), ___EmotionJSX(EuiDescriptionListDescription, _extends({
+          key: "description-".concat(index)
+        }, descriptionProps), item.description)];
+      });
+    }
+  }, [listItems, descriptionProps, titleProps]);
   return ___EmotionJSX(EuiDescriptionListContext.Provider, {
     value: {
       type: type,
@@ -98,7 +96,7 @@ export var EuiDescriptionList = function EuiDescriptionList(_ref) {
     style: inlineStyles
   }, rest, {
     "data-type": _type
-  }), childrenOrListItems));
+  }), listItems ? renderedListItems : children));
 };
 EuiDescriptionList.propTypes = {
   className: PropTypes.string,

package/es/components/description_list/description_list_description.js

@@ -19,7 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useContext } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useEuiTheme } from '../../services';
+import { useEuiMemoizedStyles } from '../../services';
 import { EuiDescriptionListContext } from './description_list_context';
 import { euiDescriptionListDescriptionStyles } from './description_list_description.styles';
 
@@ -34,8 +34,7 @@ export var EuiDescriptionListDescription = function EuiDescriptionListDescriptio
     textStyle = _useContext.textStyle,
     compressed = _useContext.compressed,
     align = _useContext.align;
-  var theme = useEuiTheme();
-  var styles = euiDescriptionListDescriptionStyles(theme);
+  var styles = useEuiMemoizedStyles(euiDescriptionListDescriptionStyles);
   var conditionalStyles = compressed && textStyle === 'reverse' ? [styles.fontStyles.compressed] : [styles.fontStyles[textStyle]];
   switch (type) {
     case 'inline':

package/es/components/description_list/description_list_title.js

@@ -19,7 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useContext } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useEuiTheme } from '../../services';
+import { useEuiMemoizedStyles } from '../../services';
 import { EuiDescriptionListContext } from './description_list_context';
 import { euiDescriptionListTitleStyles } from './description_list_title.styles';
 
@@ -35,8 +35,7 @@ export var EuiDescriptionListTitle = function EuiDescriptionListTitle(_ref) {
     compressed = _useContext.compressed,
     align = _useContext.align,
     rowGutterSize = _useContext.rowGutterSize;
-  var theme = useEuiTheme();
-  var styles = euiDescriptionListTitleStyles(theme);
+  var styles = useEuiMemoizedStyles(euiDescriptionListTitleStyles);
   var conditionalStyles = compressed && textStyle !== 'reverse' ? [styles.fontStyles.compressed] : [styles.fontStyles[textStyle]];
   switch (type) {
     case 'inline':

package/es/components/empty_prompt/empty_prompt.js

@@ -13,7 +13,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useMemo } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useEuiTheme } from '../../services';
+import { useEuiMemoizedStyles } from '../../services';
 import { EuiTitle } from '../title';
 import { EuiFlexGroup, EuiFlexItem } from '../flex';
 import { EuiSpacer } from '../spacer';
@@ -44,10 +44,7 @@ export var EuiEmptyPrompt = function EuiEmptyPrompt(_ref) {
     footer = _ref.footer,
     rest = _objectWithoutProperties(_ref, _excluded);
   var classes = classNames('euiEmptyPrompt', className);
-  var euiTheme = useEuiTheme();
-  var styles = useMemo(function () {
-    return euiEmptyPromptStyles(euiTheme);
-  }, [euiTheme]);
+  var styles = useEuiMemoizedStyles(euiEmptyPromptStyles);
   var cssStyles = [styles.euiEmptyPrompt, styles[layout]];
   var mainStyles = [styles.main.euiEmptyPrompt__main, styles.main[layout], styles.main[paddingSize], layout === 'horizontal' && styles.main.horizontalPadding[paddingSize]];
   var contentStyles = [styles.content.euiEmptyPrompt__content, styles.content[layout]];

package/es/components/flyout/_flyout_close_button.js

@@ -0,0 +1,45 @@
+var _excluded = ["className", "onClick", "onClose", "closeButtonPosition", "side"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+/*
+ * 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.
+ */
+
+import React from 'react';
+import classNames from 'classnames';
+import { useEuiMemoizedStyles } from '../../services';
+import { useEuiI18n } from '../i18n';
+import { EuiButtonIcon } from '../button';
+import { euiFlyoutCloseButtonStyles } from './_flyout_close_button.styles';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+export var EuiFlyoutCloseButton = function EuiFlyoutCloseButton(_ref) {
+  var className = _ref.className,
+    _onClick = _ref.onClick,
+    onClose = _ref.onClose,
+    closeButtonPosition = _ref.closeButtonPosition,
+    side = _ref.side,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var classes = classNames('euiFlyout__closeButton', className);
+  var styles = useEuiMemoizedStyles(euiFlyoutCloseButtonStyles);
+  var cssStyles = [styles.euiFlyout__closeButton, styles[closeButtonPosition], closeButtonPosition === 'outside' && styles.outsideSide[side]];
+  var ariaLabel = useEuiI18n('euiFlyoutCloseButton.ariaLabel', 'Close this dialog');
+  return ___EmotionJSX(EuiButtonIcon, _extends({
+    display: closeButtonPosition === 'outside' ? 'fill' : 'empty',
+    iconType: "cross",
+    color: "text",
+    "aria-label": ariaLabel,
+    "data-test-subj": "euiFlyoutCloseButton"
+  }, rest, {
+    className: classes,
+    css: cssStyles,
+    onClick: function onClick(e) {
+      onClose(e.nativeEvent);
+      _onClick === null || _onClick === void 0 ? void 0 : _onClick(e);
+    }
+  }));
+};

package/es/components/flyout/_flyout_close_button.styles.js

@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+import { css } from '@emotion/react';
+import { euiMaxBreakpoint, euiMinBreakpoint, logicalCSS } from '../../global_styling';
+import { euiShadowXLarge } from '../../themes/amsterdam/global_styling/mixins';
+import { transparentize } from '../../services';
+import { FLYOUT_BREAKPOINT } from './flyout.styles';
+export var euiFlyoutCloseButtonStyles = function euiFlyoutCloseButtonStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  return {
+    euiFlyout__closeButton: /*#__PURE__*/css("position:absolute;", logicalCSS('right', euiTheme.size.s), " ", logicalCSS('top', euiTheme.size.s), " z-index:3;;label:euiFlyout__closeButton;"),
+    inside: /*#__PURE__*/css("background-color:", transparentize(euiTheme.colors.emptyShade, 0.9), ";;label:inside;"),
+    outside: /*#__PURE__*/css(euiShadowXLarge(euiThemeContext), "animation:none!important;;label:outside;"),
+    outsideSide: {
+      // `transforms` pull in close buttons a little
+      // `!important` is necessary here to override the hover/focus transitions of buttons
+      right: /*#__PURE__*/css(logicalCSS('left', 0), " ", euiMaxBreakpoint(euiThemeContext, FLYOUT_BREAKPOINT), "{transform:translateX(calc(-100% - ", euiTheme.size.xs, "))!important;}", euiMinBreakpoint(euiThemeContext, FLYOUT_BREAKPOINT), "{transform:translateX(calc(-100% - ", euiTheme.size.l, "))!important;};label:right;"),
+      left: /*#__PURE__*/css(logicalCSS('right', 0), " ", euiMaxBreakpoint(euiThemeContext, FLYOUT_BREAKPOINT), "{transform:translateX(calc(100% + ", euiTheme.size.xs, "))!important;}", euiMinBreakpoint(euiThemeContext, FLYOUT_BREAKPOINT), "{transform:translateX(calc(100% + ", euiTheme.size.l, "))!important;};label:left;")
+    }
+  };
+};

package/es/components/flyout/flyout.js

@@ -1,10 +1,11 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["className", "children", "as", "hideCloseButton", "closeButtonProps", "closeButtonPosition", "onClose", "ownFocus", "side", "size", "paddingSize", "maxWidth", "style", "maskProps", "type", "outsideClickCloses", "pushMinBreakpoint", "pushAnimation", "focusTrapProps", "includeFixedHeadersInFocusTrap", "aria-describedby"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+import PropTypes from "prop-types";
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -28,16 +29,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React, { useEffect, useRef, useMemo, useCallback, useState, forwardRef } from 'react';
 import classnames from 'classnames';
-import { keys, EuiWindowEvent, useCombinedRefs, useIsWithinMinBreakpoint, useEuiTheme, useGeneratedHtmlId } from '../../services';
+import { keys, EuiWindowEvent, useCombinedRefs, useIsWithinMinBreakpoint, useEuiMemoizedStyles, useGeneratedHtmlId } from '../../services';
 import { logicalStyle } from '../../global_styling';
 import { EuiFocusTrap } from '../focus_trap';
 import { EuiOverlayMask } from '../overlay_mask';
-import { EuiButtonIcon } from '../button';
 import { EuiI18n } from '../i18n';
 import { useResizeObserver } from '../observer/resize_observer';
 import { EuiPortal } from '../portal';
 import { EuiScreenReaderOnly } from '../accessibility';
-import { euiFlyoutStyles, euiFlyoutCloseButtonStyles } from './flyout.styles';
+import { EuiFlyoutCloseButton } from './_flyout_close_button';
+import { euiFlyoutStyles } from './flyout.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var TYPES = ['push', 'overlay'];
 export var SIDES = ['left', 'right'];
@@ -143,36 +144,9 @@ export var EuiFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var maxWidthStyle = typeof maxWidth !== 'boolean' && logicalStyle('max-width', maxWidth);
     return _objectSpread(_objectSpread(_objectSpread({}, style), widthStyle), maxWidthStyle);
   }, [style, maxWidth, size]);
-  var euiTheme = useEuiTheme();
-  var styles = euiFlyoutStyles(euiTheme);
+  var styles = useEuiMemoizedStyles(euiFlyoutStyles);
   var cssStyles = [styles.euiFlyout, styles.paddingSizes[paddingSize], isEuiFlyoutSizeNamed(size) && styles[size], maxWidth === false && styles.noMaxWidth, isPushed ? styles.push.push : styles.overlay, isPushed && styles.push[side], isPushed && !pushAnimation && styles.push.noAnimation, styles[side]];
   var classes = classnames('euiFlyout', className);
-  var closeButton = useMemo(function () {
-    if (hideCloseButton || !onClose) return null;
-    var closeButtonClasses = classnames('euiFlyout__closeButton', closeButtonProps === null || closeButtonProps === void 0 ? void 0 : closeButtonProps.className);
-    var closeButtonStyles = euiFlyoutCloseButtonStyles(euiTheme);
-    var closeButtonCssStyles = [closeButtonStyles.euiFlyout__closeButton, closeButtonStyles[closeButtonPosition], closeButtonPosition === 'outside' && closeButtonStyles.outsideSide[side], closeButtonProps === null || closeButtonProps === void 0 ? void 0 : closeButtonProps.css];
-    return ___EmotionJSX(EuiI18n, {
-      token: "euiFlyout.closeAriaLabel",
-      default: "Close this dialog"
-    }, function (closeAriaLabel) {
-      return ___EmotionJSX(EuiButtonIcon, _extends({
-        display: closeButtonPosition === 'outside' ? 'fill' : 'empty',
-        iconType: "cross",
-        color: "text",
-        "aria-label": closeAriaLabel,
-        "data-test-subj": "euiFlyoutCloseButton"
-      }, closeButtonProps, {
-        className: closeButtonClasses,
-        css: closeButtonCssStyles,
-        onClick: function onClick(e) {
-          var _closeButtonProps$onC;
-          onClose(e.nativeEvent);
-          closeButtonProps === null || closeButtonProps === void 0 ? void 0 : (_closeButtonProps$onC = closeButtonProps.onClick) === null || _closeButtonProps$onC === void 0 ? void 0 : _closeButtonProps$onC.call(closeButtonProps, e);
-        }
-      }));
-    });
-  }, [onClose, hideCloseButton, closeButtonPosition, closeButtonProps, side, euiTheme]);
 
   /*
    * If not disabled, automatically add fixed EuiHeaders as shards
@@ -214,18 +188,20 @@ export var EuiFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var hasOverlayMask = ownFocus && !isPushed;
   var descriptionId = useGeneratedHtmlId();
   var ariaDescribedBy = classnames(descriptionId, _ariaDescribedBy);
-  var screenReaderDescription = ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", {
-    id: descriptionId
-  }, hasOverlayMask ? ___EmotionJSX(EuiI18n, {
-    token: "euiFlyout.screenReaderModalDialog",
-    default: "You are in a modal dialog. Press Escape or tap/click outside the dialog on the shadowed overlay to close."
-  }) : ___EmotionJSX(EuiI18n, {
-    token: "euiFlyout.screenReaderNonModalDialog",
-    default: "You are in a non-modal dialog. To close the dialog, press Escape."
-  }), ' ', fixedHeaders.length > 0 && ___EmotionJSX(EuiI18n, {
-    token: "euiFlyout.screenReaderFixedHeaders",
-    default: "You can still continue tabbing through the page headers in addition to the dialog."
-  })));
+  var screenReaderDescription = useMemo(function () {
+    return ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", {
+      id: descriptionId
+    }, hasOverlayMask ? ___EmotionJSX(EuiI18n, {
+      token: "euiFlyout.screenReaderModalDialog",
+      default: "You are in a modal dialog. Press Escape or tap/click outside the dialog on the shadowed overlay to close."
+    }) : ___EmotionJSX(EuiI18n, {
+      token: "euiFlyout.screenReaderNonModalDialog",
+      default: "You are in a non-modal dialog. To close the dialog, press Escape."
+    }), ' ', fixedHeaders.length > 0 && ___EmotionJSX(EuiI18n, {
+      token: "euiFlyout.screenReaderFixedHeaders",
+      default: "You can still continue tabbing through the page headers in addition to the dialog."
+    })));
+  }, [hasOverlayMask, descriptionId, fixedHeaders.length]);
 
   /*
    * Trap focus even when `ownFocus={false}`, otherwise closing
@@ -252,7 +228,16 @@ export var EuiFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
     // Otherwise if ownFocus is false and outsideClickCloses is undefined, outside clicks should not close the flyout
     return undefined;
   }, [onClose, hasOverlayMask, outsideClickCloses]);
-  var flyout = ___EmotionJSX(EuiFocusTrap, _extends({
+  return ___EmotionJSX(EuiFlyoutWrapper, {
+    hasOverlayMask: hasOverlayMask,
+    maskProps: _objectSpread(_objectSpread({}, maskProps), {}, {
+      maskRef: useCombinedRefs([maskProps === null || maskProps === void 0 ? void 0 : maskProps.maskRef, maskRef])
+    }),
+    isPortalled: !isPushed
+  }, ___EmotionJSX(EuiWindowEvent, {
+    event: "keydown",
+    handler: onKeyDown
+  }), ___EmotionJSX(EuiFocusTrap, _extends({
     disabled: isPushed,
     scrollLock: hasOverlayMask,
     clickOutsideDisables: !ownFocus,
@@ -267,28 +252,56 @@ export var EuiFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
     tabIndex: !isPushed ? 0 : rest.tabIndex,
     "aria-describedby": !isPushed ? ariaDescribedBy : _ariaDescribedBy,
     "data-autofocus": !isPushed || undefined
-  }), !isPushed && screenReaderDescription, closeButton, children));
-
-  // If ownFocus is set, wrap with an overlay and allow the user to click it to close it.
-  var mergedMaskProps = _objectSpread(_objectSpread({}, maskProps), {}, {
-    maskRef: useCombinedRefs([maskProps === null || maskProps === void 0 ? void 0 : maskProps.maskRef, maskRef])
-  });
-  if (hasOverlayMask) {
-    flyout = ___EmotionJSX(EuiOverlayMask, _extends({
-      headerZindexLocation: "below"
-    }, mergedMaskProps), flyout);
-  } else if (!isPushed) {
-    // Otherwise still wrap within an EuiPortal so it appends (unless it is the push style)
-    flyout = ___EmotionJSX(EuiPortal, null, flyout);
-  }
-  return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiWindowEvent, {
-    event: "keydown",
-    handler: onKeyDown
-  }), flyout);
+  }), !isPushed && screenReaderDescription, !hideCloseButton && onClose && ___EmotionJSX(EuiFlyoutCloseButton, _extends({}, closeButtonProps, {
+    onClose: onClose,
+    closeButtonPosition: closeButtonPosition,
+    side: side
+  })), children)));
 }
 // React.forwardRef interferes with the inferred element type
 // Casting to ensure correct element prop type checking for `as`
 // e.g., `href` is not on a `div`
 );
 // Recast to allow `displayName`
-EuiFlyout.displayName = 'EuiFlyout';
+EuiFlyout.displayName = 'EuiFlyout';
+
+/**
+ * Light wrapper for conditionally rendering portals or overlay masks:
+ *  - If ownFocus is set, wrap with an overlay and allow the user to click it to close it.
+ *  - Otherwise still wrap within an EuiPortal so it appends to the bottom of the window.
+ * Push flyouts have no overlay OR portal behavior.
+ */
+var EuiFlyoutWrapper = function EuiFlyoutWrapper(_ref2) {
+  var children = _ref2.children,
+    hasOverlayMask = _ref2.hasOverlayMask,
+    maskProps = _ref2.maskProps,
+    isPortalled = _ref2.isPortalled;
+  if (hasOverlayMask) {
+    return ___EmotionJSX(EuiOverlayMask, _extends({
+      headerZindexLocation: "below"
+    }, maskProps), children);
+  } else if (isPortalled) {
+    return ___EmotionJSX(EuiPortal, null, children);
+  } else {
+    return ___EmotionJSX(React.Fragment, null, children);
+  }
+};
+EuiFlyoutWrapper.propTypes = {
+  children: PropTypes.node.isRequired,
+  hasOverlayMask: PropTypes.bool.isRequired,
+  maskProps: PropTypes.shape({
+    /**
+       * ReactNode to render as this component's content
+       */
+    children: PropTypes.node,
+    /**
+       * Should the mask visually sit above or below the EuiHeader (controlled by z-index)
+       */
+    headerZindexLocation: PropTypes.oneOf(["above", "below"]),
+    /**
+       * React ref to be passed to the wrapping container
+       */
+    maskRef: PropTypes.oneOfType([PropTypes.any.isRequired, PropTypes.any.isRequired])
+  }).isRequired,
+  isPortalled: PropTypes.bool.isRequired
+};