@elastic/eui 92.0.0 → 92.1.0

package/es/components/datagrid/body/cell/index.js

@@ -0,0 +1,11 @@
+/*
+ * 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.
+ */
+
+export { EuiDataGridCell } from './data_grid_cell';
+export { Cell } from './data_grid_cell_wrapper';
+export { DataGridCellPopoverContext, useCellPopover } from './data_grid_cell_popover';

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

@@ -567,8 +567,6 @@ EuiDataGridBody.propTypes = {
   renderCustomGridBody: PropTypes.func,
   interactiveCellId: PropTypes.string.isRequired,
   pagination: PropTypes.any,
-  headerIsInteractive: PropTypes.bool.isRequired,
-  handleHeaderMutation: PropTypes.any.isRequired,
   setVisibleColumns: PropTypes.func.isRequired,
   switchColumnPos: PropTypes.func.isRequired,
   onColumnResize: PropTypes.func,

package/es/components/datagrid/body/data_grid_body_custom.js

@@ -33,7 +33,7 @@ import { useDefaultColumnWidth, useColumnWidths } from '../utils/col_widths';
 import { useRowHeightUtils, useDefaultRowHeight } from '../utils/row_heights';
 import { useDataGridHeader } from './header';
 import { useDataGridFooter } from './footer';
-import { Cell } from './data_grid_cell_wrapper';
+import { Cell } from './cell';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiDataGridBodyCustomRender = function EuiDataGridBodyCustomRender(_ref) {
   var renderCustomGridBody = _ref.renderCustomGridBody,
@@ -48,8 +48,6 @@ export var EuiDataGridBodyCustomRender = function EuiDataGridBodyCustomRender(_r
     renderCellPopover = _ref.renderCellPopover,
     renderFooterCellValue = _ref.renderFooterCellValue,
     interactiveCellId = _ref.interactiveCellId,
-    headerIsInteractive = _ref.headerIsInteractive,
-    handleHeaderMutation = _ref.handleHeaderMutation,
     setVisibleColumns = _ref.setVisibleColumns,
     switchColumnPos = _ref.switchColumnPos,
     onColumnResize = _ref.onColumnResize,
@@ -95,8 +93,6 @@ export var EuiDataGridBodyCustomRender = function EuiDataGridBodyCustomRender(_r
    * Header & footer
    */
   var _useDataGridHeader = useDataGridHeader({
-      headerIsInteractive: headerIsInteractive,
-      handleHeaderMutation: handleHeaderMutation,
       switchColumnPos: switchColumnPos,
       setVisibleColumns: setVisibleColumns,
       leadingControlColumns: leadingControlColumns,
@@ -714,8 +710,6 @@ EuiDataGridBodyCustomRender.propTypes = {
   renderCustomGridBody: PropTypes.func,
   interactiveCellId: PropTypes.string.isRequired,
   pagination: PropTypes.any,
-  headerIsInteractive: PropTypes.bool.isRequired,
-  handleHeaderMutation: PropTypes.any.isRequired,
   setVisibleColumns: PropTypes.func.isRequired,
   switchColumnPos: PropTypes.func.isRequired,
   onColumnResize: PropTypes.func,

package/es/components/datagrid/body/data_grid_body_virtualized.js

@@ -23,7 +23,7 @@ import { VariableSizeGrid as Grid } from 'react-window';
 import { useResizeObserver } from '../../observer/resize_observer';
 import { useDataGridHeader } from './header';
 import { useDataGridFooter } from './footer';
-import { Cell } from './data_grid_cell_wrapper';
+import { Cell } from './cell';
 import { useRowManager } from './data_grid_row_manager';
 import { useFinalGridDimensions, useUnconstrainedHeight, useVirtualizeContainerWidth } from '../utils/grid_height_width';
 import { useDefaultColumnWidth, useColumnWidths } from '../utils/col_widths';
@@ -92,8 +92,6 @@ export var EuiDataGridBodyVirtualized = function EuiDataGridBodyVirtualized(_ref
     renderFooterCellValue = _ref3.renderFooterCellValue,
     interactiveCellId = _ref3.interactiveCellId,
     pagination = _ref3.pagination,
-    headerIsInteractive = _ref3.headerIsInteractive,
-    handleHeaderMutation = _ref3.handleHeaderMutation,
     setVisibleColumns = _ref3.setVisibleColumns,
     switchColumnPos = _ref3.switchColumnPos,
     onColumnResize = _ref3.onColumnResize,
@@ -143,8 +141,6 @@ export var EuiDataGridBodyVirtualized = function EuiDataGridBodyVirtualized(_ref
    * Header & footer
    */
   var _useDataGridHeader = useDataGridHeader({
-      headerIsInteractive: headerIsInteractive,
-      handleHeaderMutation: handleHeaderMutation,
       switchColumnPos: switchColumnPos,
       setVisibleColumns: setVisibleColumns,
       leadingControlColumns: leadingControlColumns,
@@ -843,8 +839,6 @@ EuiDataGridBodyVirtualized.propTypes = {
   renderCustomGridBody: PropTypes.func,
   interactiveCellId: PropTypes.string.isRequired,
   pagination: PropTypes.any,
-  headerIsInteractive: PropTypes.bool.isRequired,
-  handleHeaderMutation: PropTypes.any.isRequired,
   setVisibleColumns: PropTypes.func.isRequired,
   switchColumnPos: PropTypes.func.isRequired,
   onColumnResize: PropTypes.func,

package/es/components/datagrid/body/footer/data_grid_footer_row.js

@@ -12,8 +12,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import classnames from 'classnames';
 import React, { forwardRef, memo, useContext } from 'react';
-import { EuiDataGridCell } from '../data_grid_cell';
-import { DataGridCellPopoverContext } from '../data_grid_cell_popover';
+import { EuiDataGridCell, DataGridCellPopoverContext } from '../cell';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var renderEmpty = function renderEmpty() {
   return null;

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

@@ -14,8 +14,7 @@ import { EuiDataGridHeaderCellWrapper } from './data_grid_header_cell_wrapper';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiDataGridControlHeaderCell = function EuiDataGridControlHeaderCell(_ref) {
   var controlColumn = _ref.controlColumn,
-    index = _ref.index,
-    headerIsInteractive = _ref.headerIsInteractive;
+    index = _ref.index;
   var HeaderCellRender = controlColumn.headerCellRender,
     headerCellProps = controlColumn.headerCellProps,
     width = controlColumn.width,
@@ -24,8 +23,7 @@ export var EuiDataGridControlHeaderCell = function EuiDataGridControlHeaderCell(
     className: classNames('euiDataGridHeaderCell--controlColumn', headerCellProps === null || headerCellProps === void 0 ? void 0 : headerCellProps.className),
     id: id,
     index: index,
-    width: width,
-    headerIsInteractive: headerIsInteractive
+    width: width
   }), ___EmotionJSX("div", {
     className: "euiDataGridHeaderCell__content"
   }, ___EmotionJSX(HeaderCellRender, null)));
@@ -61,6 +59,5 @@ EuiDataGridControlHeaderCell.propTypes = {
        * Optional props to pass to the column footer cell
        */
     footerCellProps: PropTypes.any
-  }).isRequired,
-  headerIsInteractive: PropTypes.bool.isRequired
+  }).isRequired
 };

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

@@ -1,15 +1,15 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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)."; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -44,6 +44,7 @@ var _ref2 = process.env.NODE_ENV === "production" ? {
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
+  var _classnames;
   var column = _ref.column,
     index = _ref.index,
     columns = _ref.columns,
@@ -53,15 +54,13 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     defaultColumnWidth = _ref.defaultColumnWidth,
     setColumnWidth = _ref.setColumnWidth,
     setVisibleColumns = _ref.setVisibleColumns,
-    switchColumnPos = _ref.switchColumnPos,
-    headerIsInteractive = _ref.headerIsInteractive;
+    switchColumnPos = _ref.switchColumnPos;
   var id = column.id,
     display = column.display,
     displayAsText = column.displayAsText,
     displayHeaderCellProps = column.displayHeaderCellProps;
   var width = columnWidths[id] || defaultColumnWidth;
   var columnType = schema[id] ? schema[id].columnType : null;
-  var classes = classnames(_defineProperty({}, "euiDataGridHeaderCell--".concat(columnType), columnType), displayHeaderCellProps === null || displayHeaderCellProps === void 0 ? void 0 : displayHeaderCellProps.className);
   var _useContext = useContext(DataGridFocusContext),
     setFocusedCell = _useContext.setFocusedCell,
     focusFirstVisibleInteractiveCell = _useContext.focusFirstVisibleInteractiveCell;
@@ -86,6 +85,14 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   });
   var showColumnActions = columnActions && columnActions.length > 0;
   var actionsButtonRef = useRef(null);
+  var focusActionsButton = useCallback(function () {
+    var _actionsButtonRef$cur;
+    (_actionsButtonRef$cur = actionsButtonRef.current) === null || _actionsButtonRef$cur === void 0 ? void 0 : _actionsButtonRef$cur.focus();
+  }, []);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isActionsButtonFocused = _useState4[0],
+    setIsActionsButtonFocused = _useState4[1];
   var _useSortingUtils = useSortingUtils({
       sorting: sorting,
       id: id,
@@ -106,13 +113,16 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     title: displayAsText || id,
     className: "euiDataGridHeaderCell__content"
   }, display || displayAsText || id), sortingArrow);
+  var classes = classnames((_classnames = {}, _defineProperty(_classnames, "euiDataGridHeaderCell--".concat(columnType), columnType), _defineProperty(_classnames, 'euiDataGridHeaderCell--hasColumnActions', showColumnActions), _defineProperty(_classnames, 'euiDataGridHeaderCell--isActionsPopoverOpen', isPopoverOpen), _classnames), displayHeaderCellProps === null || displayHeaderCellProps === void 0 ? void 0 : displayHeaderCellProps.className);
   return ___EmotionJSX(EuiDataGridHeaderCellWrapper, _extends({}, displayHeaderCellProps, {
     className: classes,
     id: id,
     index: index,
     width: width,
-    headerIsInteractive: headerIsInteractive,
-    "aria-sort": ariaSort
+    "aria-sort": ariaSort,
+    hasActionsPopover: showColumnActions,
+    isActionsButtonFocused: isActionsButtonFocused,
+    focusActionsButton: focusActionsButton
   }), column.isResizable !== false && width != null ? ___EmotionJSX(EuiDataGridColumnResizer, {
     columnId: id,
     columnWidth: width,
@@ -120,11 +130,16 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   }) : 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 setIsPopoverOpen(function (isPopoverOpen) {
         return !isPopoverOpen;
       });
     },
+    onFocus: function onFocus() {
+      return setIsActionsButtonFocused(true);
+    },
+    onBlur: function onBlur() {
+      return setIsActionsButtonFocused(false);
+    },
     "aria-describedby": "".concat(sortingAriaId, " ").concat(actionsAriaId),
     ref: actionsButtonRef,
     "data-test-subj": "dataGridHeaderCellActionButton-".concat(id)
@@ -138,8 +153,8 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     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) {
+        var _actionsButtonRef$cur2;
+        if (((_actionsButtonRef$cur2 = actionsButtonRef.current) === null || _actionsButtonRef$cur2 === void 0 ? void 0 : _actionsButtonRef$cur2.contains(event.target)) === false) {
           setIsPopoverOpen(false);
         }
       }

package/es/components/datagrid/body/header/data_grid_header_cell_wrapper.js

@@ -1,4 +1,4 @@
-var _excluded = ["id", "index", "headerIsInteractive", "width", "className", "children"];
+var _excluded = ["id", "index", "width", "className", "children", "hasActionsPopover", "isActionsButtonFocused", "focusActionsButton"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -18,123 +18,69 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import classnames from 'classnames';
 import PropTypes from "prop-types";
-import React, { useContext, useEffect, useRef, useState } from 'react';
-import { tabbable } from 'tabbable';
-import { keys } from '../../../../services';
+import React, { useContext, useEffect, useState, useCallback } from 'react';
 import { DataGridFocusContext } from '../../utils/focus';
-import { jsx as ___EmotionJSX } from "@emotion/react";
+import { HandleInteractiveChildren } from '../cell/focus_utils';
+
 /**
  * This is a wrapper that handles repeated concerns between control &
  * standard header cells. Most of its shared logic is around focus state/UX,
  * but it also DRY's out certain class/data-test-subj/style attributes
  */
+import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiDataGridHeaderCellWrapper = function EuiDataGridHeaderCellWrapper(_ref) {
   var id = _ref.id,
     index = _ref.index,
-    headerIsInteractive = _ref.headerIsInteractive,
     width = _ref.width,
     className = _ref.className,
     children = _ref.children,
+    hasActionsPopover = _ref.hasActionsPopover,
+    isActionsButtonFocused = _ref.isActionsButtonFocused,
+    focusActionsButton = _ref.focusActionsButton,
     rest = _objectWithoutProperties(_ref, _excluded);
   var classes = classnames('euiDataGridHeaderCell', className);
+
+  // Must be a state and not a ref to trigger a HandleInteractiveChildren rerender
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    headerEl = _useState2[0],
+    setHeaderEl = _useState2[1];
   var _useContext = useContext(DataGridFocusContext),
     setFocusedCell = _useContext.setFocusedCell,
     onFocusUpdate = _useContext.onFocusUpdate;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isFocused = _useState2[0],
-    setIsFocused = _useState2[1];
+  var updateCellFocusContext = useCallback(function () {
+    setFocusedCell([index, -1]);
+  }, [index, setFocusedCell]);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isFocused = _useState4[0],
+    setIsFocused = _useState4[1];
   useEffect(function () {
     onFocusUpdate([index, -1], function (isFocused) {
       setIsFocused(isFocused);
     });
   }, [index, onFocusUpdate]);
-  var headerRef = useRef(null);
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isCellEntered = _useState4[0],
-    setIsCellEntered = _useState4[1];
-  useEffect(function () {
-    var headerNode = headerRef.current;
-    if (isCellEntered) {
-      enableAndFocusInteractives(headerNode);
-    } else {
-      disableInteractives(headerNode);
-    }
-  }, [isCellEntered]);
   useEffect(function () {
-    var headerNode = headerRef.current;
-    if (isFocused) {
-      var interactives = headerNode.querySelectorAll('[data-euigrid-tab-managed]');
-      if (interactives.length === 1) {
-        setIsCellEntered(true);
-      } else {
-        headerNode.focus();
+    if (isFocused && headerEl) {
+      // Only focus the cell if not already focused on something in the cell
+      if (!headerEl.contains(document.activeElement)) {
+        headerEl.focus();
       }
-    } else {
-      setIsCellEntered(false);
     }
+  }, [isFocused, headerEl]);
 
-    // focusin bubbles while focus does not, and this needs to react to children gaining focus
-    var onFocusIn = function onFocusIn(e) {
-      if (!headerIsInteractive) {
-        // header is not interactive, avoid focusing
-        requestAnimationFrame(function () {
-          return headerNode.blur();
-        });
-        e.preventDefault();
-        return false;
-      } else {
-        // take the focus
-        if (isFocused === false) {
-          setFocusedCell([index, -1]);
-        } else {
-          // this cell already had the grid's focus, so re-enable and focus interactives
-          setIsCellEntered(true);
-        }
-      }
-    };
-
-    // focusout bubbles while blur does not, and this needs to react to the children losing focus
-    var onFocusOut = function onFocusOut() {
-      // wait for the next element to receive focus, then update interactives' state
-      requestAnimationFrame(function () {
-        if (!headerNode.contains(document.activeElement)) {
-          setIsCellEntered(false);
-        }
-      });
-    };
-    var onKeyUp = function onKeyUp(event) {
-      switch (event.key) {
-        case keys.ENTER:
-          {
-            event.preventDefault();
-            setIsCellEntered(true);
-            break;
-          }
-        case keys.ESCAPE:
-          {
-            event.preventDefault();
-            // move focus to cell
-            setIsCellEntered(false);
-            headerNode.focus();
-            break;
-          }
-      }
-    };
-    headerNode.addEventListener('focusin', onFocusIn);
-    headerNode.addEventListener('focusout', onFocusOut);
-    headerNode.addEventListener('keyup', onKeyUp);
-    return function () {
-      headerNode.removeEventListener('focusin', onFocusIn);
-      headerNode.removeEventListener('focusout', onFocusOut);
-      headerNode.removeEventListener('keyup', onKeyUp);
-    };
-  }, [headerIsInteractive, isFocused, index, setFocusedCell]);
+  // For cell headers with actions, auto-focus into the button instead of the cell wrapper div
+  // The button text is significantly more useful to screen readers (e.g. contains sort order & hints)
+  var onFocus = useCallback(function (e) {
+    if (hasActionsPopover && e.target === headerEl) {
+      focusActionsButton === null || focusActionsButton === void 0 ? void 0 : focusActionsButton();
+    }
+  }, [hasActionsPopover, focusActionsButton, headerEl]);
   return ___EmotionJSX("div", _extends({
     role: "columnheader",
-    ref: headerRef,
-    tabIndex: isFocused && !isCellEntered ? 0 : -1,
+    ref: setHeaderEl,
+    tabIndex: isFocused && !isActionsButtonFocused ? 0 : -1,
+    onFocus: onFocus,
     className: classes,
     "data-test-subj": "dataGridHeaderCell-".concat(id),
     "data-gridcell-column-id": id,
@@ -144,35 +90,18 @@ export var EuiDataGridHeaderCellWrapper = function EuiDataGridHeaderCellWrapper(
     style: width != null ? {
       width: "".concat(width, "px")
     } : {}
-  }, rest), children);
+  }, rest), ___EmotionJSX(HandleInteractiveChildren, {
+    cellEl: headerEl,
+    updateCellFocusContext: updateCellFocusContext,
+    renderFocusTrap: !hasActionsPopover
+  }, children));
 };
-
-/**
- * Utility fns for managing child interactive tabIndex state
- */
 EuiDataGridHeaderCellWrapper.propTypes = {
   id: PropTypes.string.isRequired,
   index: PropTypes.number.isRequired,
-  headerIsInteractive: PropTypes.bool.isRequired,
   width: PropTypes.oneOfType([PropTypes.number.isRequired, PropTypes.oneOf([null])]),
-  className: PropTypes.string
-};
-var disableInteractives = function disableInteractives(headerNode) {
-  var tabbables = tabbable(headerNode);
-  if (tabbables.length > 1) {
-    console.warn("EuiDataGridHeaderCell expects at most 1 tabbable element, ".concat(tabbables.length, " found instead"));
-  }
-  tabbables.forEach(function (element) {
-    element.setAttribute('data-euigrid-tab-managed', 'true');
-    element.setAttribute('tabIndex', '-1');
-  });
-};
-var enableAndFocusInteractives = function enableAndFocusInteractives(headerNode) {
-  var interactiveElements = headerNode.querySelectorAll('[data-euigrid-tab-managed]');
-  interactiveElements.forEach(function (element, i) {
-    element.setAttribute('tabIndex', '0');
-    if (i === 0) {
-      element.focus();
-    }
-  });
+  className: PropTypes.string,
+  hasActionsPopover: PropTypes.bool,
+  isActionsButtonFocused: PropTypes.bool,
+  focusActionsButton: PropTypes.func
 };

package/es/components/datagrid/body/header/data_grid_header_row.js

@@ -1,4 +1,4 @@
-var _excluded = ["leadingControlColumns", "trailingControlColumns", "columns", "schema", "schemaDetectors", "columnWidths", "defaultColumnWidth", "className", "setColumnWidth", "setVisibleColumns", "switchColumnPos", "headerIsInteractive", "data-test-subj"];
+var _excluded = ["leadingControlColumns", "trailingControlColumns", "columns", "schema", "schemaDetectors", "columnWidths", "defaultColumnWidth", "className", "setColumnWidth", "setVisibleColumns", "switchColumnPos", "data-test-subj"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -31,7 +31,6 @@ var EuiDataGridHeaderRow = /*#__PURE__*/forwardRef(function (props, ref) {
     setColumnWidth = props.setColumnWidth,
     setVisibleColumns = props.setVisibleColumns,
     switchColumnPos = props.switchColumnPos,
-    headerIsInteractive = props.headerIsInteractive,
     _dataTestSubj = props['data-test-subj'],
     rest = _objectWithoutProperties(props, _excluded);
   var classes = classnames('euiDataGridHeader', className);
@@ -45,8 +44,7 @@ var EuiDataGridHeaderRow = /*#__PURE__*/forwardRef(function (props, ref) {
     return ___EmotionJSX(EuiDataGridControlHeaderCell, {
       key: controlColumn.id,
       index: index,
-      controlColumn: controlColumn,
-      headerIsInteractive: headerIsInteractive
+      controlColumn: controlColumn
     });
   }), columns.map(function (column, index) {
     return ___EmotionJSX(EuiDataGridHeaderCell, {
@@ -60,15 +58,13 @@ var EuiDataGridHeaderRow = /*#__PURE__*/forwardRef(function (props, ref) {
       setColumnWidth: setColumnWidth,
       setVisibleColumns: setVisibleColumns,
       switchColumnPos: switchColumnPos,
-      defaultColumnWidth: defaultColumnWidth,
-      headerIsInteractive: headerIsInteractive
+      defaultColumnWidth: defaultColumnWidth
     });
   }), trailingControlColumns.map(function (controlColumn, index) {
     return ___EmotionJSX(EuiDataGridControlHeaderCell, {
       key: controlColumn.id,
       index: index + leadingControlColumns.length + columns.length,
-      controlColumn: controlColumn,
-      headerIsInteractive: headerIsInteractive
+      controlColumn: controlColumn
     });
   }));
 });
@@ -607,8 +603,7 @@ EuiDataGridHeaderRow.propTypes = {
   defaultColumnWidth: PropTypes.oneOfType([PropTypes.number.isRequired, PropTypes.oneOf([null])]),
   setColumnWidth: PropTypes.func.isRequired,
   setVisibleColumns: PropTypes.func.isRequired,
-  switchColumnPos: PropTypes.func.isRequired,
-  headerIsInteractive: PropTypes.bool.isRequired
+  switchColumnPos: PropTypes.func.isRequired
 };
 EuiDataGridHeaderRow.displayName = 'EuiDataGridHeaderRow';
 export { EuiDataGridHeaderRow };

package/es/components/datagrid/body/header/use_data_grid_header.js

@@ -1,4 +1,3 @@
-var _excluded = ["handleHeaderMutation"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -6,8 +5,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -17,25 +14,18 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  */
 
 import React, { useState, useMemo } from 'react';
-import { useMutationObserver } from '../../../observer/mutation_observer';
 import { useResizeObserver } from '../../../observer/resize_observer';
-import { useHeaderFocusWorkaround } from '../../utils/focus';
 import { EuiDataGridHeaderRow } from './data_grid_header_row';
-import { jsx as ___EmotionJSX } from "@emotion/react";
+
 /**
  * DRY out setting up the grid header and its refs & observers
  */
-export var useDataGridHeader = function useDataGridHeader(_ref) {
-  var handleHeaderMutation = _ref.handleHeaderMutation,
-    props = _objectWithoutProperties(_ref, _excluded);
+import { jsx as ___EmotionJSX } from "@emotion/react";
+export var useDataGridHeader = function useDataGridHeader(props) {
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     headerRowRef = _useState2[0],
     setHeaderRowRef = _useState2[1];
-  useMutationObserver(headerRowRef, handleHeaderMutation, {
-    subtree: true,
-    childList: true
-  });
   var _useResizeObserver = useResizeObserver(headerRowRef, 'height'),
     headerRowHeight = _useResizeObserver.height;
   var headerRow = useMemo(function () {
@@ -44,7 +34,6 @@ export var useDataGridHeader = function useDataGridHeader(_ref) {
     }, props));
   }, Object.values(props)); // eslint-disable-line react-hooks/exhaustive-deps
 
-  useHeaderFocusWorkaround(props.headerIsInteractive);
   return {
     headerRow: headerRow,
     headerRowHeight: headerRowHeight

package/es/components/datagrid/data_grid.js

@@ -40,8 +40,7 @@ import { useDataGridColumnSelector, useDataGridColumnSorting, useDataGridDisplay
 import { DataGridSortingContext, useSorting } from './utils/sorting';
 import { DataGridFocusContext, useFocus, createKeyDownHandler, preventTabbing } from './utils/focus';
 import { useInMemoryValues, EuiDataGridInMemoryRenderer } from './utils/in_memory';
-import { useHeaderIsInteractive } from './body/header/header_is_interactive';
-import { DataGridCellPopoverContext, useCellPopover } from './body/data_grid_cell_popover';
+import { DataGridCellPopoverContext, useCellPopover } from './body/cell';
 import { computeVisibleRows } from './utils/row_count';
 import { EuiDataGridPaginationRenderer } from './utils/data_grid_pagination';
 import { schemaDetectors as providedSchemaDetectors, useMergedSchema } from './utils/data_grid_schema';
@@ -211,13 +210,7 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
   /**
    * Focus
    */
-  var _useHeaderIsInteracti = useHeaderIsInteractive(contentRef.current),
-    headerIsInteractive = _useHeaderIsInteracti.headerIsInteractive,
-    handleHeaderMutation = _useHeaderIsInteracti.handleHeaderMutation;
-  var _useFocus = useFocus({
-      headerIsInteractive: headerIsInteractive,
-      gridItemsRendered: gridItemsRendered
-    }),
+  var _useFocus = useFocus(),
     wrappingDivFocusProps = _useFocus.focusProps,
     focusContext = _objectWithoutProperties(_useFocus, _excluded2);
 
@@ -345,7 +338,6 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
       rowCount: rowCount,
       pagination: pagination,
       hasFooter: !!renderFooterCellValue,
-      headerIsInteractive: headerIsInteractive,
       focusContext: focusContext
     }),
     "data-test-subj": "euiDataGridBody",
@@ -362,8 +354,6 @@ export var EuiDataGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (pr
     setVisibleColumns: setVisibleColumns,
     switchColumnPos: switchColumnPos,
     onColumnResize: onColumnResize,
-    headerIsInteractive: headerIsInteractive,
-    handleHeaderMutation: handleHeaderMutation,
     schemaDetectors: allSchemaDetectors,
     pagination: pagination,
     renderCellValue: renderCellValue,