@carbon/ibm-products 1.31.0 → 1.32.0

package/es/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["onChange"];
@@ -13,6 +14,7 @@ var _excluded = ["onChange"];
 // @flow
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
+import cx from 'classnames';
 import { OverflowMenu, OverflowMenuItem, Checkbox } from 'carbon-components-react';
 import { CaretDown16 } from '@carbon/icons-react';
 import { pkg } from '../../../settings'; // cspell:words columnheader
@@ -22,6 +24,8 @@ var SELECT_ALL_PAGE_ROWS = 'pageRows';
 var SELECT_ALL_ROWS = 'allRows';
 
 var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
+  var _columns$;
+
   var tableId = _ref.tableId,
       isFetching = _ref.isFetching,
       isAllRowsSelected = _ref.isAllRowsSelected,
@@ -31,7 +35,9 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
       _ref$allPageRowsLabel = _ref.allPageRowsLabel,
       allPageRowsLabel = _ref$allPageRowsLabel === void 0 ? 'Select all on page' : _ref$allPageRowsLabel,
       _ref$allRowsLabel = _ref.allRowsLabel,
-      allRowsLabel = _ref$allRowsLabel === void 0 ? 'Select all' : _ref$allRowsLabel;
+      allRowsLabel = _ref$allRowsLabel === void 0 ? 'Select all' : _ref$allRowsLabel,
+      columns = _ref.columns,
+      withStickyColumn = _ref.withStickyColumn;
 
   var _useState = useState(SELECT_ALL_PAGE_ROWS),
       _useState2 = _slicedToArray(_useState, 2),
@@ -60,10 +66,11 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
       selectProps = _objectWithoutProperties(_getProps, _excluded);
 
   var disabled = isFetching || selectProps.disabled;
