@elastic/eui 97.0.0 → 97.2.0

package/optimize/es/components/datagrid/body/header/column_actions.js

@@ -1,6 +1,8 @@
 import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _extends from "@babel/runtime/helpers/extends";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /*
@@ -11,24 +13,234 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * Side Public License, v 1.
  */
 
-import React from 'react';
-import { EuiI18n } from '../../../i18n';
+import React, { useContext, useState, useMemo, useCallback, useRef, memo, useEffect } from 'react';
+import { tabbable } from 'tabbable';
+import { keys, useEuiMemoizedStyles } from '../../../../services';
+// Keep the i18n scope the same as EuiDataGridHeaderCell
+/* eslint-disable local/i18n */
+import { EuiI18n, useEuiI18n } from '../../../i18n';
+import { EuiPopover } from '../../../popover';
+import { EuiListGroup } from '../../../list_group';
+import { EuiButtonIcon } from '../../../button';
+import { DataGridFocusContext } from '../../utils/focus';
 import { getDetailsForSchema } from '../../utils/data_grid_schema';
 import { defaultSortAscLabel, defaultSortDescLabel } from '../../controls/column_sorting_draggable';
+import { euiDataGridHeaderCellStyles } from './data_grid_header_cell.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-export var getColumnActions = function getColumnActions(_ref) {
-  var _column$actions;
-  var column = _ref.column,
+export var useHasColumnActions = function useHasColumnActions(columnActions) {
+  return useMemo(function () {
+    // By default, all column actions are enabled
+    if (columnActions === undefined) return true;
+    if (columnActions === false) return false;
+    if (columnActions.additional && columnActions.additional.length) return true;
+    // Check if all (currently 5) default column actions have been manually disabled
+    var disabledActions = Object.values(columnActions).filter(function (action) {
+      return action === false;
+    });
+    return disabledActions.length < 5;
+  }, [columnActions]);
+};
+
+// Props to pass back to EuiDataGridHeaderCell and set on EuiDataGridHeaderCellWrapper
+
+export var ColumnActions = /*#__PURE__*/memo(function (_ref) {
+  var index = _ref.index,
+    id = _ref.id,
+    title = _ref.title,
+    column = _ref.column,
     columns = _ref.columns,
     schema = _ref.schema,
     schemaDetectors = _ref.schemaDetectors,
     setVisibleColumns = _ref.setVisibleColumns,
-    focusFirstVisibleInteractiveCell = _ref.focusFirstVisibleInteractiveCell,
-    setIsPopoverOpen = _ref.setIsPopoverOpen,
-    sorting = _ref.sorting,
     switchColumnPos = _ref.switchColumnPos,
-    setFocusedCell = _ref.setFocusedCell,
-    columnFocusIndex = _ref.columnFocusIndex;
+    sorting = _ref.sorting,
+    hasFocusTrap = _ref.hasFocusTrap,
+    setPropsFromColumnActions = _ref.setPropsFromColumnActions,
+    actionsButtonRef = _ref.actionsButtonRef;
+  /**
+   * Popover logic and accessibility
+   */
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isPopoverOpen = _useState2[0],
+    setIsPopoverOpen = _useState2[1];
+  var togglePopover = useCallback(function () {
+    setIsPopoverOpen(function (isOpen) {
+      return !isOpen;
+    });
+  }, []);
+  var closePopover = useCallback(function () {
+    setIsPopoverOpen(false);
+  }, []);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isActionsButtonFocused = _useState4[0],
+    setIsActionsButtonFocused = _useState4[1];
+  var onFocus = useCallback(function () {
+    return setIsActionsButtonFocused(true);
+  }, []);
+  var onBlur = useCallback(function () {
+    return setIsActionsButtonFocused(false);
+  }, []);
+  var actionsButtonAriaLabel = useEuiI18n('euiDataGridHeaderCell.actionsButtonAriaLabel', '{title}. Click to view column header actions.', {
+    title: title
+  });
+  var actionsEnterKeyInstructions = useEuiI18n('euiDataGridHeaderCell.actionsEnterKeyInstructions', "Press the Enter key to view this column's actions");
+  var openActionsPopoverOnEnter = useCallback(function (e) {
+    if (e.key === keys.ENTER) {
+      setIsPopoverOpen(true);
+    }
+  }, []);
+  var popoverArrowNavigationProps = usePopoverArrowNavigation();
+
+  /**
+   * Props to set on parent EuiDataGridHeaderCell
+   */
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isColumnMoving = _useState6[0],
+    setIsColumnMoving = _useState6[1];
+  useEffect(function () {
+    setPropsFromColumnActions({
+      className: isPopoverOpen ? 'euiDataGridHeaderCell--isActionsPopoverOpen' : '',
+      onKeyDown: openActionsPopoverOnEnter,
+      'data-column-moving': isColumnMoving || undefined
+    });
+  }, [setPropsFromColumnActions, isPopoverOpen, openActionsPopoverOnEnter, isColumnMoving]);
+
+  /**
+   * Get column actions as an array of EuiListGroup items
+   */
+  var _useContext = useContext(DataGridFocusContext),
+    setFocusedCell = _useContext.setFocusedCell,
+    focusFirstVisibleInteractiveCell = _useContext.focusFirstVisibleInteractiveCell;
+  var columnActions = useMemo(function () {
+    return getColumnActions({
+      column: column,
+      columns: columns,
+      schema: schema,
+      schemaDetectors: schemaDetectors,
+      setVisibleColumns: setVisibleColumns,
+      focusFirstVisibleInteractiveCell: focusFirstVisibleInteractiveCell,
+      sorting: sorting,
+      switchColumnPos: switchColumnPos,
+      setIsPopoverOpen: setIsPopoverOpen,
+      setIsColumnMoving: setIsColumnMoving,
+      setFocusedCell: setFocusedCell,
+      columnFocusIndex: index
+    });
+  }, [column, columns, schema, schemaDetectors, setVisibleColumns, focusFirstVisibleInteractiveCell, sorting, switchColumnPos, setFocusedCell, index]);
+
+  /**
+   * Rendering
+   */
+  var styles = useEuiMemoizedStyles(euiDataGridHeaderCellStyles);
+  return ___EmotionJSX(EuiPopover, _extends({
+    display: "block",
+    panelPaddingSize: "none",
+    offset: 7,
+    anchorPosition: "downRight",
+    css: styles.euiDataGridHeaderCell__popover,
+    button: ___EmotionJSX(EuiButtonIcon, {
+      iconType: "boxesVertical",
+      iconSize: "s",
+      color: "text",
+      css: styles.euiDataGridHeaderCell__actions,
+      className: "euiDataGridHeaderCell__button",
+      onClick: togglePopover,
+      buttonRef: actionsButtonRef,
+      onFocus: onFocus,
+      onBlur: onBlur,
+      tabIndex: 0 // Override EuiButtonIcon's conditional tabindex based on aria-hidden
+      ,
+      "aria-hidden": hasFocusTrap && !isActionsButtonFocused ? 'true' // prevent the actions button from being read on cell focus
+      : undefined,
+      "aria-label": hasFocusTrap ? actionsButtonAriaLabel : actionsEnterKeyInstructions,
+      "data-test-subj": "dataGridHeaderCellActionButton-".concat(id)
+    }),
+    isOpen: isPopoverOpen,
+    closePopover: closePopover
+  }, popoverArrowNavigationProps), ___EmotionJSX(EuiListGroup, {
+    listItems: columnActions,
+    gutterSize: "none",
+    "data-test-subj": "dataGridHeaderCellActionGroup-".concat(id)
+  }));
+});
+ColumnActions.displayName = 'EuiDataGridHeaderCellColumnActions';
+
+/**
+ * Add keyboard arrow navigation to the cell actions popover
+ * to match the UX of the rest of EuiDataGrid
+ */
+export var usePopoverArrowNavigation = function usePopoverArrowNavigation() {
+  var popoverPanelRef = useRef(null);
+  var actionsRef = useRef(undefined);
+  var panelRef = useCallback(function (ref) {
+    popoverPanelRef.current = ref;
+    actionsRef.current = ref ? tabbable(ref) : undefined;
+  }, []);
+  var onKeyDown = useCallback(function (e) {
+    var _actionsRef$current;
+    if (e.key !== keys.ARROW_DOWN && e.key !== keys.ARROW_UP) return;
+    if (!((_actionsRef$current = actionsRef.current) !== null && _actionsRef$current !== void 0 && _actionsRef$current.length)) return;
+    e.preventDefault();
+    var initialState = document.activeElement === popoverPanelRef.current;
+    var currentIndex = !initialState ? actionsRef.current.findIndex(function (el) {
+      return document.activeElement === el;
+    }) : -1;
+    var lastIndex = actionsRef.current.length - 1;
+    var indexToFocus;
+    if (initialState) {
+      if (e.key === keys.ARROW_DOWN) {
+        indexToFocus = 0;
+      } else if (e.key === keys.ARROW_UP) {
+        indexToFocus = lastIndex;
+      }
+    } else {
+      if (e.key === keys.ARROW_DOWN) {
+        indexToFocus = currentIndex + 1;
+        if (indexToFocus > lastIndex) {
+          indexToFocus = 0;
+        }
+      } else if (e.key === keys.ARROW_UP) {
+        indexToFocus = currentIndex - 1;
+        if (indexToFocus < 0) {
+          indexToFocus = lastIndex;
+        }
+      }
+    }
+    actionsRef.current[indexToFocus].focus();
+  }, []);
+  return {
+    panelRef: panelRef,
+    panelProps: {
+      onKeyDown: onKeyDown
+    },
+    popoverScreenReaderText: ___EmotionJSX(EuiI18n, {
+      token: "euiDataGridHeaderCell.actionsPopoverScreenReaderText",
+      default: "To navigate through the list of column actions, press the Tab or Up and Down arrow keys."
+    })
+  };
+};
+
+/**
+ * Logic for returning an array of actions/items to pass to EuiListGroup
+ */
+
+export var getColumnActions = function getColumnActions(_ref2) {
+  var _column$actions;
+  var column = _ref2.column,
+    columns = _ref2.columns,
+    schema = _ref2.schema,
+    schemaDetectors = _ref2.schemaDetectors,
+    setVisibleColumns = _ref2.setVisibleColumns,
+    focusFirstVisibleInteractiveCell = _ref2.focusFirstVisibleInteractiveCell,
+    setIsPopoverOpen = _ref2.setIsPopoverOpen,
+    sorting = _ref2.sorting,
+    switchColumnPos = _ref2.switchColumnPos,
+    setIsColumnMoving = _ref2.setIsColumnMoving,
+    setFocusedCell = _ref2.setFocusedCell,
+    columnFocusIndex = _ref2.columnFocusIndex;
   if (column.actions === false) {
     return [];
   }
@@ -46,6 +258,7 @@ export var getColumnActions = function getColumnActions(_ref) {
     column: column,
     columns: columns,
     switchColumnPos: switchColumnPos,
+    setIsColumnMoving: setIsColumnMoving,
     setFocusedCell: setFocusedCell,
     columnFocusIndex: columnFocusIndex
   })), _toConsumableArray(((_column$actions = column.actions) === null || _column$actions === void 0 ? void 0 : _column$actions.additional) || []));
