@carbon/ibm-products 1.70.0 → 1.72.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,
@@ -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/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; }
@@ -33,7 +34,9 @@ var getAccessibilityProps = function getAccessibilityProps(header) {
   return props;
 };
 var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
-  var resizerAriaLabel = datagridState.resizerAriaLabel;
+  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 () {
@@ -74,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
@@ -100,15 +103,19 @@ 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,
       "aria-hidden": header.id === 'spacer' && 'true'
     }, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && !header.isAction && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, header.getResizerProps(), {
+      disabled: isFetching,
       onMouseDown: function onMouseDown(event) {
         return handleOnMouseDownResize(event, header.getResizerProps);
       },
+      onMouseUp: function onMouseUp() {
+        return (0, _stateReducer.handleColumnResizeEndEvent)(dispatch, onColResizeEnd, header.id, true);
+      },
       onKeyDown: function onKeyDown(event) {
         var key = event.key;
         if (key === 'ArrowLeft' || key === 'ArrowRight') {

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

@@ -113,7 +113,7 @@ var DatagridRow = function DatagridRow(datagridState) {
   }, /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
     className: rowClassNames
   }, row.getRowProps({
-    role: false
+    role: undefined
   }), {
     key: row.id,
     onMouseEnter: hoverHandler,
@@ -124,7 +124,7 @@ var DatagridRow = function DatagridRow(datagridState) {
   }, setAdditionalRowProps()), row.cells.map(function (cell, index) {
     var _cell$column;
     var cellProps = cell.getCellProps({
-      role: false
+      role: undefined
     });
     var children = cellProps.children,
       restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);

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

@@ -21,7 +21,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var SelectAll = function SelectAll(datagridState) {
   var _columns$;
-  var _useState = (0, _react.useState)(window.innerWidth),
+  var _useState = (0, _react.useState)(typeof window !== 'undefined' ? window.innerWidth : ''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
@@ -30,7 +30,9 @@ var SelectAll = function SelectAll(datagridState) {
     function updateSize() {
       setWindowSize(window.innerWidth);
     }
-    window.addEventListener('resize', updateSize);
+    if (typeof window !== 'undefined') {
+      window.addEventListener('resize', updateSize);
+    }
     return function () {
       return window.removeEventListener('resize', updateSize);
     };

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");
@@ -109,6 +105,16 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       }
     }));
   };
+  var onCancelHandler = function onCancelHandler() {
+    (0, _stateReducer.handleSelectAllRowData)({
+      dispatch: dispatch,
+      rows: [],
+      getRowId: getRowId,
+      isChecked: false
+    });
+    toggleAllRowsSelected(false);
+    setGlobalFilter(null);
+  };
 
   // Only display the first two batch actions, the rest are
   // displayed inside of the ButtonMenu if there are more than
@@ -116,10 +122,7 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
   return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TableBatchActions, {
     shouldShowBatchActions: totalSelected > 0,
     totalSelected: totalSelected,
-    onCancel: function onCancel() {
-      toggleAllRowsSelected(false);
-      setGlobalFilter(null);
-    },
+    onCancel: onCancelHandler,
     translateWithId: translateWithIdBatchActions
   }, !displayAllInMenu && toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
     if (index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3) {
@@ -142,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;
@@ -154,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/FilterFlyout.js

@@ -194,9 +194,13 @@ var FilterFlyout = function FilterFlyout(_ref) {
   };
 
   /** Effects */
+  // Close flyout when clicking outside
   (0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
     var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
     var hasClickedOnDropdown = target.className === "".concat(_settings.carbon.prefix, "--list-box__menu-item__option");
+
+    // Do not do anything if flyout is closed or if clicking on anything
+    // rendered via a portal
     if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
       return;
     }

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

@@ -23,7 +23,6 @@ var _ = require(".");
 var _hooks = require("./hooks");
 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; }
-/* eslint-disable react/jsx-key */
 /**
  * Copyright IBM Corp. 2022, 2024
  *

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);
             }
           }));
         }
@@ -147,22 +147,45 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
   });
   return tags;
 };
-var FilterProvider = function FilterProvider(_ref3) {
-  var children = _ref3.children,
-    filters = _ref3.filters,
-    filterProps = _ref3.filterProps;
-  var _ref4 = filterProps || {},
-    renderDateLabel = _ref4.renderDateLabel;
+var filteringReducer = function filteringReducer(state, action) {
+  switch (action.type) {
+    case _constants.SAVED_FILTERS:
+      {
+        var _ref3 = action.payload || {},
+          savedFilters = _ref3.savedFilters;
+        return _objectSpread(_objectSpread({}, state), {}, {
+          savedFilters: savedFilters
+        });
+      }
+    default:
+      return state;
+  }
+};
+var FilterProvider = function FilterProvider(_ref4) {
+  var children = _ref4.children,
+    filters = _ref4.filters,
+    filterProps = _ref4.filterProps;
+  var _ref5 = filterProps || {},
+    renderDateLabel = _ref5.renderDateLabel;
   var filterTags = prepareFiltersForTags(filters, renderDateLabel);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     panelOpen = _useState2[0],
     setPanelOpen = _useState2[1];
+  var initialState = {
+    savedFilters: []
+  };
+  var _useReducer = (0, _react.useReducer)(filteringReducer, initialState),
+    _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
+    state = _useReducer2[0],
+    dispatch = _useReducer2[1];
   var value = {
     filterTags: filterTags,
     EventEmitter: EventEmitter,
     panelOpen: panelOpen,
-    setPanelOpen: setPanelOpen
+    setPanelOpen: setPanelOpen,
+    state: state,
+    dispatch: dispatch
   };
   return /*#__PURE__*/_react.default.createElement(FilterContext.Provider, {
     value: value

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

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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, 2022
+ * Copyright IBM Corp. 2022, 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.
  */
+
 /** Constants for update methods can either be batch or instant */
 var BATCH = 'batch';
 exports.BATCH = BATCH;
@@ -32,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';
@@ -44,4 +47,8 @@ exports.CLEAR_SINGLE_FILTER = CLEAR_SINGLE_FILTER;
 var PANEL_WIDTH = 320;
 exports.PANEL_WIDTH = PANEL_WIDTH;
 var ACTION_SET_HEIGHT = 64;
-exports.ACTION_SET_HEIGHT = ACTION_SET_HEIGHT;
+
+/** Constants for local reducer */
+exports.ACTION_SET_HEIGHT = ACTION_SET_HEIGHT;
+var SAVED_FILTERS = 'savedFilters';
+exports.SAVED_FILTERS = SAVED_FILTERS;

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

@@ -6,6 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _FilterProvider = require("../FilterProvider");
 var _react = require("react");
+/**
+ * Copyright IBM Corp. 2023, 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.
+ */
+
 var useFilterContext = function useFilterContext() {
   // get the context
   var context = (0, _react.useContext)(_FilterProvider.FilterContext);

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

@@ -15,6 +15,7 @@ var _carbonComponentsReact = require("carbon-components-react");
 var _constants = require("../constants");
 var _utils = require("../utils");
 var _hooks = require("../../../../../../global/js/hooks");
+var _FilterProvider = require("../FilterProvider");
 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; }
@@ -29,6 +30,10 @@ var useFilters = function useFilters(_ref) {
     onCancel = _ref.onCancel,
     panelOpen = _ref.panelOpen,
     isFetching = _ref.isFetching;
+  var _useContext = (0, _react.useContext)(_FilterProvider.FilterContext),
+    state = _useContext.state,
+    localDispatch = _useContext.dispatch;
+  var savedFilters = state.savedFilters;
   /** State */
   var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -112,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
@@ -168,6 +173,16 @@ var useFilters = function useFilters(_ref) {
     }
     setFiltersObjectArray(filtersObjectArrayCopy);
 
+    // Dispatch action from local filter context to track filters in order
+    // to keep history if `isFetching` becomes true. If so, react-table
+    // clears all filter history
+    localDispatch({
+      type: _constants.SAVED_FILTERS,
+      payload: {
+        savedFilters: filtersObjectArrayCopy
+      }
+    });
+
     // // Automatically apply the filters if the updateMethod is instant
     if (updateMethod === _constants.INSTANT) {
       setAllFilters(filtersObjectArrayCopy);
@@ -312,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
@@ -347,10 +427,27 @@ var useFilters = function useFilters(_ref) {
       setAllFilters(JSON.parse(prevFiltersObjectArrayRef.current));
       setFetchingReset(true);
     }
+    if (isFetching && fetchingReset) {
+      var cleanFilters = function cleanFilters(originalFilterState) {
+        var copy = _objectSpread({}, originalFilterState);
+        var updatedFilters = savedFilters.map(function (f) {
+          if (Object.hasOwn(copy, f.id)) {
+            copy[f.id] = f;
+            return copy;
+          }
+          return copy;
+        });
+        return updatedFilters[0];
+      };
+      setFiltersObjectArray(savedFilters);
+      var filterStateCopy = cleanFilters(filtersState);
+      setFiltersState(filterStateCopy);
+    }
     if (!isFetching) {
       setFetchingReset(false);
     }
-  }, [isFetching, reactTableFiltersState, setAllFilters, fetchingReset]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isFetching, reactTableFiltersState, setAllFilters, fetchingReset, savedFilters, filtersObjectArray]);
   var cancel = function cancel() {
     // Reverting to previous filters only applies when using batch actions
     if (updateMethod === _constants.BATCH) {

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

@@ -14,6 +14,7 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 /* eslint-disable jsdoc/check-param-names */
 
 /**

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) {