@elastic/eui 60.3.0 → 62.0.1

package/optimize/es/components/comment_list/comment.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "className", "username", "event", "actions", "timelineIcon", "type", "timestamp"];
+var _excluded = ["children", "className", "username", "event", "actions", "timestamp", "timelineAvatar", "timelineAvatarAriaLabel", "eventColor", "eventIcon", "eventIconAriaLabel"];
 
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -11,38 +11,44 @@ var _excluded = ["children", "className", "username", "event", "actions", "timel
  */
 import React from 'react';
 import classNames from 'classnames';
+import { EuiTimelineItem } from '../timeline';
 import { EuiCommentEvent } from './comment_event';
 import { EuiCommentTimeline } from './comment_timeline';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-var typeToClassNameMap = {
-  regular: '',
-  update: 'euiComment--update'
-};
 export var EuiComment = function EuiComment(_ref) {
   var children = _ref.children,
       className = _ref.className,
       username = _ref.username,
       event = _ref.event,
       actions = _ref.actions,
-      timelineIcon = _ref.timelineIcon,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'regular' : _ref$type,
       timestamp = _ref.timestamp,
+      timelineAvatar = _ref.timelineAvatar,
+      timelineAvatarAriaLabel = _ref.timelineAvatarAriaLabel,
+      eventColor = _ref.eventColor,
+      eventIcon = _ref.eventIcon,
+      eventIconAriaLabel = _ref.eventIconAriaLabel,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  var classes = classNames('euiComment', typeToClassNameMap[type], {
-    'euiComment--hasBody': children
-  }, className);
-  return ___EmotionJSX("div", _extends({
-    className: classes
-  }, rest), ___EmotionJSX(EuiCommentTimeline, {
-    type: type,
-    timelineIcon: timelineIcon
-  }), ___EmotionJSX(EuiCommentEvent, {
+  var classes = classNames('euiComment', className);
+  var isTypeUpdate = !children;
+  var verticalAlign = isTypeUpdate ? 'center' : 'top';
+
+  var mainIcon = ___EmotionJSX(EuiCommentTimeline, {
+    timelineAvatar: timelineAvatar,
+    timelineAvatarAriaLabel: timelineAvatarAriaLabel
+  });
+
+  return ___EmotionJSX(EuiTimelineItem, _extends({
+    verticalAlign: verticalAlign,
+    className: classes,
+    icon: mainIcon
+  }, rest), ___EmotionJSX(EuiCommentEvent, {
     username: username,
     actions: actions,
     event: event,
     timestamp: timestamp,
-    type: type
+    eventColor: eventColor,
+    eventIcon: eventIcon,
+    eventIconAriaLabel: eventIconAriaLabel
   }, children));
 };

package/optimize/es/components/comment_list/comment_event.js

@@ -1,3 +1,5 @@
+import _extends from "@babel/runtime/helpers/extends";
+
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -6,42 +8,95 @@
  * Side Public License, v 1.
  */
 import React from 'react';
-import { keysOf } from '../common';
+import { useEuiTheme } from '../../services';
 import classNames from 'classnames';
+import { EuiPanel } from '../panel';
+import { EuiAvatar } from '../avatar';
+import { euiCommentEventStyles, euiCommentEventHeaderStyles, euiCommentEventBodyStyles } from './comment_event.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-var typeToClassNameMap = {
-  regular: 'euiCommentEvent--regular',
-  update: 'euiCommentEvent--update'
-};
-export var TYPES = keysOf(typeToClassNameMap);
 export var EuiCommentEvent = function EuiCommentEvent(_ref) {
   var children = _ref.children,
       className = _ref.className,
+      eventIcon = _ref.eventIcon,
+      eventIconAriaLabel = _ref.eventIconAriaLabel,
       username = _ref.username,
       timestamp = _ref.timestamp,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'regular' : _ref$type,
       event = _ref.event,
-      actions = _ref.actions;
-  var classes = classNames('euiCommentEvent', typeToClassNameMap[type], className);
-  var isFigure = type === 'regular' || type === 'update' && typeof children !== 'undefined';
+      actions = _ref.actions,
+      eventColor = _ref.eventColor;
+  var classes = classNames('euiCommentEvent', className); // the username is required so we only check if other elements are define
+
+  var hasEventElements = eventIcon || timestamp || event || actions;
+  var isTypeRegular = children && hasEventElements;
+  var isTypeUpdate = !children && hasEventElements;
+  var type;
+
+  if (isTypeRegular) {
+    type = 'regular';
+  } else if (isTypeUpdate) {
+    type = 'update';
+  } else {
+    type = 'custom';
+  }
+
+  var euiTheme = useEuiTheme();
+  var styles = euiCommentEventStyles(euiTheme);
+  var cssStyles = [styles.euiCommentEvent, styles[type]];
+  var headerStyles = euiCommentEventHeaderStyles(euiTheme);
+  var cssHeaderStyles = [headerStyles.euiCommentEvent__header, eventColor && headerStyles.hasEventColor, isTypeRegular && headerStyles.regular];
+  var cssHeaderPanelStyles = headerStyles.euiCommentEvent__headerPanel;
+  var cssHeaderEventIconStyles = headerStyles.euiCommentEvent__headerEventIcon;
+  var cssHeaderUsernameStyles = headerStyles.euiCommentEvent__headerUsername;
+  var cssHeaderEventStyles = headerStyles.euiCommentEvent__headerEvent;
+  var cssHeaderTimestampStyles = headerStyles.euiCommentEvent__headerTimestamp;
+  var cssHeaderMainStyles = headerStyles.euiCommentEvent__headerMain;
+  var cssHeaderDataStyles = headerStyles.euiCommentEvent__headerData;
+  var cssHeaderActionsStyles = headerStyles.euiCommentEvent__headerActions;
+  var bodyStyles = euiCommentEventBodyStyles(euiTheme);
+  var cssBodyStyles = [bodyStyles.euiCommentEvent__body, bodyStyles[type]];
+  var isFigure = isTypeRegular;
   var Element = isFigure ? 'figure' : 'div';
-  var HeaderElement = isFigure ? 'figcaption' : 'div';
-  return ___EmotionJSX(Element, {
-    className: classes
-  }, ___EmotionJSX(HeaderElement, {
-    className: "euiCommentEvent__header"
-  }, ___EmotionJSX("div", {
-    className: "euiCommentEvent__headerData"
+  var HeaderElement = isFigure ? 'figcaption' : 'div'; // The 'plain' color creates a shadow and adds a border radius that we don't want.
+  // So for these cases we use the transparent color instead.
+
+  var finalEventColor = eventColor === 'plain' ? 'transparent' : eventColor;
+  var panelProps = finalEventColor ? {
+    color: finalEventColor,
+    paddingSize: 's'
+  } : {
+    color: 'transparent',
+    paddingSize: 'none'
+  };
+
+  var eventHeader = ___EmotionJSX(HeaderElement, {
+    css: cssHeaderStyles
+  }, ___EmotionJSX(EuiPanel, _extends({}, panelProps, {
+    css: cssHeaderPanelStyles
+  }), ___EmotionJSX("div", {
+    css: cssHeaderMainStyles
   }, ___EmotionJSX("div", {
-    className: "euiCommentEvent__headerUsername"
-  }, username), ___EmotionJSX("div", {
-    className: "euiCommentEvent__headerEvent"
-  }, event), timestamp ? ___EmotionJSX("div", {
-    className: "euiCommentEvent__headerTimestamp"
-  }, ___EmotionJSX("time", null, timestamp)) : undefined), actions ? ___EmotionJSX("div", {
-    className: "euiCommentEvent__headerActions"
-  }, actions) : undefined), children ? ___EmotionJSX("div", {
-    className: "euiCommentEvent__body"
-  }, children) : undefined);
+    css: cssHeaderDataStyles
+  }, eventIcon && ___EmotionJSX(EuiAvatar, {
+    css: cssHeaderEventIconStyles,
+    size: "s",
+    iconType: eventIcon,
+    name: eventIconAriaLabel ? eventIconAriaLabel : '',
+    color: "subdued",
+    "aria-hidden": !eventIconAriaLabel
+  }), username && ___EmotionJSX("div", {
+    css: cssHeaderUsernameStyles
+  }, username), event && ___EmotionJSX("div", {
+    css: cssHeaderEventStyles
+  }, event), timestamp && ___EmotionJSX("div", {
+    css: cssHeaderTimestampStyles
+  }, ___EmotionJSX("time", null, timestamp))), actions && ___EmotionJSX("div", {
+    css: cssHeaderActionsStyles
+  }, actions))));
+
+  return ___EmotionJSX(Element, {
+    className: classes,
+    css: cssStyles
+  }, hasEventElements && eventHeader, children && ___EmotionJSX("div", {
+    css: cssBodyStyles
+  }, children));
 };

package/optimize/es/components/comment_list/comment_event.styles.js

@@ -0,0 +1,78 @@
+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 { css } from '@emotion/react';
+import { logicalCSS } from '../../global_styling';
+
+var _ref3 = process.env.NODE_ENV === "production" ? {
+  name: "yoyozp-euiCommentEvent",
+  styles: "overflow:hidden;label:euiCommentEvent;"
+} : {
+  name: "yoyozp-euiCommentEvent",
+  styles: "overflow:hidden;label:euiCommentEvent;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
+
+export var euiCommentEventStyles = function euiCommentEventStyles(_ref4) {
+  var euiTheme = _ref4.euiTheme;
+  return {
+    euiCommentEvent: _ref3,
+    // types
+    regular: /*#__PURE__*/css("border:", euiTheme.border.thin, ";border-radius:", euiTheme.border.radius.medium, ";;label:regular;"),
+    update: /*#__PURE__*/css(";label:update;"),
+    custom: /*#__PURE__*/css(";label:custom;")
+  };
+};
+
+var _ref = process.env.NODE_ENV === "production" ? {
+  name: "bqgcpj-hasEventColor",
+  styles: "padding:0;label:hasEventColor;"
+} : {
+  name: "bqgcpj-hasEventColor",
+  styles: "padding:0;label:hasEventColor;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
+
+var _ref2 = process.env.NODE_ENV === "production" ? {
+  name: "ui5tce-euiCommentEvent__headerEvent",
+  styles: "align-items:center;display:inline-flex;white-space:pre-wrap;flex-wrap:wrap;label:euiCommentEvent__headerEvent;"
+} : {
+  name: "ui5tce-euiCommentEvent__headerEvent",
+  styles: "align-items:center;display:inline-flex;white-space:pre-wrap;flex-wrap:wrap;label:euiCommentEvent__headerEvent;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
+
+export var euiCommentEventHeaderStyles = function euiCommentEventHeaderStyles(_ref5) {
+  var euiTheme = _ref5.euiTheme;
+  return {
+    euiCommentEvent__header: /*#__PURE__*/css(";label:euiCommentEvent__header;"),
+    euiCommentEvent__headerPanel: /*#__PURE__*/css(";label:euiCommentEvent__headerPanel;"),
+    euiCommentEvent__headerMain: /*#__PURE__*/css("display:flex;flex:1;gap:", euiTheme.size.s, ";;label:euiCommentEvent__headerMain;"),
+    euiCommentEvent__headerData: /*#__PURE__*/css("display:flex;flex:1;align-items:center;flex-wrap:wrap;gap:", euiTheme.size.xs, ";;label:euiCommentEvent__headerData;"),
+    euiCommentEvent__headerEventIcon: /*#__PURE__*/css(logicalCSS('margin-right', euiTheme.size.xs), ";;label:euiCommentEvent__headerEventIcon;"),
+    euiCommentEvent__headerUsername: /*#__PURE__*/css("font-weight:", euiTheme.font.weight.semiBold, ";;label:euiCommentEvent__headerUsername;"),
+    euiCommentEvent__headerEvent: _ref2,
+    euiCommentEvent__headerTimestamp: /*#__PURE__*/css(";label:euiCommentEvent__headerTimestamp;"),
+    euiCommentEvent__headerActions: /*#__PURE__*/css("display:flex;flex-wrap:wrap;gap:", euiTheme.size.xs, ";;label:euiCommentEvent__headerActions;"),
+    // types
+    regular: /*#__PURE__*/css("background:", euiTheme.colors.lightestShade, ";border-bottom:", euiTheme.border.thin, ";padding:", euiTheme.size.s, ";;label:regular;"),
+    // variants
+    hasEventColor: _ref
+  };
+};
+export var euiCommentEventBodyStyles = function euiCommentEventBodyStyles(_ref6) {
+  var euiTheme = _ref6.euiTheme;
+  return {
+    euiCommentEvent__body: /*#__PURE__*/css(";label:euiCommentEvent__body;"),
+    // types
+    regular: /*#__PURE__*/css("padding:", euiTheme.size.s, ";;label:regular;"),
+    update: /*#__PURE__*/css(logicalCSS('padding-top', euiTheme.size.xs), ";;label:update;"),
+    custom: /*#__PURE__*/css(";label:custom;")
+  };
+};

package/optimize/es/components/comment_list/comment_list.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "className", "comments"];
+var _excluded = ["children", "className", "comments", "gutterSize"];
 
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -12,11 +12,14 @@ var _excluded = ["children", "className", "comments"];
 import React from 'react';
 import classNames from 'classnames';
 import { EuiComment } from './comment';
+import { EuiTimeline } from '../timeline';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiCommentList = function EuiCommentList(_ref) {
   var children = _ref.children,
       className = _ref.className,
       comments = _ref.comments,
+      _ref$gutterSize = _ref.gutterSize,
+      gutterSize = _ref$gutterSize === void 0 ? 'l' : _ref$gutterSize,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var classes = classNames('euiCommentList', className);
@@ -30,7 +33,8 @@ export var EuiCommentList = function EuiCommentList(_ref) {
     });
   }
 
-  return ___EmotionJSX("div", _extends({
-    className: classes
+  return ___EmotionJSX(EuiTimeline, _extends({
+    className: classes,
+    gutterSize: gutterSize
   }, rest), commentElements, children);
 };

package/optimize/es/components/comment_list/comment_timeline.js

@@ -6,45 +6,32 @@
  * Side Public License, v 1.
  */
 import React from 'react';
-import { keysOf } from '../common';
-import classNames from 'classnames';
-import { EuiIcon } from '../icon';
+import { EuiAvatar } from '../avatar';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-var typeToClassNameMap = {
-  regular: 'euiCommentTimeline__icon--regular',
-  update: 'euiCommentTimeline__icon--update'
-};
-export var TYPES = keysOf(typeToClassNameMap);
 export var EuiCommentTimeline = function EuiCommentTimeline(_ref) {
-  var className = _ref.className,
-      timelineIcon = _ref.timelineIcon,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'regular' : _ref$type;
-  var classes = classNames('euiCommentTimeline', className);
-  var iconClasses = classNames({
-    'euiCommentTimeline__icon--default': !timelineIcon || typeof timelineIcon === 'string'
-  }, typeToClassNameMap[type]);
+  var timelineAvatar = _ref.timelineAvatar,
+      timelineAvatarAriaLabel = _ref.timelineAvatarAriaLabel;
   var iconRender;
+  var avatarClassName = 'euiCommentAvatar';
+  var iconIsString = typeof timelineAvatar === 'string';
 
-  if (typeof timelineIcon === 'string') {
-    iconRender = ___EmotionJSX(EuiIcon, {
-      size: type === 'update' ? 'm' : 'l',
-      type: timelineIcon
+  if (iconIsString) {
+    iconRender = ___EmotionJSX(EuiAvatar, {
+      className: avatarClassName,
+      name: timelineAvatarAriaLabel || '',
+      iconType: timelineAvatar,
+      color: "subdued"
     });
-  } else if (timelineIcon) {
-    iconRender = timelineIcon;
+  } else if (timelineAvatar) {
+    iconRender = timelineAvatar;
   } else {
-    iconRender = ___EmotionJSX(EuiIcon, {
-      type: type === 'update' ? 'dot' : 'user',
-      size: type === 'update' ? 's' : 'l'
+    iconRender = ___EmotionJSX(EuiAvatar, {
+      className: avatarClassName,
+      name: timelineAvatarAriaLabel || '',
+      iconType: "userAvatar",
+      color: "subdued"
     });
   }
 
-  return ___EmotionJSX("div", {
-    className: classes
-  }, ___EmotionJSX("div", {
-    className: "euiCommentTimeline__content"
-  }, ___EmotionJSX("div", {
-    className: iconClasses
-  }, iconRender)));
+  return ___EmotionJSX(React.Fragment, null, iconRender);
 };

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

@@ -320,7 +320,7 @@ export var EuiContextMenuPanel = /*#__PURE__*/function (_Component) {
       // If EuiContextMenu is used within an EuiPopover, we need to wait for EuiPopover to:
       // 1. Correctly set its `returnFocus` to the toggling button,
       //    so focus is correctly restored to the popover toggle on close
-      // 2. Finish its own `updateFocus()` call 350ms after transitioning in,
+      // 2. Finish its react-focus-on `autoFocus` behavior after transitioning in,
       //    so the panel can handle its own focus without focus fighting
       if (this.initialPopoverParent) {
         this.initialPopoverParent.addEventListener('focus', this.reclaimPopoverFocus, {

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

@@ -319,7 +319,7 @@ export var EuiDataGridBody = function EuiDataGridBody(props) {
    */
 
   var rowHeightUtils = useRowHeightUtils({
-    gridRef: gridRef.current,
+    gridRef: gridRef,
     gridStyles: gridStyles,
     columns: columns,
     rowHeightsOptions: rowHeightsOptions

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

@@ -10,12 +10,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
  * Side Public License, v 1.
  */
 import classnames from 'classnames';
-import React, { useContext, useState, useRef, useCallback } from 'react';
+import React, { useContext, useState, useRef, useCallback, useMemo } from 'react';
 import { tabbable } from 'tabbable';
 import { keys } from '../../../../services';
 import { useGeneratedHtmlId } from '../../../../services/accessibility';
 import { EuiScreenReaderOnly } from '../../../accessibility';
-import { useEuiI18n, EuiI18n } from '../../../i18n';
+import { EuiI18n } from '../../../i18n';
 import { EuiIcon } from '../../../icon';
 import { EuiListGroup } from '../../../list_group';
 import { EuiPopover } from '../../../popover';
@@ -43,9 +43,6 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   var width = columnWidths[id] || defaultColumnWidth;
   var columnType = schema[id] ? schema[id].columnType : null;
   var classes = classnames(_defineProperty({}, "euiDataGridHeaderCell--".concat(columnType), columnType));
-  var actionButtonAriaLabel = useEuiI18n('euiDataGridHeaderCell.headerActions', 'Header actions');
-  var ariaProps = {};
-  var screenReaderId = useGeneratedHtmlId();
 
   var _useContext = useContext(DataGridFocusContext),
       setFocusedCell = _useContext.setFocusedCell,
@@ -54,37 +51,6 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   var _useContext2 = useContext(DataGridSortingContext),
       sorting = _useContext2.sorting;
 
-  var sortString;
-
-  if (sorting) {
-    var sortedColumnIds = new Set(sorting.columns.map(function (_ref2) {
-      var id = _ref2.id;
-      return id;
-    }));
-
-    if (sortedColumnIds.has(id)) {
-      if (sorting.columns.length === 1) {
-        var sortDirection = sorting.columns[0].direction;
-        var sortValue = 'other';
-
-        if (sortDirection === 'asc') {
-          sortValue = 'ascending';
-        }
-
-        if (sortDirection === 'desc') {
-          sortValue = 'descending';
-        }
-
-        ariaProps['aria-sort'] = sortValue;
-      } else {
-        sortString = sorting.columns.map(function (col) {
-          return "Sorted by ".concat(col.id, " ").concat(col.direction);
-        }).join(' then ');
-        ariaProps['aria-describedby'] = screenReaderId;
-      }
-    }
-  }
-
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       isPopoverOpen = _useState2[0],
@@ -104,31 +70,39 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     setFocusedCell: setFocusedCell
   });
   var showColumnActions = columnActions && columnActions.length > 0;
-  var sortedColumn = sorting === null || sorting === void 0 ? void 0 : sorting.columns.find(function (col) {
-    return col.id === id;
+
+  var _useSortingUtils = useSortingUtils({
+    sorting: sorting,
+    id: id,
+    showColumnActions: showColumnActions
+  }),
+      sortingArrow = _useSortingUtils.sortingArrow,
+      ariaSort = _useSortingUtils.ariaSort,
+      sortingScreenReaderText = _useSortingUtils.sortingScreenReaderText;
+
+  var sortingAriaId = useGeneratedHtmlId({
+    prefix: 'euiDataGridCellHeader',
+    suffix: 'sorting'
   });
-  var sortingArrow = sortedColumn ? ___EmotionJSX(EuiIcon, {
-    type: sortedColumn.direction === 'asc' ? 'sortUp' : 'sortDown',
-    color: "text",
-    className: "euiDataGridHeaderCell__sortingArrow",
-    "data-test-subj": "dataGridHeaderCellSortingIcon-".concat(id)
-  }) : null;
-  return ___EmotionJSX(EuiDataGridHeaderCellWrapper, _extends({
+  var actionsAriaId = useGeneratedHtmlId({
+    prefix: 'euiDataGridCellHeader',
+    suffix: 'actions'
+  });
+  return ___EmotionJSX(EuiDataGridHeaderCellWrapper, {
     id: id,
     index: index,
     width: width,
     headerIsInteractive: headerIsInteractive,
-    className: classes
-  }, ariaProps), column.isResizable !== false && width != null ? ___EmotionJSX(EuiDataGridColumnResizer, {
+    className: classes,
+    "aria-sort": ariaSort
+  }, column.isResizable !== false && width != null ? ___EmotionJSX(EuiDataGridColumnResizer, {
     columnId: id,
     columnWidth: width,
     setColumnWidth: setColumnWidth
-  }) : null, sortString && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("div", {
-    id: screenReaderId
-  }, sortString)), !showColumnActions ? ___EmotionJSX(React.Fragment, null, sortingArrow, ___EmotionJSX("div", {
+  }) : null, !showColumnActions ? ___EmotionJSX(React.Fragment, null, sortingArrow, ___EmotionJSX("div", {
     className: "euiDataGridHeaderCell__content",
     title: displayAsText || id
-  }, display || displayAsText || id)) : ___EmotionJSX(EuiPopover, _extends({
+  }, display || displayAsText || id), sortingScreenReaderText && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", null, sortingScreenReaderText))) : ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiPopover, _extends({
     className: "eui-fullWidth",
     anchorClassName: "eui-fullWidth",
     panelPaddingSize: "none",
@@ -140,7 +114,8 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
         setIsPopoverOpen(function (isPopoverOpen) {
           return !isPopoverOpen;
         });
-      }
+      },
+      "aria-describedby": "".concat(sortingAriaId, " ").concat(actionsAriaId)
     }, sortingArrow, ___EmotionJSX("div", {
       className: "euiDataGridHeaderCell__content",
       title: displayAsText || id
@@ -149,7 +124,6 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
       type: "arrowDown",
       size: "s",
       color: "text",
-      "aria-label": actionButtonAriaLabel,
       "data-test-subj": "dataGridHeaderCellActionButton-".concat(id)
     })),
     isOpen: isPopoverOpen,
@@ -160,7 +134,129 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     listItems: columnActions,
     gutterSize: "none",
     "data-test-subj": "dataGridHeaderCellActionGroup-".concat(id)
-  })));
+  })), ___EmotionJSX("p", {
+    id: sortingAriaId,
+    hidden: true
+  }, sortingScreenReaderText), ___EmotionJSX("p", {
+    id: actionsAriaId,
+    hidden: true
+  }, ___EmotionJSX(EuiI18n, {
+    token: "euiDataGridHeaderCell.headerActions",
+    default: "Click to view column header actions"
+  }))));
+};
+/**
+ * Column sorting utility helpers
+ */
+
+export var useSortingUtils = function useSortingUtils(_ref2) {
+  var _sorting$columns;
+
+  var sorting = _ref2.sorting,
+      id = _ref2.id,
+      showColumnActions = _ref2.showColumnActions;
+  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 ? void 0 : (_sorting$columns = sorting.columns) === null || _sorting$columns === void 0 ? void 0 : _sorting$columns.length) === 1;
+  /**
+   * Arrow icon
+   */
+
+  var sortingArrow = isColumnSorted ? ___EmotionJSX(EuiIcon, {
+    type: sortedColumn.direction === 'asc' ? 'sortUp' : 'sortDown',
+    color: "text",
+    className: "euiDataGridHeaderCell__sortingArrow",
+    "data-test-subj": "dataGridHeaderCellSortingIcon-".concat(id)
+  }) : null;
+  /**
+   * 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 = // eslint-disable-next-line no-nested-ternary
+  isColumnSorted && hasOnlyOneSort ? sorting.columns[0].direction === 'asc' ? 'ascending' : 'descending' : undefined;
+  /**
+   * Sorting status - screen reader text
+   */
+
+  var sortingScreenReaderText = useMemo(function () {
+    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;
+
+      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, showColumnActions, hasOnlyOneSort, sorting]);
+  return {
+    sortingArrow: sortingArrow,
+    ariaSort: ariaSort,
+    sortingScreenReaderText: sortingScreenReaderText
+  };
 };
 /**
  * Add keyboard arrow navigation to the cell actions popover