@elastic/eui 91.0.0 → 91.2.0

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, {

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

@@ -15,14 +15,12 @@ import { EuiButtonIcon } from '../../button/button_icon';
 import { EuiButtonEmpty } from '../../button/button_empty';
 import { EuiFlexGroup, EuiFlexItem } from '../../flex';
 import { EuiPopoverFooter } from '../../popover';
-import classNames from 'classnames';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export 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
@@ -33,11 +31,11 @@ export var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
     default: "Click or hit enter to interact with cell content"
   }, function (expandButtonTitle) {
     return ___EmotionJSX(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,
@@ -49,8 +47,13 @@ export var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
     var ButtonComponent = function ButtonComponent(props) {
       return ___EmotionJSX(EuiButtonIcon, _extends({}, 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),
@@ -69,11 +72,8 @@ export var EuiDataGridCellActions = function EuiDataGridCellActions(_ref) {
       });
     });
   }, [column, colIndex, rowIndex]);
-  var classes = classNames('euiDataGridRowCell__actions', {
-    'euiDataGridRowCell__actions--overlay': cellHeightType !== 'default'
-  });
   return ___EmotionJSX("div", {
-    className: classes
+    className: "euiDataGridRowCell__actions"
   }, [].concat(_toConsumableArray(additionalButtons), [expandButton]));
 };
 export var EuiDataGridCellPopoverActions = function EuiDataGridCellPopoverActions(_ref2) {

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

@@ -24,6 +24,7 @@ export var DataGridCellPopoverContext = /*#__PURE__*/createContext({
   openCellPopover: function openCellPopover() {},
   closeCellPopover: function closeCellPopover() {},
   setPopoverAnchor: function setPopoverAnchor() {},
+  setPopoverAnchorPosition: function setPopoverAnchorPosition() {},
   setPopoverContent: function setPopoverContent() {},
   setCellPopoverProps: function setCellPopoverProps() {}
 });
@@ -46,15 +47,19 @@ export var useCellPopover = function useCellPopover() {
     _useState6 = _slicedToArray(_useState5, 2),
     popoverAnchor = _useState6[0],
     setPopoverAnchor = _useState6[1];
-  var _useState7 = useState(),
+  var _useState7 = useState('downLeft'),
     _useState8 = _slicedToArray(_useState7, 2),
-    popoverContent = _useState8[0],
-    setPopoverContent = _useState8[1];
-  // Allow customization of most (not all) popover props by consumers
-  var _useState9 = useState({}),
+    popoverAnchorPosition = _useState8[0],
+    setPopoverAnchorPosition = _useState8[1];
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_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 = useState({}),
+    _useState12 = _slicedToArray(_useState11, 2),
+    cellPopoverProps = _useState12[0],
+    setCellPopoverProps = _useState12[1];
   var closeCellPopover = useCallback(function () {
     return setPopoverIsOpen(false);
   }, []);
@@ -81,29 +86,57 @@ export 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 = 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 && ___EmotionJSX(EuiWrappingPopover, _extends({
     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: classNames('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 === keys.F2 || event.key === 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/es/components/datagrid/body/header/data_grid_header_cell.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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
@@ -25,6 +26,14 @@ import { getColumnActions } from './column_actions';
 import { EuiDataGridColumnResizer } from './data_grid_column_resizer';
 import { EuiDataGridHeaderCellWrapper } from './data_grid_header_cell_wrapper';
 import { jsx as ___EmotionJSX } from "@emotion/react";
+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__
+};
 export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   var column = _ref.column,
     index = _ref.index,
@@ -67,6 +76,7 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     setFocusedCell: setFocusedCell
   });
   var showColumnActions = columnActions && columnActions.length > 0;
+  var actionsButtonRef = useRef(null);
   var _useSortingUtils = useSortingUtils({
       sorting: sorting,
       id: id,
@@ -83,6 +93,10 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     prefix: 'euiDataGridCellHeader',
     suffix: 'actions'
   });
+  var cellContent = ___EmotionJSX(React.Fragment, null, ___EmotionJSX("div", {
+    title: displayAsText || id,
+    className: "euiDataGridHeaderCell__content"
+  }, display || displayAsText || id), sortingArrow);
   return ___EmotionJSX(EuiDataGridHeaderCellWrapper, _extends({}, displayHeaderCellProps, {
     className: classes,
     id: id,
@@ -94,29 +108,36 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     columnId: id,
     columnWidth: width,
     setColumnWidth: setColumnWidth
-  }) : null, !showColumnActions ? ___EmotionJSX(React.Fragment, null, sortingArrow, ___EmotionJSX("div", {
-    className: "euiDataGridHeaderCell__content",
-    title: displayAsText || id
-  }, display || displayAsText || id), sortingScreenReaderText && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", null, sortingScreenReaderText))) : ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiPopover, _extends({
-    className: "eui-fullWidth",
+  }) : null, !showColumnActions ? ___EmotionJSX(React.Fragment, null, cellContent, sortingScreenReaderText && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", null, sortingScreenReaderText))) : ___EmotionJSX(React.Fragment, null, ___EmotionJSX("button", {
+    className: "euiDataGridHeaderCell__button",
+    onClick: function onClick() {
+      setFocusedCell([index, -1]);
+      setIsPopoverOpen(function (isPopoverOpen) {
+        return !isPopoverOpen;
+      });
+    },
+    "aria-describedby": "".concat(sortingAriaId, " ").concat(actionsAriaId),
+    ref: actionsButtonRef
+  }, cellContent, ___EmotionJSX(EuiPopover, _extends({
     display: "block",
     panelPaddingSize: "none",
     offset: 7,
-    button: ___EmotionJSX("button", {
-      className: "euiDataGridHeaderCell__button",
-      onClick: function onClick() {
-        setFocusedCell([index, -1]);
-        setIsPopoverOpen(function (isPopoverOpen) {
-          return !isPopoverOpen;
-        });
-      },
-      "aria-describedby": "".concat(sortingAriaId, " ").concat(actionsAriaId)
-    }, sortingArrow, ___EmotionJSX("div", {
-      className: "euiDataGridHeaderCell__content",
-      title: displayAsText || id
-    }, display || displayAsText || id), ___EmotionJSX(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: ___EmotionJSX("div", {
+      className: "euiDataGridHeaderCell__icon"
+    }, ___EmotionJSX(EuiIcon, {
+      type: "boxesVertical",
       size: "s",
       color: "text",
       "data-test-subj": "dataGridHeaderCellActionButton-".concat(id)
@@ -129,7 +150,7 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     listItems: columnActions,
     gutterSize: "none",
     "data-test-subj": "dataGridHeaderCellActionGroup-".concat(id)
-  })), ___EmotionJSX("p", {
+  }))), ___EmotionJSX("p", {
     id: sortingAriaId,
     hidden: true
   }, sortingScreenReaderText), ___EmotionJSX("p", {
@@ -144,11 +165,11 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
 /**
  * Column sorting utility helpers
  */
-export var useSortingUtils = function useSortingUtils(_ref2) {
+export 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 = useMemo(function () {
     return sorting === null || sorting === void 0 ? void 0 : sorting.columns.find(function (col) {
       return col.id === id;
@@ -182,9 +203,9 @@ export 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 ___EmotionJSX(React.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 ___EmotionJSX(React.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 ___EmotionJSX(EuiI18n, {

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

@@ -20,6 +20,7 @@ import { EuiDragDropContext, EuiDraggable, EuiDroppable, euiDragDropReorder } fr
 import { EuiIcon } from '../../icon';
 import { useDependentState } from '../../../services';
 import { getNestedObjectOptions } from './data_grid_toolbar';
+import { EuiDataGridToolbarControl } from './data_grid_toolbar_control';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var useDataGridColumnSelector = function useDataGridColumnSelector(availableColumns, columnVisibility, showColumnSelector, displayValues) {
   var allowColumnHiding = getNestedObjectOptions(showColumnSelector, 'allowHide');
@@ -63,9 +64,6 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
     _useState4 = _slicedToArray(_useState3, 2),
     columnSearchText = _useState4[0],
     setColumnSearchText = _useState4[1];
-  var controlBtnClasses = classNames('euiDataGrid__controlBtn', {
-    'euiDataGrid__controlBtn--active': numberOfHiddenFields > 0
-  });
   var filteredColumns = useMemo(function () {
     return sortedColumns.filter(function (id) {
       return (displayValues[id] || id).toLowerCase().indexOf(columnSearchText.toLowerCase()) !== -1;
@@ -77,23 +75,17 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
     token: "euiColumnSelector.button",
     default: "Columns"
   });
-  if (numberOfHiddenFields === 1) {
-    buttonText = ___EmotionJSX(EuiI18n, {
-      token: "euiColumnSelector.buttonActiveSingular",
-      default: "{numberOfHiddenFields} column hidden",
-      values: {
-        numberOfHiddenFields: numberOfHiddenFields
-      }
-    });
-  } else if (numberOfHiddenFields > 1) {
-    buttonText = ___EmotionJSX(EuiI18n, {
-      token: "euiColumnSelector.buttonActivePlural",
-      default: "{numberOfHiddenFields} columns hidden",
-      values: {
-        numberOfHiddenFields: numberOfHiddenFields
-      }
+  var orderedVisibleColumns = 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 ? ___EmotionJSX(EuiPopover, {
     "data-test-subj": "dataGridColumnSelectorPopover",
     isOpen: isOpen,
@@ -103,11 +95,9 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
     anchorPosition: "downLeft",
     panelPaddingSize: "s",
     hasDragDrop: true,
-    button: ___EmotionJSX(EuiButtonEmpty, {
-      size: "xs",
-      iconType: allowColumnHiding ? 'listAdd' : 'list',
-      color: "text",
-      className: controlBtnClasses,
+    button: ___EmotionJSX(EuiDataGridToolbarControl, {
+      badgeContent: numberOfHiddenFields > 0 ? "".concat(orderedVisibleColumns.length, "/").concat(availableColumns.length) : availableColumns.length,
+      iconType: "tableDensityNormal",
       "data-test-subj": "dataGridColumnSelectorButton",
       onClick: function onClick() {
         return setIsOpen(!isOpen);
@@ -116,10 +106,10 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
   }, allowColumnHiding && ___EmotionJSX(EuiPopoverTitle, null, ___EmotionJSX(EuiI18n, {
     tokens: ['euiColumnSelector.search', 'euiColumnSelector.searchcolumns'],
     defaults: ['Search', 'Search columns']
-  }, function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-      search = _ref4[0],
-      searchcolumns = _ref4[1];
+  }, function (_ref4) {
+    var _ref5 = _slicedToArray(_ref4, 2),
+      search = _ref5[0],
+      searchcolumns = _ref5[1];
     return ___EmotionJSX(EuiFieldText, {
       compressed: true,
       placeholder: search,
@@ -217,17 +207,7 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
     token: "euiColumnSelector.hideAll",
     default: "Hide all"
   })))))) : null;
-  var orderedVisibleColumns = 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
    */