@carbon/ibm-products 1.71.0 → 1.72.1

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

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["datagridState", "title"];
+var _excluded = ["ariaToolbarLabel", "datagridState", "title"];
 /**
  * Copyright IBM Corp. 2020, 2022
  *
@@ -20,7 +20,8 @@ import { FilterProvider } from './addons/Filtering/FilterProvider';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var componentName = 'Datagrid';
 export var Datagrid = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var datagridState = _ref.datagridState,
+  var ariaToolbarLabel = _ref.ariaToolbarLabel,
+    datagridState = _ref.datagridState,
     title = _ref.title,
     rest = _objectWithoutProperties(_ref, _excluded);
   if (!datagridState) {
@@ -37,7 +38,8 @@ export var Datagrid = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
   var props = {
     title: title,
-    datagridState: datagridState
+    datagridState: datagridState,
+    ariaToolbarLabel: ariaToolbarLabel
   };
   return /*#__PURE__*/React.createElement(FilterProvider, {
     filters: filters,
@@ -58,6 +60,11 @@ Datagrid = pkg.checkComponentEnabled(Datagrid, componentName);
 // 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.string,
   /**
    * The data grid state, much of it being supplied by the useDatagrid hook
    */

package/es/components/Datagrid/Datagrid/DatagridContent.js

@@ -32,7 +32,8 @@ var TableContainer = DataTable.TableContainer,
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 export var DatagridContent = function DatagridContent(_ref) {
   var _cx5;
-  var datagridState = _ref.datagridState,
+  var ariaToolbarLabel = _ref.ariaToolbarLabel,
+    datagridState = _ref.datagridState,
     title = _ref.title;
   var _useContext = useContext(InlineEditContext),
     inlineEditState = _useContext.state,
@@ -89,7 +90,7 @@ export var DatagridContent = function DatagridContent(_ref) {
   var renderTable = function renderTable() {
     var _getTableProps;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Table, _extends({}, getTableProps(), {
-      className: cx(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), _defineProperty({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), _defineProperty({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), _defineProperty({}, "".concat(blockClass, "__table-grid-active"), gridActive), _defineProperty({}, "".concat(blockClass, "__table-is-resizing"), typeof columnResizing.isResizingColumn === 'string'), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
+      className: cx(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), _defineProperty({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), _defineProperty({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), _defineProperty({}, "".concat(blockClass, "__table-grid-active"), gridActive), _defineProperty({}, "".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 */
@@ -154,7 +155,9 @@ export var DatagridContent = function DatagridContent(_ref) {
     className: cx("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : '', (_cx5 = {}, _defineProperty(_cx5, "".concat(blockClass, "__grid-container-grid-active"), gridActive), _defineProperty(_cx5, "".concat(blockClass, "__grid-container-inline-edit"), withInlineEdit), _defineProperty(_cx5, "".concat(blockClass, "__grid-container-grid-active--without-toolbar"), withInlineEdit && !DatagridActions), _cx5)),
     title: gridTitle,
     description: gridDescription
-  }, /*#__PURE__*/React.createElement(DatagridToolbar, datagridState), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(DatagridToolbar, _extends({}, datagridState, {
+    ariaToolbarLabel: ariaToolbarLabel
+  })), /*#__PURE__*/React.createElement("div", {
     className: cx("".concat(blockClass, "__table-container"), _defineProperty({}, "".concat(blockClass, "__table-container--filter-open"), panelOpen)),
     ref: gridAreaRef
   }, (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && /*#__PURE__*/React.createElement(FilterPanel, _extends({}, getFilterFlyoutProps(), {
@@ -173,6 +176,7 @@ export var DatagridContent = function DatagridContent(_ref) {
   }));
 };
 DatagridContent.propTypes = {
+  ariaToolbarLabel: PropTypes.string,
   datagridState: PropTypes.shape({
     getTableProps: PropTypes.func,
     getFilterFlyoutProps: PropTypes.func,

package/es/components/Datagrid/Datagrid/DatagridEmptyBody.js

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

package/es/components/Datagrid/Datagrid/DatagridExpandedRow.js

@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -15,10 +15,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/es/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -18,6 +18,7 @@ import { selectionColumnId } from '../common-column-ids';
 import { pkg } from '../../../settings';
 import { handleColumnResizeEndEvent, handleColumnResizingEvent } from './addons/stateReducer';
 import { getNodeTextContent } from '../../../global/js/utils/getNodeTextContent';
+import { useInitialColumnSort } from '../useInitialColumnSort';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var getAccessibilityProps = function getAccessibilityProps(header) {
   var props = {};
@@ -32,6 +33,7 @@ var getAccessibilityProps = function getAccessibilityProps(header) {
 var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
   var resizerAriaLabel = datagridState.resizerAriaLabel,
     isFetching = datagridState.isFetching;
+  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
   useEffect(function () {
@@ -72,7 +74,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
     onMouseDown === null || onMouseDown === void 0 ? void 0 : onMouseDown(event);
   };
   return /*#__PURE__*/React.createElement(TableRow, _extends({}, headerGroup.getHeaderGroupProps({
-    role: false
+    role: undefined
   }), {
     className: cx("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
     ref: headRef
@@ -98,7 +100,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       columnWidths = _ref4.columnWidths;
     var originalCol = visibleColumns[index];
     return /*#__PURE__*/React.createElement(TableHeader, _extends({}, header.getHeaderProps({
-      role: false
+      role: undefined
     }), {
       className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__resizableColumn"), header.getResizerProps), _defineProperty(_cx, "".concat(blockClass, "__isResizing"), header.isResizing), _defineProperty(_cx, "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), _defineProperty(_cx, "".concat(blockClass, "__isSorted"), header.isSorted), _defineProperty(_cx, "".concat(blockClass, "__header-actions-column"), header.isAction), _cx), header.getHeaderProps().className),
       key: header.id,

package/es/components/Datagrid/Datagrid/DatagridRefBody.js

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

package/es/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 = cx("".concat(blockClass, "__carbon-row"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), _defineProperty(_cx, "".concat(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.createElement(React.Fragment, {
     key: key
-  }, /*#__PURE__*/React.createElement(TableRow, _extends({
-    className: rowClassNames
-  }, row.getRowProps({
-    role: false
+  }, /*#__PURE__*/React.createElement(TableRow, _extends({}, row.getRowProps({
+    role: undefined
   }), {
+    className: cx(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 = _objectWithoutProperties(cellProps, _excluded);
@@ -136,7 +137,7 @@ var DatagridRow = function DatagridRow(datagridState) {
       });
     }
     return /*#__PURE__*/React.createElement(TableCell, _extends({
-      className: cx("".concat(blockClass, "__cell"), _defineProperty({}, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0))
+      className: cx("".concat(blockClass, "__cell"), (_cx2 = {}, _defineProperty(_cx2, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0), _defineProperty(_cx2, "".concat(blockClass, "__expandable-row-cell--is-expanded"), row.isExpanded && index === 0), _cx2))
     }, restProps, {
       key: cell.column.id
     }), content);

package/es/components/Datagrid/Datagrid/DatagridSimpleBody.js

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

package/es/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -1,5 +1,7 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+var _excluded = ["ariaToolbarLabel"];
 /**
  * Copyright IBM Corp. 2022, 2023
  *
@@ -8,6 +10,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  */
 
 import React, { useEffect, useRef, useState } from 'react';
+import PropTypes from 'prop-types';
 import { Add16, OverflowMenuVertical16 } from '@carbon/icons-react';
 import { DataTable, TableBatchActions, TableBatchAction } from 'carbon-components-react';
 import { useResizeObserver } from '../../../global/js/hooks/useResizeObserver';
@@ -139,7 +142,9 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     }
   })), renderBatchActionOverflow());
 };
-var DatagridToolbar = function DatagridToolbar(datagridState) {
+var DatagridToolbar = function DatagridToolbar(_ref2) {
+  var ariaToolbarLabel = _ref2.ariaToolbarLabel,
+    datagridState = _objectWithoutProperties(_ref2, _excluded);
   var ref = useRef(null);
   var _useResizeObserver = useResizeObserver(ref),
     width = _useResizeObserver.width;
@@ -151,8 +156,15 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
   return batchActions && DatagridActions ? /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: cx([toolbarClass, "".concat(toolbarClass, "--").concat(getRowHeight)])
-  }, /*#__PURE__*/React.createElement(TableToolbar, null, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(TableToolbar, {
+    "aria-label": ariaToolbarLabel
+  }, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React.createElement("div", {
     className: toolbarClass
-  }, /*#__PURE__*/React.createElement(TableToolbar, null, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
+  }, /*#__PURE__*/React.createElement(TableToolbar, {
+    "aria-label": ariaToolbarLabel
+  }, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
+};
+DatagridToolbar.propTypes = {
+  ariaToolbarLabel: PropTypes.string
 };
 export default DatagridToolbar;

package/es/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -73,7 +73,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       overflow: 'hidden'
     }
   }, /*#__PURE__*/React.createElement(DatagridHead, datagridState)), /*#__PURE__*/React.createElement(TableBody, _extends({}, getTableBodyProps({
-    role: false
+    role: undefined
   }), {
     onScroll: syncScroll
   }), /*#__PURE__*/React.createElement(VariableSizeList, {

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

@@ -12,7 +12,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { createContext, useState, useReducer } from 'react';
 import PropTypes from 'prop-types';
-import { DATE, DROPDOWN, NUMBER, RADIO, CHECKBOX, CLEAR_SINGLE_FILTER, SAVED_FILTERS } from './constants';
+import { DATE, DROPDOWN, NUMBER, RADIO, CHECKBOX, CLEAR_SINGLE_FILTER, SAVED_FILTERS, MULTISELECT } from './constants';
 export var FilterContext = /*#__PURE__*/createContext();
 var EventEmitter = {
   events: {},
@@ -36,7 +36,7 @@ var removeFilterItem = function removeFilterItem(state, index) {
   return state.splice(index, 1);
 };
 var updateFilterState = function updateFilterState(state, type, value) {
-  if (type === CHECKBOX) {
+  if (type === CHECKBOX || type === MULTISELECT) {
     return;
   }
   if (type === DATE) {
@@ -59,7 +59,7 @@ export var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, s
       var filterValues = f.value;
       var filterType = f.type;
       updateFilterState(tempState, filterType, value);
-      if (filterType === CHECKBOX) {
+      if (filterType === CHECKBOX || filterType === 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
@@ -125,15 +125,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 === CHECKBOX) {
-      value.forEach(function (checkbox) {
-        if (checkbox.selected) {
+    } else if (type === CHECKBOX || type === 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/es/components/Datagrid/Datagrid/addons/Filtering/constants.js

@@ -19,6 +19,7 @@ export var NUMBER = 'number';
 export var CHECKBOX = 'checkbox';
 export var RADIO = 'radio';
 export var DROPDOWN = 'dropdown';
+export var MULTISELECT = 'multiSelect';
 
 /** Constants for event emitters */
 export var CLEAR_FILTERS = 'clearFilters';

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

@@ -12,8 +12,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 import React, { useState, useRef, useEffect, useCallback, useContext } from 'react';
-import { Checkbox, DatePicker, DatePickerInput, Dropdown, FormGroup, NumberInput, RadioButton, RadioButtonGroup } from 'carbon-components-react';
-import { INSTANT, BATCH, DATE, CHECKBOX, NUMBER, RADIO, DROPDOWN, PANEL, SAVED_FILTERS } from '../constants';
+import { Checkbox, DatePicker, DatePickerInput, Dropdown, FormGroup, NumberInput, RadioButton, RadioButtonGroup, MultiSelect } from 'carbon-components-react';
+import { INSTANT, BATCH, DATE, CHECKBOX, NUMBER, RADIO, DROPDOWN, PANEL, SAVED_FILTERS, MULTISELECT } from '../constants';
 import { getInitialStateFromFilters } from '../utils';
 import { usePreviousValue } from '../../../../../../global/js/hooks';
 import { FilterContext } from '../FilterProvider';
@@ -114,7 +114,7 @@ var useFilters = function useFilters(_ref) {
     }
 
     // ATTENTION: this is where you would reset or remove individual filters from the filters array
-    if (type === CHECKBOX) {
+    if (type === CHECKBOX || type === 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
@@ -324,6 +324,71 @@ var useFilters = function useFilters(_ref) {
           },
           light: isPanel
         }));
+        break;
+      case 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.createElement(MultiSelect, _extends({}, 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), {}, _defineProperty({}, column, {
+                value: allOptions,
+                type: type
+              })));
+              applyFilters({
+                column: column,
+                value: _toConsumableArray(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.createElement(React.Fragment, {
       key: column

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { CHECKBOX, DATE, DROPDOWN, FLYOUT, NUMBER, PANEL, RADIO } from './constants';
+import { CHECKBOX, DATE, DROPDOWN, FLYOUT, MULTISELECT, NUMBER, PANEL, RADIO } from './constants';
 var applyInitialFilters = function applyInitialFilters(filterState, initialFilters) {
   Object.keys(filterState).forEach(function (key) {
     var hasInitialFilter = initialFilters.find(function (filter) {
@@ -59,6 +59,17 @@ export var getInitialStateFromFilters = function getInitialStateFromFilters(filt
         value: '',
         type: type
       };
+    } else if (type === 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 === FLYOUT) {

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

@@ -89,13 +89,20 @@ export 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/es/components/Datagrid/useDisableSelectRows.js

@@ -13,7 +13,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);

package/es/components/Datagrid/useFiltering.js

@@ -12,57 +12,59 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import { useMemo } from 'react';
 import { FilterFlyout } from './Datagrid/addons/Filtering';
-import { BATCH } from './Datagrid/addons/Filtering/constants';
+import { BATCH, CHECKBOX, DATE, MULTISELECT, NUMBER } from './Datagrid/addons/Filtering/constants';
+var handleMultiFilter = function handleMultiFilter(rows, id, value) {
+  // gets all the items that are selected and returns their value
+  var selectedItems = value.filter(function (item) {
+    return item.selected;
+  }).map(function (item) {
+    return item.value;
+  });
+
+  // if the user removed all checkboxes then display all rows
+  if (selectedItems.length === 0) {
+    return rows;
+  }
+  return rows.filter(function (row) {
+    var rowValue = row.values[id];
+    return selectedItems.includes(rowValue);
+  });
+};
 var useFiltering = function useFiltering(hooks) {
   /* istanbul ignore next */
   var filterTypes = useMemo(function () {
-    return {
-      date: function date(rows, id, _ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          startDate = _ref2[0],
-          endDate = _ref2[1];
-        return rows.filter(function (row) {
-          var rowValue = row.values[id];
-          var startDateObj = _typeof(startDate) === 'object' ? startDate : new Date(startDate);
-          var endDateObj = _typeof(endDate) === 'object' ? endDate : new Date(endDate);
-          var rowValueDateObj = _typeof(rowValue) === 'object' ? rowValue : new Date(rowValue);
-          if (rowValueDateObj.getTime() <= endDateObj.getTime() && rowValueDateObj.getTime() >= startDateObj.getTime()) {
-            // In date range
-            return true;
-          } else {
-            // Not in date range
-            return false;
-          }
-        });
-      },
-      number: function number(rows, id, value) {
-        if (value === '') {
-          return rows;
+    var _ref3;
+    return _ref3 = {}, _defineProperty(_ref3, DATE, function (rows, id, _ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        startDate = _ref2[0],
+        endDate = _ref2[1];
+      return rows.filter(function (row) {
+        var rowValue = row.values[id];
+        var startDateObj = _typeof(startDate) === 'object' ? startDate : new Date(startDate);
+        var endDateObj = _typeof(endDate) === 'object' ? endDate : new Date(endDate);
+        var rowValueDateObj = _typeof(rowValue) === 'object' ? rowValue : new Date(rowValue);
+        if (rowValueDateObj.getTime() <= endDateObj.getTime() && rowValueDateObj.getTime() >= startDateObj.getTime()) {
+          // In date range
+          return true;
+        } else {
+          // Not in date range
+          return false;
         }
-        var parsedValue = parseInt(value);
-        return rows.filter(function (row) {
-          var rowValue = row.values[id];
-          return rowValue === parsedValue;
-        });
-      },
-      checkbox: function checkbox(rows, id, value) {
-        // gets all the items that are selected and returns their value
-        var selectedItems = value.filter(function (item) {
-          return item.selected;
-        }).map(function (item) {
-          return item.value;
-        });
-
-        // if the user removed all checkboxes then display all rows
-        if (selectedItems.length === 0) {
-          return rows;
-        }
-        return rows.filter(function (row) {
-          var rowValue = row.values[id];
-          return selectedItems.includes(rowValue);
-        });
+      });
+    }), _defineProperty(_ref3, NUMBER, function (rows, id, value) {
+      if (value === '') {
+        return rows;
       }
-    };
+      var parsedValue = parseInt(value);
+      return rows.filter(function (row) {
+        var rowValue = row.values[id];
+        return rowValue === parsedValue;
+      });
+    }), _defineProperty(_ref3, CHECKBOX, function (rows, id, value) {
+      return handleMultiFilter(rows, id, value);
+    }), _defineProperty(_ref3, MULTISELECT, function (rows, id, value) {
+      return handleMultiFilter(rows, id, value);
+    }), _ref3;
   }, []);
   hooks.useInstance.push(function (instance) {
     var filterProps = instance.filterProps,

package/es/components/Datagrid/useInitialColumnSort.js

@@ -0,0 +1,39 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+/**
+ * Copyright IBM Corp. 2024, 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.
+ */
+
+import { useEffect, useState } from 'react';
+import { getNewSortOrder } from './useSortableColumns';
+export var useInitialColumnSort = function useInitialColumnSort(instance) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    hasInitialSort = _useState2[0],
+    setHasInitialSort = _useState2[1];
+  useEffect(function () {
+    var initialState = instance.initialState,
+      headers = instance.headers,
+      onSort = instance.onSort,
+      isTableSortable = instance.isTableSortable;
+    var sortableColumn = initialState.sortableColumn;
+    var foundSortedCol = headers.some(function (h) {
+      return h.isSorted;
+    });
+    if (foundSortedCol || hasInitialSort || !isTableSortable) {
+      return;
+    }
+    if (sortableColumn) {
+      var columnId = sortableColumn.id,
+        order = sortableColumn.order;
+      var _getNewSortOrder = getNewSortOrder(order),
+        newSortDesc = _getNewSortOrder.newSortDesc,
+        newOrder = _getNewSortOrder.newOrder;
+      onSort === null || onSort === void 0 ? void 0 : onSort(columnId, newOrder);
+      instance.toggleSortBy(columnId, newSortDesc, false);
+      setHasInitialSort(true);
+    }
+  }, [instance, hasInitialSort]);
+};

package/es/components/Datagrid/useSelectRows.js

@@ -100,7 +100,7 @@ var SelectRow = function SelectRow(datagridState) {
       return window.removeEventListener('resize', updateSize);
     };
   }, []);
-  var selectDisabled = isFetching || row.getRowProps().selectDisabled;
+  var selectDisabled = isFetching || row.getRowProps().disabled;
   var _row$getToggleRowSele2 = row.getToggleRowSelectedProps(),
     onChange = _row$getToggleRowSele2.onChange,
     title = _row$getToggleRowSele2.title,
@@ -124,7 +124,7 @@ var SelectRow = function SelectRow(datagridState) {
       getRowId: getRowId
     });
   };
-  var rowId = "".concat(tableId, "-").concat(row.index);
+  var rowId = "".concat(tableId, "-").concat(row.id, "-").concat(row.index);
   return /*#__PURE__*/React.createElement(TableSelectRow, _extends({}, cellProps, selectProps, {
     radio: radio,
     onSelect: onSelectHandler,