+  var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
   return /*#__PURE__*/React.createElement("th", {
     role: "columnheader",
     scope: "col",
-    className: "".concat(blockClass, "__select-all-toggle-on")
+    className: cx("".concat(blockClass, "__select-all-toggle-on"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft))
   }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Checkbox, _extends({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
     onClick: function onClick(e) {
@@ -111,11 +118,13 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
 SelectAllWithToggle.propTypes = {
   allPageRowsLabel: PropTypes.string,
   allRowsLabel: PropTypes.string,
+  columns: PropTypes.arrayOf(PropTypes.object),
   getToggleAllPageRowsSelectedProps: PropTypes.func.isRequired,
   getToggleAllRowsSelectedProps: PropTypes.func.isRequired,
   isAllRowsSelected: PropTypes.bool.isRequired,
   isFetching: PropTypes.bool,
   selectAllToggle: PropTypes.object,
-  tableId: PropTypes.string.isRequired
+  tableId: PropTypes.string.isRequired,
+  withStickyColumn: PropTypes.bool
 };
 export default SelectAllWithToggle;

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditButton/InlineEditButton.js

@@ -20,8 +20,6 @@ export var InlineEditButton = function InlineEditButton(_ref) {
       disabled = _ref.disabled,
       LabelIcon = _ref.labelIcon,
       placeholder = _ref.placeholder,
-      _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? -1 : _ref$tabIndex,
       nonEditCell = _ref.nonEditCell,
       isActiveCell = _ref.isActiveCell,
       columnConfig = _ref.columnConfig,
@@ -31,7 +29,7 @@ export var InlineEditButton = function InlineEditButton(_ref) {
   var inlineEditColsLessThanHalfOfTotal = totalInlineEditColumns < totalColumns / 2;
   return /*#__PURE__*/React.createElement("div", {
     className: cx("".concat(blockClass, "__inline-edit-button"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--disabled"), disabled || nonEditCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--with-label-icon"), LabelIcon), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--non-edit"), nonEditCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--active"), isActiveCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--edit-less-than-half-of-total-cols"), inlineEditColsLessThanHalfOfTotal), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--").concat(type), type === 'date' || type === 'selection'), _cx)),
-    tabIndex: tabIndex,
+    tabIndex: isActiveCell ? 0 : -1,
     "data-disabled": disabled || nonEditCell,
     "aria-disabled": disabled || nonEditCell,
     role: "button",
@@ -55,7 +53,6 @@ InlineEditButton.propTypes = {
   nonEditCell: PropTypes.bool,
   placeholder: PropTypes.string,
   renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-  tabIndex: PropTypes.number,
   totalColumns: PropTypes.number,
   totalInlineEditColumns: PropTypes.number,
   type: PropTypes.oneOf(['text', 'number', 'selection', 'date']),

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -33,8 +33,6 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       placeholder = _ref$placeholder === void 0 ? '' : _ref$placeholder,
       tabIndex = _ref.tabIndex,
       value = _ref.value,
-      _ref$label = _ref.label,
-      label = _ref$label === void 0 ? 'Inline edit type text label' : _ref$label,
       nonEditCell = _ref.nonEditCell,
       totalInlineEditColumns = _ref.totalInlineEditColumns,
       type = _ref.type;
@@ -64,6 +62,11 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       initialValue = _useState6[0],
       setInitialValue = _useState6[1];
 
+  var _useState7 = useState(),
+      _useState8 = _slicedToArray(_useState7, 2),
+      cellLabel = _useState8[0],
+      setCellLabel = _useState8[1];
+
   var activeCellId = state.activeCellId,
       editId = state.editId;
   var previousState = usePreviousValue({
@@ -80,7 +83,12 @@ export var InlineEditCell = function InlineEditCell(_ref) {
   var datePickerRef = useRef();
   var outerButtonElement = useRef();
   useEffect(function () {
-    setInitialValue(value); // eslint-disable-next-line react-hooks/exhaustive-deps
+    setInitialValue(value);
+    var columnId = cell.column.id;
+    var columnLabel = instance.columns.find(function (item) {
+      return item.id === columnId;
+    });
+    setCellLabel(typeof columnLabel.Header === 'string' ? columnLabel.Header : 'Inline edit cell label'); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []); // If you are in edit mode and click outside of the cell,
   // this changes the cell back to the InlineEditButton
 
@@ -248,7 +256,8 @@ export var InlineEditCell = function InlineEditCell(_ref) {
 
     return /*#__PURE__*/React.createElement(Dropdown, _extends({
       id: cellId,
-      label: "Dropdown menu options"
+      label: cellLabel || 'Dropdown menu options',
+      ariaLabel: cellLabel || 'Dropdown menu options'
     }, inputProps, {
       hideLabel: true,
       style: {
@@ -350,7 +359,7 @@ export var InlineEditCell = function InlineEditCell(_ref) {
         position: 'static'
       },
       placeholder: (datePickerInputProps === null || datePickerInputProps === void 0 ? void 0 : datePickerInputProps.placeholder) || 'mm/dd/yyyy',
-      labelText: (datePickerInputProps === null || datePickerInputProps === void 0 ? void 0 : datePickerInputProps.labelText) || 'Set date',
+      labelText: (datePickerInputProps === null || datePickerInputProps === void 0 ? void 0 : datePickerInputProps.labelText) || cellLabel || 'Set date',
       id: datePickerInputProps.id || "".concat(blockClass, "__inline-edit--date-picker--").concat(cell.row.index),
       hideLabel: true
     })));
@@ -407,7 +416,7 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       totalColumns: totalColumns,
       type: type
     }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React.createElement(React.Fragment, null, type === 'text' && /*#__PURE__*/React.createElement(TextInput, _extends({
-      labelText: label,
+      labelText: cellLabel,
       placeholder: placeholder
     }, inputProps, {
       id: cellId,
@@ -423,7 +432,7 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       ref: textInputRef
     })), type === 'number' && /*#__PURE__*/React.createElement(NumberInput, _extends({
       placeholder: placeholder,
-      label: label
+      label: cellLabel
     }, inputProps, {
       id: cellId,
       hideLabel: true,
@@ -449,7 +458,6 @@ InlineEditCell.propTypes = {
     rowSize: PropTypes.string,
     tableId: PropTypes.string
   }),
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   nonEditCell: PropTypes.bool,
   placeholder: PropTypes.string,
   tabIndex: PropTypes.number,

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditContext/returnUpdatedActiveCell.js

@@ -10,8 +10,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-// This function returns the state back to the reducer after
+import { pkg } from '../../../../../../settings';
+var blockClass = "".concat(pkg.prefix, "--datagrid"); // This function returns the state back to the reducer after
 // determining the new active cell value
+
 export var returnUpdatedActiveCell = function returnUpdatedActiveCell(_ref) {
   var activeCellCoords = _ref.activeCellCoords,
       direction = _ref.direction,
@@ -25,6 +27,12 @@ export var returnUpdatedActiveCell = function returnUpdatedActiveCell(_ref) {
   });
 
   var newActiveCellId = "column-".concat(newActiveCoords.column, "-row-").concat(newActiveCoords.row);
+  var newCellIdButton = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit [data-cell-id=\"").concat(newActiveCellId, "\"] .").concat(blockClass, "__inline-edit-button")); // Allows scrollable area to keep focused/active cell id visible
+
+  if (newCellIdButton) {
+    newCellIdButton === null || newCellIdButton === void 0 ? void 0 : newCellIdButton.focus();
+  }
+
   return _objectSpread(_objectSpread({}, state), {}, {
     activeCellId: newActiveCellId
   });

package/es/components/Datagrid/Datagrid/addons/InlineEdit/handleGridKeyPress.js

@@ -11,8 +11,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * LICENSE file in the root directory of this source tree.
  */
 import { carbon, pkg } from '../../../../../settings';
+import { handleMultipleKeys } from './handleMultipleKeys';
+import { getCellIdAsObject } from './InlineEditContext/getCellIdAsObject';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
-export var handleGridKeyPress = function handleGridKeyPress(event, dispatch, state, instance) {
+export var handleGridKeyPress = function handleGridKeyPress(_ref) {
+  var event = _ref.event,
+      dispatch = _ref.dispatch,
+      state = _ref.state,
+      instance = _ref.instance,
+      keysPressedList = _ref.keysPressedList,
+      usingMac = _ref.usingMac;
   var key = event.key;
   var gridActive = state.gridActive,
       activeCellId = state.activeCellId,
@@ -89,7 +97,7 @@ export var handleGridKeyPress = function handleGridKeyPress(event, dispatch, sta
   } // Prevent arrow keys, home key, and end key from scrolling the page when the data spreadsheet container has focus
 
 
-  if (['End', 'Home', 'ArrowLeft', 'ArrowUp', 'ArrowRight', 'ArrowDown'].indexOf(key) > -1 && !isEditing) {
+  if (['End', 'Home', 'ArrowLeft', 'ArrowUp', 'ArrowRight', 'ArrowDown'].indexOf(key) > -1 && !isEditing && keysPressedList.length < 2) {
     event.preventDefault();
   }
 
@@ -99,99 +107,157 @@ export var handleGridKeyPress = function handleGridKeyPress(event, dispatch, sta
     instance: instance
   };
 
-  switch (key) {
-    case 'Tab':
-      {
-        if (!editId) {
+  if (keysPressedList.length > 1) {
+    handleMultipleKeys({
+      usingMac: usingMac,
+      keysPressedList: keysPressedList,
+      dispatch: dispatch,
+      activeCellId: activeCellId,
+      instance: instance
+    });
+  }
+
+  if (keysPressedList.length < 2) {
+    switch (key) {
+      case 'Tab':
+        {
+          if (!editId) {
+            dispatch({
+              type: 'REMOVE_GRID_ACTIVE_FOCUS',
+              payload: activeCellId
+            });
+          }
+
+          break;
+        }
+
+      case 'ArrowRight':
+        {
           dispatch({
-            type: 'REMOVE_GRID_ACTIVE_FOCUS',
-            payload: activeCellId
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'right'
+            }, sharedUpdateParams)
           });
+          break;
         }
 
-        break;
-      }
-
-    case 'ArrowRight':
-      {
-        dispatch({
-          type: 'UPDATE_ACTIVE_CELL_ID',
-          payload: _objectSpread({
-            direction: 'right'
-          }, sharedUpdateParams)
-        });
-        break;
-      }
-
-    case 'ArrowLeft':
-      {
-        dispatch({
-          type: 'UPDATE_ACTIVE_CELL_ID',
-          payload: _objectSpread({
-            direction: 'left'
-          }, sharedUpdateParams)
-        });
-        break;
-      }
-
-    case 'ArrowUp':
-      {
-        dispatch({
-          type: 'UPDATE_ACTIVE_CELL_ID',
-          payload: _objectSpread({
-            direction: 'up'
-          }, sharedUpdateParams)
-        });
-        break;
-      }
-
-    case 'ArrowDown':
-      {
-        dispatch({
-          type: 'UPDATE_ACTIVE_CELL_ID',
-          payload: _objectSpread({
-            direction: 'down'
-          }, sharedUpdateParams)
-        });
-        break;
-      }
-
-    case ' ':
-    case 'F2':
-    case 'Enter':
-      {
-        // Disabled cells are not allowed to go into edit mode
-        if (isDisabledCell) {
-          return;
-        } // Only go into edit mode if there is no editId, meaning that we're not already in edit mode
-
-
-        if (!editId) {
-          var focusedType = focusedCell.getAttribute('data-inline-type'); // Open dropdown immediately after entering edit mode for selection type
-
-          if (focusedType === 'selection') {
-            setTimeout(function () {
-              var dropdownTrigger = focusedCell.querySelector('button');
-              dropdownTrigger === null || dropdownTrigger === void 0 ? void 0 : dropdownTrigger.click();
-            }, 1);
-          }
+      case 'ArrowLeft':
+        {
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'left'
+            }, sharedUpdateParams)
+          });
+          break;
+        }
 
-          if (focusedType === 'date') {
-            setTimeout(function () {
-              var dateInputTrigger = focusedCell.querySelector('input');
-              dateInputTrigger === null || dateInputTrigger === void 0 ? void 0 : dateInputTrigger.click();
-              dateInputTrigger === null || dateInputTrigger === void 0 ? void 0 : dateInputTrigger.focus();
-            }, 1);
-          }
+      case 'ArrowUp':
+        {
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'up'
+            }, sharedUpdateParams)
+          });
+          break;
+        }
 
+      case 'ArrowDown':
+        {
           dispatch({
-            type: 'ENTER_EDIT_MODE',
-            payload: {
-              activeCellId: activeCellId,
-              editId: activeCellId
-            }
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'down'
+            }, sharedUpdateParams)
+          });
+          break;
+        }
+      // Move active cell to first column in current row
+
+      case 'Home':
+        {
+          var activeCellObject = getCellIdAsObject(activeCellId);
+
+          var newActiveCellCoords = _objectSpread(_objectSpread({}, activeCellObject), {}, {
+            column: 0
+          });
+
+          var newActiveCellId = "column-".concat(newActiveCellCoords.column, "-row-").concat(newActiveCellCoords.row);
+          var scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest left position
+
+          scrollElement.scrollLeft = 0;
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: newActiveCellId
           });
+          break;
         }
-      }
+      // Move active cell to last column in current row
+
+      case 'End':
+        {
+          var _activeCellObject = getCellIdAsObject(activeCellId);
+
+          var totalVisibleColumns = instance.visibleColumns.filter(function (item) {
+            return item.id !== 'spacer';
+          });
+
+          var _newActiveCellCoords = _objectSpread(_objectSpread({}, _activeCellObject), {}, {
+            column: totalVisibleColumns.length - 1
+          });
+
+          var _newActiveCellId = "column-".concat(_newActiveCellCoords.column, "-row-").concat(_newActiveCellCoords.row);
+
+          var _scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest right position
+
+
+          _scrollElement.scrollLeft = _scrollElement.scrollWidth;
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _newActiveCellId
+          });
+          break;
+        }
+
+      case ' ':
+      case 'F2':
+      case 'Enter':
+        {
+          // Disabled cells are not allowed to go into edit mode
+          if (isDisabledCell) {
+            return;
+          } // Only go into edit mode if there is no editId, meaning that we're not already in edit mode
+
+
+          if (!editId) {
+            var focusedType = focusedCell.getAttribute('data-inline-type'); // Open dropdown immediately after entering edit mode for selection type
+
+            if (focusedType === 'selection') {
+              setTimeout(function () {
+                var dropdownTrigger = focusedCell.querySelector('button');
+                dropdownTrigger === null || dropdownTrigger === void 0 ? void 0 : dropdownTrigger.click();
+              }, 1);
+            }
+
+            if (focusedType === 'date') {
+              setTimeout(function () {
+                var dateInputTrigger = focusedCell.querySelector('input');
+                dateInputTrigger === null || dateInputTrigger === void 0 ? void 0 : dateInputTrigger.click();
+                dateInputTrigger === null || dateInputTrigger === void 0 ? void 0 : dateInputTrigger.focus();
+              }, 1);
+            }
+
+            dispatch({
+              type: 'ENTER_EDIT_MODE',
+              payload: {
+                activeCellId: activeCellId,
+                editId: activeCellId
+              }
+            });
+          }
+        }
+    }
   }
 };

