@carbon/ibm-products 1.71.0 → 1.72.1

package/es/components/Datagrid/useSortableColumns.js

@@ -21,6 +21,21 @@ var ordering = {
   DESC: 'DESC',
   NONE: 'NONE'
 };
+export var getNewSortOrder = function getNewSortOrder(sortOrder) {
+  var order = {
+    newSortDesc: undefined,
+    newOrder: ordering.NONE
+  };
+  if (sortOrder === false) {
+    order.newOrder = ordering.DESC;
+    order.newSortDesc = true;
+  }
+  if (sortOrder === undefined) {
+    order.newOrder = ordering.ASC;
+    order.newSortDesc = false;
+  }
+  return order;
+};
 var getAriaSortValue = function getAriaSortValue(col, _ref) {
   var ascendingSortableLabelText = _ref.ascendingSortableLabelText,
     descendingSortableLabelText = _ref.descendingSortableLabelText,
@@ -91,7 +106,7 @@ var useSortableColumns = function useSortableColumns(hooks) {
       };
       var Header = function Header(headerProp) {
         var _cx;
-        return column.disableSortBy === true || column.id === 'datagridSelection' ? column.disableSortBy ? column.Header : /*#__PURE__*/React.createElement(SelectAll, instance) : /*#__PURE__*/React.createElement(Button, {
+        return column.disableSortBy === true || column.id === 'datagridSelection' || column.isAction ? column.disableSortBy || column.isAction ? column.Header : /*#__PURE__*/React.createElement(SelectAll, instance) : /*#__PURE__*/React.createElement(Button, {
           "aria-sort": getAriaSortValue(headerProp === null || headerProp === void 0 ? void 0 : headerProp.column, {
             ascendingSortableLabelText: ascendingSortableLabelText,
             descendingSortableLabelText: descendingSortableLabelText,
@@ -119,21 +134,6 @@ var useSortableColumns = function useSortableColumns(hooks) {
       isTableSortable: true
     });
   };
-  var getNewSortOrder = function getNewSortOrder(sortOrder) {
-    var order = {
-      newSortDesc: undefined,
-      newOrder: ordering.NONE
-    };
-    if (sortOrder === false) {
-      order.newOrder = ordering.DESC;
-      order.newSortDesc = true;
-    }
-    if (sortOrder === undefined) {
-      order.newOrder = ordering.ASC;
-      order.newSortDesc = false;
-    }
-    return order;
-  };
   hooks.visibleColumns.push(sortableVisibleColumns);
   hooks.useInstance.push(sortInstanceProps);
 };

package/lib/components/CoachmarkStack/CoachmarkStack.js

@@ -91,17 +91,6 @@ var CoachmarkStack = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
   var handleClickNavItem = function handleClickNavItem(itemNumber) {
     setSelectedItemNumber(itemNumber);
   };
-  var escFunction = (0, _react.useCallback)(function (event) {
-    if (event.key === 'Escape') {
-      selectedItemNumber === 0 ? handleClose(true) : handleClose(false);
-    }
-  }, [handleClose, selectedItemNumber]);
-  (0, _react.useEffect)(function () {
-    document.addEventListener('keydown', escFunction, false);
-    return function () {
-      document.removeEventListener('keydown', escFunction, false);
-    };
-  }, [escFunction]);
   var handleClose = (0, _react.useCallback)(function (isParentCloseButton) {
     if (isParentCloseButton) {
       // Trigger slide-out animation
@@ -120,6 +109,17 @@ var CoachmarkStack = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
       setSelectedItemNumber(0);
     }
   }, [onClose]);
+  var escFunction = (0, _react.useCallback)(function (event) {
+    if (event.key === 'Escape') {
+      selectedItemNumber === 0 ? handleClose(true) : handleClose(false);
+    }
+  }, [handleClose, selectedItemNumber]);
+  (0, _react.useEffect)(function () {
+    document.addEventListener('keydown', escFunction, false);
+    return function () {
+      document.removeEventListener('keydown', escFunction, false);
+    };
+  }, [escFunction]);
   var contextValue = {
     buttonProps: {
       tabIndex: 0,

package/lib/components/Datagrid/Datagrid/Datagrid.js

@@ -16,11 +16,12 @@ var _pconsole = _interopRequireDefault(require("../../../global/js/utils/pconsol
 var _InlineEditContext = require("./addons/InlineEdit/InlineEditContext");
 var _DatagridContent = require("./DatagridContent");
 var _FilterProvider = require("./addons/Filtering/FilterProvider");
-var _excluded = ["datagridState", "title"];
+var _excluded = ["ariaToolbarLabel", "datagridState", "title"];
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var componentName = 'Datagrid';
 var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var datagridState = _ref.datagridState,
+  var ariaToolbarLabel = _ref.ariaToolbarLabel,
+    datagridState = _ref.datagridState,
     title = _ref.title,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   if (!datagridState) {
@@ -37,7 +38,8 @@ var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
   var props = {
     title: title,
-    datagridState: datagridState
+    datagridState: datagridState,
+    ariaToolbarLabel: ariaToolbarLabel
   };
   return /*#__PURE__*/_react.default.createElement(_FilterProvider.FilterProvider, {
     filters: filters,
@@ -59,6 +61,11 @@ exports.Datagrid = Datagrid = _settings.pkg.checkComponentEnabled(Datagrid, comp
 // is used in preference to relying on function.name.
 Datagrid.displayName = componentName;
 Datagrid.propTypes = {
+  /**
+   * Specify a label to be read by screen readers on the container node
+   * 'aria-label' of the TableToolbar component.
+   */
+  ariaToolbarLabel: _propTypes.default.string,
   /**
    * The data grid state, much of it being supplied by the useDatagrid hook
    */

package/lib/components/Datagrid/Datagrid/DatagridContent.js

@@ -42,7 +42,8 @@ var TableContainer = _carbonComponentsReact.DataTable.TableContainer,
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var DatagridContent = function DatagridContent(_ref) {
   var _cx5;
-  var datagridState = _ref.datagridState,
+  var ariaToolbarLabel = _ref.ariaToolbarLabel,
+    datagridState = _ref.datagridState,
     title = _ref.title;
   var _useContext = (0, _react.useContext)(_InlineEditContext.InlineEditContext),
     inlineEditState = _useContext.state,
@@ -99,7 +100,7 @@ var DatagridContent = function DatagridContent(_ref) {
   var renderTable = function renderTable() {
     var _getTableProps;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(Table, (0, _extends2.default)({}, getTableProps(), {
-      className: (0, _classnames.default)(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), (0, _defineProperty2.default)({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-grid-active"), gridActive), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-is-resizing"), typeof columnResizing.isResizingColumn === 'string'), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
+      className: (0, _classnames.default)(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), (0, _defineProperty2.default)({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-grid-active"), gridActive), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-is-resizing"), typeof (columnResizing === null || columnResizing === void 0 ? void 0 : columnResizing.isResizingColumn) === 'string'), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
       role: withInlineEdit && 'grid',
       tabIndex: withInlineEdit && 0,
       onKeyDown: /* istanbul ignore next */
@@ -164,7 +165,9 @@ var DatagridContent = function DatagridContent(_ref) {
     className: (0, _classnames.default)("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : '', (_cx5 = {}, (0, _defineProperty2.default)(_cx5, "".concat(blockClass, "__grid-container-grid-active"), gridActive), (0, _defineProperty2.default)(_cx5, "".concat(blockClass, "__grid-container-inline-edit"), withInlineEdit), (0, _defineProperty2.default)(_cx5, "".concat(blockClass, "__grid-container-grid-active--without-toolbar"), withInlineEdit && !DatagridActions), _cx5)),
     title: gridTitle,
     description: gridDescription
-  }, /*#__PURE__*/_react.default.createElement(_DatagridToolbar.default, datagridState), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_DatagridToolbar.default, (0, _extends2.default)({}, datagridState, {
+    ariaToolbarLabel: ariaToolbarLabel
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(blockClass, "__table-container"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-container--filter-open"), panelOpen)),
     ref: gridAreaRef
   }, (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && /*#__PURE__*/_react.default.createElement(_FilterPanel.default, (0, _extends2.default)({}, getFilterFlyoutProps(), {
@@ -184,6 +187,7 @@ var DatagridContent = function DatagridContent(_ref) {
 };
 exports.DatagridContent = DatagridContent;
 DatagridContent.propTypes = {
+  ariaToolbarLabel: _propTypes.default.string,
   datagridState: _propTypes.default.shape({
     getTableProps: _propTypes.default.func,
     getFilterFlyoutProps: _propTypes.default.func,

package/lib/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -42,7 +42,7 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
   };
   var validEmptyStates = ['error', 'noData', 'notFound'];
   return /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps({
-    role: false
+    role: undefined
   }), {
     className: "".concat(blockClass, "__empty-state-body")
   }), /*#__PURE__*/_react.default.createElement(TableRow, null, /*#__PURE__*/_react.default.createElement(TableCell, {

package/lib/components/Datagrid/Datagrid/DatagridExpandedRow.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _settings = require("../../../settings");
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -22,10 +22,10 @@ var DatagridExpandedRow = function DatagridExpandedRow(ExpandedRowContentCompone
     var row = datagridState.row;
     var expandedContentHeight = row.expandedContentHeight;
     var toggleParentHoverClass = function toggleParentHoverClass(event, eventType) {
-      var _event$target, _event$target$parentN;
+      var _event$target;
       /* istanbul ignore else */
-      if (event !== null && event !== void 0 && (_event$target = event.target) !== null && _event$target !== void 0 && (_event$target$parentN = _event$target.parentNode) !== null && _event$target$parentN !== void 0 && _event$target$parentN.previousElementSibling) {
-        var parentNode = event.target.parentNode.previousElementSibling;
+      if (event !== null && event !== void 0 && (_event$target = event.target) !== null && _event$target !== void 0 && _event$target.closest('tr').previousElementSibling) {
+        var parentNode = event.target.closest('tr').previousElementSibling;
         if (eventType === 'enter') {
           parentNode.classList.add("".concat(blockClass, "__expandable-row--hover"));
         } else {

package/lib/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -17,6 +17,7 @@ var _commonColumnIds = require("../common-column-ids");
 var _settings = require("../../../settings");
 var _stateReducer = require("./addons/stateReducer");
 var _getNodeTextContent = require("../../../global/js/utils/getNodeTextContent");
+var _useInitialColumnSort = require("../useInitialColumnSort");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -35,6 +36,7 @@ var getAccessibilityProps = function getAccessibilityProps(header) {
 var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
   var resizerAriaLabel = datagridState.resizerAriaLabel,
     isFetching = datagridState.isFetching;
+  (0, _useInitialColumnSort.useInitialColumnSort)(datagridState);
   // Used to measure the height of the table and uses that value
   // to display a vertical line to indicate the column you are resizing
   (0, _react.useEffect)(function () {
@@ -75,7 +77,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
     onMouseDown === null || onMouseDown === void 0 ? void 0 : onMouseDown(event);
   };
   return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps({
-    role: false
+    role: undefined
   }), {
     className: (0, _classnames.default)("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
     ref: headRef
@@ -101,7 +103,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       columnWidths = _ref4.columnWidths;
     var originalCol = visibleColumns[index];
     return /*#__PURE__*/_react.default.createElement(TableHeader, (0, _extends2.default)({}, header.getHeaderProps({
-      role: false
+      role: undefined
     }), {
       className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__resizableColumn"), header.getResizerProps), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__isResizing"), header.isResizing), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__isSorted"), header.isSorted), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__header-actions-column"), header.isAction), _cx), header.getHeaderProps().className),
       key: header.id,

package/lib/components/Datagrid/Datagrid/DatagridRefBody.js

@@ -23,7 +23,7 @@ var DatagridRefBody = function DatagridRefBody(datagridState) {
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow;
   return /*#__PURE__*/_react.default.createElement("tbody", (0, _extends2.default)({}, getTableBodyProps({
-    role: false
+    role: undefined
   }), {
     className: (0, _classnames.default)("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {

package/lib/components/Datagrid/Datagrid/DatagridRow.js

@@ -99,6 +99,8 @@ var DatagridRow = function DatagridRow(datagridState) {
       hoverHandler(event);
     }
   };
+  var _row$getRowProps = row.getRowProps(),
+    className = _row$getRowProps.className;
   var rowClassNames = (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx));
   var setAdditionalRowProps = function setAdditionalRowProps() {
     if (withNestedRows || withExpandedRows) {
@@ -110,11 +112,10 @@ var DatagridRow = function DatagridRow(datagridState) {
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
     key: key
-  }, /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
-    className: rowClassNames
-  }, row.getRowProps({
-    role: false
+  }, /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({}, row.getRowProps({
+    role: undefined
   }), {
+    className: (0, _classnames.default)(rowClassNames, className),
     key: row.id,
     onMouseEnter: hoverHandler,
     onMouseLeave: handleMouseLeave,
@@ -122,9 +123,9 @@ var DatagridRow = function DatagridRow(datagridState) {
     onBlur: focusRemover,
     onKeyUp: handleOnKeyUp
   }, setAdditionalRowProps()), row.cells.map(function (cell, index) {
-    var _cell$column;
+    var _cell$column, _cx2;
     var cellProps = cell.getCellProps({
-      role: false
+      role: undefined
     });
     var children = cellProps.children,
       restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);
@@ -136,7 +137,7 @@ var DatagridRow = function DatagridRow(datagridState) {
       });
     }
     return /*#__PURE__*/_react.default.createElement(TableCell, (0, _extends2.default)({
-      className: (0, _classnames.default)("".concat(blockClass, "__cell"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0))
+      className: (0, _classnames.default)("".concat(blockClass, "__cell"), (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0), (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__expandable-row-cell--is-expanded"), row.isExpanded && index === 0), _cx2))
     }, restProps, {
       key: cell.column.id
     }), content);

package/lib/components/Datagrid/Datagrid/DatagridSimpleBody.js

@@ -20,7 +20,7 @@ var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow;
   return /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps({
-    role: false
+    role: undefined
   }), {
     className: (0, _classnames.default)("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {

package/lib/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _iconsReact = require("@carbon/icons-react");
 var _carbonComponentsReact = require("carbon-components-react");
 var _useResizeObserver2 = require("../../../global/js/hooks/useResizeObserver");
@@ -16,15 +18,9 @@ var _ButtonMenu = require("../../ButtonMenu");
 var _settings = require("../../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _stateReducer = require("./addons/stateReducer");
+var _excluded = ["ariaToolbarLabel"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-/**
- * Copyright IBM Corp. 2022, 2023
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var toolbarClass = "".concat(blockClass, "__table-toolbar");
 var menuClass = "".concat(blockClass, "__button-menu");
@@ -149,7 +145,9 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     }
   })), renderBatchActionOverflow());
 };
-var DatagridToolbar = function DatagridToolbar(datagridState) {
+var DatagridToolbar = function DatagridToolbar(_ref2) {
+  var ariaToolbarLabel = _ref2.ariaToolbarLabel,
+    datagridState = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
   var ref = (0, _react.useRef)(null);
   var _useResizeObserver = (0, _useResizeObserver2.useResizeObserver)(ref),
     width = _useResizeObserver.width;
@@ -161,9 +159,16 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
   return batchActions && DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
     className: (0, _classnames.default)([toolbarClass, "".concat(toolbarClass, "--").concat(getRowHeight)])
-  }, /*#__PURE__*/_react.default.createElement(TableToolbar, null, DatagridActions && /*#__PURE__*/_react.default.createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(TableToolbar, {
+    "aria-label": ariaToolbarLabel
+  }, DatagridActions && /*#__PURE__*/_react.default.createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
     className: toolbarClass
-  }, /*#__PURE__*/_react.default.createElement(TableToolbar, null, DatagridActions && /*#__PURE__*/_react.default.createElement(DatagridActions, datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
+  }, /*#__PURE__*/_react.default.createElement(TableToolbar, {
+    "aria-label": ariaToolbarLabel
+  }, DatagridActions && /*#__PURE__*/_react.default.createElement(DatagridActions, datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
+};
+DatagridToolbar.propTypes = {
+  ariaToolbarLabel: _propTypes.default.string
 };
 var _default = DatagridToolbar;
 exports.default = _default;

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -76,7 +76,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       overflow: 'hidden'
     }
   }, /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState)), /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps({
-    role: false
+    role: undefined
   }), {
     onScroll: syncScroll
   }), /*#__PURE__*/_react.default.createElement(_reactWindow.VariableSizeList, {

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js

@@ -40,7 +40,7 @@ var removeFilterItem = function removeFilterItem(state, index) {
   return state.splice(index, 1);
 };
 var updateFilterState = function updateFilterState(state, type, value) {
-  if (type === _constants.CHECKBOX) {
+  if (type === _constants.CHECKBOX || type === _constants.MULTISELECT) {
     return;
   }
   if (type === _constants.DATE) {
@@ -63,7 +63,7 @@ var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
       var filterValues = f.value;
       var filterType = f.type;
       updateFilterState(tempState, filterType, value);
-      if (filterType === _constants.CHECKBOX) {
+      if (filterType === _constants.CHECKBOX || filterType === _constants.MULTISELECT) {
         /**
           When all checkboxes of a group are all unselected the value still exists in the filtersObjectArray
           This checks if all the checkboxes are selected = false and removes it from the array
@@ -130,15 +130,15 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
         key: id,
         value: (_renderDateLabel = renderDateLabel === null || renderDateLabel === void 0 ? void 0 : renderDateLabel(startDate, endDate)) !== null && _renderDateLabel !== void 0 ? _renderDateLabel : formatDateRange(startDate, endDate)
       }, sharedFilterProps));
-    } else if (type === _constants.CHECKBOX) {
-      value.forEach(function (checkbox) {
-        if (checkbox.selected) {
+    } else if (type === _constants.CHECKBOX || type === _constants.MULTISELECT) {
+      value.forEach(function (option) {
+        if (option.selected) {
           tags.push(_objectSpread(_objectSpread({
             key: id,
-            value: checkbox.value
+            value: option.value
           }, sharedFilterProps), {}, {
             onClose: function onClose() {
-              return handleSingleFilterRemoval(id, checkbox.value);
+              return handleSingleFilterRemoval(id, option.value);
             }
           }));
         }

package/lib/components/Datagrid/Datagrid/addons/Filtering/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SAVED_FILTERS = exports.RADIO = exports.PANEL_WIDTH = exports.PANEL = exports.NUMBER = exports.INSTANT = exports.FLYOUT = exports.DROPDOWN = exports.DATE = exports.CLEAR_SINGLE_FILTER = exports.CLEAR_FILTERS = exports.CHECKBOX = exports.BATCH = exports.ACTION_SET_HEIGHT = void 0;
+exports.SAVED_FILTERS = exports.RADIO = exports.PANEL_WIDTH = exports.PANEL = exports.NUMBER = exports.MULTISELECT = exports.INSTANT = exports.FLYOUT = exports.DROPDOWN = exports.DATE = exports.CLEAR_SINGLE_FILTER = exports.CLEAR_FILTERS = exports.CHECKBOX = exports.BATCH = exports.ACTION_SET_HEIGHT = void 0;
 /**
  * Copyright IBM Corp. 2022, 2024
  *
@@ -33,9 +33,11 @@ exports.CHECKBOX = CHECKBOX;
 var RADIO = 'radio';
 exports.RADIO = RADIO;
 var DROPDOWN = 'dropdown';
+exports.DROPDOWN = DROPDOWN;
+var MULTISELECT = 'multiSelect';
 
 /** Constants for event emitters */
-exports.DROPDOWN = DROPDOWN;
+exports.MULTISELECT = MULTISELECT;
 var CLEAR_FILTERS = 'clearFilters';
 exports.CLEAR_FILTERS = CLEAR_FILTERS;
 var CLEAR_SINGLE_FILTER = 'clearSingleFilter';

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -117,7 +117,7 @@ var useFilters = function useFilters(_ref) {
     }
 
     // ATTENTION: this is where you would reset or remove individual filters from the filters array
-    if (type === _constants.CHECKBOX) {
+    if (type === _constants.CHECKBOX || type === _constants.MULTISELECT) {
       /**
       When all checkboxes of a group are all unselected the value still exists in the filtersObjectArray
       This checks if all the checkboxes are selected = false and removes it from the array
@@ -327,6 +327,71 @@ var useFilters = function useFilters(_ref) {
           },
           light: isPanel
         }));
+        break;
+      case _constants.MULTISELECT:
+        {
+          var _filtersState$column3;
+          var isStringArray = components.MultiSelect.items.length && typeof components.MultiSelect.items[0] === 'string';
+          var selectedFilters = (_filtersState$column3 = filtersState[column]) === null || _filtersState$column3 === void 0 ? void 0 : _filtersState$column3.value.filter(function (i) {
+            return i.selected;
+          });
+          var filteredItems = components.MultiSelect.items.map(function (item) {
+            if (selectedFilters.filter(function (a) {
+              return isStringArray ? a.id === item : a.id === item.id;
+            }).length) {
+              return item;
+            }
+            return null;
+          }).filter(Boolean);
+          filter = /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.MultiSelect, (0, _extends2.default)({}, components.MultiSelect, {
+            selectedItems: filteredItems,
+            onChange: function onChange(_ref6) {
+              var _components$MultiSele, _components$MultiSele2;
+              var selectedItems = _ref6.selectedItems;
+              var allOptions = filtersState[column].value;
+              // Find selected items from list of options
+              var foundItems = selectedItems.map(function (item) {
+                if (allOptions.filter(function (option) {
+                  return isStringArray ? option.id === item : option.id === item.id;
+                })) {
+                  return allOptions.filter(function (option) {
+                    return isStringArray ? option.id === item : option.id === item.id;
+                  })[0];
+                }
+                return null;
+              }).filter(Boolean);
+
+              // Change selected state for those items that have been selected
+              allOptions.map(function (a) {
+                return a.selected = false;
+              });
+              foundItems.map(function (item) {
+                var foundOriginalItem = allOptions.filter(function (a) {
+                  return isStringArray ? a === item : a.id === item.id;
+                });
+                if (foundOriginalItem && foundOriginalItem.length) {
+                  foundOriginalItem[0].selected = true;
+                }
+              });
+              if (!selectedItems.length) {
+                allOptions.map(function (a) {
+                  return a.selected = false;
+                });
+              }
+              setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+                value: allOptions,
+                type: type
+              })));
+              applyFilters({
+                column: column,
+                value: (0, _toConsumableArray2.default)(filtersState[column].value),
+                type: type
+              });
+              (_components$MultiSele = components.MultiSelect) === null || _components$MultiSele === void 0 ? void 0 : (_components$MultiSele2 = _components$MultiSele.onChange) === null || _components$MultiSele2 === void 0 ? void 0 : _components$MultiSele2.call(_components$MultiSele, selectedItems);
+            }
+          }));
+          break;
+        }
     }
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
       key: column

package/lib/components/Datagrid/Datagrid/addons/Filtering/utils.js

@@ -65,6 +65,17 @@ var getInitialStateFromFilters = function getInitialStateFromFilters(filters, va
         value: '',
         type: type
       };
+    } else if (type === _constants.MULTISELECT) {
+      initialFilterState[column] = {
+        value: props.MultiSelect.items.map(function (item) {
+          return {
+            id: typeof item === 'string' ? item : item.id,
+            value: typeof item === 'string' ? item : item.text,
+            selected: false
+          };
+        }),
+        type: type
+      };
     }
   };
   if (variation === _constants.FLYOUT) {

package/lib/components/Datagrid/Datagrid/addons/stateReducer.js

@@ -93,13 +93,20 @@ var stateReducer = function stateReducer(newState, action) {
           getRowId = _ref3.getRowId,
           indeterminate = _ref3.indeterminate,
           isChecked = _ref3.isChecked;
+        var newSelectedRowIds = {};
         if (rows) {
           var newSelectedRowData = {};
           rows.forEach(function (row) {
+            var props = row.getRowProps();
+            if (props && props.disabled) {
+              return;
+            }
+            newSelectedRowIds[getRowId(row.original, row.index)] = true;
             newSelectedRowData[getRowId(row.original, row.index)] = row.original;
           });
           return _objectSpread(_objectSpread({}, newState), {}, {
-            selectedRowData: indeterminate || !isChecked ? {} : newSelectedRowData
+            selectedRowData: indeterminate || !isChecked ? {} : newSelectedRowData,
+            selectedRowIds: newSelectedRowIds
           });
         }
         return _objectSpread({}, newState);

package/lib/components/Datagrid/useDisableSelectRows.js

@@ -19,7 +19,7 @@ var useDisableSelectRows = function useDisableSelectRows(hooks) {
     var row = _ref.row,
       instance = _ref.instance;
     return [props, {
-      selectDisabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
+      disabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
     }];
   };
   hooks.getRowProps.push(getRowProps);