@elastic/eui 94.0.0 → 94.1.0-backport.0

package/es/components/basic_table/basic_table.js

@@ -640,7 +640,7 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
         content = items.map(function (item, index) {
           // if there's pagination the item's index must be adjusted to the where it is in the whole dataset
           var tableItemIndex = hasPagination(_this4.props) && _this4.pageSize > 0 ? _this4.props.pagination.pageIndex * _this4.pageSize + index : index;
-          return _this4.renderItemRow(item, tableItemIndex);
+          return _this4.renderItemRow(item, tableItemIndex, index);
         });
       }
       return ___EmotionJSX(RenderWithEuiTheme, null, function (theme) {
@@ -682,7 +682,7 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "renderItemRow",
-    value: function renderItemRow(item, rowIndex) {
+    value: function renderItemRow(item, rowIndex, displayedRowIndex) {
       var _this5 = this;
       var _this$props10 = this.props,
         columns = _this$props10.columns,
@@ -697,7 +697,7 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
       });
       var rowSelectionDisabled = false;
       if (selection) {
-        var _this$renderItemSelec = this.renderItemSelectionCell(itemId, item, selected),
+        var _this$renderItemSelec = this.renderItemSelectionCell(itemId, item, selected, displayedRowIndex),
           _this$renderItemSelec2 = _slicedToArray(_this$renderItemSelec, 2),
           checkboxCell = _this$renderItemSelec2[0],
           isDisabled = _this$renderItemSelec2[1];
@@ -758,7 +758,7 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "renderItemSelectionCell",
-    value: function renderItemSelectionCell(itemId, item, selected) {
+    value: function renderItemSelectionCell(itemId, item, selected, displayedRowIndex) {
       var _this6 = this;
       var selection = this.props.selection;
       var key = "_selection_column_".concat(itemId);
@@ -782,7 +782,10 @@ export var EuiBasicTable = /*#__PURE__*/function (_Component) {
         key: key
       }, ___EmotionJSX(EuiI18n, {
         token: "euiBasicTable.selectThisRow",
-        default: "Select this row"
+        default: "Select row {index}",
+        values: {
+          index: displayedRowIndex + 1
+        }
       }, function (selectThisRow) {
         return ___EmotionJSX(EuiCheckbox, {
           id: "".concat(_this6.tableId).concat(key, "-checkbox"),
@@ -1166,10 +1169,14 @@ EuiBasicTable.propTypes = {
          */
       description: PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.func.isRequired]).isRequired,
       /**
-         * A handler function to execute the action
+         * A handler function to execute the action. Passes back the current row
+         * item as the first argument, and the originating React click event
+         * as a second argument.
          */
       /**
-         * A handler function to execute the action
+         * A handler function to execute the action. Passes back the current row
+         * item as the first argument, and the originating React click event
+         * as a second argument.
          */
       onClick: PropTypes.func,
       href: PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.func.isRequired]),

package/es/components/basic_table/collapsed_item_actions.js

@@ -13,7 +13,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import React, { useState, useCallback, useMemo } from 'react';
-import { isString } from '../../services/predicate';
 import { EuiContextMenuItem, EuiContextMenuPanel } from '../context_menu';
 import { EuiPopover } from '../popover';
 import { EuiButtonIcon } from '../button';
@@ -31,9 +30,8 @@ export var CollapsedItemActions = function CollapsedItemActions(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     popoverOpen = _useState2[0],
     setPopoverOpen = _useState2[1];
-  var onClickItem = useCallback(function (onClickAction) {
-    setPopoverOpen(false);
-    onClickAction === null || onClickAction === void 0 ? void 0 : onClickAction();
+  var closePopover = useCallback(function () {
+    return setPopoverOpen(false);
   }, []);
   var controls = useMemo(function () {
     return actions.reduce(function (controls, action, index) {
@@ -52,16 +50,10 @@ export var CollapsedItemActions = function CollapsedItemActions(_ref) {
           key: index,
           className: "euiBasicTable__collapsedCustomAction"
         }, ___EmotionJSX("span", {
-          onClick: function onClick() {
-            return onClickItem();
-          }
+          onClick: closePopover
         }, actionControl)));
       } else {
-        var buttonIcon = action.icon;
-        var icon;
-        if (buttonIcon) {
-          icon = isString(buttonIcon) ? buttonIcon : buttonIcon(item);
-        }
+        var icon = action.icon ? callWithItemIfFunction(item)(action.icon) : undefined;
         var buttonContent = callWithItemIfFunction(item)(action.name);
         var toolTipContent = callWithItemIfFunction(item)(action.description);
         var href = callWithItemIfFunction(item)(action.href);
@@ -76,10 +68,11 @@ export var CollapsedItemActions = function CollapsedItemActions(_ref) {
           target: target,
           icon: icon,
           "data-test-subj": dataTestSubj,
-          onClick: function onClick() {
-            return onClickItem(_onClick ? function () {
-              return _onClick(item);
-            } : undefined);
+          onClick: function onClick(event) {
+            event.persist();
+            _onClick === null || _onClick === void 0 ? void 0 : _onClick(item, event);
+            // Allow consumer events to prevent the popover from closing if necessary
+            if (!event.isPropagationStopped()) closePopover();
           },
           toolTipContent: toolTipContent,
           toolTipProps: {
@@ -89,7 +82,7 @@ export var CollapsedItemActions = function CollapsedItemActions(_ref) {
       }
       return controls;
     }, []);
-  }, [actions, actionsDisabled, item, onClickItem]);
+  }, [actions, actionsDisabled, item, closePopover]);
   var popoverButton = ___EmotionJSX(EuiI18n, {
     tokens: ['euiCollapsedItemActions.allActions', 'euiCollapsedItemActions.allActionsDisabled'],
     defaults: ['All actions', 'Individual item actions are disabled when rows are being selected.']
@@ -126,9 +119,7 @@ export var CollapsedItemActions = function CollapsedItemActions(_ref) {
     id: "".concat(itemId, "-actions"),
     isOpen: popoverOpen,
     button: withTooltip || popoverButton,
-    closePopover: function closePopover() {
-      return setPopoverOpen(false);
-    },
+    closePopover: closePopover,
     panelPaddingSize: "none",
     anchorPosition: "leftCenter"
   }, ___EmotionJSX(EuiContextMenuPanel, {

package/es/components/basic_table/default_item_action.js

@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
-import { isString } from '../../services/predicate';
+import React, { useCallback } from 'react';
 import { EuiButtonEmpty, EuiButtonIcon } from '../button';
 import { EuiToolTip } from '../tool_tip';
 import { useGeneratedHtmlId } from '../../services/accessibility';
@@ -22,26 +21,20 @@ export var DefaultItemAction = function DefaultItemAction(_ref) {
   if (!action.onClick && !action.href) {
     throw new Error("Cannot render item action [".concat(action.name, "]. Missing required 'onClick' callback\n      or 'href' string. If you want to provide a custom action control, make sure to define the 'render' callback"));
   }
-  var onClick = action.onClick ? function () {
-    return action.onClick(item);
-  } : undefined;
-  var buttonColor = action.color;
-  var color = 'primary';
-  if (buttonColor) {
-    color = isString(buttonColor) ? buttonColor : buttonColor(item);
-  }
-  var buttonIcon = action.icon;
-  var icon;
-  if (buttonIcon) {
-    icon = isString(buttonIcon) ? buttonIcon : buttonIcon(item);
-  }
-  var button;
+  var onClick = useCallback(function (event) {
+    if (!action.onClick) return;
+    event.persist(); // TODO: Remove once React 16 support is dropped
+    action.onClick(item, event);
+  }, [action.onClick, item]);
+  var color = action.color ? callWithItemIfFunction(item)(action.color) : 'primary';
+  var icon = action.icon ? callWithItemIfFunction(item)(action.icon) : undefined;
   var actionContent = callWithItemIfFunction(item)(action.name);
   var tooltipContent = callWithItemIfFunction(item)(action.description);
   var href = callWithItemIfFunction(item)(action.href);
   var dataTestSubj = callWithItemIfFunction(item)(action['data-test-subj']);
   var ariaLabelId = useGeneratedHtmlId();
   var ariaLabelledBy;
+  var button;
   if (action.type === 'icon') {
     if (!icon) {
       throw new Error("Cannot render item action [".concat(action.name, "]. It is configured to render as an icon but no\n      icon is provided. Make sure to set the 'icon' property of the action"));

package/es/components/basic_table/in_memory_table.js

@@ -676,10 +676,14 @@ EuiInMemoryTable.propTypes = {
          */
       description: PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.func.isRequired]).isRequired,
       /**
-         * A handler function to execute the action
+         * A handler function to execute the action. Passes back the current row
+         * item as the first argument, and the originating React click event
+         * as a second argument.
          */
       /**
-         * A handler function to execute the action
+         * A handler function to execute the action. Passes back the current row
+         * item as the first argument, and the originating React click event
+         * as a second argument.
          */
       onClick: PropTypes.func,
       href: PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.func.isRequired]),

package/es/components/table/table_cells_shared.styles.js

@@ -13,10 +13,12 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  */
 
 import { css } from '@emotion/react';
+import { makeHighContrastColor, tintOrShade } from '../../services';
 import { euiFontSize, logicalCSS, logicalTextAlignCSS } from '../../global_styling';
 import { euiTableVariables } from './table.styles';
 export var euiTableHeaderFooterCellStyles = function euiTableHeaderFooterCellStyles(euiThemeContext) {
-  var euiTheme = euiThemeContext.euiTheme;
+  var euiTheme = euiThemeContext.euiTheme,
+    colorMode = euiThemeContext.colorMode;
 
   // euiFontSize returns an object, so we keep object notation here to merge into css``
   var sharedStyles = _objectSpread(_objectSpread({}, euiFontSize(euiThemeContext, 'xs')), {}, {
@@ -27,7 +29,10 @@ export var euiTableHeaderFooterCellStyles = function euiTableHeaderFooterCellSty
   return {
     euiTableHeaderCell: /*#__PURE__*/css(sharedStyles, ";;label:euiTableHeaderCell;"),
     euiTableHeaderCell__content: /*#__PURE__*/css("gap:", euiTheme.size.xs, ";;label:euiTableHeaderCell__content;"),
-    euiTableHeaderCell__button: /*#__PURE__*/css(logicalCSS('width', '100%'), " font-weight:inherit;&:hover,&:focus{color:", euiTheme.colors.primaryText, ";text-decoration:underline;};label:euiTableHeaderCell__button;"),
+    euiTableHeaderCell__button: /*#__PURE__*/css(logicalCSS('width', '100%'), " font-weight:inherit;line-height:inherit;.euiTableSortIcon--sortable{color:", makeHighContrastColor(
+    // Tint it arbitrarily high, the contrast util will take care of lowering back down to WCAG
+    tintOrShade(euiTheme.colors.subduedText, 0.9, colorMode), 3 // 3:1 ratio from https://www.w3.org/WAI/WCAG22/Understanding/non-text-contrast.html
+    )(euiTheme.colors.emptyShade), ";}&:hover,&:focus{color:", euiTheme.colors.primaryText, ";text-decoration:underline;.euiTableSortIcon--sortable{color:", euiTheme.colors.primaryText, ";}};label:euiTableHeaderCell__button;"),
     euiTableFooterCell: /*#__PURE__*/css(sharedStyles, " background-color:", euiTheme.colors.lightestShade, ";;label:euiTableFooterCell;")
   };
 };

package/es/components/table/table_header_cell.js

@@ -28,9 +28,9 @@ var CellContents = function CellContents(_ref) {
     align = _ref.align,
     description = _ref.description,
     children = _ref.children,
+    canSort = _ref.canSort,
     isSorted = _ref.isSorted,
-    isSortAscending = _ref.isSortAscending,
-    showSortMsg = _ref.showSortMsg;
+    isSortAscending = _ref.isSortAscending;
   return ___EmotionJSX(EuiTableCellContent, {
     className: className,
     align: align,
@@ -51,11 +51,16 @@ var CellContents = function CellContents(_ref) {
         className: "eui-textTruncate"
       }, children);
     });
-  }), description && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("span", null, description)), showSortMsg && isSorted && ___EmotionJSX(EuiIcon, {
+  }), description && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("span", null, description)), isSorted ? ___EmotionJSX(EuiIcon, {
     className: "euiTableSortIcon",
     type: isSortAscending ? 'sortUp' : 'sortDown',
     size: "m"
-  }));
+  }) : canSort ? ___EmotionJSX(EuiIcon, {
+    className: "euiTableSortIcon euiTableSortIcon--sortable",
+    type: "sortable",
+    size: "m",
+    color: "subdued" // Tinted a bit further via CSS
+  }) : null);
 };
 export var EuiTableHeaderCell = function EuiTableHeaderCell(_ref2) {
   var children = _ref2.children,
@@ -82,45 +87,38 @@ export var EuiTableHeaderCell = function EuiTableHeaderCell(_ref2) {
   var CellComponent = children ? 'th' : 'td';
   var cellScope = CellComponent === 'th' ? scope !== null && scope !== void 0 ? scope : 'col' : undefined; // `scope` is only valid on `th` elements
 
-  var cellContents = ___EmotionJSX(CellContents, {
+  var canSort = !!(onSort && !readOnly);
+  var ariaSortValue;
+  if (isSorted) {
+    ariaSortValue = isSortAscending ? 'ascending' : 'descending';
+  } else if (canSort) {
+    ariaSortValue = 'none';
+  }
+  var cellContentsProps = {
     css: styles.euiTableHeaderCell__content,
     align: align,
     description: description,
-    showSortMsg: true,
+    canSort: canSort,
     isSorted: isSorted,
-    isSortAscending: isSortAscending
-  }, children);
-  if (onSort || isSorted) {
-    var buttonClasses = classNames('euiTableHeaderButton', {
-      'euiTableHeaderButton-isSorted': isSorted
-    });
-    var ariaSortValue = 'none';
-    if (isSorted) {
-      ariaSortValue = isSortAscending ? 'ascending' : 'descending';
-    }
-    return ___EmotionJSX(CellComponent, _extends({
-      css: styles.euiTableHeaderCell,
-      className: classes,
-      scope: cellScope,
-      role: "columnheader",
-      "aria-sort": ariaSortValue,
-      "aria-live": "polite",
-      style: inlineStyles
-    }, rest), onSort && !readOnly ? ___EmotionJSX("button", {
-      type: "button",
-      css: styles.euiTableHeaderCell__button,
-      className: buttonClasses,
-      onClick: onSort,
-      "data-test-subj": "tableHeaderSortButton"
-    }, cellContents) : cellContents);
-  }
+    isSortAscending: isSortAscending,
+    children: children
+  };
   return ___EmotionJSX(CellComponent, _extends({
     css: styles.euiTableHeaderCell,
     className: classes,
     scope: cellScope,
     role: "columnheader",
+    "aria-sort": ariaSortValue,
     style: inlineStyles
-  }, rest), cellContents);
+  }, rest), canSort ? ___EmotionJSX("button", {
+    type: "button",
+    css: styles.euiTableHeaderCell__button,
+    className: classNames('euiTableHeaderButton', {
+      'euiTableHeaderButton-isSorted': isSorted
+    }),
+    onClick: onSort,
+    "data-test-subj": "tableHeaderSortButton"
+  }, ___EmotionJSX(CellContents, cellContentsProps)) : ___EmotionJSX(CellContents, cellContentsProps));
 };
 EuiTableHeaderCell.propTypes = {
   className: PropTypes.string,

package/es/components/table/table_row_cell.styles.js

@@ -8,7 +8,7 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringif
  */
 
 import { css } from '@emotion/react';
-import { euiCanAnimate, euiFontSize, euiTextTruncate, logicalCSS } from '../../global_styling';
+import { euiCanAnimate, euiFontSize, euiTextTruncate, logicalCSS, logicalTextAlignCSS } from '../../global_styling';
 import { euiTableVariables } from './table.styles';
 var _ref = process.env.NODE_ENV === "production" ? {
   name: "1amvdy6-bottom",
@@ -52,7 +52,7 @@ export var euiTableRowCellStyles = function euiTableRowCellStyles(euiThemeContex
   var hasIcons = "line-height: 1;";
   return {
     euiTableRowCell: /*#__PURE__*/css("color:", euiTheme.colors.text, ";;label:euiTableRowCell;"),
-    rowHeader: /*#__PURE__*/css("font-weight:", euiTheme.font.weight.regular, ";;label:rowHeader;"),
+    rowHeader: /*#__PURE__*/css("font-weight:", euiTheme.font.weight.regular, ";", logicalTextAlignCSS('left'), ";;label:rowHeader;"),
     isExpander: /*#__PURE__*/css(hasIcons, ";;label:isExpander;"),
     hasActions: /*#__PURE__*/css(hasIcons, ";;label:hasActions;"),
     // valign

package/eui.d.ts

@@ -22639,7 +22639,7 @@ declare module '@elastic/eui/src/components/tour' {
 
 }
 declare module '@elastic/eui/src/components/basic_table/action_types' {
-	import { ReactElement, ReactNode } from 'react';
+	import { ReactElement, ReactNode, MouseEvent } from 'react';
 	import { EuiIconType } from '@elastic/eui/src/components/icon/icon';
 	import { EuiButtonIconProps } from '@elastic/eui/src/components/button/button_icon/button_icon';
 	import { EuiButtonEmptyProps } from '@elastic/eui/src/components/button/button_empty';
@@ -22654,9 +22654,11 @@ declare module '@elastic/eui/src/components/basic_table/action_types' {
 	     */
 	    description: string | ((item: T) => string);
 	    /**
-	     * A handler function to execute the action
+	     * A handler function to execute the action. Passes back the current row
+	     * item as the first argument, and the originating React click event
+	     * as a second argument.
 	     */
-	    onClick?: (item: T) => void;
+	    onClick?: (item: T, event: MouseEvent) => void;
 	    href?: string | ((item: T) => string);
 	    target?: string;
 	    /**
@@ -23132,8 +23134,8 @@ declare module '@elastic/eui/src/components/basic_table/basic_table' {
 	    renderTableBody(): React.JSX.Element;
 	    renderErrorMessage(error: string): React.JSX.Element;
 	    renderEmptyMessage(): React.JSX.Element;
-	    renderItemRow(item: T, rowIndex: number): React.JSX.Element;
-	    renderItemSelectionCell(itemId: ItemId<T>, item: T, selected: boolean): (boolean | React.JSX.Element | undefined)[];
+	    renderItemRow(item: T, rowIndex: number, displayedRowIndex: number): React.JSX.Element;
+	    renderItemSelectionCell(itemId: ItemId<T>, item: T, selected: boolean, displayedRowIndex: number): (boolean | React.JSX.Element | undefined)[];
 	    renderItemActionsCell(itemId: ItemIdResolved, item: T, column: EuiTableActionsColumnType<T>, columnIndex: number, hasCustomActions: boolean): React.JSX.Element;
 	    renderItemFieldDataCell(itemId: ItemId<T>, item: T, column: EuiTableFieldDataColumnType<T>, columnIndex: number, setScopeRow: boolean): React.JSX.Element;
 	    renderItemComputedCell(itemId: ItemId<T>, item: T, column: EuiTableComputedColumnType<T>, columnIndex: number): React.JSX.Element;

package/i18ntokens.json

@@ -127,18 +127,18 @@
   },
   {
     "token": "euiBasicTable.selectThisRow",
-    "defString": "Select this row",
+    "defString": "Select row {index}",
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 1103,
+        "line": 1109,
         "column": 8,
-        "index": 30673
+        "index": 30781
       },
       "end": {
-        "line": 1103,
-        "column": 79,
-        "index": 30744
+        "line": 1113,
+        "column": 9,
+        "index": 30936
       }
     },
     "filepath": "src/components/basic_table/basic_table.tsx"
@@ -149,14 +149,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 1329,
+        "line": 1339,
         "column": 8,
-        "index": 37489
+        "index": 37681
       },
       "end": {
-        "line": 1333,
+        "line": 1343,
         "column": 9,
-        "index": 37648
+        "index": 37840
       }
     },
     "filepath": "src/components/basic_table/basic_table.tsx"
@@ -167,14 +167,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 115,
+        "line": 110,
         "column": 4,
-        "index": 3600
+        "index": 3586
       },
       "end": {
-        "line": 124,
+        "line": 119,
         "column": 5,
-        "index": 3867
+        "index": 3853
       }
     },
     "filepath": "src/components/basic_table/collapsed_item_actions.tsx"
@@ -185,14 +185,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 115,
+        "line": 110,
         "column": 4,
-        "index": 3600
+        "index": 3586
       },
       "end": {
-        "line": 124,
+        "line": 119,
         "column": 5,
-        "index": 3867
+        "index": 3853
       }
     },
     "filepath": "src/components/basic_table/collapsed_item_actions.tsx"
@@ -203,14 +203,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 141,
+        "line": 136,
         "column": 4,
-        "index": 4427
+        "index": 4413
       },
       "end": {
-        "line": 141,
+        "line": 136,
         "column": 78,
-        "index": 4501
+        "index": 4487
       }
     },
     "filepath": "src/components/basic_table/collapsed_item_actions.tsx"
@@ -6595,12 +6595,12 @@
       "start": {
         "line": 77,
         "column": 10,
-        "index": 2366
+        "index": 2359
       },
       "end": {
         "line": 81,
         "column": 11,
-        "index": 2540
+        "index": 2533
       }
     },
     "filepath": "src/components/table/table_header_cell.tsx"

package/lib/components/basic_table/basic_table.js

@@ -648,7 +648,7 @@ var EuiBasicTable = /*#__PURE__*/function (_Component) {
         content = items.map(function (item, index) {
           // if there's pagination the item's index must be adjusted to the where it is in the whole dataset
           var tableItemIndex = hasPagination(_this4.props) && _this4.pageSize > 0 ? _this4.props.pagination.pageIndex * _this4.pageSize + index : index;
-          return _this4.renderItemRow(item, tableItemIndex);
+          return _this4.renderItemRow(item, tableItemIndex, index);
         });
       }
       return (0, _react2.jsx)(_services.RenderWithEuiTheme, null, function (theme) {
@@ -690,7 +690,7 @@ var EuiBasicTable = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "renderItemRow",
-    value: function renderItemRow(item, rowIndex) {
+    value: function renderItemRow(item, rowIndex, displayedRowIndex) {
       var _this5 = this;
       var _this$props10 = this.props,
         columns = _this$props10.columns,
@@ -705,7 +705,7 @@ var EuiBasicTable = /*#__PURE__*/function (_Component) {
       });
       var rowSelectionDisabled = false;
       if (selection) {
-        var _this$renderItemSelec = this.renderItemSelectionCell(itemId, item, selected),
+        var _this$renderItemSelec = this.renderItemSelectionCell(itemId, item, selected, displayedRowIndex),
           _this$renderItemSelec2 = _slicedToArray(_this$renderItemSelec, 2),
           checkboxCell = _this$renderItemSelec2[0],
           isDisabled = _this$renderItemSelec2[1];
@@ -766,7 +766,7 @@ var EuiBasicTable = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "renderItemSelectionCell",
-    value: function renderItemSelectionCell(itemId, item, selected) {
+    value: function renderItemSelectionCell(itemId, item, selected, displayedRowIndex) {
       var _this6 = this;
       var selection = this.props.selection;
       var key = "_selection_column_".concat(itemId);
@@ -790,7 +790,10 @@ var EuiBasicTable = /*#__PURE__*/function (_Component) {
         key: key
       }, (0, _react2.jsx)(_i18n.EuiI18n, {
         token: "euiBasicTable.selectThisRow",
-        default: "Select this row"
+        default: "Select row {index}",
+        values: {
+          index: displayedRowIndex + 1
+        }
       }, function (selectThisRow) {
         return (0, _react2.jsx)(_form.EuiCheckbox, {
           id: "".concat(_this6.tableId).concat(key, "-checkbox"),
@@ -1175,10 +1178,14 @@ EuiBasicTable.propTypes = {
          */
       description: _propTypes.default.oneOfType([_propTypes.default.string.isRequired, _propTypes.default.func.isRequired]).isRequired,
       /**
-         * A handler function to execute the action
+         * A handler function to execute the action. Passes back the current row
+         * item as the first argument, and the originating React click event
+         * as a second argument.
          */
       /**
-         * A handler function to execute the action
+         * A handler function to execute the action. Passes back the current row
+         * item as the first argument, and the originating React click event
+         * as a second argument.
          */
       onClick: _propTypes.default.func,
       href: _propTypes.default.oneOfType([_propTypes.default.string.isRequired, _propTypes.default.func.isRequired]),

package/lib/components/basic_table/collapsed_item_actions.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CollapsedItemActions = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _predicate = require("../../services/predicate");
 var _context_menu = require("../context_menu");
 var _popover = require("../popover");
 var _button = require("../button");
@@ -38,9 +37,8 @@ var CollapsedItemActions = function CollapsedItemActions(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     popoverOpen = _useState2[0],
     setPopoverOpen = _useState2[1];
-  var onClickItem = (0, _react.useCallback)(function (onClickAction) {
-    setPopoverOpen(false);
-    onClickAction === null || onClickAction === void 0 ? void 0 : onClickAction();
+  var closePopover = (0, _react.useCallback)(function () {
+    return setPopoverOpen(false);
   }, []);
   var controls = (0, _react.useMemo)(function () {
     return actions.reduce(function (controls, action, index) {
@@ -59,16 +57,10 @@ var CollapsedItemActions = function CollapsedItemActions(_ref) {
           key: index,
           className: "euiBasicTable__collapsedCustomAction"
         }, (0, _react2.jsx)("span", {
-          onClick: function onClick() {
-            return onClickItem();
-          }
+          onClick: closePopover
         }, actionControl)));
       } else {
-        var buttonIcon = action.icon;
-        var icon;
-        if (buttonIcon) {
-          icon = (0, _predicate.isString)(buttonIcon) ? buttonIcon : buttonIcon(item);
-        }
+        var icon = action.icon ? (0, _action_types.callWithItemIfFunction)(item)(action.icon) : undefined;
         var buttonContent = (0, _action_types.callWithItemIfFunction)(item)(action.name);
         var toolTipContent = (0, _action_types.callWithItemIfFunction)(item)(action.description);
         var href = (0, _action_types.callWithItemIfFunction)(item)(action.href);
@@ -83,10 +75,11 @@ var CollapsedItemActions = function CollapsedItemActions(_ref) {
           target: target,
           icon: icon,
           "data-test-subj": dataTestSubj,
-          onClick: function onClick() {
-            return onClickItem(_onClick ? function () {
-              return _onClick(item);
-            } : undefined);
+          onClick: function onClick(event) {
+            event.persist();
+            _onClick === null || _onClick === void 0 ? void 0 : _onClick(item, event);
+            // Allow consumer events to prevent the popover from closing if necessary
+            if (!event.isPropagationStopped()) closePopover();
           },
           toolTipContent: toolTipContent,
           toolTipProps: {
@@ -96,7 +89,7 @@ var CollapsedItemActions = function CollapsedItemActions(_ref) {
       }
       return controls;
     }, []);
-  }, [actions, actionsDisabled, item, onClickItem]);
+  }, [actions, actionsDisabled, item, closePopover]);
   var popoverButton = (0, _react2.jsx)(_i18n.EuiI18n, {
     tokens: ['euiCollapsedItemActions.allActions', 'euiCollapsedItemActions.allActionsDisabled'],
     defaults: ['All actions', 'Individual item actions are disabled when rows are being selected.']
@@ -133,9 +126,7 @@ var CollapsedItemActions = function CollapsedItemActions(_ref) {
     id: "".concat(itemId, "-actions"),
     isOpen: popoverOpen,
     button: withTooltip || popoverButton,
-    closePopover: function closePopover() {
-      return setPopoverOpen(false);
-    },
+    closePopover: closePopover,
     panelPaddingSize: "none",
     anchorPosition: "leftCenter"
   }, (0, _react2.jsx)(_context_menu.EuiContextMenuPanel, {