@elastic/eui 91.0.0 → 91.2.0

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

@@ -30,7 +30,7 @@ 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", "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"];
 /*
@@ -50,7 +50,6 @@ var EuiDataGridCellContent = /*#__PURE__*/(0, _react.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,
@@ -58,27 +57,17 @@ var EuiDataGridCellContent = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     rowHeightUtils = _ref.rowHeightUtils,
     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;
-  var wrapperClasses = (0, _classnames.default)('euiDataGridRowCell__contentWrapper', "euiDataGridRowCell__".concat(cellHeightType, "Height"));
-  var classes = (0, _classnames.default)('euiDataGridRowCell__content', !isControlColumn && {
+  var cellHeightType = (rowHeightUtils === null || rowHeightUtils === void 0 ? void 0 : rowHeightUtils.getHeightType(rowHeight)) || 'default';
+  var classes = (0, _classnames.default)('euiDataGridRowCell__content', "euiDataGridRowCell__content--".concat(cellHeightType, "Height"), !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;
-    },
+    ref: setCellContentsRef,
     "data-datagrid-cellcontent": true,
     className: classes
   }, (0, _react2.jsx)(CellElement, (0, _extends2.default)({
@@ -106,9 +95,7 @@ var EuiDataGridCellContent = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       row: ariaRowIndex
     }
   })));
-  return (0, _react2.jsx)("div", {
-    className: wrapperClasses
-  }, cellContent, screenReaderText, cellActions);
+  return (0, _react2.jsx)(_react.default.Fragment, null, cellContent, screenReaderText, cellActions);
 });
 var EuiDataGridCell = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(EuiDataGridCell, _Component);
@@ -130,7 +117,8 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
       isFocused: false,
       isEntered: false,
       enableInteractions: false,
-      disableCellTabIndex: false
+      disableCellTabIndex: false,
+      cellTextAlign: 'Left'
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "unsubscribeCell", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "focusTimeout", void 0);
@@ -233,6 +221,7 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
         _this.contentObserver.disconnect();
       }
       _this.preventTabbing();
+      _this.setCellTextAlign();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onFocus", function (e) {
       // only perform this logic when the event's originating element (e.target) is
