@elastic/eui 95.10.1 → 95.11.0

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

@@ -1,9 +1,6 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "title", "arrow"];
-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
@@ -15,48 +12,30 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringif
 import classnames from 'classnames';
 import React, { useContext, useState, useRef, useCallback, useMemo, memo } from 'react';
 import { tabbable } from 'tabbable';
-import { keys, useEuiMemoizedStyles } from '../../../../services';
-import { useGeneratedHtmlId } from '../../../../services/accessibility';
+import { keys, useGeneratedHtmlId, useEuiMemoizedStyles } from '../../../../services';
 import { EuiI18n, useEuiI18n } from '../../../i18n';
 import { EuiIcon } from '../../../icon';
 import { EuiListGroup } from '../../../list_group';
 import { EuiPopover } from '../../../popover';
-import { _emptyHoverStyles } from '../../../button/button_icon/button_icon.styles';
+import { EuiButtonIcon } from '../../../button';
 import { DataGridFocusContext } from '../../utils/focus';
 import { getColumnActions } from './column_actions';
 import { EuiDataGridColumnResizer } from './data_grid_column_resizer';
 import { EuiDataGridHeaderCellWrapper } from './data_grid_header_cell_wrapper';
+import { euiDataGridHeaderCellStyles } from './data_grid_header_cell.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-var CellContent = function CellContent(_ref) {
-  var children = _ref.children,
-    title = _ref.title,
-    arrow = _ref.arrow,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  return ___EmotionJSX(React.Fragment, null, ___EmotionJSX("div", _extends({}, rest, {
-    title: title,
-    className: "euiDataGridHeaderCell__content"
-  }), children), arrow);
-};
-var _ref3 = 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 = /*#__PURE__*/memo(function (_ref2) {
-  var index = _ref2.index,
-    column = _ref2.column,
-    columns = _ref2.columns,
-    columnWidths = _ref2.columnWidths,
-    defaultColumnWidth = _ref2.defaultColumnWidth,
-    setColumnWidth = _ref2.setColumnWidth,
-    setVisibleColumns = _ref2.setVisibleColumns,
-    switchColumnPos = _ref2.switchColumnPos,
-    sorting = _ref2.sorting,
-    schema = _ref2.schema,
-    schemaDetectors = _ref2.schemaDetectors;
+export var EuiDataGridHeaderCell = /*#__PURE__*/memo(function (_ref) {
+  var index = _ref.index,
+    column = _ref.column,
+    columns = _ref.columns,
+    columnWidths = _ref.columnWidths,
+    defaultColumnWidth = _ref.defaultColumnWidth,
+    setColumnWidth = _ref.setColumnWidth,
+    setVisibleColumns = _ref.setVisibleColumns,
+    switchColumnPos = _ref.switchColumnPos,
+    sorting = _ref.sorting,
+    schema = _ref.schema,
+    schemaDetectors = _ref.schemaDetectors;
   var id = column.id,
     display = column.display,
     displayAsText = column.displayAsText,
@@ -135,7 +114,8 @@ export var EuiDataGridHeaderCell = /*#__PURE__*/memo(function (_ref2) {
    * Rendering
    */
   var classes = classnames(_defineProperty(_defineProperty(_defineProperty({}, "euiDataGridHeaderCell--".concat(columnType), columnType), 'euiDataGridHeaderCell--hasColumnActions', showColumnActions), 'euiDataGridHeaderCell--isActionsPopoverOpen', isPopoverOpen), displayHeaderCellProps === null || displayHeaderCellProps === void 0 ? void 0 : displayHeaderCellProps.className);
-  var emptyHoverStyles = useEuiMemoizedStyles(_emptyHoverStyles);
+  var styles = useEuiMemoizedStyles(euiDataGridHeaderCellStyles);
+  var contentStyles = [styles.euiDataGridHeaderCell__content, columnType === 'numeric' || columnType === 'currency' ? styles.right : styles.left];
   return ___EmotionJSX(EuiDataGridHeaderCellWrapper, _extends({}, displayHeaderCellProps, {
     className: classes,
     id: id,
@@ -152,10 +132,11 @@ export var EuiDataGridHeaderCell = /*#__PURE__*/memo(function (_ref2) {
       columnId: id,
       columnWidth: width,
       setColumnWidth: setColumnWidth
-    }) : null, ___EmotionJSX(CellContent, {
-      title: title,
-      arrow: sortingArrow
-    }, children), sortingScreenReaderText && ___EmotionJSX("p", {
+    }) : null, ___EmotionJSX("div", {
+      css: contentStyles,
+      className: "euiDataGridHeaderCell__content",
+      title: title
+    }, children), sortingArrow, sortingScreenReaderText && ___EmotionJSX("p", {
       id: sortingAriaId,
       hidden: true
     }, sortingScreenReaderText), showColumnActions && ___EmotionJSX(EuiPopover, _extends({
@@ -163,12 +144,14 @@ export var EuiDataGridHeaderCell = /*#__PURE__*/memo(function (_ref2) {
       panelPaddingSize: "none",
       offset: 7,
       anchorPosition: "downRight",
-      css: _ref3 // Align to right
-      ,
-      button: ___EmotionJSX("button", {
-        ref: actionsButtonRef,
+      css: styles.euiDataGridHeaderCell__popover,
+      button: ___EmotionJSX(EuiButtonIcon, {
+        iconType: "boxesVertical",
+        iconSize: "s",
+        color: "text",
+        css: styles.euiDataGridHeaderCell__button,
         className: "euiDataGridHeaderCell__button",
-        css: emptyHoverStyles.text,
+        buttonRef: actionsButtonRef,
         onClick: togglePopover,
         onFocus: function onFocus() {
           return setIsActionsButtonFocused(true);
@@ -176,17 +159,13 @@ export var EuiDataGridHeaderCell = /*#__PURE__*/memo(function (_ref2) {
         onBlur: function onBlur() {
           return setIsActionsButtonFocused(false);
         },
+        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)
-      }, ___EmotionJSX("div", {
-        className: "euiDataGridHeaderCell__icon"
-      }, ___EmotionJSX(EuiIcon, {
-        type: "boxesVertical",
-        size: "s",
-        color: "text"
-      }))),
+      }),
       isOpen: isPopoverOpen,
       closePopover: closePopover
     }, popoverArrowNavigationProps), ___EmotionJSX(EuiListGroup, {
@@ -201,11 +180,11 @@ EuiDataGridHeaderCell.displayName = 'EuiDataGridHeaderCell';
 /**
  * Column sorting utility helpers
  */
-export var useSortingUtils = function useSortingUtils(_ref4) {
+export var useSortingUtils = function useSortingUtils(_ref2) {
   var _sorting$columns;
-  var sorting = _ref4.sorting,
-    id = _ref4.id,
-    showColumnActions = _ref4.showColumnActions;
+  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;
@@ -241,9 +220,9 @@ export var useSortingUtils = function useSortingUtils(_ref4) {
     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 || (_sorting$columns2 = sorting.columns) === null || _sorting$columns2 === void 0 ? void 0 : _sorting$columns2.map(function (_ref5, index) {
-      var columnId = _ref5.id,
-        direction = _ref5.direction;
+    return ___EmotionJSX(React.Fragment, null, sorting === null || sorting === 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, {

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

@@ -0,0 +1,29 @@
+/*
+ * 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 { euiCanAnimate, euiTextTruncate, logicalCSS, logicalTextAlignCSS } from '../../../../global_styling';
+import { euiDataGridCellOutlineSelectors } from '../cell/data_grid_cell.styles';
+
+/**
+ * Styles only applied to data header cell content, not control header cells
+ */
+export var euiDataGridHeaderCellStyles = function euiDataGridHeaderCellStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var _euiDataGridCellOutli = euiDataGridCellOutlineSelectors('.euiDataGridHeaderCell'),
+    header = _euiDataGridCellOutli.header;
+  return {
+    euiDataGridHeaderCell__content: /*#__PURE__*/css("flex-grow:1;", euiTextTruncate(), ";;label:euiDataGridHeaderCell__content;"),
+    // Overwrite inherited 'center' styles from <button>
+    left: /*#__PURE__*/css(logicalTextAlignCSS('left'), ";;label:left;"),
+    // Numeric and currency schemas are aligned to the right
+    right: /*#__PURE__*/css(logicalTextAlignCSS('right'), ";;label:right;"),
+    euiDataGridHeaderCell__popover: /*#__PURE__*/css(logicalCSS('margin-left', 'auto'), "line-height:0;;label:euiDataGridHeaderCell__popover;"),
+    euiDataGridHeaderCell__button: /*#__PURE__*/css("overflow:hidden;", header.hideActions, " &{", logicalCSS('width', 0), " opacity:0;}", euiCanAnimate, "{transition:inline-size ", euiTheme.animation.fast, " ease-in,opacity ", euiTheme.animation.slow, " ease-in;transform:none!important;animation:none!important;};label:euiDataGridHeaderCell__button;")
+  };
+};

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

@@ -12,9 +12,10 @@ var _excluded = ["id", "index", "width", "className", "children", "hasActionsPop
 
 import React, { useContext, useEffect, useState, useCallback } from 'react';
 import classnames from 'classnames';
-import { keys } from '../../../../services';
+import { keys, useEuiMemoizedStyles } from '../../../../services';
 import { DataGridFocusContext } from '../../utils/focus';
 import { HandleInteractiveChildren } from '../cell/focus_utils';
+import { euiDataGridHeaderCellWrapperStyles } from './data_grid_header_cell_wrapper.styles';
 
 /**
  * This is a wrapper that handles repeated concerns between control &
@@ -33,6 +34,7 @@ export var EuiDataGridHeaderCellWrapper = function EuiDataGridHeaderCellWrapper(
     ariaLabel = _ref['aria-label'],
     rest = _objectWithoutProperties(_ref, _excluded);
   var classes = classnames('euiDataGridHeaderCell', className);
+  var styles = useEuiMemoizedStyles(euiDataGridHeaderCellWrapperStyles);
 
   // Must be a state and not a ref to trigger a HandleInteractiveChildren rerender
   var _useState = useState(null),
@@ -84,6 +86,7 @@ export var EuiDataGridHeaderCellWrapper = function EuiDataGridHeaderCellWrapper(
     ref: setHeaderEl,
     tabIndex: isFocused ? 0 : -1,
     onKeyDown: onKeyDown,
+    css: styles.euiDataGridHeaderCell,
     className: classes,
     "data-test-subj": "dataGridHeaderCell-".concat(id),
     "data-gridcell-column-id": id,

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

@@ -0,0 +1,27 @@
+/*
+ * 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';
+import { euiDataGridCellOutlineStyles, euiDataGridCellOutlineSelectors } from '../cell/data_grid_cell.styles';
+
+/**
+ * Styles that apply to both control and non-control columns
+ */
+export var euiDataGridHeaderCellWrapperStyles = function euiDataGridHeaderCellWrapperStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var _euiDataGridCellOutli = euiDataGridCellOutlineStyles(euiThemeContext),
+    focusStyles = _euiDataGridCellOutli.focusStyles,
+    hoverStyles = _euiDataGridCellOutli.hoverStyles;
+  var _euiDataGridCellOutli2 = euiDataGridCellOutlineSelectors(),
+    outlineSelectors = _euiDataGridCellOutli2.header;
+  var _sharedFlexCss = /*#__PURE__*/css("display:flex;align-items:center;gap:", euiTheme.size.xxs, ";");
+  return {
+    euiDataGridHeaderCell: /*#__PURE__*/css("position:relative;", _sharedFlexCss, " flex:0 0 auto;font-weight:", euiTheme.font.weight.bold, ";", outlineSelectors.focus, "{", focusStyles, ";}", outlineSelectors.focusTrapped, "{", hoverStyles, ";}&>[data-focus-lock-disabled]{", _sharedFlexCss, " ", logicalCSS('width', '100%'), ";};label:euiDataGridHeaderCell;")
+  };
+};

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

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["className", "data-test-subj", "leadingControlColumns", "trailingControlColumns", "columns", "columnWidths", "defaultColumnWidth", "setColumnWidth", "setVisibleColumns", "switchColumnPos", "sorting", "schema", "schemaDetectors"];
+var _excluded = ["className", "data-test-subj", "leadingControlColumns", "trailingControlColumns", "columns", "columnWidths", "defaultColumnWidth", "setColumnWidth", "setVisibleColumns", "switchColumnPos", "sorting", "schema", "schemaDetectors", "gridStyles"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -11,9 +11,11 @@ var _excluded = ["className", "data-test-subj", "leadingControlColumns", "traili
 
 import classnames from 'classnames';
 import React, { forwardRef, memo } from 'react';
+import { useEuiMemoizedStyles } from '../../../../services';
+import { emptyControlColumns } from '../../data_grid_types';
 import { EuiDataGridControlHeaderCell } from './data_grid_control_header_cell';
 import { EuiDataGridHeaderCell } from './data_grid_header_cell';
-import { emptyControlColumns } from '../../data_grid_types';
+import { euiDataGridHeaderStyles } from './data_grid_header_row.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var EuiDataGridHeaderRow = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,
@@ -31,12 +33,16 @@ var EuiDataGridHeaderRow = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (
     sorting = props.sorting,
     schema = props.schema,
     schemaDetectors = props.schemaDetectors,
+    gridStyles = props.gridStyles,
     rest = _objectWithoutProperties(props, _excluded);
+  var styles = useEuiMemoizedStyles(euiDataGridHeaderStyles);
+  var cssStyles = [styles.euiDataGridHeader, styles[gridStyles.header]];
   var classes = classnames('euiDataGridHeader', className);
   var dataTestSubj = classnames('dataGridHeader', _dataTestSubj);
   return ___EmotionJSX("div", _extends({
     role: "row",
     ref: ref,
+    css: cssStyles,
     className: classes,
     "data-test-subj": dataTestSubj
   }, rest), leadingControlColumns.map(function (controlColumn, index) {

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

@@ -0,0 +1,21 @@
+/*
+ * 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';
+import { euiDataGridVariables } from '../../data_grid.styles';
+export var euiDataGridHeaderStyles = function euiDataGridHeaderStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var _euiDataGridVariables = euiDataGridVariables(euiThemeContext),
+    levels = _euiDataGridVariables.levels;
+  return {
+    euiDataGridHeader: /*#__PURE__*/css("z-index:", levels.stickyHeader, ";position:sticky;", logicalCSS('top', 0), " ", logicalCSS('width', 'fit-content'), " display:flex;;label:euiDataGridHeader;"),
+    underline: /*#__PURE__*/css("background-color:", euiTheme.colors.emptyShade, ";", logicalCSS('border-bottom', "".concat(euiTheme.border.width.thick, " solid ").concat(euiTheme.colors.text)), ";;label:underline;"),
+    shade: /*#__PURE__*/css("background-color:", euiTheme.colors.lightestShade, ";;label:shade;")
+  };
+};

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

@@ -11,16 +11,18 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
 import React, { useState, useMemo, useCallback } from 'react';
 import classNames from 'classnames';
+import { useDependentState, useEuiMemoizedStyles } from '../../../services';
 import { EuiPopover, EuiPopoverFooter, EuiPopoverTitle } from '../../popover';
 import { EuiI18n, useEuiI18n } from '../../i18n';
 import { EuiButtonEmpty } from '../../button';
 import { EuiFlexGroup, EuiFlexItem } from '../../flex';
 import { EuiSwitch, EuiFieldText } from '../../form';
-import { EuiDragDropContext, EuiDraggable, EuiDroppable, euiDragDropReorder } from '../../drag_and_drop';
+import { EuiText } from '../../text';
 import { EuiIcon } from '../../icon';
-import { useDependentState } from '../../../services';
+import { EuiDragDropContext, EuiDraggable, EuiDroppable, euiDragDropReorder } from '../../drag_and_drop';
 import { getNestedObjectOptions } from './data_grid_toolbar';
 import { EuiDataGridToolbarControl } from './data_grid_toolbar_control';
+import { euiDataGridColumnSelectorStyles } from './column_selector.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var useDataGridColumnSelector = function useDataGridColumnSelector(availableColumns, columnVisibility, showColumnSelector, displayValues) {
   var allowColumnHiding = getNestedObjectOptions(showColumnSelector, 'allowHide');
@@ -82,6 +84,7 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
       return column != null;
     });
   }, [availableColumns, visibleColumns]);
+  var styles = useEuiMemoizedStyles(euiDataGridColumnSelectorStyles);
   var columnSelector = useMemo(function () {
     return allowColumnHiding || allowColumnReorder ? ___EmotionJSX(EuiPopover, {
       "data-test-subj": "dataGridColumnSelectorPopover",
@@ -90,7 +93,7 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
         return setIsOpen(false);
       },
       anchorPosition: "downLeft",
-      panelPaddingSize: "s",
+      panelPaddingSize: "none",
       hasDragDrop: true,
       button: ___EmotionJSX(EuiDataGridToolbarControl, {
         badgeContent: numberOfHiddenFields > 0 ? "".concat(orderedVisibleColumns.length, "/").concat(availableColumns.length) : availableColumns.length,
@@ -103,7 +106,9 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
         token: "euiColumnSelector.button",
         default: "Columns"
       }))
-    }, allowColumnHiding && ___EmotionJSX(EuiPopoverTitle, null, ___EmotionJSX(EuiI18n, {
+    }, allowColumnHiding && ___EmotionJSX(EuiPopoverTitle, {
+      paddingSize: "s"
+    }, ___EmotionJSX(EuiI18n, {
       tokens: ['euiColumnSelector.search', 'euiColumnSelector.searchcolumns'],
       defaults: ['Search', 'Search columns']
     }, function (_ref4) {
@@ -125,7 +130,7 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
     }, ___EmotionJSX(EuiDroppable, {
       droppableId: "columnOrder",
       isDropDisabled: !isDragEnabled,
-      className: "euiDataGrid__controlScroll"
+      css: styles.euiDataGridColumnSelector
     }, ___EmotionJSX(React.Fragment, null, filteredColumns.map(function (id, index) {
       return ___EmotionJSX(EuiDraggable, {
         key: id,
@@ -136,6 +141,7 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
         customDragHandle: true
       }, function (provided, state) {
         return ___EmotionJSX("div", {
+          css: styles.euiDataGridColumnSelector__item,
           className: classNames('euiDataGridColumnSelector__item', {
             'euiDataGridColumnSelector__item-isDragging': state.isDragging
           }),
@@ -166,7 +172,8 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
         , _extends({}, provided.dragHandleProps, {
           "aria-hidden": true,
           tabIndex: -1
-        }), ___EmotionJSX("span", {
+        }), ___EmotionJSX(EuiText, {
+          size: "xs",
           className: "euiDataGridColumnSelector__itemLabel"
         }, displayValues[id] || id)), isDragEnabled && ___EmotionJSX(EuiFlexItem, _extends({
           grow: false
@@ -177,7 +184,9 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
           color: "subdued"
         }))));
       });
-    })))), allowColumnHiding && ___EmotionJSX(EuiPopoverFooter, null, ___EmotionJSX(EuiFlexGroup, {
+    })))), allowColumnHiding && ___EmotionJSX(EuiPopoverFooter, {
+      paddingSize: "s"
+    }, ___EmotionJSX(EuiFlexGroup, {
       gutterSize: "s",
       responsive: false,
       justifyContent: "spaceBetween"
@@ -206,7 +215,7 @@ export var useDataGridColumnSelector = function useDataGridColumnSelector(availa
       token: "euiColumnSelector.hideAll",
       default: "Hide all"
     })))))) : null;
-  }, [availableColumns.length, numberOfHiddenFields, orderedVisibleColumns.length, allowColumnHiding, allowColumnReorder, isOpen, columnSearchText, displayValues, visibleColumnIds, sortedColumns, setVisibleColumns, setIsOpen, onDragEnd, isDragEnabled, dragHandleAriaLabel, filteredColumns]);
+  }, [styles, availableColumns.length, numberOfHiddenFields, orderedVisibleColumns.length, allowColumnHiding, allowColumnReorder, isOpen, columnSearchText, displayValues, visibleColumnIds, sortedColumns, setVisibleColumns, setIsOpen, onDragEnd, isDragEnabled, dragHandleAriaLabel, filteredColumns]);
 
   /**
    * Used for moving columns left/right, available in the headers actions menu

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

@@ -0,0 +1,22 @@
+/*
+ * 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 { euiYScroll, logicalCSS, mathWithUnits } from '../../../global_styling';
+import { euiShadowLarge } from '../../../themes';
+export var euiDataGridColumnSelectorStyles = function euiDataGridColumnSelectorStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var maxStaticHeight = mathWithUnits(euiTheme.size.base, function (x) {
+    return x * 25;
+  });
+  var maxResponsiveHeight = "min(".concat(maxStaticHeight, ", 50vh)");
+  return {
+    euiDataGridColumnSelector: /*#__PURE__*/css(euiYScroll(euiThemeContext), " ", logicalCSS('max-height', maxResponsiveHeight), " padding:", euiTheme.size.s, ";;label:euiDataGridColumnSelector;"),
+    euiDataGridColumnSelector__item: /*#__PURE__*/css("padding:", euiTheme.size.xs, ";&.euiDataGridColumnSelector__item-isDragging{", euiShadowLarge(euiThemeContext), " background-color:", euiTheme.colors.emptyShade, ";};label:euiDataGridColumnSelector__item;")
+  };
+};

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

@@ -12,6 +12,7 @@ var _excluded = ["sorting"];
  */
 
 import React, { useEffect, useState, useMemo, useCallback, memo } from 'react';
+import { useEuiMemoizedStyles } from '../../../services';
 import { EuiButtonEmpty } from '../../button';
 import { EuiDragDropContext, euiDragDropReorder, EuiDroppable } from '../../drag_and_drop';
 import { EuiFlexGroup, EuiFlexItem } from '../../flex';
@@ -19,9 +20,10 @@ import { EuiI18n, useEuiI18n } from '../../i18n';
 import { EuiPopover, EuiPopoverFooter } from '../../popover';
 import { EuiText } from '../../text';
 import { EuiToken } from '../../token';
+import { getDetailsForSchema } from '../utils/data_grid_schema';
 import { EuiDataGridToolbarControl } from './data_grid_toolbar_control';
 import { EuiDataGridColumnSortingDraggable } from './column_sorting_draggable';
-import { getDetailsForSchema } from '../utils/data_grid_schema';
+import { euiDataGridColumnSortingStyles } from './column_sorting.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var useDataGridColumnSorting = function useDataGridColumnSorting(_ref) {
   var sorting = _ref.sorting,
@@ -42,6 +44,7 @@ export var DataGridSortingControl = /*#__PURE__*/memo(function (_ref2) {
     setIsOpen = _useState2[1];
   var sortingButtonText = useEuiI18n('euiColumnSorting.button', 'Sort fields');
   var sortFieldAriaLabel = useEuiI18n('euiColumnSorting.sortFieldAriaLabel', 'Sort by: ');
+  var styles = useEuiMemoizedStyles(euiDataGridColumnSortingStyles);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     availableColumnsIsOpen = _useState4[0],
@@ -142,7 +145,7 @@ export var DataGridSortingControl = /*#__PURE__*/memo(function (_ref2) {
     onDragEnd: onDragEnd
   }, ___EmotionJSX(EuiDroppable, {
     droppableId: "columnSorting",
-    className: "euiDataGrid__controlScroll"
+    css: styles.euiDataGridColumnSorting
   }, ___EmotionJSX(React.Fragment, null, sorting.columns.map(function (_ref7, index) {
     var id = _ref7.id,
       direction = _ref7.direction;
@@ -192,6 +195,7 @@ export var DataGridSortingControl = /*#__PURE__*/memo(function (_ref2) {
       default: "Pick fields to sort by"
     }))
   }, ___EmotionJSX("div", {
+    css: styles.euiDataGridColumnSorting__fieldList,
     className: "euiDataGridColumnSorting__fieldList",
     role: "listbox"
   }, inactiveSortableColumns.map(function (_ref8) {
@@ -199,6 +203,7 @@ export var DataGridSortingControl = /*#__PURE__*/memo(function (_ref2) {
       defaultSortDirection = _ref8.defaultSortDirection;
     return ___EmotionJSX("button", {
       key: id,
+      css: styles.euiDataGridColumnSorting__field,
       className: "euiDataGridColumnSorting__field",
       "aria-label": "".concat(sortFieldAriaLabel, " ").concat(id),
       role: "option",

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

@@ -0,0 +1,35 @@
+/*
+ * 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 { euiFontSize, euiMinBreakpoint, euiYScroll, logicalCSS, mathWithUnits } from '../../../global_styling';
+import { euiShadowLarge } from '../../../themes';
+export var euiDataGridColumnSortingStyles = function euiDataGridColumnSortingStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var maxStaticHeight = mathWithUnits(euiTheme.size.m, function (x) {
+    return x * 25;
+  });
+  var maxResponsiveHeight = "min(".concat(maxStaticHeight, ", 75vh)");
+  return {
+    /**
+     * Sorted fields
+     */
+    euiDataGridColumnSorting: /*#__PURE__*/css(logicalCSS('max-height', maxResponsiveHeight), " ", logicalCSS('padding-vertical', euiTheme.size.s), "margin:-", euiTheme.size.s, ";", euiYScroll(euiThemeContext), ";;label:euiDataGridColumnSorting;"),
+    euiDataGridColumnSorting__item: /*#__PURE__*/css(logicalCSS('padding-horizontal', euiTheme.size.s), " &.euiDataGridColumnSorting__item-isDragging{", euiShadowLarge(euiThemeContext), " background-color:", euiTheme.colors.emptyShade, ";};label:euiDataGridColumnSorting__item;"),
+    euiDataGridColumnSorting__name: /*#__PURE__*/css(logicalCSS('padding-right', euiTheme.size.xs), " ", euiMinBreakpoint(euiThemeContext, 'm'), "{", logicalCSS('padding-right', euiTheme.size.l), ";};label:euiDataGridColumnSorting__name;"),
+    euiDataGridColumnSorting__order: /*#__PURE__*/css(euiMinBreakpoint(euiThemeContext, 'm'), "{", logicalCSS('min-width', mathWithUnits(euiTheme.size.xxl, function (x) {
+      return x * 5;
+    })), ";}.euiButtonGroup__buttons{border:none;}.euiButtonGroupButton{font-size:", euiFontSize(euiThemeContext, 'xs').fontSize, ";};label:euiDataGridColumnSorting__order;"),
+    euiDataGridColumnSorting__dragHandle: /*#__PURE__*/css(logicalCSS('padding-right', euiTheme.size.xs), ";;label:euiDataGridColumnSorting__dragHandle;"),
+    /**
+     * 'Pick fields to sort by' popover
+     */
+    euiDataGridColumnSorting__fieldList: /*#__PURE__*/css("display:flex;flex-direction:column;padding-block:", euiTheme.size.xs, ";", logicalCSS('max-height', maxResponsiveHeight), " ", euiYScroll(euiThemeContext), ";;label:euiDataGridColumnSorting__fieldList;"),
+    euiDataGridColumnSorting__field: /*#__PURE__*/css("padding-block:", euiTheme.size.xs, ";padding-inline:", euiTheme.size.s, ";outline-offset:-", euiTheme.focus.width, ";;label:euiDataGridColumnSorting__field;")
+  };
+};

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

@@ -12,6 +12,7 @@ var _excluded = ["id", "display", "direction", "index", "sorting", "schema", "sc
 
 import React, { useCallback } from 'react';
 import classNames from 'classnames';
+import { useEuiMemoizedStyles } from '../../../services';
 import { EuiScreenReaderOnly } from '../../accessibility';
 import { EuiButtonGroup, EuiButtonIcon } from '../../button';
 import { EuiDraggable } from '../../drag_and_drop';
@@ -21,6 +22,7 @@ import { EuiIcon } from '../../icon';
 import { EuiText } from '../../text';
 import { EuiToken } from '../../token';
 import { getDetailsForSchema } from '../utils/data_grid_schema';
+import { euiDataGridColumnSortingStyles } from './column_sorting.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var defaultSortAscLabel = ___EmotionJSX(EuiI18n, {
   token: "euiColumnSortingDraggable.defaultSortAsc",
@@ -75,16 +77,22 @@ export var EuiDataGridColumnSortingDraggable = function EuiDataGridColumnSorting
     });
     sorting.onSort(nextColumns);
   }, [id, sorting]);
+  var styles = useEuiMemoizedStyles(euiDataGridColumnSortingStyles);
   return ___EmotionJSX(EuiDraggable, _extends({
     draggableId: id,
     index: index,
     hasInteractiveChildren: true,
     customDragHandle: true
   }, rest), function (provided, state) {
-    return ___EmotionJSX("div", {
+    return ___EmotionJSX(EuiFlexGroup, {
+      css: styles.euiDataGridColumnSorting__item,
       className: classNames('euiDataGridColumnSorting__item', {
         'euiDataGridColumnSorting__item-isDragging': state.isDragging
-      })
+      }),
+      gutterSize: "xs",
+      alignItems: "center",
+      responsive: false,
+      "data-test-subj": "euiDataGridColumnSorting-sortColumn-".concat(id)
     }, ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", null, ___EmotionJSX(EuiI18n, {
       token: "euiColumnSortingDraggable.activeSortLabel",
       default: "{display} is sorting this data grid",
@@ -93,12 +101,7 @@ export var EuiDataGridColumnSortingDraggable = function EuiDataGridColumnSorting
       }
     }, function (activeSortLabel) {
       return activeSortLabel;
-    }))), ___EmotionJSX(EuiFlexGroup, {
-      gutterSize: "xs",
-      alignItems: "center",
-      responsive: false,
-      "data-test-subj": "euiDataGridColumnSorting-sortColumn-".concat(id)
-    }, ___EmotionJSX(EuiFlexItem, {
+    }))), ___EmotionJSX(EuiFlexItem, {
       grow: false
     }, ___EmotionJSX(EuiI18n, {
       token: "euiColumnSortingDraggable.removeSortLabel",
@@ -114,10 +117,12 @@ export var EuiDataGridColumnSortingDraggable = function EuiDataGridColumnSorting
         iconType: "cross",
         onClick: removeSort
       });
-    })), ___EmotionJSX(EuiFlexItem, _extends({
+    })), ___EmotionJSX(EuiFlexItem
+    // This extra column name flex item affords the column more grabbable real estate
+    // for mouse users, while hiding repetition for keyboard/screen reader users
+    , _extends({
+      css: styles.euiDataGridColumnSorting__name,
       className: "euiDataGridColumnSorting__name"
-      // This extra column name flex item affords the column more grabbable real estate
-      // for mouse users, while hiding repetition for keyboard/screen reader users
     }, provided.dragHandleProps, {
       tabIndex: -1,
       "aria-hidden": true
@@ -132,7 +137,7 @@ export var EuiDataGridColumnSortingDraggable = function EuiDataGridColumnSorting
       iconType: schemaDetails != null ? schemaDetails.icon : 'tokenString'
     })), ___EmotionJSX(EuiFlexItem, null, ___EmotionJSX(EuiText, {
       size: "xs"
-    }, ___EmotionJSX("p", null, display))))), ___EmotionJSX(EuiFlexItem, null, ___EmotionJSX(EuiI18n, {
+    }, display)))), ___EmotionJSX(EuiFlexItem, null, ___EmotionJSX(EuiI18n, {
       token: "euiColumnSortingDraggable.toggleLegend",
       default: "Select sorting method for {display}",
       values: {
@@ -141,10 +146,10 @@ export var EuiDataGridColumnSortingDraggable = function EuiDataGridColumnSorting
     }, function (toggleLegend) {
       return ___EmotionJSX(EuiButtonGroup, {
         legend: toggleLegend,
-        name: id,
         isFullWidth: true,
         options: toggleOptions,
         buttonSize: "compressed",
+        css: styles.euiDataGridColumnSorting__order,
         className: "euiDataGridColumnSorting__order",
         idSelected: direction === 'asc' ? "".concat(id, "Asc") : "".concat(id, "Desc"),
         onChange: toggleLegendHandler
@@ -156,6 +161,6 @@ export var EuiDataGridColumnSortingDraggable = function EuiDataGridColumnSorting
     }), ___EmotionJSX(EuiIcon, {
       type: "grab",
       color: "subdued"
-    }))));
+    })));
   });
 };