@carbon/ibm-products 2.25.0 → 2.27.0

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -20,6 +20,7 @@ var checkSelectedHeaderCell = require('./utils/checkSelectedHeaderCell.js');
 var handleHeaderCellSelection = require('./utils/handleHeaderCellSelection.js');
 var selectAllCells = require('./utils/selectAllCells.js');
 var getSpreadsheetWidth = require('./utils/getSpreadsheetWidth.js');
+var checkForHoldingKey = require('./utils/checkForHoldingKey.js');
 var usePreviousValue = require('../../global/js/hooks/usePreviousValue.js');
 var useSpreadsheetMouseMove = require('./hooks/useSpreadsheetMouseMove.js');
 
@@ -70,8 +71,8 @@ var DataSpreadsheetHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, [cellSize, ref, scrollBarSize, previousState === null || previousState === void 0 ? void 0 : previousState.cellSize]);
   var handleColumnHeaderClick = function handleColumnHeaderClick(index) {
     return function (event) {
-      var isHoldingCommandKey = event.metaKey || event.ctrlKey;
-      var isHoldingShiftKey = event.shiftKey;
+      var isHoldingCommandKey = checkForHoldingKey.checkForHoldingKey(event, 'cmd');
+      var isHoldingShiftKey = checkForHoldingKey.checkForHoldingKey(event, 'shiftKey');
       handleHeaderCellSelection.handleHeaderCellSelection({
         type: 'column',
         activeCellCoordinates: activeCellCoordinates,

package/lib/components/DataSpreadsheet/utils/checkForHoldingKey.d.ts

@@ -0,0 +1 @@
+export function checkForHoldingKey(event: any, key: any): any;

package/lib/components/DataSpreadsheet/utils/checkForHoldingKey.js

@@ -0,0 +1,21 @@
+/**
+ * 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.
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var checkForHoldingKey = function checkForHoldingKey(event, key) {
+  // possible key inputs: altKey,ctrlKey,metaKey,shiftKey
+  if (key == 'cmd') {
+    return event.metaKey || event.ctrlKey;
+  } else {
+    return event[key];
+  }
+};
+
+exports.checkForHoldingKey = checkForHoldingKey;

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

@@ -24,7 +24,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _excluded = ["datagridState", "title"];
+var _excluded = ["datagridState", "title", "ariaToolbarLabel"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var componentName = 'Datagrid';
 
@@ -34,6 +34,7 @@ var componentName = 'Datagrid';
 exports.Datagrid = /*#__PURE__*/React__default["default"].forwardRef(function (_ref, ref) {
   var datagridState = _ref.datagridState,
     title = _ref.title,
+    ariaToolbarLabel = _ref.ariaToolbarLabel,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   if (!datagridState) {
     pconsole["default"].warn('Datagrid was not passed datagridState which is required to render this component.');
@@ -49,7 +50,8 @@ exports.Datagrid = /*#__PURE__*/React__default["default"].forwardRef(function (_
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
   var props = {
     title: title,
-    datagridState: datagridState
+    datagridState: datagridState,
+    ariaToolbarLabel: ariaToolbarLabel
   };
   return /*#__PURE__*/React__default["default"].createElement(FilterProvider.FilterProvider, {
     filters: filters,
@@ -70,6 +72,11 @@ exports.Datagrid = settings.pkg.checkComponentEnabled(exports.Datagrid, componen
 // is used in preference to relying on function.name.
 exports.Datagrid.displayName = componentName;
 exports.Datagrid.propTypes = {
+  /**
+   * Specify a label to be read by screen readers on the container node
+   * 'aria-label' of the TableToolbar component.
+   */
+  ariaToolbarLabel: index$1["default"].string,
   /**
    * The data grid state, much of it being supplied by the useDatagrid hook
    */

package/lib/components/Datagrid/Datagrid/DatagridContent.d.ts

@@ -1,9 +1,11 @@
-export function DatagridContent({ datagridState, title }: {
+export function DatagridContent({ datagridState, title, ariaToolbarLabel }: {
     datagridState: any;
     title: any;
+    ariaToolbarLabel: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace DatagridContent {
     namespace propTypes {
+        let ariaToolbarLabel: PropTypes.Requireable<string>;
         let datagridState: PropTypes.Requireable<PropTypes.InferProps<{
             getTableProps: PropTypes.Requireable<(...args: any[]) => any>;
             getFilterFlyoutProps: PropTypes.Requireable<(...args: any[]) => any>;

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

@@ -38,7 +38,8 @@ var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var gcClass = "".concat(blockClass, "__grid-container");
 var DatagridContent = function DatagridContent(_ref) {
   var datagridState = _ref.datagridState,
-    title = _ref.title;
+    title = _ref.title,
+    ariaToolbarLabel = _ref.ariaToolbarLabel;
   var _useContext = React.useContext(InlineEditContext.InlineEditContext),
     inlineEditState = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -159,7 +160,9 @@ var DatagridContent = function DatagridContent(_ref) {
     className: index["default"]("".concat(gcClass), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(gcClass, "-active"), gridActive), "".concat(gcClass, "-active--without-toolbar"), withInlineEdit && !DatagridActions), "".concat(gcClass, "-inline-edit"), withInlineEdit), "".concat(blockClass, "__full-height"), withVirtualScroll || fullHeightDatagrid), "".concat(blockClass, "__with-pagination"), DatagridPagination), "".concat(blockClass, "__dense-header"), useDenseHeader)),
     title: gridTitle,
     description: gridDescription
-  }, /*#__PURE__*/React__default["default"].createElement(DatagridToolbar["default"], datagridState), /*#__PURE__*/React__default["default"].createElement("div", {
+  }, /*#__PURE__*/React__default["default"].createElement(DatagridToolbar["default"], _rollupPluginBabelHelpers["extends"]({}, datagridState, {
+    ariaToolbarLabel: ariaToolbarLabel
+  })), /*#__PURE__*/React__default["default"].createElement("div", {
     className: index["default"]("".concat(blockClass, "__table-container"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__table-container--filter-open"), panelOpen)),
     ref: gridAreaRef
   }, (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && /*#__PURE__*/React__default["default"].createElement(FilterPanel["default"], _rollupPluginBabelHelpers["extends"]({}, getFilterFlyoutProps(), {
@@ -179,6 +182,7 @@ var DatagridContent = function DatagridContent(_ref) {
   }));
 };
 DatagridContent.propTypes = {
+  ariaToolbarLabel: index$1["default"].string,
   datagridState: index$1["default"].shape({
     getTableProps: index$1["default"].func,
     getFilterFlyoutProps: index$1["default"].func,

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

@@ -18,12 +18,13 @@ var commonColumnIds = require('../common-column-ids.js');
 var settings = require('../../../settings.js');
 var stateReducer = require('./addons/stateReducer.js');
 var getNodeTextContent = require('../../../global/js/utils/getNodeTextContent.js');
-var ColumnHeaderSlug = require('./addons/Slug/ColumnHeaderSlug.js');
+var DatagridSlug = require('./addons/Slug/DatagridSlug.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var _th;
 var _excluded = ["role"],
   _excluded2 = ["className", "role"],
   _excluded3 = ["role", "className"];
@@ -49,7 +50,8 @@ var ResizeHeader = function ResizeHeader(_ref) {
     minWidth = _ref.minWidth,
     dispatch = _ref.dispatch,
     onColResizeEnd = _ref.onColResizeEnd,
-    resizerAriaLabel = _ref.resizerAriaLabel;
+    resizerAriaLabel = _ref.resizerAriaLabel,
+    isFetching = _ref.isFetching;
   // eslint-disable-next-line no-unused-vars
   resizerProps.role;
     var headerProps = _rollupPluginBabelHelpers.objectWithoutProperties(resizerProps, _excluded);
@@ -87,14 +89,17 @@ var ResizeHeader = function ResizeHeader(_ref) {
     className: "".concat(blockClass, "__col-resizer-range"),
     type: "range",
     defaultValue: originalCol.width,
-    "aria-label": resizerAriaLabel || 'Resize column'
+    "aria-label": resizerAriaLabel || 'Resize column',
+    disabled: isFetching
   })), /*#__PURE__*/React__default["default"].createElement("span", {
     className: "".concat(blockClass, "__col-resize-indicator")
   }));
 };
 var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
   var resizerAriaLabel = datagridState.resizerAriaLabel,
-    isTableSortable = datagridState.isTableSortable;
+    isTableSortable = datagridState.isTableSortable,
+    rows = datagridState.rows,
+    isFetching = datagridState.isFetching;
   // Used to measure the height of the table and uses that value
   // to display a vertical line to indicate the column you are resizing
   React.useEffect(function () {
@@ -140,14 +145,21 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
     if (isTableSortable) {
       return;
     }
-    return /*#__PURE__*/React__default["default"].createElement(ColumnHeaderSlug.ColumnHeaderSlug, {
+    return /*#__PURE__*/React__default["default"].createElement(DatagridSlug.DatagridSlug, {
       slug: slug
     });
   };
+  var foundAIRow = rows.some(function (r) {
+    var _r$original;
+    return /*#__PURE__*/React.isValidElement(r === null || r === void 0 || (_r$original = r.original) === null || _r$original === void 0 ? void 0 : _r$original.slug);
+  });
   return /*#__PURE__*/React__default["default"].createElement(react.TableRow, _rollupPluginBabelHelpers["extends"]({}, headerGroupProps, {
     className: index["default"]("".concat(blockClass, "__head"), headerGroupClassName),
     ref: headRef
-  }), datagridState.headers.filter(function (_ref3) {
+  }), foundAIRow ? _th || (_th = /*#__PURE__*/React__default["default"].createElement("th", {
+    scope: "col",
+    "aria-hidden": "false"
+  })) : null, datagridState.headers.filter(function (_ref3) {
     var isVisible = _ref3.isVisible;
     return isVisible;
   }).map(function (header, index$1) {
@@ -188,7 +200,8 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       minWidth: minWidth,
       dispatch: dispatch,
       onColResizeEnd: onColResizeEnd,
-      resizerAriaLabel: resizerAriaLabel
+      resizerAriaLabel: resizerAriaLabel,
+      isFetching: isFetching
     }));
   }));
 };

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

@@ -16,6 +16,7 @@ var layout = require('@carbon/layout');
 var commonColumnIds = require('../common-column-ids.js');
 var index = require('../../../node_modules/classnames/index.js');
 var settings = require('../../../settings.js');
+var DatagridSlug = require('./addons/Slug/DatagridSlug.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -35,7 +36,9 @@ var rowHeights = {
 
 // eslint-disable-next-line react/prop-types
 var DatagridRow = function DatagridRow(datagridState) {
+  var _row$original, _row$original2;
   var row = datagridState.row,
+    rows = datagridState.rows,
     rowSize = datagridState.rowSize,
     withNestedRows = datagridState.withNestedRows,
     prepareRow = datagridState.prepareRow,
@@ -117,6 +120,10 @@ var DatagridRow = function DatagridRow(datagridState) {
   var _row$getRowProps = row.getRowProps();
     _row$getRowProps.role;
     var rowProps = _rollupPluginBabelHelpers.objectWithoutProperties(_row$getRowProps, _excluded);
+  var foundAIRow = rows.some(function (r) {
+    var _r$original;
+    return /*#__PURE__*/React.isValidElement(r === null || r === void 0 || (_r$original = r.original) === null || _r$original === void 0 ? void 0 : _r$original.slug);
+  });
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, {
     key: key
   }, /*#__PURE__*/React__default["default"].createElement(react.TableRow, _rollupPluginBabelHelpers["extends"]({
@@ -128,7 +135,13 @@ var DatagridRow = function DatagridRow(datagridState) {
     onFocus: hoverHandler,
     onBlur: focusRemover,
     onKeyUp: handleOnKeyUp
-  }, setAdditionalRowProps()), row.cells.map(function (cell, index$1) {
+  }, setAdditionalRowProps()), foundAIRow ? row !== null && row !== void 0 && (_row$original = row.original) !== null && _row$original !== void 0 && _row$original.slug ? /*#__PURE__*/React__default["default"].createElement("td", {
+    className: "".concat(blockClass, "__table-row-ai-enabled")
+  }, /*#__PURE__*/React__default["default"].createElement(DatagridSlug.DatagridSlug, {
+    slug: row === null || row === void 0 || (_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.slug
+  })) : /*#__PURE__*/React__default["default"].createElement("td", {
+    className: "".concat(blockClass, "__table-row-ai-spacer")
+  }) : null, row.cells.map(function (cell, index$1) {
     var _cell$column, _content$props;
     var cellProps = cell.getCellProps();
     // eslint-disable-next-line no-unused-vars

package/lib/components/Datagrid/Datagrid/DatagridToolbar.d.ts

@@ -1,2 +1,11 @@
 export default DatagridToolbar;
-declare function DatagridToolbar(datagridState: any): import("react/jsx-runtime").JSX.Element | null;
+declare function DatagridToolbar({ ariaToolbarLabel, ...datagridState }: {
+    [x: string]: any;
+    ariaToolbarLabel: any;
+}): import("react/jsx-runtime").JSX.Element | null;
+declare namespace DatagridToolbar {
+    namespace propTypes {
+        let ariaToolbarLabel: PropTypes.Requireable<string>;
+    }
+}
+import PropTypes from 'prop-types';

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

@@ -11,6 +11,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
+var index$1 = require('../../../node_modules/prop-types/index.js');
 var react = require('@carbon/react');
 var useResizeObserver = require('../../../global/js/hooks/useResizeObserver.js');
 var settings = require('../../../settings.js');
@@ -21,6 +22,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var _excluded = ["ariaToolbarLabel"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid__table-toolbar");
 var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
   var _useState = React.useState(false),
@@ -115,6 +117,12 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     }
   };
   var onCancelHandler = function onCancelHandler() {
+    stateReducer.handleSelectAllRowData({
+      dispatch: dispatch,
+      rows: [],
+      getRowId: getRowId,
+      isChecked: false
+    });
     toggleAllRowsSelected(false);
     setGlobalFilter(null);
   };
@@ -152,7 +160,9 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     }
   })), renderBatchActionOverflow());
 };
-var DatagridToolbar = function DatagridToolbar(datagridState) {
+var DatagridToolbar = function DatagridToolbar(_ref2) {
+  var ariaToolbarLabel = _ref2.ariaToolbarLabel,
+    datagridState = _rollupPluginBabelHelpers.objectWithoutProperties(_ref2, _excluded);
   var ref = React.useRef(null);
   var _useResizeObserver = useResizeObserver.useResizeObserver(ref),
     width = _useResizeObserver.width;
@@ -164,9 +174,16 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
   return batchActions && DatagridActions ? /*#__PURE__*/React__default["default"].createElement("div", {
     ref: ref,
     className: index["default"]([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, null, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React__default["default"].createElement("div", {
+  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, {
+    "aria-label": ariaToolbarLabel
+  }, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: blockClass
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, null, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
+  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, {
+    "aria-label": ariaToolbarLabel
+  }, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
+};
+DatagridToolbar.propTypes = {
+  ariaToolbarLabel: index$1["default"].string
 };
 var DatagridToolbar$1 = DatagridToolbar;
 

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

@@ -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 _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, 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 = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     panelOpen = _useState2[0],
     setPanelOpen = _useState2[1];
+  var initialState = {
+    savedFilters: []
+  };
+  var _useReducer = React.useReducer(filteringReducer, initialState),
+    _useReducer2 = _rollupPluginBabelHelpers.slicedToArray(_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["default"].createElement(FilterContext.Provider, {
     value: value

package/lib/components/Datagrid/Datagrid/addons/Filtering/constants.d.ts

@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -22,3 +22,5 @@ export const CLEAR_SINGLE_FILTER: "clearSingleFilter";
 /** Constants for panel dimensions */
 export const PANEL_WIDTH: 320;
 export const ACTION_SET_HEIGHT: 64;
+/** Constants for local reducer */
+export const SAVED_FILTERS: "savedFilters";

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

@@ -32,6 +32,9 @@ var CLEAR_SINGLE_FILTER = 'clearSingleFilter';
 var PANEL_WIDTH = 320;
 var ACTION_SET_HEIGHT = 64;
 
+/** Constants for local reducer */
+var SAVED_FILTERS = 'savedFilters';
+
 exports.ACTION_SET_HEIGHT = ACTION_SET_HEIGHT;
 exports.BATCH = BATCH;
 exports.CHECKBOX = CHECKBOX;
@@ -45,3 +48,4 @@ exports.NUMBER = NUMBER;
 exports.PANEL = PANEL;
 exports.PANEL_WIDTH = PANEL_WIDTH;
 exports.RADIO = RADIO;
+exports.SAVED_FILTERS = SAVED_FILTERS;

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

@@ -15,6 +15,7 @@ var react = require('@carbon/react');
 var React = require('react');
 var OverflowCheckboxes = require('../OverflowCheckboxes.js');
 var utils = require('../utils.js');
+var FilterProvider = require('../FilterProvider.js');
 var handleCheckboxChange = require('../handleCheckboxChange.js');
 var usePreviousValue = require('../../../../../../global/js/hooks/usePreviousValue.js');
 
@@ -33,6 +34,10 @@ var useFilters = function useFilters(_ref) {
     panelOpen = _ref.panelOpen,
     autoHideFilters = _ref.autoHideFilters,
     isFetching = _ref.isFetching;
+  var _useContext = React.useContext(FilterProvider.FilterContext),
+    state = _useContext.state,
+    localDispatch = _useContext.dispatch;
+  var savedFilters = state.savedFilters;
   /** State */
   var _useState = React.useState(utils.getInitialStateFromFilters(filters, variation, reactTableFiltersState)),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
@@ -130,6 +135,16 @@ var useFilters = function useFilters(_ref) {
       filterCopy.splice(index, 1);
     }
     setFiltersObjectArray(filterCopy);
+
+    // 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: filterCopy
+      }
+    });
     if (updateMethod === constants.INSTANT) {
       setAllFilters(filterCopy);
     }
@@ -320,10 +335,27 @@ var useFilters = function useFilters(_ref) {
       setAllFilters(JSON.parse(prevFiltersObjectArrayRef.current));
       setFetchingReset(true);
     }
+    if (isFetching && fetchingReset) {
+      var cleanFilters = function cleanFilters(originalFilterState) {
+        var copy = _rollupPluginBabelHelpers.objectSpread2({}, 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/Slug/DatagridSlug.d.ts

@@ -0,0 +1,2 @@
+export const DatagridSlug: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
+import React from 'react';

package/lib/components/Datagrid/Datagrid/addons/Slug/{ColumnHeaderSlug.js → DatagridSlug.js}

@@ -16,7 +16,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var ColumnHeaderSlug = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+var DatagridSlug = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var slug = _ref.slug;
   if (slug && /*#__PURE__*/React.isValidElement(slug)) {
     var normalizedSlug = /*#__PURE__*/React__default["default"].cloneElement(slug, {
@@ -25,13 +25,13 @@ var ColumnHeaderSlug = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     });
     return normalizedSlug;
   }
-  return;
+  return null;
 });
-ColumnHeaderSlug.propTypes = {
+DatagridSlug.propTypes = {
   /**
    * Specify the AI slug to be displayed
    */
   slug: index["default"].node
 };
 
-exports.ColumnHeaderSlug = ColumnHeaderSlug;
+exports.DatagridSlug = DatagridSlug;

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

@@ -93,7 +93,7 @@ var stateReducer = function stateReducer(newState, action) {
         if (rows) {
           var newSelectedRowData = {};
           rows.forEach(function (row) {
-            newSelectedRowData[getRowId(row, row.index)] = row;
+            newSelectedRowData[getRowId(row.original, row.index)] = row.original;
           });
           return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState), {}, {
             selectedRowData: indeterminate || !isChecked ? {} : newSelectedRowData
@@ -112,7 +112,7 @@ var stateReducer = function stateReducer(newState, action) {
         }
         if (_isChecked) {
           return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState), {}, {
-            selectedRowData: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState.selectedRowData), {}, _rollupPluginBabelHelpers.defineProperty({}, _getRowId(rowData, rowData.index), rowData))
+            selectedRowData: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState.selectedRowData), {}, _rollupPluginBabelHelpers.defineProperty({}, _getRowId(rowData.original, rowData.index), rowData.original))
           });
         }
         if (rowData && !_isChecked) {
@@ -120,7 +120,7 @@ var stateReducer = function stateReducer(newState, action) {
           var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref5) {
             var _ref6 = _rollupPluginBabelHelpers.slicedToArray(_ref5, 1),
               key = _ref6[0];
-            return parseInt(key) !== parseInt(rowData.index);
+            return parseInt(key) !== parseInt(_getRowId(rowData.original, rowData.index));
           }));
           return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState), {}, {
             selectedRowData: dataWithRemovedRow

package/lib/components/Datagrid/useSelectAllToggle.js

@@ -15,6 +15,7 @@ var index = require('../../node_modules/classnames/index.js');
 var commonColumnIds = require('./common-column-ids.js');
 var DatagridSelectAllWithToggle = require('./Datagrid/DatagridSelectAllWithToggle.js');
 var settings = require('../../settings.js');
+var useIsomorphicEffect = require('../../global/js/hooks/useIsomorphicEffect.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -44,11 +45,12 @@ var useSelectAllWithToggleComponent = function useSelectAllWithToggleComponent(h
   hooks.useInstance.push(useInstance);
 };
 var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
-  var _useState = React.useState(window.innerWidth),
+  var _useState = React.useState(0),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
-  React.useLayoutEffect(function () {
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    setWindowSize(window.innerWidth);
     function updateSize() {
       setWindowSize(window.innerWidth);
     }

package/lib/components/Datagrid/useSortableColumns.js

@@ -16,7 +16,7 @@ var settings = require('../../settings.js');
 var react = require('@carbon/react');
 var icons = require('@carbon/react/icons');
 var DatagridSelectAll = require('./Datagrid/DatagridSelectAll.js');
-var ColumnHeaderSlug = require('./Datagrid/addons/Slug/ColumnHeaderSlug.js');
+var DatagridSlug = require('./Datagrid/addons/Slug/DatagridSlug.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -115,7 +115,7 @@ var useSortableColumns = function useSortableColumns(hooks) {
           kind: "ghost",
           renderIcon: function renderIcon(props) {
             var _headerProp$column;
-            return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(ColumnHeaderSlug.ColumnHeaderSlug, {
+            return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(DatagridSlug.DatagridSlug, {
               slug: headerProp === null || headerProp === void 0 || (_headerProp$column = headerProp.column) === null || _headerProp$column === void 0 ? void 0 : _headerProp$column.slug
             }), icon(headerProp === null || headerProp === void 0 ? void 0 : headerProp.column, props));
           },

package/lib/components/EmptyStates/EmptyStateContent.d.ts

@@ -112,7 +112,7 @@ export namespace EmptyStateContent {
             "aria-posinset"?: React.Validator<number | null | undefined> | undefined;
             "aria-pressed"?: React.Validator<boolean | "true" | "false" | "mixed" | null | undefined> | undefined;
             "aria-readonly"?: React.Validator<(boolean | "true" | "false") | null | undefined> | undefined;
-            "aria-relevant"?: React.Validator<"text" | "additions" | "additions removals" | "additions text" | "all" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | null | undefined> | undefined;
+            "aria-relevant"?: React.Validator<"all" | "text" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | null | undefined> | undefined;
             "aria-required"?: React.Validator<(boolean | "true" | "false") | null | undefined> | undefined;
             "aria-roledescription"?: React.Validator<string | null | undefined> | undefined;
             "aria-rowcount"?: React.Validator<number | null | undefined> | undefined;