@elastic/eui 89.0.0 → 90.0.0

package/optimize/lib/components/context_menu/context_menu_panel.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SIZES = exports.EuiContextMenuPanel = void 0;
+exports.SIZES = exports.EuiContextMenuPanelClass = exports.EuiContextMenuPanel = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -18,13 +18,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _tabbable = require("tabbable");
-var _common = require("../common");
-var _icon = require("../icon");
-var _resize_observer = require("../observer/resize_observer");
 var _services = require("../../services");
+var _resize_observer = require("../observer/resize_observer");
 var _context_menu_item = require("./context_menu_item");
+var _context_menu_panel = require("./context_menu_panel.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["children", "className", "onClose", "title", "onHeightChange", "transitionType", "transitionDirection", "onTransitionComplete", "onUseKeyboardToNavigate", "items", "initialFocusedItemIndex", "showNextPanel", "showPreviousPanel", "size"];
+var _excluded = ["theme", "children", "className", "onClose", "title", "onHeightChange", "transitionType", "transitionDirection", "onTransitionComplete", "onUseKeyboardToNavigate", "items", "initialFocusedItemIndex", "showNextPanel", "showPreviousPanel", "size"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -35,28 +34,14 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
                                                                                                                                                                                                                                                                                                                                            * in compliance with, at your election, the Elastic License 2.0 or the Server
                                                                                                                                                                                                                                                                                                                                            * Side Public License, v 1.
                                                                                                                                                                                                                                                                                                                                            */
-var titleSizeToClassNameMap = {
-  s: 'euiContextMenuPanelTitle--small',
-  m: null
-};
-var SIZES = (0, _common.keysOf)(titleSizeToClassNameMap);
+var SIZES = ['s', 'm'];
 exports.SIZES = SIZES;
-var transitionDirectionAndTypeToClassNameMap = {
-  next: {
-    in: 'euiContextMenuPanel-txInLeft',
-    out: 'euiContextMenuPanel-txOutLeft'
-  },
-  previous: {
-    in: 'euiContextMenuPanel-txInRight',
-    out: 'euiContextMenuPanel-txOutRight'
-  }
-};
-var EuiContextMenuPanel = /*#__PURE__*/function (_Component) {
-  (0, _inherits2.default)(EuiContextMenuPanel, _Component);
-  var _super = _createSuper(EuiContextMenuPanel);
-  function EuiContextMenuPanel(props) {
+var EuiContextMenuPanelClass = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(EuiContextMenuPanelClass, _Component);
+  var _super = _createSuper(EuiContextMenuPanelClass);
+  function EuiContextMenuPanelClass(props) {
     var _this;
-    (0, _classCallCheck2.default)(this, EuiContextMenuPanel);
+    (0, _classCallCheck2.default)(this, EuiContextMenuPanelClass);
     _this = _super.call(this, props);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "_isMounted", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "backButton", null);
@@ -191,7 +176,7 @@ var EuiContextMenuPanel = /*#__PURE__*/function (_Component) {
     };
     return _this;
   }
-  (0, _createClass2.default)(EuiContextMenuPanel, [{
+  (0, _createClass2.default)(EuiContextMenuPanelClass, [{
     key: "takeInitialFocus",
     value: function takeInitialFocus() {
       var _this2 = this;
@@ -335,6 +320,7 @@ var EuiContextMenuPanel = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this3 = this;
       var _this$props2 = this.props,
+        theme = _this$props2.theme,
         children = _this$props2.children,
         className = _this$props2.className,
         onClose = _this$props2.onClose,
@@ -350,36 +336,19 @@ var EuiContextMenuPanel = /*#__PURE__*/function (_Component) {
         showPreviousPanel = _this$props2.showPreviousPanel,
         size = _this$props2.size,
         rest = (0, _objectWithoutProperties2.default)(_this$props2, _excluded);
-      var panelTitle;
-      if (title) {
-        var titleClasses = (0, _classnames.default)('euiContextMenuPanelTitle', size && titleSizeToClassNameMap[size]);
-        if (Boolean(onClose)) {
-          panelTitle = (0, _react2.jsx)("button", {
-            className: titleClasses,
-            type: "button",
-            onClick: onClose,
-            ref: function ref(node) {
-              _this3.backButton = node;
-            },
-            "data-test-subj": "contextMenuPanelTitleButton"
-          }, (0, _react2.jsx)("span", {
-            className: "euiContextMenu__itemLayout"
-          }, (0, _react2.jsx)(_icon.EuiIcon, {
-            type: "arrowLeft",
-            size: "m",
-            className: "euiContextMenu__icon"
-          }), (0, _react2.jsx)("span", {
-            className: "euiContextMenu__text"
-          }, title)));
-        } else {
-          panelTitle = (0, _react2.jsx)("div", {
-            className: titleClasses
-          }, (0, _react2.jsx)("span", {
-            className: "euiContextMenu__itemLayout"
-          }, title));
-        }
-      }
-      var classes = (0, _classnames.default)('euiContextMenuPanel', className, transitionDirection && transitionType && transitionDirectionAndTypeToClassNameMap[transitionDirection] ? transitionDirectionAndTypeToClassNameMap[transitionDirection][transitionType] : undefined);
+      var classes = (0, _classnames.default)('euiContextMenuPanel', className);
+      var styles = (0, _context_menu_panel.euiContextMenuPanelStyles)(theme);
+      var cssStyles = [styles.euiContextMenuPanel, transitionDirection && transitionType && styles[transitionDirection][transitionType]];
+      var panelTitle = title && (0, _react2.jsx)(_context_menu_item.EuiContextMenuItem, {
+        css: styles.euiContextMenuPanel__title,
+        className: "euiContextMenuPanel__title",
+        onClick: onClose,
+        buttonRef: function buttonRef(node) {
+          if (onClose) _this3.backButton = node;
+        },
+        "data-test-subj": onClose ? 'contextMenuPanelTitleButton' : 'contextMenuPanelTitle',
+        icon: onClose && 'arrowLeft'
+      }, title);
       var content = items && items.length ? items.map(function (MenuItem) {
         var cloneProps = {};
         if (size) {
@@ -389,6 +358,7 @@ var EuiContextMenuPanel = /*#__PURE__*/function (_Component) {
       }) : children;
       return (0, _react2.jsx)("div", (0, _extends2.default)({
         ref: this.panelRef,
+        css: cssStyles,
         className: classes,
         onKeyDown: this.onKeyDown,
         tabIndex: -1,
@@ -423,9 +393,11 @@ var EuiContextMenuPanel = /*#__PURE__*/function (_Component) {
       return null;
     }
   }]);
-  return EuiContextMenuPanel;
+  return EuiContextMenuPanelClass;
 }(_react.Component);
-exports.EuiContextMenuPanel = EuiContextMenuPanel;
-(0, _defineProperty2.default)(EuiContextMenuPanel, "defaultProps", {
+exports.EuiContextMenuPanelClass = EuiContextMenuPanelClass;
+(0, _defineProperty2.default)(EuiContextMenuPanelClass, "defaultProps", {
   items: []
-});
+});
+var EuiContextMenuPanel = (0, _services.withEuiTheme)(EuiContextMenuPanelClass);
+exports.EuiContextMenuPanel = EuiContextMenuPanel;

package/optimize/lib/components/context_menu/context_menu_panel.styles.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.euiContextMenuPanelStyles = void 0;
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+var _react = require("@emotion/react");
+var _global_styling = require("../../global_styling");
+var _title = require("../title/title.styles");
+var _context_menu = require("./context_menu.styles");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+var euiContextMenuPanelStyles = function euiContextMenuPanelStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var _euiContextMenuVariab = (0, _context_menu.euiContextMenuVariables)(euiThemeContext),
+    panelWidth = _euiContextMenuVariab.panelWidth;
+  var animations = {
+    transitioning: /*#__PURE__*/(0, _react.css)("pointer-events:none;animation-fill-mode:forwards;animation-duration:", euiTheme.animation.normal, ";animation-timing-function:", euiTheme.animation.resistance, ";", _global_styling.euiCantAnimate, "{animation-duration:0s;};label:transitioning;"),
+    inLeft: (0, _react.keyframes)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n      0% { transform: translateX(", "); }\n      100% { transform: translateX(0); }\n    "])), panelWidth),
+    outLeft: (0, _react.keyframes)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n      0% { transform: translateX(0); }\n      100% { transform: translateX(-", "); }\n    "])), panelWidth),
+    inRight: (0, _react.keyframes)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n      0% { transform: translateX(-", "); }\n      100% { transform: translateX(0); }\n    "])), panelWidth),
+    outRight: (0, _react.keyframes)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n      0% { transform: translateX(0); }\n      100% { transform: translateX(", "); }\n    "])), panelWidth)
+  };
+  return {
+    euiContextMenuPanel: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('width', '100%'), " visibility:visible;outline-offset:-", euiTheme.focus.width, ";&:focus{outline:none;};label:euiContextMenuPanel;"),
+    // Panel animations
+    next: {
+      in: /*#__PURE__*/(0, _react.css)(animations.transitioning, " animation-name:", animations.inLeft, ";;label:in;"),
+      out: /*#__PURE__*/(0, _react.css)(animations.transitioning, " animation-name:", animations.outLeft, ";;label:out;")
+    },
+    previous: {
+      in: /*#__PURE__*/(0, _react.css)(animations.transitioning, " animation-name:", animations.inRight, ";;label:in;"),
+      out: /*#__PURE__*/(0, _react.css)(animations.transitioning, " animation-name:", animations.outRight, ";;label:out;")
+    },
+    // Children
+    euiContextMenuPanel__title: /*#__PURE__*/(0, _react.css)((0, _title.euiTitle)(euiThemeContext, 'xxs'), " ", (0, _global_styling.logicalCSS)('border-bottom', euiTheme.border.thin), " &:enabled:focus{background-color:unset;};label:euiContextMenuPanel__title;")
+  };
+};
+exports.euiContextMenuPanelStyles = euiContextMenuPanelStyles;

package/optimize/lib/components/control_bar/control_bar.js

@@ -17,6 +17,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
+var _services = require("../../services");
 var _accessibility = require("../accessibility");
 var _breadcrumbs = require("../breadcrumbs");
 var _button = require("../button");
@@ -153,8 +154,7 @@ var EuiControlBar = /*#__PURE__*/function (_Component) {
             {
               var controlType = control.controlType,
                 id = control.id,
-                _control$color = control.color,
-                color = _control$color === void 0 ? 'ghost' : _control$color,
+                color = control.color,
                 label = control.label,
                 _className = control.className,
                 _rest = (0, _objectWithoutProperties2.default)(control, _excluded2);
@@ -172,8 +172,8 @@ var EuiControlBar = /*#__PURE__*/function (_Component) {
                 _id = control.id,
                 iconType = control.iconType,
                 _className2 = control.className,
-                _control$color2 = control.color,
-                _color = _control$color2 === void 0 ? 'ghost' : _control$color2,
+                _control$color = control.color,
+                _color = _control$color === void 0 ? 'text' : _control$color,
                 onClick = control.onClick,
                 href = control.href,
                 _rest2 = (0, _objectWithoutProperties2.default)(control, _excluded3);
@@ -249,25 +249,30 @@ var EuiControlBar = /*#__PURE__*/function (_Component) {
         token: "euiControlBar.screenReaderHeading",
         default: "Page level controls"
       }, function (screenReaderHeading) {
-        return (
-          // Though it would be better to use aria-labelledby than aria-label and not repeat the same string twice
-          // A bug in voiceover won't list some landmarks in the rotor without an aria-label
-          (0, _react2.jsx)("section", (0, _extends2.default)({
-            className: classes,
-            "aria-label": landmarkHeading ? landmarkHeading : screenReaderHeading
-          }, rest, {
-            style: styles
-          }), (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, null, (0, _react2.jsx)("h2", null, landmarkHeading ? landmarkHeading : screenReaderHeading)), (0, _react2.jsx)("div", {
-            className: "euiControlBar__controls",
-            ref: function ref(node) {
-              _this2.bar = node;
-            }
-          }, controls.map(function (control, index) {
-            return controlItem(control, index);
-          })), _this2.props.showContent ? (0, _react2.jsx)("div", {
-            className: "euiControlBar__content"
-          }, children) : null)
-        );
+        return (0, _react2.jsx)(_services.EuiThemeProvider, {
+          colorMode: "dark",
+          wrapperProps: {
+            cloneElement: true
+          }
+        }, (0, _react2.jsx)("section", (0, _extends2.default)({
+          className: classes
+          // Though it would be better to use aria-labelledby than aria-label
+          // and not repeat the same string twice, a bug in voiceover won't list
+          // some landmarks in the rotor without an aria-label
+          ,
+          "aria-label": landmarkHeading ? landmarkHeading : screenReaderHeading
+        }, rest, {
+          style: styles
+        }), (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, null, (0, _react2.jsx)("h2", null, landmarkHeading ? landmarkHeading : screenReaderHeading)), (0, _react2.jsx)("div", {
+          className: "euiControlBar__controls",
+          ref: function ref(node) {
+            _this2.bar = node;
+          }
+        }, controls.map(function (control, index) {
+          return controlItem(control, index);
+        })), _this2.props.showContent ? (0, _react2.jsx)("div", {
+          className: "euiControlBar__content"
+        }, children) : null));
       });
       return position === 'fixed' ? (0, _react2.jsx)(_portal.EuiPortal, null, controlBar, (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, null, (0, _react2.jsx)("p", {
         "aria-live": "assertive"

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

@@ -23,13 +23,14 @@ var _services = require("../../../services");
 var _accessibility = require("../../accessibility");
 var _focus_trap = require("../../focus_trap");
 var _i18n = require("../../i18n");
+var _text_truncate = require("../../text_truncate");
 var _resize_observer = require("../../observer/resize_observer/resize_observer");
 var _focus = require("../utils/focus");
 var _data_grid_cell_actions = require("./data_grid_cell_actions");
 var _data_grid_cell_popover = require("./data_grid_cell_popover");
 var _utils = require("../../../utils");
 var _react2 = require("@emotion/react");
-var _excluded = ["renderCellValue", "column", "setCellContentsRef", "rowHeightsOptions", "rowIndex", "colIndex", "ariaRowIndex", "rowHeightUtils", "isDefinedHeight", "isFocused"],
+var _excluded = ["renderCellValue", "column", "setCellContentsRef", "setPopoverAnchorRef", "rowIndex", "colIndex", "ariaRowIndex", "rowHeight", "rowHeightUtils", "isControlColumn", "isFocused", "cellHeightType", "cellActions"],
   _excluded2 = ["width", "popoverContext", "interactiveCellId", "columnType", "className", "column", "style", "rowHeightUtils", "rowHeightsOptions", "rowManager", "pagination"],
   _excluded3 = ["isExpandable", "style", "className", "data-test-subj"];
 /*
@@ -49,28 +50,52 @@ var EuiDataGridCellContent = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var renderCellValue = _ref.renderCellValue,
     column = _ref.column,
     setCellContentsRef = _ref.setCellContentsRef,
-    rowHeightsOptions = _ref.rowHeightsOptions,
+    setPopoverAnchorRef = _ref.setPopoverAnchorRef,
     rowIndex = _ref.rowIndex,
     colIndex = _ref.colIndex,
     ariaRowIndex = _ref.ariaRowIndex,
+    rowHeight = _ref.rowHeight,
     rowHeightUtils = _ref.rowHeightUtils,
-    isDefinedHeight = _ref.isDefinedHeight,
+    isControlColumn = _ref.isControlColumn,
     isFocused = _ref.isFocused,
+    cellHeightType = _ref.cellHeightType,
+    cellActions = _ref.cellActions,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // React is more permissible than the TS types indicate
   var CellElement = renderCellValue;
-  return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("div", {
-    ref: setCellContentsRef,
+  var wrapperClasses = (0, _classnames.default)('euiDataGridRowCell__contentWrapper', "euiDataGridRowCell__".concat(cellHeightType, "Height"));
+  var classes = (0, _classnames.default)('euiDataGridRowCell__content', !isControlColumn && {
+    'eui-textBreakWord': cellHeightType !== 'default',
+    'eui-textTruncate': cellHeightType === 'default'
+  });
+  var cellContent = (0, _react2.jsx)("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;
+    },
     "data-datagrid-cellcontent": true,
-    className: isDefinedHeight ? 'euiDataGridRowCell__definedHeight' : 'euiDataGridRowCell__truncate',
-    style: isDefinedHeight ? rowHeightUtils === null || rowHeightUtils === void 0 ? void 0 : rowHeightUtils.getStylesForCell(rowHeightsOptions, rowIndex) : {}
+    className: classes
   }, (0, _react2.jsx)(CellElement, (0, _extends2.default)({
     isDetails: false,
     "data-test-subj": "cell-content",
     rowIndex: rowIndex,
     colIndex: colIndex,
     schema: (column === null || column === void 0 ? void 0 : column.schema) || rest.columnType
-  }, rest))), (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, null, (0, _react2.jsx)("p", {
+  }, rest)));
+  if (cellHeightType === 'lineCount' && !isControlColumn) {
+    var lines = rowHeightUtils.getLineCount(rowHeight);
+    cellContent = (0, _react2.jsx)(_text_truncate.EuiTextBlockTruncate, {
+      lines: lines,
+      cloneElement: true
+    }, cellContent);
+  }
+  var screenReaderText = (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, null, (0, _react2.jsx)("p", {
     hidden: !isFocused
   }, '- ', (0, _react2.jsx)(_i18n.EuiI18n, {
     token: "euiDataGridCell.position",
@@ -80,7 +105,10 @@ var EuiDataGridCellContent = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       col: colIndex + 1,
       row: ariaRowIndex
     }
-  }))));
+  })));
+  return (0, _react2.jsx)("div", {
+    className: wrapperClasses
+  }, cellContent, screenReaderText, cellActions);
 });
 var EuiDataGridCell = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(EuiDataGridCell, _Component);
@@ -530,24 +558,43 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
           }
         }
       };
-      var isDefinedHeight = !!(rowHeightUtils !== null && rowHeightUtils !== void 0 && rowHeightUtils.getRowHeightOption(rowIndex, rowHeightsOptions));
+      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,
-        rowHeightsOptions: rowHeightsOptions,
+        setPopoverAnchorRef: this.popoverAnchorRef,
+        rowHeight: rowHeight,
         rowHeightUtils: rowHeightUtils,
-        isDefinedHeight: isDefinedHeight,
+        isControlColumn: cellClasses.includes('euiDataGridRowCell--controlColumn'),
         ariaRowIndex: ariaRowIndex
       });
-      var anchorClass = 'euiDataGridRowCell__expandFlex';
-      var expandClass = isDefinedHeight ? 'euiDataGridRowCell__contentByHeight' : 'euiDataGridRowCell__expandContent';
-      var innerContent = (0, _react2.jsx)(_focus_trap.EuiFocusTrap, {
+      var cellActions = showCellActions && (0, _react2.jsx)(_data_grid_cell_actions.EuiDataGridCellActions, {
+        rowIndex: rowIndex,
+        colIndex: colIndex,
+        column: column,
+        cellHeightType: cellHeightType,
+        onExpandClick: function onExpandClick() {
+          if (popoverIsOpen) {
+            closeCellPopover();
+          } else {
+            openCellPopover({
+              rowIndex: visibleRowIndex,
+              colIndex: colIndex
+            });
+          }
+        }
+      });
+      var cellContent = isExpandable ? (0, _react2.jsx)(EuiDataGridCellContent, (0, _extends2.default)({}, cellContentProps, {
+        cellActions: cellActions
+      })) : (0, _react2.jsx)(_focus_trap.EuiFocusTrap, {
         disabled: !this.state.isEntered,
         autoFocus: true,
         onDeactivation: function onDeactivation() {
@@ -556,35 +603,8 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
           }, _this2.preventTabbing);
         },
         clickOutsideDisables: true
-      }, (0, _react2.jsx)("div", {
-        className: anchorClass,
-        ref: this.popoverAnchorRef
-      }, (0, _react2.jsx)("div", {
-        className: expandClass
-      }, (0, _react2.jsx)(EuiDataGridCellContent, cellContentProps))));
-      if (isExpandable) {
-        innerContent = (0, _react2.jsx)("div", {
-          className: anchorClass,
-          ref: this.popoverAnchorRef
-        }, (0, _react2.jsx)("div", {
-          className: expandClass
-        }, (0, _react2.jsx)(EuiDataGridCellContent, cellContentProps)), showCellActions && (0, _react2.jsx)(_data_grid_cell_actions.EuiDataGridCellActions, {
-          rowIndex: rowIndex,
-          colIndex: colIndex,
-          column: column,
-          onExpandClick: function onExpandClick() {
-            if (popoverIsOpen) {
-              closeCellPopover();
-            } else {
-              openCellPopover({
-                rowIndex: visibleRowIndex,
-                colIndex: colIndex
-              });
-            }
-          }
-        }));
-      }
-      var content = (0, _react2.jsx)("div", (0, _extends2.default)({
+      }, (0, _react2.jsx)(EuiDataGridCellContent, cellContentProps));
+      var cell = (0, _react2.jsx)("div", (0, _extends2.default)({
         role: "gridcell",
         "aria-rowindex": ariaRowIndex,
         tabIndex: this.state.isFocused && !this.state.disableCellTabIndex ? 0 : -1,
@@ -614,14 +634,14 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
           });
         },
         onBlur: this.onBlur
-      }), innerContent);
-      return rowManager && !_utils.IS_JEST_ENVIRONMENT ? /*#__PURE__*/(0, _reactDom.createPortal)(content, rowManager.getRow({
+      }), cellContent);
+      return rowManager && !_utils.IS_JEST_ENVIRONMENT ? /*#__PURE__*/(0, _reactDom.createPortal)(cell, rowManager.getRow({
         rowIndex: rowIndex,
         visibleRowIndex: visibleRowIndex,
         top: style.top,
         // comes in as a `{float}px` string from react-window
         height: style.height // comes in as an integer from react-window
-      })) : content;
+      })) : cell;
     }
   }]);
   return EuiDataGridCell;

package/optimize/lib/components/datagrid/body/data_grid_cell_actions.js

@@ -15,6 +15,7 @@ var _button_icon = require("../../button/button_icon");
 var _button_empty = require("../../button/button_empty");
 var _flex = require("../../flex");
 var _popover = require("../../popover");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _react2 = require("@emotion/react");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -30,7 +31,8 @@ var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
   var onExpandClick = _ref.onExpandClick,
     column = _ref.column,
     rowIndex = _ref.rowIndex,
-    colIndex = _ref.colIndex;
+    colIndex = _ref.colIndex,
+    cellHeightType = _ref.cellHeightType;
   // Note: The cell expand button/expansion popover is *always* rendered if
   // column.cellActions is present (regardless of column.isExpandable).
   // This is because cell actions are not otherwise accessible to keyboard
@@ -77,8 +79,11 @@ var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
       });
     });
   }, [column, colIndex, rowIndex]);
+  var classes = (0, _classnames.default)('euiDataGridRowCell__actions', {
+    'euiDataGridRowCell__actions--overlay': cellHeightType !== 'default'
+  });
   return (0, _react2.jsx)("div", {
-    className: "euiDataGridRowCell__expandActions"
+    className: classes
   }, [].concat((0, _toConsumableArray2.default)(additionalButtons), [expandButton]));
 };
 exports.EuiDataGridCellActions = EuiDataGridCellActions;

package/optimize/lib/components/datagrid/body/data_grid_row_manager.js

@@ -1,10 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useRowManager = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = require("react");
+var _services = require("../../../services");
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -26,14 +29,12 @@ var useRowManager = function useRowManager(_ref) {
     if (rowElement == null) {
       rowElement = document.createElement('div');
       rowElement.setAttribute('role', 'row');
-      rowElement.dataset.gridRowIndex = String(rowIndex); // Row index from data, affected by sorting/pagination
-      rowElement.dataset.gridVisibleRowIndex = String(visibleRowIndex); // Affected by sorting/pagination
+      rowElement.dataset.gridRowIndex = String(rowIndex); // Row index from data, not affected by sorting/pagination
       rowElement.classList.add('euiDataGridRow');
       if (rowClasses !== null && rowClasses !== void 0 && rowClasses[rowIndex]) {
-        rowElement.classList.add(rowClasses[rowIndex]);
+        var _rowElement$classList;
+        (_rowElement$classList = rowElement.classList).add.apply(_rowElement$classList, (0, _toConsumableArray2.default)(rowClasses[rowIndex].split(' ')));
       }
-      var isOddRow = visibleRowIndex % 2 !== 0;
-      if (isOddRow) rowElement.classList.add('euiDataGridRow--striped');
       rowElement.style.position = 'absolute';
       rowElement.style.left = '0';
       rowElement.style.right = '0';
@@ -62,6 +63,17 @@ var useRowManager = function useRowManager(_ref) {
       });
     }
 
+    // Ensure the row's visible row index & striping update correctly on sort & pagination
+    if (rowElement.dataset.gridVisibleRowIndex !== String(visibleRowIndex)) {
+      rowElement.dataset.gridVisibleRowIndex = String(visibleRowIndex);
+      var isOddRow = visibleRowIndex % 2 !== 0;
+      if (isOddRow) {
+        rowElement.classList.add('euiDataGridRow--striped');
+      } else {
+        rowElement.classList.remove('euiDataGridRow--striped');
+      }
+    }
+
     // Ensure that the row's dimensions are always correct by having each cell update position styles
     rowElement.style.top = top;
     rowElement.style.height = "".concat(height, "px");
@@ -69,13 +81,16 @@ var useRowManager = function useRowManager(_ref) {
   }, [rowClasses, innerGridRef]);
 
   // Update row classes dynamically whenever a new prop is passed in
-  (0, _react.useEffect)(function () {
+  (0, _services.useUpdateEffect)(function () {
     if (rowClasses) {
       rowIdToElements.current.forEach(function (rowElement, rowIndex) {
+        var euiClasses = Array.from(rowElement.classList).filter(function (className) {
+          return className.startsWith('euiDataGridRow');
+        }).join(' ');
         if (rowClasses[rowIndex]) {
-          rowElement.classList.value = "euiDataGridRow ".concat(rowClasses[rowIndex]);
+          rowElement.classList.value = "".concat(euiClasses, " ").concat(rowClasses[rowIndex]);
         } else {
-          rowElement.classList.value = 'euiDataGridRow'; // Clear any added classes
+          rowElement.classList.value = euiClasses; // Clear any added classes
         }
       });
     }

package/optimize/lib/components/datagrid/utils/row_heights.js

@@ -48,25 +48,20 @@ var RowHeightUtils = /*#__PURE__*/function () {
       paddingTop: 0,
       paddingBottom: 0
     });
-    (0, _defineProperty2.default)(this, "getStylesForCell", function (rowHeightsOptions, rowIndex) {
-      var height = _this.getRowHeightOption(rowIndex, rowHeightsOptions);
-      if (height === AUTO_HEIGHT) {
-        return {};
+    /**
+     * Height types
+     */
+    (0, _defineProperty2.default)(this, "getHeightType", function (option) {
+      if (option == null) {
+        return 'default';
       }
-      var lineCount = _this.getLineCount(height);
-      if (lineCount) {
-        return {
-          WebkitLineClamp: lineCount,
-          display: '-webkit-box',
-          WebkitBoxOrient: 'vertical',
-          height: '100%',
-          overflow: 'hidden'
-        };
+      if (option === AUTO_HEIGHT) {
+        return 'auto';
       }
-      return {
-        height: '100%',
-        overflow: 'hidden'
-      };
+      if (_this.getLineCount(option) != null) {
+        return 'lineCount';
+      }
+      return 'numerical';
     });
     /**
      * Heights cache utils