@elastic/eui 90.0.0 → 91.1.0

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",
-    anchorClassName: "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,23 +95,21 @@ 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);
       }
     }, buttonText)
-  }, ___EmotionJSX("div", null, allowColumnHiding && ___EmotionJSX(EuiPopoverTitle, null, ___EmotionJSX(EuiI18n, {
+  }, 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,
@@ -130,13 +120,12 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
       },
       "data-test-subj": "dataGridColumnSelectorSearch"
     });
-  })), ___EmotionJSX("div", {
-    className: "euiDataGrid__controlScroll"
-  }, ___EmotionJSX(EuiDragDropContext, {
+  })), ___EmotionJSX(EuiDragDropContext, {
     onDragEnd: onDragEnd
   }, ___EmotionJSX(EuiDroppable, {
     droppableId: "columnOrder",
-    isDropDisabled: !isDragEnabled
+    isDropDisabled: !isDragEnabled,
+    className: "euiDataGrid__controlScroll"
   }, ___EmotionJSX(React.Fragment, null, filteredColumns.map(function (id, index) {
     return ___EmotionJSX(EuiDraggable, {
       key: id,
@@ -189,7 +178,7 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
         color: "subdued"
       }))));
     });
-  })))))), allowColumnHiding && ___EmotionJSX(EuiPopoverFooter, null, ___EmotionJSX(EuiFlexGroup, {
+  })))), allowColumnHiding && ___EmotionJSX(EuiPopoverFooter, null, ___EmotionJSX(EuiFlexGroup, {
     gutterSize: "s",
     responsive: false,
     justifyContent: "spaceBetween"
@@ -218,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
    */

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

@@ -8,8 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * Side Public License, v 1.
  */
 
-import classNames from 'classnames';
-import React, { Fragment, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { EuiButtonEmpty } from '../../button';
 import { EuiDragDropContext, euiDragDropReorder, EuiDroppable } from '../../drag_and_drop';
 import { EuiFlexGroup, EuiFlexItem } from '../../flex';
@@ -17,6 +16,7 @@ import { EuiI18n, useEuiI18n } from '../../i18n';
 import { EuiPopover, EuiPopoverFooter } from '../../popover';
 import { EuiText } from '../../text';
 import { EuiToken } from '../../token';
+import { EuiDataGridToolbarControl } from './data_grid_toolbar_control';
 import { EuiDataGridColumnSortingDraggable } from './column_sorting_draggable';
 import { getDetailsForSchema } from '../utils/data_grid_schema';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -51,15 +51,9 @@ export var useDataGridColumnSorting = function useDataGridColumnSorting(columns,
     }
   }, [columns, sorting]);
   var sortingButtonText = useEuiI18n('euiColumnSorting.button', 'Sort fields');
-  var sortingButtonTextActive = useEuiI18n('euiColumnSorting.buttonActive', function (_ref2) {
-    var numberOfSortedFields = _ref2.numberOfSortedFields;
-    return "".concat(numberOfSortedFields, " field").concat(numberOfSortedFields === 1 ? '' : 's', " sorted");
-  }, {
-    numberOfSortedFields: sorting != null ? sorting.columns.length : 0
-  });
   if (sorting == null) return null;
-  var activeColumnIds = new Set(sorting.columns.map(function (_ref3) {
-    var id = _ref3.id;
+  var activeColumnIds = new Set(sorting.columns.map(function (_ref2) {
+    var id = _ref2.id;
     return id;
   }));
   var _columns$reduce = columns.reduce(function (acc, column) {
@@ -74,24 +68,21 @@ export var useDataGridColumnSorting = function useDataGridColumnSorting(columns,
       inactiveColumns: []
     }),
     inactiveColumns = _columns$reduce.inactiveColumns;
-  var onDragEnd = function onDragEnd(_ref4) {
-    var sourceIndex = _ref4.source.index,
-      destination = _ref4.destination;
+  var onDragEnd = function onDragEnd(_ref3) {
+    var sourceIndex = _ref3.source.index,
+      destination = _ref3.destination;
     if (destination) {
       var destinationIndex = destination.index;
       var nextColumns = euiDragDropReorder(sorting.columns, sourceIndex, destinationIndex);
       sorting.onSort(nextColumns);
     }
   };
-  var controlBtnClasses = classNames('euiDataGrid__controlBtn', {
-    'euiDataGrid__controlBtn--active': sorting.columns.length > 0
-  });
   var schemaDetails = function schemaDetails(id) {
     return schema.hasOwnProperty(id) && schema[id].columnType != null ? getDetailsForSchema(schemaDetectors, schema[id].columnType) : null;
   };
-  var inactiveSortableColumns = inactiveColumns.filter(function (_ref5) {
-    var id = _ref5.id,
-      isSortable = _ref5.isSortable;
+  var inactiveSortableColumns = inactiveColumns.filter(function (_ref4) {
+    var id = _ref4.id,
+      isSortable = _ref4.isSortable;
     var schemaDetail = schemaDetails(id);
     var sortable = true;
     if (isSortable != null) {
@@ -110,27 +101,22 @@ export var useDataGridColumnSorting = function useDataGridColumnSorting(columns,
     anchorPosition: "downLeft",
     panelPaddingSize: "s",
     hasDragDrop: true,
-    button: ___EmotionJSX(EuiButtonEmpty, {
-      size: "xs",
+    button: ___EmotionJSX(EuiDataGridToolbarControl, {
+      badgeContent: sorting.columns.length,
       iconType: "sortable",
-      color: "text",
-      className: controlBtnClasses,
       "data-test-subj": "dataGridColumnSortingButton",
       onClick: function onClick() {
         return setIsOpen(!isOpen);
       }
-    }, sorting.columns.length > 0 ? sortingButtonTextActive : sortingButtonText)
-  }, sorting.columns.length > 0 ? ___EmotionJSX("div", {
-    role: "region",
-    "aria-live": "assertive",
-    className: "euiDataGrid__controlScroll"
-  }, ___EmotionJSX(EuiDragDropContext, {
+    }, sortingButtonText)
+  }, sorting.columns.length > 0 ? ___EmotionJSX(EuiDragDropContext, {
     onDragEnd: onDragEnd
   }, ___EmotionJSX(EuiDroppable, {
-    droppableId: "columnSorting"
-  }, ___EmotionJSX(Fragment, null, sorting.columns.map(function (_ref6, index) {
-    var id = _ref6.id,
-      direction = _ref6.direction;
+    droppableId: "columnSorting",
+    className: "euiDataGrid__controlScroll"
+  }, ___EmotionJSX(React.Fragment, null, sorting.columns.map(function (_ref5, index) {
+    var id = _ref5.id,
+      direction = _ref5.direction;
     return ___EmotionJSX(EuiDataGridColumnSortingDraggable, {
       key: id,
       id: id,
@@ -141,7 +127,7 @@ export var useDataGridColumnSorting = function useDataGridColumnSorting(columns,
       schema: schema,
       schemaDetectors: schemaDetectors
     });
-  }))))) : ___EmotionJSX(EuiText, {
+  })))) : ___EmotionJSX(EuiText, {
     size: "s",
     color: "subdued"
   }, ___EmotionJSX("p", {
@@ -183,9 +169,9 @@ export var useDataGridColumnSorting = function useDataGridColumnSorting(columns,
     return ___EmotionJSX("div", {
       className: "euiDataGridColumnSorting__fieldList",
       role: "listbox"
-    }, inactiveSortableColumns.map(function (_ref7) {
-      var id = _ref7.id,
-        defaultSortDirection = _ref7.defaultSortDirection;
+    }, inactiveSortableColumns.map(function (_ref6) {
+      var id = _ref6.id,
+        defaultSortDirection = _ref6.defaultSortDirection;
       return ___EmotionJSX("button", {
         key: id,
         className: "euiDataGridColumnSorting__field",

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

@@ -0,0 +1,70 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["children", "className", "badgeContent", "textProps"];
+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.
+ */
+
+import React from 'react';
+import classNames from 'classnames';
+import { css } from '@emotion/react';
+import { EuiButtonEmpty } from '../../button';
+import { EuiNotificationBadge } from '../../badge';
+import { useEuiI18n } from '../../i18n';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var _ref = process.env.NODE_ENV === "production" ? {
+  name: "1vci2nd-EuiDataGridToolbarControl",
+  styles: "cursor:inherit;label:EuiDataGridToolbarControl;"
+} : {
+  name: "1vci2nd-EuiDataGridToolbarControl",
+  styles: "cursor:inherit;label:EuiDataGridToolbarControl;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
+var _ref2 = process.env.NODE_ENV === "production" ? {
+  name: "8fsqop-EuiDataGridToolbarControl",
+  styles: "&:focus,&:hover:not(:disabled){text-decoration:none;.euiDataGridToolbarControl__text{text-decoration:underline;}};label:EuiDataGridToolbarControl;"
+} : {
+  name: "8fsqop-EuiDataGridToolbarControl",
+  styles: "&:focus,&:hover:not(:disabled){text-decoration:none;.euiDataGridToolbarControl__text{text-decoration:underline;}};label:EuiDataGridToolbarControl;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
+export var EuiDataGridToolbarControl = function EuiDataGridToolbarControl(_ref3) {
+  var children = _ref3.children,
+    className = _ref3.className,
+    badgeContent = _ref3.badgeContent,
+    textProps = _ref3.textProps,
+    rest = _objectWithoutProperties(_ref3, _excluded);
+  var classes = classNames('euiDataGridToolbarControl', className);
+  var badgeAriaLabel = useEuiI18n('euiDataGridToolbarControl.badgeAriaLabel', 'Active: {count}', {
+    count: typeof badgeContent === 'string' ? betterScreenReaderSlashes(badgeContent) : badgeContent
+  });
+  return ___EmotionJSX(EuiButtonEmpty, _extends({
+    className: classes,
+    size: "xs",
+    color: "text",
+    textProps: false
+    // Underline actual text, but not the badge
+    ,
+    css: _ref2
+  }, rest), ___EmotionJSX("span", _extends({}, textProps, {
+    className: classNames('euiDataGridToolbarControl__text', 'eui-textTruncate', textProps && textProps.className)
+  }), children), Boolean(badgeContent) && ___EmotionJSX(EuiNotificationBadge, {
+    className: "euiDataGridToolbarControl__badge",
+    css: _ref,
+    color: "subdued",
+    "aria-label": "- ".concat(badgeAriaLabel) // Punctuation helps add pauses for screen readers
+    ,
+    role: "marquee" // https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/marquee_role
+  }, badgeContent));
+};
+
+// The columns control specifically passes (e.g.) `5/10` when some columns
+// are being hidden. We can make this a bit more legible to SRs with this quick util
+var betterScreenReaderSlashes = function betterScreenReaderSlashes(badgeContent) {
+  return badgeContent.replaceAll('/', ' out of ');
+};