@@ -67,11 +280,11 @@ export var getColumnActions = function getColumnActions(_ref) {
  * Hide column action
  */
 
-export var getHideColumnAction = function getHideColumnAction(_ref2) {
-  var column = _ref2.column,
-    columns = _ref2.columns,
-    setVisibleColumns = _ref2.setVisibleColumns,
-    focusFirstVisibleInteractiveCell = _ref2.focusFirstVisibleInteractiveCell;
+export var getHideColumnAction = function getHideColumnAction(_ref3) {
+  var column = _ref3.column,
+    columns = _ref3.columns,
+    setVisibleColumns = _ref3.setVisibleColumns,
+    focusFirstVisibleInteractiveCell = _ref3.focusFirstVisibleInteractiveCell;
   var items = [];
   var onClickHideColumn = function onClickHideColumn() {
     setVisibleColumns(columns.filter(function (col) {
@@ -102,16 +315,25 @@ export var getHideColumnAction = function getHideColumnAction(_ref2) {
  * Move column actions
  */
 
-var getMoveColumnActions = function getMoveColumnActions(_ref3) {
-  var column = _ref3.column,
-    columns = _ref3.columns,
-    switchColumnPos = _ref3.switchColumnPos,
-    setFocusedCell = _ref3.setFocusedCell,
-    columnFocusIndex = _ref3.columnFocusIndex;
+var getMoveColumnActions = function getMoveColumnActions(_ref4) {
+  var column = _ref4.column,
+    columns = _ref4.columns,
+    switchColumnPos = _ref4.switchColumnPos,
+    setIsColumnMoving = _ref4.setIsColumnMoving,
+    setFocusedCell = _ref4.setFocusedCell,
+    columnFocusIndex = _ref4.columnFocusIndex;
   var items = [];
   var colIdx = columns.findIndex(function (col) {
     return col.id === column.id;
   });
+
+  // UX polish: prevent the column actions hover animation from flashing after column move
+  var handleAnimationFlash = function handleAnimationFlash() {
+    setIsColumnMoving(true);
+    requestAnimationFrame(function () {
+      return setIsColumnMoving(false);
+    });
+  };
   var moveFocus = function moveFocus(direction) {
     var newIndex = direction === 'left' ? -1 : 1;
     // Wait a beat to move focus, otherwise the EuiPopover's EuiFocusTrap's
@@ -125,6 +347,7 @@ var getMoveColumnActions = function getMoveColumnActions(_ref3) {
       var targetCol = columns[colIdx - 1];
       if (targetCol) {
         switchColumnPos(column.id, targetCol.id);
+        handleAnimationFlash();
         moveFocus('left');
       }
     };
@@ -146,6 +369,7 @@ var getMoveColumnActions = function getMoveColumnActions(_ref3) {
       var targetCol = columns[colIdx + 1];
       if (targetCol) {
         switchColumnPos(column.id, targetCol.id);
+        handleAnimationFlash();
         moveFocus('right');
       }
     };
@@ -169,11 +393,11 @@ var getMoveColumnActions = function getMoveColumnActions(_ref3) {
  * Sort column actions
  */
 
-export var getSortColumnActions = function getSortColumnActions(_ref4) {
-  var column = _ref4.column,
-    sorting = _ref4.sorting,
-    schema = _ref4.schema,
-    schemaDetectors = _ref4.schemaDetectors;
+export var getSortColumnActions = function getSortColumnActions(_ref5) {
+  var column = _ref5.column,
+    sorting = _ref5.sorting,
+    schema = _ref5.schema,
+    schemaDetectors = _ref5.schemaDetectors;
   if (!sorting) return [];
   var items = [];
   var sortingIdx = sorting.columns.findIndex(function (col) {

package/optimize/es/components/datagrid/body/header/{data_grid_column_resizer.js → column_resizer.js}

@@ -17,7 +17,8 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React, { Component } from 'react';
 import { RenderWithEuiStylesMemoizer } from '../../../../services';
 import { logicalStyle } from '../../../../global_styling';
-import { euiDataGridColumnResizerStyles } from './data_grid_column_resizer.styles';
+import { DragOverlay } from './draggable_columns';
+import { euiDataGridColumnResizerStyles } from './column_resizer.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var MINIMUM_COLUMN_WIDTH = 40;
 export var EuiDataGridColumnResizer = /*#__PURE__*/function (_Component) {
@@ -74,16 +75,20 @@ export var EuiDataGridColumnResizer = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this2 = this;
       var offset = this.state.offset;
+      var isLastColumn = this.props.isLastColumn;
       return ___EmotionJSX(RenderWithEuiStylesMemoizer, null, function (stylesMemoizer) {
         var styles = stylesMemoizer(euiDataGridColumnResizerStyles);
-        var cssStyles = [styles.euiDataGridColumnResizer, offset && styles.isDragging];
+        var cssStyles = [styles.euiDataGridColumnResizer, isLastColumn && styles.isLastColumn, offset && styles.isDragging];
         return ___EmotionJSX("div", {
           css: cssStyles,
           className: "euiDataGridColumnResizer",
           "data-test-subj": "dataGridColumnResizer",
           style: offset ? logicalStyle('margin-right', "".concat(-offset, "px")) : undefined,
           onMouseDown: _this2.onMouseDown
-        });
+        }, ___EmotionJSX(DragOverlay, {
+          isDragging: !!offset,
+          cursor: "ew-resize"
+        }));
       });
     }
   }]);

package/optimize/es/components/datagrid/body/header/{data_grid_column_resizer.styles.js → column_resizer.styles.js}

@@ -30,7 +30,12 @@ export var euiDataGridColumnResizerStyles = function euiDataGridColumnResizerSty
   }); // Odd number because it straddles a border
   var indicatorOffset = "-".concat(euiTheme.border.width.thin);
   return {
-    euiDataGridColumnResizer: /*#__PURE__*/css("z-index:2;position:absolute;", logicalCSS('vertical', 0), " ", logicalCSS('right', positionOffset), " cursor:ew-resize;opacity:0;&:hover,&:active{opacity:1;}&::after{content:'';position:absolute;", logicalCSS('vertical', 0), " ", logicalCSS('left', positionOffset), " ", logicalCSS('margin-left', indicatorOffset), " ", logicalCSS('width', indicatorWidth), " background-color:", euiTheme.colors.primary, ";}.euiDataGridHeaderCell:last-child &{", logicalCSS('right', 0), " ", logicalCSS('width', euiTheme.size.s), " &::after{", logicalCSS('left', 'auto'), " ", logicalCSS('right', 0), ";}};label:euiDataGridColumnResizer;"),
+    euiDataGridColumnResizer: /*#__PURE__*/css("z-index:2;position:absolute;", logicalCSS('vertical', 0), " ", logicalCSS('right', positionOffset), " cursor:ew-resize;opacity:0;&:hover,&:active{opacity:1;}&::after{content:'';position:absolute;", logicalCSS('vertical', 0), " ", logicalCSS('left', positionOffset), " ", logicalCSS('margin-left', indicatorOffset), " ", logicalCSS('width', indicatorWidth), " background-color:", euiTheme.colors.primary, ";};label:euiDataGridColumnResizer;"),
+    /* Because the resizer sits in the negative space to the right of the column,
+     * it can cause the full grid to be a few pixels longer than it actually is.
+     * So for the last cell, we don't use negative positioning and the borders from
+     * the cell will match the container. */
+    isLastColumn: /*#__PURE__*/css(logicalCSS('right', 0), " ", logicalCSS('width', euiTheme.size.s), " &::after{", logicalCSS('left', 'auto'), " ", logicalCSS('right', 0), ";};label:isLastColumn;"),
     isDragging: _ref
   };
 };

package/optimize/es/components/datagrid/body/header/column_sorting.js

@@ -0,0 +1,134 @@
+/*
+ * 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, { useMemo } from 'react';
+import { useGeneratedHtmlId } from '../../../../services';
+// Keep the i18n scope the same as EuiDataGridHeaderCell
+/* eslint-disable local/i18n */
+import { EuiI18n } from '../../../i18n';
+import { EuiIcon } from '../../../icon';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+/**
+ * Column sorting utility helpers
+ */
+export var useColumnSorting = function useColumnSorting(_ref) {
+  var _sorting$columns;
+  var sorting = _ref.sorting,
+    id = _ref.id,
+    hasColumnActions = _ref.hasColumnActions;
+  var sortedColumn = useMemo(function () {
+    return sorting === null || sorting === void 0 ? void 0 : sorting.columns.find(function (col) {
+      return col.id === id;
+    });
+  }, [sorting, id]);
+  var isColumnSorted = !!sortedColumn;
+  var hasOnlyOneSort = (sorting === null || sorting === void 0 || (_sorting$columns = sorting.columns) === null || _sorting$columns === void 0 ? void 0 : _sorting$columns.length) === 1;
+
+  /**
+   * Arrow icon
+   */
+  var sortingArrow = useMemo(function () {
+    return isColumnSorted ? ___EmotionJSX(EuiIcon, {
+      type: sortedColumn.direction === 'asc' ? 'sortUp' : 'sortDown',
+      color: "text",
+      className: "euiDataGridHeaderCell__sortingArrow",
+      "data-test-subj": "dataGridHeaderCellSortingIcon-".concat(id)
+    }) : null;
+  }, [id, isColumnSorted, sortedColumn]);
+
+  /**
+   * aria-sort attribute - should only be used when a single column is being sorted
+   * @see https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-sort
+   * @see https://www.w3.org/WAI/ARIA/apg/example-index/table/sortable-table.html
+   * @see https://github.com/w3c/aria/issues/283 for potential future multi-column usage
+   */
+  var ariaSort = isColumnSorted && hasOnlyOneSort ? sorting.columns[0].direction === 'asc' ? 'ascending' : 'descending' : undefined;
+
+  // aria-describedby ID for when aria-sort isn't sufficient
+  var sortingAriaId = useGeneratedHtmlId({
+    prefix: 'euiDataGridCellHeader',
+    suffix: 'sorting'
+  });
+
+  /**
+   * Sorting status - screen reader text
+   */
+  var sortingScreenReaderText = useMemo(function () {
+    var _sorting$columns2;
+    if (!isColumnSorted) return null;
+    if (!hasColumnActions && hasOnlyOneSort) return null; // in this scenario, the `aria-sort` attribute will be used by screen readers
+    return ___EmotionJSX("p", {
+      id: sortingAriaId,
+      hidden: true
+    }, sorting === null || sorting === void 0 || (_sorting$columns2 = sorting.columns) === null || _sorting$columns2 === void 0 ? void 0 : _sorting$columns2.map(function (_ref2, index) {
+      var columnId = _ref2.id,
+        direction = _ref2.direction;
+      if (hasOnlyOneSort) {
+        if (direction === 'asc') {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByAscendingSingle",
+            default: "Sorted ascending",
+            key: index
+          });
+        } else {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByDescendingSingle",
+            default: "Sorted descending",
+            key: index
+          });
+        }
+      } else if (index === 0) {
+        if (direction === 'asc') {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByAscendingFirst",
+            default: "Sorted by {columnId}, ascending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        } else {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByDescendingFirst",
+            default: "Sorted by {columnId}, descending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        }
+      } else {
+        if (direction === 'asc') {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByAscendingMultiple",
+            default: ", then sorted by {columnId}, ascending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        } else {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByDescendingMultiple",
+            default: ", then sorted by {columnId}, descending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        }
+      }
+    }), ".");
+  }, [isColumnSorted, hasColumnActions, hasOnlyOneSort, sorting, sortingAriaId]);
+  return {
+    sortingArrow: sortingArrow,
+    ariaSort: ariaSort,
+    sortingAriaId: sortingAriaId,
+    sortingScreenReaderText: sortingScreenReaderText
+  };
+};

package/optimize/es/components/datagrid/body/header/data_grid_control_header_cell.js

@@ -14,7 +14,7 @@ import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiDataGridControlHeaderCell = /*#__PURE__*/memo(function (_ref) {
   var controlColumn = _ref.controlColumn,
     index = _ref.index,
-    visibleColCount = _ref.visibleColCount;
+    isLastColumn = _ref.isLastColumn;
   var HeaderCellRender = controlColumn.headerCellRender,
     headerCellProps = controlColumn.headerCellProps,
     width = controlColumn.width,
@@ -24,7 +24,7 @@ export var EuiDataGridControlHeaderCell = /*#__PURE__*/memo(function (_ref) {
     id: id,
     index: index,
     width: width,
-    visibleColCount: visibleColCount
+    isLastColumn: isLastColumn
   }), ___EmotionJSX(HeaderCellRender, null));
 });
 EuiDataGridControlHeaderCell.displayName = 'EuiDataGridControlHeaderCell';