@elastic/eui 90.0.0 → 91.1.0

package/optimize/es/components/combo_box/combo_box.js

@@ -405,14 +405,16 @@ export var EuiComboBox = /*#__PURE__*/function (_Component) {
       var _this$props10 = _this.props,
         onSearchChange = _this$props10.onSearchChange,
         delimiter = _this$props10.delimiter;
-      if (onSearchChange) {
-        var _hasMatchingOptions = _this.state.matchingOptions.length > 0;
-        onSearchChange(searchValue, _hasMatchingOptions);
-      }
       _this.setState({
         searchValue: searchValue
       }, function () {
-        if (searchValue && _this.state.isListOpen === false) _this.openList();
+        if (searchValue && _this.state.isListOpen === false) {
+          _this.openList();
+        }
+        if (onSearchChange) {
+          var _hasMatchingOptions = _this.state.matchingOptions.length > 0;
+          onSearchChange(searchValue, _hasMatchingOptions);
+        }
       });
       if (delimiter && searchValue.endsWith(delimiter)) {
         _this.setCustomOptions(false);

package/optimize/es/components/combo_box/combo_box_input/combo_box_input.js

@@ -1,6 +1,6 @@
+import _typeof from "@babel/runtime/helpers/typeof";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _typeof from "@babel/runtime/helpers/typeof";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -25,6 +25,7 @@ import { keys, CanvasTextUtils } from '../../../services';
 import { EuiScreenReaderOnly } from '../../accessibility';
 import { EuiFormControlLayout } from '../../form/form_control_layout';
 import { getFormControlClassNameForIconCount } from '../../form/form_control_layout/_num_icons';
+import { EuiComboBoxOptionAppendPrepend } from '../utils';
 import { EuiComboBoxPill } from './combo_box_pill';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
@@ -51,6 +52,7 @@ export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "updateInputSize", function (inputValue) {
       if (!_this.widthUtils) return;
+      if (_this.asPlainText) return;
       _this.widthUtils.setTextToCheck(inputValue);
       // Canvas has minute subpixel differences in rendering compared to DOM
       // We'll buffer the input by ~2px just to ensure sufficient width
@@ -76,65 +78,42 @@ export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "onKeyDown", function (event) {
       var _this$props2 = _this.props,
         searchValue = _this$props2.searchValue,
+        hasSelectedOptions = _this$props2.hasSelectedOptions,
         selectedOptions = _this$props2.selectedOptions,
         onRemoveOption = _this$props2.onRemoveOption,
         singleSelection = _this$props2.singleSelection,
         isListOpen = _this$props2.isListOpen,
-        onOpenListClick = _this$props2.onOpenListClick;
-
-      // When backspacing from an empty input, delete the last pill option in the list
+        onOpenListClick = _this$props2.onOpenListClick,
+        onChange = _this$props2.onChange;
       var searchIsEmpty = !searchValue.length;
-      var hasPills = selectedOptions.length;
-      if (event.key === keys.BACKSPACE && searchIsEmpty && hasPills) {
-        onRemoveOption(selectedOptions[selectedOptions.length - 1]);
-        if (!!singleSelection && !isListOpen) {
-          onOpenListClick();
+      if (event.key === keys.BACKSPACE) {
+        // When backspacing in a plain text combobox, change normally and remove the selection
+        if (_this.asPlainText) {
+          onChange(event.currentTarget.value);
+          if (hasSelectedOptions) {
+            onRemoveOption(selectedOptions[selectedOptions.length - 1]);
+          }
+        }
+        // When backspacing from an empty input, delete the last pill option in the list
+        else if (searchIsEmpty && hasSelectedOptions) {
+          onRemoveOption(selectedOptions[selectedOptions.length - 1]);
+          if (!!singleSelection && !isListOpen) {
+            onOpenListClick();
+          }
         }
       }
     });
-    return _this;
-  }
-  _createClass(EuiComboBoxInput, [{
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      if (prevProps.searchValue !== this.props.searchValue) {
-        this.updateInputSize(this.props.searchValue);
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props3 = this.props,
-        compressed = _this$props3.compressed,
-        focusedOptionId = _this$props3.focusedOptionId,
-        fullWidth = _this$props3.fullWidth,
-        hasSelectedOptions = _this$props3.hasSelectedOptions,
-        id = _this$props3.id,
-        isDisabled = _this$props3.isDisabled,
-        isListOpen = _this$props3.isListOpen,
-        noIcon = _this$props3.noIcon,
-        _onChange = _this$props3.onChange,
-        onClear = _this$props3.onClear,
-        onClick = _this$props3.onClick,
-        onCloseListClick = _this$props3.onCloseListClick,
-        onOpenListClick = _this$props3.onOpenListClick,
-        onRemoveOption = _this$props3.onRemoveOption,
-        placeholder = _this$props3.placeholder,
-        rootId = _this$props3.rootId,
-        searchValue = _this$props3.searchValue,
+    _defineProperty(_assertThisInitialized(_this), "renderPills", function () {
+      // Don't render a pill for plain text comboboxes - use the input instead
+      if (_this.asPlainText) return null;
+      // Don't render the single pill selection while searching
+      if (_this.props.singleSelection && _this.props.searchValue) return null;
+      var _this$props3 = _this.props,
         selectedOptions = _this$props3.selectedOptions,
-        singleSelectionProp = _this$props3.singleSelection,
-        value = _this$props3.value,
-        prepend = _this$props3.prepend,
-        append = _this$props3.append,
-        isLoading = _this$props3.isLoading,
-        isInvalid = _this$props3.isInvalid,
-        autoFocus = _this$props3.autoFocus,
-        ariaLabel = _this$props3['aria-label'],
-        ariaLabelledby = _this$props3['aria-labelledby'];
-      var singleSelection = Boolean(singleSelectionProp);
-      var asPlainText = singleSelectionProp && _typeof(singleSelectionProp) === 'object' && singleSelectionProp.asPlainText || false;
-      var pills = selectedOptions ? selectedOptions.map(function (option) {
+        isDisabled = _this$props3.isDisabled,
+        onRemoveOption = _this$props3.onRemoveOption;
+      if (!selectedOptions || !selectedOptions.length) return null;
+      return selectedOptions.map(function (option) {
         var key = option.key,
           label = option.label,
           color = option.color,
@@ -143,17 +122,77 @@ export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
           prepend = option.prepend,
           truncationProps = option.truncationProps,
           rest = _objectWithoutProperties(option, _excluded);
-        var pillOnClose = isDisabled || singleSelection || onClick ? undefined : onRemoveOption;
+        var pillOnClose = isDisabled || _this.props.singleSelection || onClick ? undefined : onRemoveOption;
         return ___EmotionJSX(EuiComboBoxPill, _extends({
           option: option,
           onClose: pillOnClose,
           key: key !== null && key !== void 0 ? key : label.toLowerCase(),
           color: color,
           onClick: onClick,
-          onClickAriaLabel: onClick ? 'Change' : undefined,
-          asPlainText: asPlainText
+          onClickAriaLabel: onClick ? 'Change' : undefined
         }, rest), label);
-      }) : null;
+      });
+    });
+    return _this;
+  }
+  _createClass(EuiComboBoxInput, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.searchValue !== this.props.searchValue) {
+        this.updateInputSize(this.props.searchValue);
+      }
+    }
+  }, {
+    key: "asPlainText",
+    get: function get() {
+      var singleSelection = this.props.singleSelection;
+      var isSingleSelectionConfig = singleSelection && _typeof(singleSelection) === 'object';
+      return !!(isSingleSelectionConfig && singleSelection.asPlainText);
+    }
+  }, {
+    key: "searchValue",
+    get: function get() {
+      var _this$props4 = this.props,
+        searchValue = _this$props4.searchValue,
+        selectedOptions = _this$props4.selectedOptions;
+      if (this.asPlainText) {
+        var _selectedOptions$;
+        return searchValue || (selectedOptions === null || selectedOptions === void 0 ? void 0 : (_selectedOptions$ = selectedOptions[0]) === null || _selectedOptions$ === void 0 ? void 0 : _selectedOptions$.label) || '';
+      } else {
+        return searchValue;
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props5 = this.props,
+        compressed = _this$props5.compressed,
+        focusedOptionId = _this$props5.focusedOptionId,
+        fullWidth = _this$props5.fullWidth,
+        hasSelectedOptions = _this$props5.hasSelectedOptions,
+        id = _this$props5.id,
+        isDisabled = _this$props5.isDisabled,
+        isListOpen = _this$props5.isListOpen,
+        noIcon = _this$props5.noIcon,
+        _onChange = _this$props5.onChange,
+        onClear = _this$props5.onClear,
+        onClick = _this$props5.onClick,
+        onFocus = _this$props5.onFocus,
+        onCloseListClick = _this$props5.onCloseListClick,
+        onOpenListClick = _this$props5.onOpenListClick,
+        placeholder = _this$props5.placeholder,
+        rootId = _this$props5.rootId,
+        searchValue = _this$props5.searchValue,
+        selectedOptions = _this$props5.selectedOptions,
+        singleSelection = _this$props5.singleSelection,
+        value = _this$props5.value,
+        prepend = _this$props5.prepend,
+        append = _this$props5.append,
+        isLoading = _this$props5.isLoading,
+        isInvalid = _this$props5.isInvalid,
+        autoFocus = _this$props5.autoFocus,
+        ariaLabel = _this$props5['aria-label'],
+        ariaLabelledby = _this$props5['aria-labelledby'];
       var removeOptionMessage;
       var removeOptionMessageId;
       if (this.state.hasFocus) {
@@ -170,12 +209,7 @@ export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
           id: removeOptionMessageId
         }, removeOptionMessageContent));
       }
-      var placeholderMessage;
-      if (placeholder && selectedOptions && !selectedOptions.length && !searchValue) {
-        placeholderMessage = ___EmotionJSX("p", {
-          className: "euiComboBoxPlaceholder"
-        }, placeholder);
-      }
+      var showPlaceholder = placeholder && !(selectedOptions !== null && selectedOptions !== void 0 && selectedOptions.length) && !searchValue;
       var clickProps = {};
       if (!isDisabled && onClear && hasSelectedOptions) {
         clickProps.clear = {
@@ -205,6 +239,7 @@ export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
         'euiComboBox__inputWrap--compressed': compressed,
         'euiComboBox__inputWrap--fullWidth': fullWidth,
         'euiComboBox__inputWrap--noWrap': singleSelection,
+        'euiComboBox__inputWrap--plainText': this.asPlainText || showPlaceholder,
         'euiComboBox__inputWrap--inGroup': prepend || append
       });
       return ___EmotionJSX(EuiFormControlLayout, _extends({
@@ -222,7 +257,10 @@ export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
         "data-test-subj": "comboBoxInput",
         onClick: onClick,
         tabIndex: -1 // becomes onBlur event's relatedTarget, otherwise relatedTarget is null when clicking on this div
-      }, !singleSelection || !searchValue ? pills : null, placeholderMessage, ___EmotionJSX("input", {
+      }, this.renderPills(), ___EmotionJSX(EuiComboBoxOptionAppendPrepend, {
+        option: this.asPlainText ? selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions[0] : undefined,
+        classNamePrefix: "euiComboBoxPlainTextSelection"
+      }, ___EmotionJSX("input", {
         "aria-activedescendant": focusedOptionId,
         "aria-autocomplete": "list",
         "aria-controls": isListOpen ? rootId('listbox') : '',
@@ -243,11 +281,15 @@ export var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
         ref: this.inputRefCallback,
         role: "combobox",
         style: {
-          inlineSize: this.state.inputWidth
+          inlineSize: this.asPlainText || showPlaceholder ? '100%' : this.state.inputWidth
         },
-        value: searchValue,
+        placeholder: showPlaceholder ? placeholder : undefined,
+        value: this.searchValue,
         autoFocus: autoFocus
-      }), removeOptionMessage));
+        // Force the menu to re-open on every input click - only necessary when plain text
+        ,
+        onClick: this.asPlainText ? onFocus : undefined // Type shenanigans - event should be mostly the same
+      })), removeOptionMessage));
     }
   }]);
   return EuiComboBoxInput;