@@ -260,10 +249,6 @@ 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();
-        }
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onBlur", function () {
@@ -290,6 +275,28 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
         }
       }
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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'
+          });
+        }
+      }
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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,
@@ -310,12 +317,14 @@ 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,
@@ -476,7 +485,7 @@ 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 = (0, _classnames.default)('euiDataGridRowCell', (_classNames = {}, (0, _defineProperty2.default)(_classNames, "euiDataGridRowCell--".concat(columnType), columnType), (0, _defineProperty2.default)(_classNames, 'euiDataGridRowCell--open', popoverIsOpen), _classNames), className);
+      var cellClasses = (0, _classnames.default)('euiDataGridRowCell', "euiDataGridRowCell--align".concat(this.state.cellTextAlign), (_classNames = {}, (0, _defineProperty2.default)(_classNames, "euiDataGridRowCell--".concat(columnType), columnType), (0, _defineProperty2.default)(_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,
@@ -559,28 +568,24 @@ 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 && (0, _react2.jsx)(_data_grid_cell_actions.EuiDataGridCellActions, {
+      var cellActions = showCellActions && (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_data_grid_cell_actions.EuiDataGridCellActions, {
         rowIndex: rowIndex,
         colIndex: colIndex,
         column: column,
-        cellHeightType: cellHeightType,
         onExpandClick: function onExpandClick() {
           if (popoverIsOpen) {
             closeCellPopover();
@@ -591,7 +596,10 @@ var EuiDataGridCell = /*#__PURE__*/function (_Component) {
             });
           }
         }
-      });
+      }), (0, _react2.jsx)("div", {
+        ref: this.popoverAnchorRef,
+        "data-test-subject": "cellPopoverAnchor"
+      }));
       var cellContent = isExpandable ? (0, _react2.jsx)(EuiDataGridCellContent, (0, _extends2.default)({}, cellContentProps, {
         cellActions: cellActions
       })) : (0, _react2.jsx)(_focus_trap.EuiFocusTrap, {

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

@@ -15,7 +15,6 @@ 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; }
@@ -31,8 +30,7 @@ var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
   var onExpandClick = _ref.onExpandClick,
     column = _ref.column,
     rowIndex = _ref.rowIndex,
-    colIndex = _ref.colIndex,
-    cellHeightType = _ref.cellHeightType;
+    colIndex = _ref.colIndex;
   // 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
@@ -43,11 +41,11 @@ var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
     default: "Click or hit enter to interact with cell content"
   }, function (expandButtonTitle) {
     return (0, _react2.jsx)(_button_icon.EuiButtonIcon, {
-      display: "fill",
-      className: "euiDataGridRowCell__actionButtonIcon",
+      className: "euiDataGridRowCell__actionButtonIcon euiDataGridRowCell__expandCell",
       "data-test-subj": "euiDataGridCellExpandButton",
+      display: "fill",
       color: "primary",
-      iconSize: "s",
+      iconSize: "m",
       iconType: "expandMini",
       "aria-hidden": true,
       onClick: onExpandClick,
@@ -59,8 +57,13 @@ var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
     var ButtonComponent = function ButtonComponent(props) {
       return (0, _react2.jsx)(_button_icon.EuiButtonIcon, (0, _extends2.default)({}, props, {
         "aria-hidden": true,
-        className: "euiDataGridRowCell__actionButtonIcon",
-        iconSize: "s"
+        className: "euiDataGridRowCell__actionButtonIcon"
+        // Don't allow consumers to override sizes or colors for cell actions on hover/focus
+        ,
+        size: "xs",
+        iconSize: "s",
+        display: "fill",
+        color: "primary"
       }));
     };
     var _getVisibleCellAction = getVisibleCellActions(column === null || column === void 0 ? void 0 : column.cellActions, column === null || column === void 0 ? void 0 : column.visibleCellActions),
@@ -79,11 +82,8 @@ 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: classes
+    className: "euiDataGridRowCell__actions"
   }, [].concat((0, _toConsumableArray2.default)(additionalButtons), [expandButton]));
 };
 exports.EuiDataGridCellActions = EuiDataGridCellActions;

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

@@ -35,6 +35,7 @@ var DataGridCellPopoverContext = /*#__PURE__*/(0, _react.createContext)({
   openCellPopover: function openCellPopover() {},
   closeCellPopover: function closeCellPopover() {},
   setPopoverAnchor: function setPopoverAnchor() {},
+  setPopoverAnchorPosition: function setPopoverAnchorPosition() {},
   setPopoverContent: function setPopoverContent() {},
   setCellPopoverProps: function setCellPopoverProps() {}
 });
@@ -58,15 +59,19 @@ var useCellPopover = function useCellPopover() {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     popoverAnchor = _useState6[0],
     setPopoverAnchor = _useState6[1];
-  var _useState7 = (0, _react.useState)(),
+  var _useState7 = (0, _react.useState)('downLeft'),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    popoverContent = _useState8[0],
-    setPopoverContent = _useState8[1];
-  // Allow customization of most (not all) popover props by consumers
-  var _useState9 = (0, _react.useState)({}),
+    popoverAnchorPosition = _useState8[0],
+    setPopoverAnchorPosition = _useState8[1];
+  var _useState9 = (0, _react.useState)(),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    cellPopoverProps = _useState10[0],
-    setCellPopoverProps = _useState10[1];
+    popoverContent = _useState10[0],
+    setPopoverContent = _useState10[1];
+  // Allow customization of most (not all) popover props by consumers
+  var _useState11 = (0, _react.useState)({}),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    cellPopoverProps = _useState12[0],
+    setCellPopoverProps = _useState12[1];
   var closeCellPopover = (0, _react.useCallback)(function () {
     return setPopoverIsOpen(false);
   }, []);
@@ -93,29 +98,57 @@ var useCellPopover = function useCellPopover() {
     openCellPopover: openCellPopover,
     cellLocation: cellLocation,
     setPopoverAnchor: setPopoverAnchor,
+    setPopoverAnchorPosition: setPopoverAnchorPosition,
     setPopoverContent: setPopoverContent,
     setCellPopoverProps: setCellPopoverProps
   };
 
+  // Override the default EuiPopover `onClickOutside` behavior, since the toggling
+  // popover button isn't actually the DOM node we pass to `button`. Otherwise,
+  // clicking the expansion cell action triggers an outside click
+  var onClickOutside = (0, _react.useCallback)(function (event) {
+    var _popoverAnchor$parent, _popoverAnchor$parent2;
+    var cellActions = popoverAnchor === null || popoverAnchor === void 0 ? void 0 : (_popoverAnchor$parent = popoverAnchor.parentElement) === null || _popoverAnchor$parent === void 0 ? void 0 : (_popoverAnchor$parent2 = _popoverAnchor$parent.parentElement) === null || _popoverAnchor$parent2 === void 0 ? void 0 : _popoverAnchor$parent2.previousElementSibling;
+    if (!(cellActions !== null && cellActions !== void 0 && cellActions.contains(event.target))) {
+      closeCellPopover();
+    }
+  }, [popoverAnchor, closeCellPopover]);
+
   // Note that this popover is rendered once at the top grid level, rather than one popover per cell
   var cellPopover = popoverIsOpen && popoverAnchor && (0, _react2.jsx)(_popover.EuiWrappingPopover, (0, _extends2.default)({
     isOpen: popoverIsOpen,
     display: "block",
     hasArrow: false,
-    panelPaddingSize: "s"
+    panelPaddingSize: "s",
+    anchorPosition: popoverAnchorPosition,
+    repositionToCrossAxis: false
   }, cellPopoverProps, {
+    focusTrapProps: {
+      onClickOutside: onClickOutside,
+      clickOutsideDisables: false
+    },
     panelProps: _objectSpread({
       'data-test-subj': 'euiDataGridExpansionPopover'
     }, cellPopoverProps.panelProps || {}),
     panelClassName: (0, _classnames.default)('euiDataGridRowCell__popover', cellPopoverProps.panelClassName, (_cellPopoverProps$pan = cellPopoverProps.panelProps) === null || _cellPopoverProps$pan === void 0 ? void 0 : _cellPopoverProps$pan.className),
+    panelStyle: {
+      maxInlineSize: "min(75vw, max(".concat(popoverAnchor.parentElement.offsetWidth, "px, 400px))"),
+      maxBlockSize: '50vh'
+    },
     onKeyDown: function onKeyDown(event) {
       if (event.key === _services.keys.F2 || event.key === _services.keys.ESCAPE) {
+        var _popoverAnchor$parent3, _popoverAnchor$parent4;
         event.preventDefault();
         event.stopPropagation();
         closeCellPopover();
-        // Ensure focus is returned to the parent cell
+        var cell = (_popoverAnchor$parent3 = popoverAnchor.parentElement) === null || _popoverAnchor$parent3 === void 0 ? void 0 : (_popoverAnchor$parent4 = _popoverAnchor$parent3.parentElement) === null || _popoverAnchor$parent4 === void 0 ? void 0 : _popoverAnchor$parent4.parentElement;
+
+        // Prevent cell animation flash while focus is being shifted between popover and cell
+        cell === null || cell === void 0 ? void 0 : cell.setAttribute('data-keyboard-closing', 'true');
+        // Ensure focus is returned to the parent cell, and remove animation stopgap
         requestAnimationFrame(function () {
-          return popoverAnchor.parentElement.focus();
+          popoverAnchor.parentElement.focus();
+          cell === null || cell === void 0 ? void 0 : cell.removeAttribute('data-keyboard-closing');
         });
       }
     },

package/optimize/lib/components/datagrid/body/header/data_grid_header_cell.js

@@ -27,14 +27,21 @@ var _data_grid_header_cell_wrapper = require("./data_grid_header_cell_wrapper");
 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; }
-/*
- * 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.
- */
-
+function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; } /*
+                                                                                                                                                                                                                                                                                           * 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 _ref2 = process.env.NODE_ENV === "production" ? {
+  name: "mc0thx-EuiDataGridHeaderCell",
+  styles: "margin-inline-start:auto;label:EuiDataGridHeaderCell;"
+} : {
+  name: "mc0thx-EuiDataGridHeaderCell",
+  styles: "margin-inline-start:auto;label:EuiDataGridHeaderCell;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
 var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   var column = _ref.column,
     index = _ref.index,
@@ -77,6 +84,7 @@ var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     setFocusedCell: setFocusedCell
   });
   var showColumnActions = columnActions && columnActions.length > 0;
+  var actionsButtonRef = (0, _react.useRef)(null);
   var _useSortingUtils = useSortingUtils({
       sorting: sorting,
       id: id,
@@ -93,6 +101,10 @@ var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     prefix: 'euiDataGridCellHeader',
     suffix: 'actions'
   });
+  var cellContent = (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("div", {
+    title: displayAsText || id,
+    className: "euiDataGridHeaderCell__content"
+  }, display || displayAsText || id), sortingArrow);
   return (0, _react2.jsx)(_data_grid_header_cell_wrapper.EuiDataGridHeaderCellWrapper, (0, _extends2.default)({}, displayHeaderCellProps, {
     className: classes,
     id: id,
@@ -104,29 +116,36 @@ var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     columnId: id,
     columnWidth: width,
     setColumnWidth: setColumnWidth
-  }) : null, !showColumnActions ? (0, _react2.jsx)(_react.default.Fragment, null, sortingArrow, (0, _react2.jsx)("div", {
-    className: "euiDataGridHeaderCell__content",
-    title: displayAsText || id
-  }, display || displayAsText || id), sortingScreenReaderText && (0, _react2.jsx)(_accessibility2.EuiScreenReaderOnly, null, (0, _react2.jsx)("p", null, sortingScreenReaderText))) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_popover.EuiPopover, (0, _extends2.default)({
-    className: "eui-fullWidth",
+  }) : null, !showColumnActions ? (0, _react2.jsx)(_react.default.Fragment, null, cellContent, sortingScreenReaderText && (0, _react2.jsx)(_accessibility2.EuiScreenReaderOnly, null, (0, _react2.jsx)("p", null, sortingScreenReaderText))) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("button", {
+    className: "euiDataGridHeaderCell__button",
+    onClick: function onClick() {
+      setFocusedCell([index, -1]);
+      setIsPopoverOpen(function (isPopoverOpen) {
+        return !isPopoverOpen;
+      });
+    },
+    "aria-describedby": "".concat(sortingAriaId, " ").concat(actionsAriaId),
+    ref: actionsButtonRef
+  }, cellContent, (0, _react2.jsx)(_popover.EuiPopover, (0, _extends2.default)({
     display: "block",
     panelPaddingSize: "none",
     offset: 7,
-    button: (0, _react2.jsx)("button", {
-      className: "euiDataGridHeaderCell__button",
-      onClick: function onClick() {
-        setFocusedCell([index, -1]);
-        setIsPopoverOpen(function (isPopoverOpen) {
-          return !isPopoverOpen;
-        });
-      },
-      "aria-describedby": "".concat(sortingAriaId, " ").concat(actionsAriaId)
-    }, sortingArrow, (0, _react2.jsx)("div", {
-      className: "euiDataGridHeaderCell__content",
-      title: displayAsText || id
-    }, display || displayAsText || id), (0, _react2.jsx)(_icon.EuiIcon, {
-      className: "euiDataGridHeaderCell__icon",
-      type: "arrowDown",
+    anchorPosition: "downRight",
+    css: _ref2 // Align to right
+    ,
+    focusTrapProps: {
+      // We need to override the default EuiPopover `onClickOutside` since the anchor is separate from the actual button
+      onClickOutside: function onClickOutside(event) {
+        var _actionsButtonRef$cur;
+        if (((_actionsButtonRef$cur = actionsButtonRef.current) === null || _actionsButtonRef$cur === void 0 ? void 0 : _actionsButtonRef$cur.contains(event.target)) === false) {
+          setIsPopoverOpen(false);
+        }
+      }
+    },
+    button: (0, _react2.jsx)("div", {
+      className: "euiDataGridHeaderCell__icon"
+    }, (0, _react2.jsx)(_icon.EuiIcon, {
+      type: "boxesVertical",
       size: "s",
       color: "text",
       "data-test-subj": "dataGridHeaderCellActionButton-".concat(id)
@@ -139,7 +158,7 @@ var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     listItems: columnActions,
     gutterSize: "none",
     "data-test-subj": "dataGridHeaderCellActionGroup-".concat(id)
-  })), (0, _react2.jsx)("p", {
+  }))), (0, _react2.jsx)("p", {
     id: sortingAriaId,
     hidden: true
   }, sortingScreenReaderText), (0, _react2.jsx)("p", {
@@ -155,11 +174,11 @@ var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
  * Column sorting utility helpers
  */
 exports.EuiDataGridHeaderCell = EuiDataGridHeaderCell;
-var useSortingUtils = function useSortingUtils(_ref2) {
+var useSortingUtils = function useSortingUtils(_ref3) {
   var _sorting$columns;
-  var sorting = _ref2.sorting,
-    id = _ref2.id,
-    showColumnActions = _ref2.showColumnActions;
+  var sorting = _ref3.sorting,
+    id = _ref3.id,
+    showColumnActions = _ref3.showColumnActions;
   var sortedColumn = (0, _react.useMemo)(function () {
     return sorting === null || sorting === void 0 ? void 0 : sorting.columns.find(function (col) {
       return col.id === id;
@@ -193,9 +212,9 @@ var useSortingUtils = function useSortingUtils(_ref2) {
     var _sorting$columns2;
     if (!isColumnSorted) return null;
     if (!showColumnActions && hasOnlyOneSort) return null; // in this scenario, the `aria-sort` attribute will be used by screen readers
-    return (0, _react2.jsx)(_react.default.Fragment, null, sorting === null || sorting === void 0 ? void 0 : (_sorting$columns2 = sorting.columns) === null || _sorting$columns2 === void 0 ? void 0 : _sorting$columns2.map(function (_ref3, index) {
-      var columnId = _ref3.id,
-        direction = _ref3.direction;
+    return (0, _react2.jsx)(_react.default.Fragment, null, sorting === null || sorting === void 0 ? void 0 : (_sorting$columns2 = sorting.columns) === null || _sorting$columns2 === void 0 ? void 0 : _sorting$columns2.map(function (_ref4, index) {
+      var columnId = _ref4.id,
+        direction = _ref4.direction;
       if (hasOnlyOneSort) {
         if (direction === 'asc') {
           return (0, _react2.jsx)(_i18n.EuiI18n, {

package/optimize/lib/components/datagrid/controls/column_selector.js

@@ -20,6 +20,7 @@ var _drag_and_drop = require("../../drag_and_drop");
 var _icon = require("../../icon");
 var _services = require("../../../services");
 var _data_grid_toolbar = require("./data_grid_toolbar");
+var _data_grid_toolbar_control = require("./data_grid_toolbar_control");
 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; }
@@ -73,9 +74,6 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     columnSearchText = _useState4[0],
     setColumnSearchText = _useState4[1];
-  var controlBtnClasses = (0, _classnames.default)('euiDataGrid__controlBtn', {
-    'euiDataGrid__controlBtn--active': numberOfHiddenFields > 0
-  });
   var filteredColumns = (0, _react.useMemo)(function () {
     return sortedColumns.filter(function (id) {
       return (displayValues[id] || id).toLowerCase().indexOf(columnSearchText.toLowerCase()) !== -1;
@@ -87,23 +85,17 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
     token: "euiColumnSelector.button",
     default: "Columns"
   });
-  if (numberOfHiddenFields === 1) {
-    buttonText = (0, _react2.jsx)(_i18n.EuiI18n, {
-      token: "euiColumnSelector.buttonActiveSingular",
-      default: "{numberOfHiddenFields} column hidden",
-      values: {
-        numberOfHiddenFields: numberOfHiddenFields
-      }
-    });
-  } else if (numberOfHiddenFields > 1) {
-    buttonText = (0, _react2.jsx)(_i18n.EuiI18n, {
-      token: "euiColumnSelector.buttonActivePlural",
-      default: "{numberOfHiddenFields} columns hidden",
-      values: {
-        numberOfHiddenFields: numberOfHiddenFields
-      }
+  var orderedVisibleColumns = (0, _react.useMemo)(function () {
+    return visibleColumns.map(function (columnId) {
+      return availableColumns.find(function (_ref3) {
+        var id = _ref3.id;
+        return id === columnId;
+      });
+    } // cast to avoid `undefined`, it filters those out next
+    ).filter(function (column) {
+      return column != null;
     });
-  }
+  }, [availableColumns, visibleColumns]);
   var columnSelector = allowColumnHiding || allowColumnReorder ? (0, _react2.jsx)(_popover.EuiPopover, {
     "data-test-subj": "dataGridColumnSelectorPopover",
     isOpen: isOpen,
@@ -113,11 +105,9 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
     anchorPosition: "downLeft",
     panelPaddingSize: "s",
     hasDragDrop: true,
-    button: (0, _react2.jsx)(_button.EuiButtonEmpty, {
-      size: "xs",
-      iconType: allowColumnHiding ? 'listAdd' : 'list',
-      color: "text",
-      className: controlBtnClasses,
+    button: (0, _react2.jsx)(_data_grid_toolbar_control.EuiDataGridToolbarControl, {
+      badgeContent: numberOfHiddenFields > 0 ? "".concat(orderedVisibleColumns.length, "/").concat(availableColumns.length) : availableColumns.length,
+      iconType: "tableDensityNormal",
       "data-test-subj": "dataGridColumnSelectorButton",
       onClick: function onClick() {
         return setIsOpen(!isOpen);
@@ -126,10 +116,10 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
   }, allowColumnHiding && (0, _react2.jsx)(_popover.EuiPopoverTitle, null, (0, _react2.jsx)(_i18n.EuiI18n, {
     tokens: ['euiColumnSelector.search', 'euiColumnSelector.searchcolumns'],
     defaults: ['Search', 'Search columns']
-  }, function (_ref3) {
-    var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
-      search = _ref4[0],
-      searchcolumns = _ref4[1];
+  }, function (_ref4) {
+    var _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+      search = _ref5[0],
+      searchcolumns = _ref5[1];
     return (0, _react2.jsx)(_form.EuiFieldText, {
       compressed: true,
       placeholder: search,
@@ -227,17 +217,7 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
     token: "euiColumnSelector.hideAll",
     default: "Hide all"
   })))))) : null;
-  var orderedVisibleColumns = (0, _react.useMemo)(function () {
-    return visibleColumns.map(function (columnId) {
-      return availableColumns.find(function (_ref5) {
-        var id = _ref5.id;
-        return id === columnId;
-      });
-    } // cast to avoid `undefined`, it filters those out next
-    ).filter(function (column) {
-      return column != null;
-    });
-  }, [availableColumns, visibleColumns]);
+
   /**
    * Used for moving columns left/right, available in the headers actions menu
    */