package/es/components/Datagrid/Datagrid/addons/InlineEdit/handleMultipleKeys.js

@@ -0,0 +1,66 @@
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { includesResourceKey } from '../../../../DataSpreadsheet/utils/handleMultipleKeys';
+import { pkg } from '../../../../../settings';
+var blockClass = "".concat(pkg.prefix, "--datagrid");
+export var handleMultipleKeys = function handleMultipleKeys(_ref) {
+  var usingMac = _ref.usingMac,
+      keysPressedList = _ref.keysPressedList,
+      dispatch = _ref.dispatch,
+      activeCellId = _ref.activeCellId,
+      instance = _ref.instance;
+
+  // Resource key and Home
+  // Move active cell to first cell in first row and column
+  if (includesResourceKey(keysPressedList, usingMac) && keysPressedList.includes('Home')) {
+    var scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest top left position
+
+    scrollElement.scrollTop = 0;
+    scrollElement.scrollLeft = 0;
+    dispatch({
+      type: 'UPDATE_ACTIVE_CELL_ID',
+      payload: 'column-0-row-0'
+    });
+  } // Resource key and End
+  // Move active cell to last cell in in the last row and column
+
+
+  if (includesResourceKey(keysPressedList, usingMac) && keysPressedList.includes('End')) {
+    var _instance$rows;
+
+    var totalVisibleColumns = instance.visibleColumns.filter(function (item) {
+      return item.id !== 'spacer';
+    }).length;
+    var totalRows = (_instance$rows = instance.rows) === null || _instance$rows === void 0 ? void 0 : _instance$rows.length;
+    var lastCellDataId = "column-".concat(totalVisibleColumns - 1, "-row-").concat(totalRows - 1);
+    var lastCellElement = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit [data-cell-id=\"").concat(activeCellId, "\"]"));
+
+    var _scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest bottom right position
+
+
+    _scrollElement.scrollTop = _scrollElement.scrollHeight;
+    _scrollElement.scrollLeft = _scrollElement.scrollWidth;
+
+    if (lastCellElement) {
+      dispatch({
+        type: 'UPDATE_ACTIVE_CELL_ID',
+        payload: lastCellDataId
+      });
+    } else {
+      // If a Datagrid component is using virtualized data, it's possible that the last cell
+      // has not yet been rendered. In this case, we simply need to wait until the scrollable
+      // container has scrolled to the bottom/right most position, then we can dispatch the
+      // update active cell id action
+      setTimeout(function () {
+        dispatch({
+          type: 'UPDATE_ACTIVE_CELL_ID',
+          payload: lastCellDataId
+        });
+      }, 250);
+    }
+  }
+};