package/optimize/es/components/combo_box/combo_box_input/combo_box_pill.js

@@ -7,7 +7,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["asPlainText", "children", "className", "color", "onClick", "onClickAriaLabel", "onClose", "option"];
+var _excluded = ["children", "className", "color", "onClick", "onClickAriaLabel", "onClose", "option"];
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /*
@@ -22,6 +22,7 @@ import React, { Component } from 'react';
 import classNames from 'classnames';
 import { EuiBadge } from '../../badge';
 import { EuiI18n } from '../../i18n';
+import { EuiComboBoxOptionAppendPrepend } from '../utils';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
   _inherits(EuiComboBoxPill, _Component);
@@ -48,7 +49,6 @@ export var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this2 = this;
       var _this$props2 = this.props,
-        asPlainText = _this$props2.asPlainText,
         children = _this$props2.children,
         className = _this$props2.className,
         color = _this$props2.color,
@@ -57,20 +57,17 @@ export var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
         onClose = _this$props2.onClose,
         option = _this$props2.option,
         rest = _objectWithoutProperties(_this$props2, _excluded);
-      var classes = classNames('euiComboBoxPill', {
-        'euiComboBoxPill--plainText': asPlainText
-      }, className);
+      var classes = classNames('euiComboBoxPill', className);
       var onClickProps = onClick && onClickAriaLabel ? {
         onClick: onClick,
         onClickAriaLabel: onClickAriaLabel
       } : {};
-      var content = ___EmotionJSX(React.Fragment, null, option.prepend && ___EmotionJSX("span", {
-        className: "euiComboBoxPill__prepend"
-      }, option.prepend), ___EmotionJSX("span", {
+      var content = ___EmotionJSX(EuiComboBoxOptionAppendPrepend, {
+        option: option,
+        classNamePrefix: "euiComboBoxPill"
+      }, ___EmotionJSX("span", {
         className: "eui-textTruncate"
-      }, children), option.append && ___EmotionJSX("span", {
-        className: "euiComboBoxPill__append"
-      }, option.append));
+      }, children));
       if (onClose) {
         return ___EmotionJSX(EuiI18n, {
           token: "euiComboBoxPill.removeSelection",
@@ -91,12 +88,6 @@ export var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
           }, onClickProps, rest), content);
         });
       }
-      if (asPlainText) {
-        return ___EmotionJSX("span", _extends({
-          className: classes,
-          "data-test-subj": "euiComboBoxPill"
-        }, rest), content);
-      }
       return ___EmotionJSX(EuiBadge, _extends({
         className: classes,
         color: color,

package/optimize/es/components/combo_box/combo_box_options_list/combo_box_options_list.js

@@ -36,6 +36,7 @@ import { EuiFilterSelectItem } from '../../filter_group/filter_select_item';
 import { EuiBadge } from '../../badge';
 import { EuiTextTruncate } from '../../text_truncate';
 import { EuiInputPopoverWidthContext } from '../../popover/input_popover';
+import { EuiComboBoxOptionAppendPrepend } from '../utils';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var hitEnterBadge = ___EmotionJSX(EuiBadge, {
   className: "euiComboBoxOption__enterBadge",
@@ -119,13 +120,12 @@ export var EuiComboBoxOptionsList = /*#__PURE__*/function (_Component) {
         title: label
       }, rest), ___EmotionJSX("span", {
         className: "euiComboBoxOption__contentWrapper"
-      }, prepend && ___EmotionJSX("span", {
-        className: "euiComboBoxOption__prepend"
-      }, prepend), ___EmotionJSX("span", {
+      }, ___EmotionJSX(EuiComboBoxOptionAppendPrepend, {
+        option: option,
+        classNamePrefix: "euiComboBoxOption"
+      }, ___EmotionJSX("span", {
         className: "euiComboBoxOption__content"
-      }, renderOption ? renderOption(option, searchValue, 'euiComboBoxOption__renderOption') : _this.renderTruncatedOption(label, truncationProps)), append && ___EmotionJSX("span", {
-        className: "euiComboBoxOption__append"
-      }, append), optionIsFocused && !optionIsDisabled ? hitEnterBadge : null));
+      }, renderOption ? renderOption(option, searchValue, 'euiComboBoxOption__renderOption') : _this.renderTruncatedOption(label, truncationProps))), optionIsFocused && !optionIsDisabled ? hitEnterBadge : null));
     });
     _defineProperty(_assertThisInitialized(_this), "optionWidth", void 0);
     _defineProperty(_assertThisInitialized(_this), "setOptionWidth", function (width) {

package/optimize/es/components/combo_box/utils.js

@@ -0,0 +1,23 @@
+/*
+ * 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 { jsx as ___EmotionJSX } from "@emotion/react";
+/**
+ * DRY util for rendering an option with its prepend and append properties
+ */
+export var EuiComboBoxOptionAppendPrepend = function EuiComboBoxOptionAppendPrepend(_ref) {
+  var children = _ref.children,
+    option = _ref.option,
+    classNamePrefix = _ref.classNamePrefix;
+  return ___EmotionJSX(React.Fragment, null, (option === null || option === void 0 ? void 0 : option.prepend) && ___EmotionJSX("span", {
+    className: "".concat(classNamePrefix, "__prepend")
+  }, option.prepend), children, (option === null || option === void 0 ? void 0 : option.append) && ___EmotionJSX("span", {
+    className: "".concat(classNamePrefix, "__append")
+  }, option.append));
+};

package/optimize/es/components/context_menu/context_menu_item.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "className", "hasPanel", "icon", "buttonRef", "disabled", "layoutAlign", "toolTipTitle", "toolTipContent", "toolTipPosition", "href", "target", "rel", "size"];
+var _excluded = ["children", "className", "hasPanel", "icon", "buttonRef", "disabled", "layoutAlign", "toolTipTitle", "toolTipContent", "toolTipPosition", "toolTipProps", "href", "target", "rel", "size"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -38,6 +38,7 @@ export var EuiContextMenuItem = function EuiContextMenuItem(_ref) {
     toolTipContent = _ref.toolTipContent,
     _ref$toolTipPosition = _ref.toolTipPosition,
     toolTipPosition = _ref$toolTipPosition === void 0 ? 'right' : _ref$toolTipPosition,
+    toolTipProps = _ref.toolTipProps,
     href = _ref.href,
     target = _ref.target,
     rel = _ref.rel,
@@ -89,7 +90,7 @@ export var EuiContextMenuItem = function EuiContextMenuItem(_ref) {
       rel: secureRel,
       ref: buttonRef
     }, rest), buttonContent);
-  } else if (href || rest.onClick) {
+  } else if (href || rest.onClick || toolTipContent) {
     button = ___EmotionJSX("button", _extends({
       disabled: disabled,
       css: cssStyles,
@@ -105,12 +106,14 @@ export var EuiContextMenuItem = function EuiContextMenuItem(_ref) {
     }, rest), buttonContent);
   }
   if (toolTipContent) {
-    return ___EmotionJSX(EuiToolTip, {
+    var anchorClasses = classNames('eui-displayBlock', toolTipProps === null || toolTipProps === void 0 ? void 0 : toolTipProps.anchorClassName);
+    return ___EmotionJSX(EuiToolTip, _extends({
       title: toolTipTitle ? toolTipTitle : null,
-      content: toolTipContent,
-      anchorClassName: "eui-displayBlock",
       position: toolTipPosition
-    }, button);
+    }, toolTipProps, {
+      anchorClassName: anchorClasses,
+      content: toolTipContent
+    }), button);
   } else {
     return button;
   }

package/optimize/es/components/context_menu/context_menu_item.styles.js

@@ -60,7 +60,7 @@ var _ref6 = process.env.NODE_ENV === "production" ? {
 export var euiContextMenuItemStyles = function euiContextMenuItemStyles(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
   return {
-    euiContextMenuItem: /*#__PURE__*/css("display:flex;gap:", euiTheme.size.s, ";", logicalCSS('width', '100%'), " ", logicalTextAlignCSS('left'), " color:", euiTheme.colors.text, ";outline-offset:-", euiTheme.focus.width, ";&:enabled:hover,&:enabled:focus{text-decoration:underline;}&:enabled:focus{background-color:", euiTheme.focus.backgroundColor, ";};label:euiContextMenuItem;"),
+    euiContextMenuItem: /*#__PURE__*/css("display:flex;gap:", euiTheme.size.s, ";", logicalCSS('width', '100%'), " ", logicalTextAlignCSS('left'), " color:", euiTheme.colors.text, ";outline-offset:-", euiTheme.focus.width, ";&:not(:disabled){&:hover,&:focus{text-decoration:underline;}&:focus{background-color:", euiTheme.focus.backgroundColor, ";}};label:euiContextMenuItem;"),
     disabled: /*#__PURE__*/css("color:", euiTheme.colors.disabledText, ";cursor:default;;label:disabled;"),
     layoutAlign: {
       center: _ref6,

package/optimize/es/components/datagrid/body/data_grid_cell.js

@@ -7,7 +7,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["renderCellValue", "column", "setCellContentsRef", "setPopoverAnchorRef", "rowIndex", "colIndex", "ariaRowIndex", "rowHeight", "rowHeightUtils", "isControlColumn", "isFocused", "cellHeightType", "cellActions"],
+var _excluded = ["renderCellValue", "column", "setCellContentsRef", "rowIndex", "colIndex", "ariaRowIndex", "rowHeight", "rowHeightUtils", "isControlColumn", "isFocused", "cellActions"],
   _excluded2 = ["width", "popoverContext", "interactiveCellId", "columnType", "className", "column", "style", "rowHeightUtils", "rowHeightsOptions", "rowManager", "pagination"],
   _excluded3 = ["isExpandable", "style", "className", "data-test-subj"];
 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; }
@@ -41,7 +41,6 @@ var EuiDataGridCellContent = /*#__PURE__*/memo(function (_ref) {
   var renderCellValue = _ref.renderCellValue,
     column = _ref.column,
     setCellContentsRef = _ref.setCellContentsRef,
-    setPopoverAnchorRef = _ref.setPopoverAnchorRef,
     rowIndex = _ref.rowIndex,
     colIndex = _ref.colIndex,
     ariaRowIndex = _ref.ariaRowIndex,
@@ -49,27 +48,17 @@ var EuiDataGridCellContent = /*#__PURE__*/memo(function (_ref) {
     rowHeightUtils = _ref.rowHeightUtils,
     isControlColumn = _ref.isControlColumn,
     isFocused = _ref.isFocused,
-    cellHeightType = _ref.cellHeightType,
     cellActions = _ref.cellActions,
     rest = _objectWithoutProperties(_ref, _excluded);
   // React is more permissible than the TS types indicate
   var CellElement = renderCellValue;
-  var wrapperClasses = classNames('euiDataGridRowCell__contentWrapper', "euiDataGridRowCell__".concat(cellHeightType, "Height"));
-  var classes = classNames('euiDataGridRowCell__content', !isControlColumn && {
+  var cellHeightType = (rowHeightUtils === null || rowHeightUtils === void 0 ? void 0 : rowHeightUtils.getHeightType(rowHeight)) || 'default';
+  var classes = classNames('euiDataGridRowCell__content', "euiDataGridRowCell__content--".concat(cellHeightType, "Height"), !isControlColumn && {
     'eui-textBreakWord': cellHeightType !== 'default',
     'eui-textTruncate': cellHeightType === 'default'
   });
   var cellContent = ___EmotionJSX("div", {
-    ref: function ref(el) {
-      setCellContentsRef(el);
-      setPopoverAnchorRef.current = cellHeightType === 'default' ? // Default height cells need the popover to be anchored on the wrapper,
-      // in order for the popover to centered on the full cell width (as content
-      // width is affected by the width of cell actions)
-      el === null || el === void 0 ? void 0 : el.parentElement :
-      // Numerical height cells need the popover anchor to be below the wrapper
-      // class, in order to set height: 100% on the portalled popover div wrappers
-      el;
-    },
+    ref: setCellContentsRef,
     "data-datagrid-cellcontent": true,
     className: classes
   }, ___EmotionJSX(CellElement, _extends({
@@ -97,9 +86,7 @@ var EuiDataGridCellContent = /*#__PURE__*/memo(function (_ref) {
       row: ariaRowIndex
     }
   })));
-  return ___EmotionJSX("div", {
-    className: wrapperClasses
-  }, cellContent, screenReaderText, cellActions);
+  return ___EmotionJSX(React.Fragment, null, cellContent, screenReaderText, cellActions);
 });
 export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
   _inherits(EuiDataGridCell, _Component);
@@ -121,7 +108,8 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
       isFocused: false,
       isEntered: false,
       enableInteractions: false,
-      disableCellTabIndex: false
+      disableCellTabIndex: false,
+      cellTextAlign: 'Left'
     });
     _defineProperty(_assertThisInitialized(_this), "unsubscribeCell", void 0);
     _defineProperty(_assertThisInitialized(_this), "focusTimeout", void 0);
@@ -224,6 +212,7 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
         _this.contentObserver.disconnect();
       }
       _this.preventTabbing();
+      _this.setCellTextAlign();
     });
     _defineProperty(_assertThisInitialized(_this), "onFocus", function (e) {
       // only perform this logic when the event's originating element (e.target) is
@@ -251,10 +240,6 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
             });
           }
         }, 0);
-        // Close the cell popover if the popover was open and the user clicked the cell
-        if (_this.props.popoverContext.popoverIsOpen) {
-          _this.props.popoverContext.closeCellPopover();
-        }
       }
     });
     _defineProperty(_assertThisInitialized(_this), "onBlur", function () {
@@ -281,6 +266,28 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
         }
       }
     });
+    _defineProperty(_assertThisInitialized(_this), "setCellTextAlign", function () {
+      if (_this.cellContentsRef) {
+        var columnType = _this.props.columnType;
+        if (!columnType) {
+          // If no schema was set, this is likely a left aligned column
+          _this.setState({
+            cellTextAlign: 'Left'
+          });
+        } else if (columnType === 'numeric' || columnType === 'currency') {
+          // Default EUI schemas that we know set right text align
+          _this.setState({
+            cellTextAlign: 'Right'
+          });
+        } else {
+          // If the consumer is using a custom schema, it may have custom text alignment
+          var textAlign = window.getComputedStyle(_this.cellContentsRef).getPropertyValue('text-align');
+          _this.setState({
+            cellTextAlign: textAlign === 'right' || textAlign === 'end' ? 'Right' : 'Left'
+          });
+        }
+      }
+    });
     _defineProperty(_assertThisInitialized(_this), "isExpandable", function () {
       var _this$props$column, _this$props$column$ce, _this$state$cellProps;
       // A cell must always show an expansion popover if it has cell actions,
@@ -301,12 +308,14 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
       if (_this.isPopoverOpen()) {
         var _this$props$popoverCo2 = _this.props.popoverContext,
           setPopoverAnchor = _this$props$popoverCo2.setPopoverAnchor,
+          setPopoverAnchorPosition = _this$props$popoverCo2.setPopoverAnchorPosition,
           setPopoverContent = _this$props$popoverCo2.setPopoverContent,
           setCellPopoverProps = _this$props$popoverCo2.setCellPopoverProps;
 
         // Set popover anchor
         var cellAnchorEl = _this.popoverAnchorRef.current;
         setPopoverAnchor(cellAnchorEl);
+        setPopoverAnchorPosition("down".concat(_this.state.cellTextAlign));
 
         // Set popover contents with cell content
         var _this$props6 = _this.props,
@@ -467,7 +476,7 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
       var isExpandable = this.isExpandable();
       var popoverIsOpen = this.isPopoverOpen();
       var showCellActions = this.state.isFocused || this.state.isEntered || this.state.enableInteractions || popoverIsOpen;
-      var cellClasses = classNames('euiDataGridRowCell', (_classNames = {}, _defineProperty(_classNames, "euiDataGridRowCell--".concat(columnType), columnType), _defineProperty(_classNames, 'euiDataGridRowCell--open', popoverIsOpen), _classNames), className);
+      var cellClasses = classNames('euiDataGridRowCell', "euiDataGridRowCell--align".concat(this.state.cellTextAlign), (_classNames = {}, _defineProperty(_classNames, "euiDataGridRowCell--".concat(columnType), columnType), _defineProperty(_classNames, 'euiDataGridRowCell--open', popoverIsOpen), _classNames), className);
       var ariaRowIndex = pagination ? visibleRowIndex + 1 + pagination.pageSize * pagination.pageIndex : visibleRowIndex + 1;
       var _this$state$cellProps2 = this.state.cellProps,
         _ = _this$state$cellProps2.isExpandable,
@@ -550,28 +559,24 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
         }
       };
       var rowHeight = rowHeightUtils === null || rowHeightUtils === void 0 ? void 0 : rowHeightUtils.getRowHeightOption(rowIndex, rowHeightsOptions);
-      var cellHeightType = (rowHeightUtils === null || rowHeightUtils === void 0 ? void 0 : rowHeightUtils.getHeightType(rowHeight)) || 'default';
       var cellContentProps = _objectSpread(_objectSpread({}, rest), {}, {
         setCellProps: this.setCellProps,
         column: column,
         columnType: columnType,
-        cellHeightType: cellHeightType,
         isExpandable: isExpandable,
         isExpanded: popoverIsOpen,
         isDetails: false,
         isFocused: this.state.isFocused,
         setCellContentsRef: this.setCellContentsRef,
-        setPopoverAnchorRef: this.popoverAnchorRef,
         rowHeight: rowHeight,
         rowHeightUtils: rowHeightUtils,
         isControlColumn: cellClasses.includes('euiDataGridRowCell--controlColumn'),
         ariaRowIndex: ariaRowIndex
       });
-      var cellActions = showCellActions && ___EmotionJSX(EuiDataGridCellActions, {
+      var cellActions = showCellActions && ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiDataGridCellActions, {
         rowIndex: rowIndex,
         colIndex: colIndex,
         column: column,
-        cellHeightType: cellHeightType,
         onExpandClick: function onExpandClick() {
           if (popoverIsOpen) {
             closeCellPopover();
@@ -582,7 +587,10 @@ export var EuiDataGridCell = /*#__PURE__*/function (_Component) {
             });
           }
         }
-      });
+      }), ___EmotionJSX("div", {
+        ref: this.popoverAnchorRef,
+        "data-test-subject": "cellPopoverAnchor"
+      }));
       var cellContent = isExpandable ? ___EmotionJSX(EuiDataGridCellContent, _extends({}, cellContentProps, {
         cellActions: cellActions
       })) : ___EmotionJSX(EuiFocusTrap, {