package/es/components/Datagrid/useActionsColumn.js

@@ -1,7 +1,8 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["id", "onClick", "shouldHideMenuItem", "shouldDisableMenuItem", "disabled"];
+var _excluded = ["id", "itemText", "onClick", "icon"],
+    _excluded2 = ["id", "onClick", "shouldHideMenuItem", "shouldDisableMenuItem", "disabled"];
 
 /*
  * Licensed Materials - Property of IBM
@@ -19,7 +20,8 @@ var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useActionsColumn = function useActionsColumn(hooks) {
   var useAttachActionsOnInstance = function useAttachActionsOnInstance(instance) {
     var rowActions = instance.rowActions,
-        isFetching = instance.isFetching;
+        isFetching = instance.isFetching,
+        selectedFlatRows = instance.selectedFlatRows;
 
     if (rowActions && Array.isArray(rowActions)) {
       var addActionsMenu = function addActionsMenu(props, cellData) {
@@ -28,7 +30,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
             column = cell.column;
 
         if (column.isAction) {
-          var _cx;
+          var _cx3;
 
           return [props, {
             children: /*#__PURE__*/React.createElement("div", {
@@ -40,26 +42,37 @@ var useActionsColumn = function useActionsColumn(hooks) {
               style: {
                 display: 'flex'
               }
-            }, rowActions.map(function (action) {
+            }, rowActions.map(function (action, index) {
               var id = action.id,
                   itemText = action.itemText,
                   _onClick = action.onClick,
-                  icon = action.icon;
+                  icon = action.icon,
+                  rest = _objectWithoutProperties(action, _excluded);
+
+              var selectedRowId = selectedFlatRows === null || selectedFlatRows === void 0 ? void 0 : selectedFlatRows.filter(function (item) {
+                return item.id === row.id ? item.id : null;
+              });
               return /*#__PURE__*/React.createElement("div", {
-                className: "".concat(blockClass, "__actions-column-button"),
-                key: ""
-              }, /*#__PURE__*/React.createElement(OverflowMenu, {
+                className: cx("".concat(blockClass, "__actions-column-button"), _defineProperty({}, "".concat(blockClass, "__disabled-row-action-button"), selectedFlatRows && selectedFlatRows.length && selectedRowId && selectedRowId.length)),
+                key: "".concat(itemText, "__").concat(index)
+              }, /*#__PURE__*/React.createElement(OverflowMenu, _extends({}, rest, {
                 renderIcon: icon,
                 hasIconOnly: true,
                 light: true,
                 iconDescription: itemText,
                 kind: "ghost",
+                className: cx(_defineProperty({}, "".concat(blockClass, "__disabled-row-action"), selectedFlatRows && selectedFlatRows.length && selectedRowId && selectedRowId.length)),
                 onClick: function onClick(e) {
+                  if (selectedFlatRows && selectedFlatRows.length && selectedRowId && selectedRowId.length) {
+                    // Row actions should be disabled if row is selected and batchActions toolbar is active
+                    return;
+                  }
+
                   e.stopPropagation();
 
                   _onClick(id, row, e);
                 }
-              }));
+              })));
             })), !isFetching && rowActions.length > 2 && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(OverflowMenu, {
               size: "sm",
               light: true,
@@ -73,7 +86,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
                   shouldHideMenuItem = action.shouldHideMenuItem,
                   shouldDisableMenuItem = action.shouldDisableMenuItem,
                   disabled = action.disabled,
-                  rest = _objectWithoutProperties(action, _excluded);
+                  rest = _objectWithoutProperties(action, _excluded2);
 
               var hidden = typeof shouldHideMenuItem === 'function' && shouldHideMenuItem(row); // shouldDisableMenuItem will override disabled because it's more specific
               // if shouldDisableMenuItem doesn't exists, fall back to disabled
@@ -94,7 +107,10 @@ var useActionsColumn = function useActionsColumn(hooks) {
                 key: id
               }));
             })))),
-            className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__actions-column-cell"), true), _defineProperty(_cx, "".concat(blockClass, "__cell"), true), _cx))
+            className: cx((_cx3 = {}, _defineProperty(_cx3, "".concat(blockClass, "__actions-column-cell"), true), _defineProperty(_cx3, "".concat(blockClass, "__cell"), true), _cx3)),
+            style: {
+              width: 96
+            }
           }];
         }
 

package/es/components/Datagrid/useExpandedRow.js

@@ -37,7 +37,6 @@ var useExpandedRow = function useExpandedRow(hooks) {
       return _objectSpread(_objectSpread({}, row), {}, {
         canExpand: row.original && !row.original.notExpandable,
         expandedContentHeight: expandedRowsHeight[row.index] || expandedContentHeight,
-        // RowRenderer: DatagridExpandedRow(row.RowRenderer, expansionRenderer),
         RowRenderer: DatagridExpandedRow(row.RowRenderer, ExpandedRowContentComponent)
       });
     });