@carbon/ibm-products 1.69.0 → 1.71.0

package/es/components/ButtonMenu/ButtonMenu.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "className", "iconDescription", "kind", "label", "menuOptionsClass", "renderIcon", "size"];
+var _excluded = ["children", "className", "iconDescription", "kind", "label", "menuAriaLabel", "menuOptionsClass", "renderIcon", "size"];
 /**
  * Copyright IBM Corp. 2021, 2021
  *
@@ -18,6 +18,7 @@ import { pkg, carbon } from '../../settings';
 
 // Carbon and package components we use.
 import { Button, OverflowMenu } from 'carbon-components-react';
+import { getNodeTextContent } from '../../global/js/utils/getNodeTextContent';
 
 // The block part of our conventional BEM class names (blockClass__E--M).
 var blockClass = "".concat(pkg.prefix, "--button-menu");
@@ -39,12 +40,14 @@ var defaults = {
  * OverflowMenuItem component.
  */
 export var ButtonMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var _ref2;
   var children = _ref.children,
     className = _ref.className,
     iconDescription = _ref.iconDescription,
     _ref$kind = _ref.kind,
     kind = _ref$kind === void 0 ? defaults.kind : _ref$kind,
     label = _ref.label,
+    menuAriaLabel = _ref.menuAriaLabel,
     menuOptionsClass = _ref.menuOptionsClass,
     Icon = _ref.renderIcon,
     _ref$size = _ref.size,
@@ -59,6 +62,7 @@ export var ButtonMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 
     menuOptionsClass: cx("".concat(blockClass, "__options"), menuOptionsClass),
     size: size,
+    ariaLabel: (_ref2 = menuAriaLabel !== null && menuAriaLabel !== void 0 ? menuAriaLabel : getNodeTextContent(label)) !== null && _ref2 !== void 0 ? _ref2 : undefined,
     renderIcon: function renderIcon() {
       return /*#__PURE__*/React.createElement("div", {
         className: cx(["".concat(blockClass, "__trigger"), "".concat(carbon.prefix, "--btn"), "".concat(carbon.prefix, "--btn--").concat(kind), "".concat(carbon.prefix, "--btn--").concat(buttonSize)])
@@ -105,6 +109,12 @@ ButtonMenu.propTypes = {
    * The button label for the menu trigger.
    */
   label: PropTypes.node,
+  /**
+   * Provide the menuAriaLabel prop to be passed to the ButtonMenu component.
+   * This optional label should contain or match the visible labels or
+   *  it will automatically take button label
+   */
+  menuAriaLabel: PropTypes.string,
   /**
    * class name applied to the overflow options
    */

package/es/components/CreateTearsheet/preview-components/MultiStepWithIntro.js

@@ -119,7 +119,8 @@ export var MultiStepWithIntro = function MultiStepWithIntro(_ref) {
   }, /*#__PURE__*/React.createElement(RadioTile, {
     className: "".concat(pkg.prefix, "--tearsheet-create-multi-step--custom-tile"),
     value: "standard",
-    id: "tile-1"
+    id: "tile-1",
+    tabIndex: selectedCategory === 'standard' ? 0 : -1
   }, /*#__PURE__*/React.createElement(NoDataIllustration, {
     size: "lg"
   }), /*#__PURE__*/React.createElement("span", {
@@ -127,7 +128,8 @@ export var MultiStepWithIntro = function MultiStepWithIntro(_ref) {
   }, "Standard")), /*#__PURE__*/React.createElement(RadioTile, {
     className: "".concat(pkg.prefix, "--tearsheet-create-multi-step--custom-tile"),
     value: "premium",
-    id: "tile-2"
+    id: "tile-2",
+    tabIndex: selectedCategory === 'premium' ? 0 : -1
   }, /*#__PURE__*/React.createElement(NoDataIllustration, {
     size: "lg"
   }), /*#__PURE__*/React.createElement("span", {
@@ -135,7 +137,8 @@ export var MultiStepWithIntro = function MultiStepWithIntro(_ref) {
   }, "Premium")), /*#__PURE__*/React.createElement(RadioTile, {
     className: "".concat(pkg.prefix, "--tearsheet-create-multi-step--custom-tile"),
     value: "plus",
-    id: "tile-3"
+    id: "tile-3",
+    tabIndex: selectedCategory === 'plus' ? 0 : -1
   }, /*#__PURE__*/React.createElement(NoDataIllustration, {
     size: "lg"
   }), /*#__PURE__*/React.createElement("span", {

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

@@ -88,7 +88,7 @@ export var DatagridContent = function DatagridContent(_ref) {
   });
   var renderTable = function renderTable() {
     var _getTableProps;
-    return /*#__PURE__*/React.createElement(Table, _extends({}, 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),
       role: withInlineEdit && 'grid',
       tabIndex: withInlineEdit && 0,
@@ -109,7 +109,7 @@ export var DatagridContent = function DatagridContent(_ref) {
       title: title
     }), !withVirtualScroll && /*#__PURE__*/React.createElement(DatagridHead, datagridState), /*#__PURE__*/React.createElement(DatagridBody, _extends({}, datagridState, {
       rows: contentRows
-    })));
+    }))), (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && renderPagination());
   };
   var _useMultipleKeyTracki = useMultipleKeyTracking({
       ref: withInlineEdit ? multiKeyTrackingRef : null,
@@ -134,8 +134,6 @@ export var DatagridContent = function DatagridContent(_ref) {
   useSubscribeToEventEmitter(CLEAR_SINGLE_FILTER, function (id) {
     return clearSingleFilter(id, setAllFilters, state);
   });
-
-  /* istanbul ignore next */
   var renderFilterSummary = function renderFilterSummary() {
     return state.filters.length > 0 && /*#__PURE__*/React.createElement(FilterSummary, {
       className: "".concat(blockClass, "__filter-summary"),
@@ -147,6 +145,11 @@ export var DatagridContent = function DatagridContent(_ref) {
       overflowType: "tag"
     });
   };
+  var renderPagination = function renderPagination() {
+    if ((contentRows === null || contentRows === void 0 ? void 0 : contentRows.length) > 0 && !isFetching && DatagridPagination) {
+      return /*#__PURE__*/React.createElement(DatagridPagination, datagridState);
+    }
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContainer, {
     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,
@@ -154,9 +157,7 @@ export var DatagridContent = function DatagridContent(_ref) {
   }, /*#__PURE__*/React.createElement(DatagridToolbar, datagridState), /*#__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({
-    updateMethod: "batch"
-  }, getFilterFlyoutProps(), {
+  }, (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && /*#__PURE__*/React.createElement(FilterPanel, _extends({}, getFilterFlyoutProps(), {
     title: filterProps.panelTitle,
     filterSections: filterProps.sections,
     isFetching: isFetching
@@ -167,7 +168,7 @@ export var DatagridContent = function DatagridContent(_ref) {
   }, renderTable()) : withVirtualScroll ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__virtualScrollContainer"),
     ref: gridRef
-  }, renderTable()) : renderTable()))), (contentRows === null || contentRows === void 0 ? void 0 : contentRows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/React.createElement(DatagridPagination, datagridState), CustomizeColumnsTearsheet && /*#__PURE__*/React.createElement(CustomizeColumnsTearsheet, {
+  }, renderTable()) : renderTable()))), (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) !== 'panel' && renderPagination(), CustomizeColumnsTearsheet && /*#__PURE__*/React.createElement(CustomizeColumnsTearsheet, {
     instance: datagridState
   }));
 };

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

@@ -30,7 +30,8 @@ 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;
   // 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 () {
@@ -103,9 +104,13 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       key: header.id,
       "aria-hidden": header.id === 'spacer' && 'true'
     }, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && !header.isAction && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("input", _extends({}, header.getResizerProps(), {
+      disabled: isFetching,
       onMouseDown: function onMouseDown(event) {
         return handleOnMouseDownResize(event, header.getResizerProps);
       },
+      onMouseUp: function onMouseUp() {
+        return handleColumnResizeEndEvent(dispatch, onColResizeEnd, header.id, true);
+      },
       onKeyDown: function onKeyDown(event) {
         var key = event.key;
         if (key === 'ArrowLeft' || key === 'ArrowRight') {

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

@@ -37,7 +37,9 @@ var DatagridRow = function DatagridRow(datagridState) {
     prepareRow = datagridState.prepareRow,
     key = datagridState.key,
     tableId = datagridState.tableId,
-    withExpandedRows = datagridState.withExpandedRows;
+    withExpandedRows = datagridState.withExpandedRows,
+    withMouseHover = datagridState.withMouseHover,
+    setMouseOverRowIndex = datagridState.setMouseOverRowIndex;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -82,6 +84,9 @@ var DatagridRow = function DatagridRow(datagridState) {
     return null;
   };
   var handleMouseLeave = function handleMouseLeave(event) {
+    if (withMouseHover) {
+      setMouseOverRowIndex(null);
+    }
     var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
     hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
   };

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

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["onChange"];
 /**
- * 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.
@@ -18,7 +18,7 @@ import { handleSelectAllRowData } from './addons/stateReducer';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var SelectAll = function SelectAll(datagridState) {
   var _columns$;
-  var _useState = useState(window.innerWidth),
+  var _useState = useState(typeof window !== 'undefined' ? window.innerWidth : ''),
     _useState2 = _slicedToArray(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
@@ -27,7 +27,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);
     };
@@ -44,7 +46,8 @@ var SelectAll = function SelectAll(datagridState) {
     dispatch = datagridState.dispatch,
     rows = datagridState.rows,
     getRowId = datagridState.getRowId,
-    toggleAllRowsSelected = datagridState.toggleAllRowsSelected;
+    toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
+    onAllRowSelect = datagridState.onAllRowSelect;
   var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
   if (hideSelectAll || radio) {
     return /*#__PURE__*/React.createElement("div", {
@@ -66,6 +69,7 @@ var SelectAll = function SelectAll(datagridState) {
         indeterminate: true
       });
       toggleAllRowsSelected(false);
+      onAllRowSelect === null || onAllRowSelect === void 0 ? void 0 : onAllRowSelect(rows, event);
       return onChange === null || onChange === void 0 ? void 0 : onChange({
         target: {
           checked: false
@@ -78,6 +82,7 @@ var SelectAll = function SelectAll(datagridState) {
       getRowId: getRowId,
       isChecked: event.target.checked
     });
+    onAllRowSelect === null || onAllRowSelect === void 0 ? void 0 : onAllRowSelect(rows, event);
     return onChange === null || onChange === void 0 ? void 0 : onChange(event);
   };
   return /*#__PURE__*/React.createElement("div", {

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

@@ -99,6 +99,16 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       }
     }));
   };
+  var onCancelHandler = function onCancelHandler() {
+    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
@@ -106,10 +116,7 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
   return /*#__PURE__*/React.createElement(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) {

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

@@ -40,7 +40,7 @@ var DraggableElement = function DraggableElement(_ref) {
     }, "".concat(blockClass, "__draggable-handleStyle"))
   }, isSticky ? /*#__PURE__*/React.createElement(Locked16, null) : /*#__PURE__*/React.createElement(Draggable16, null)), children);
   var style = {
-    transform: CSS.Transform.toString(transform),
+    transform: !disabled ? CSS.Transform.toString(transform) : {},
     transition: transition
   };
   return /*#__PURE__*/React.createElement("li", _extends({

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/Columns.js

@@ -38,6 +38,9 @@ var Columns = function Columns(_ref) {
       $splice: [[from, 1], [to, 0, fromCol]]
     }));
   }, [columns, setColumnsObject]);
+  var filteredStickyColumn = columns === null || columns === void 0 ? void 0 : columns.filter(function (item) {
+    return !item.sticky;
+  });
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__customize-columns-column-list"),
     ref: listRef
@@ -61,7 +64,7 @@ var Columns = function Columns(_ref) {
     checked: getVisibleColumnsCount() === columns.length,
     indeterminate: getVisibleColumnsCount() < columns.length && getVisibleColumnsCount() > 0,
     onChange: function onChange() {
-      onSelectColumn(columns, getVisibleColumnsCount() !== columns.length);
+      onSelectColumn(filteredStickyColumn, getVisibleColumnsCount() !== columns.length);
     },
     id: "".concat(blockClass, "__customization-column-select-all"),
     labelText: selectAllLabel

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js

@@ -90,7 +90,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   };
   var onCheckboxCheck = function onCheckboxCheck(col, value) {
     var changedDefinitions = columnObjects.map(function (definition) {
-      if (Array.isArray(col) && col.indexOf(definition) != null || definition.id === col.id) {
+      if (Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) {
         return _objectSpread(_objectSpread({}, definition), {}, {
           isVisible: value
         });

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

@@ -21,18 +21,23 @@ import { useSubscribeToEventEmitter, useFilters, useShouldDisableButtons } from
 import { carbon } from '../../../../../settings';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var componentClass = "".concat(blockClass, "-filter-flyout");
+var defaults = {
+  flyoutIconDescription: 'Open filters',
+  title: 'Filter',
+  primaryActionLabel: 'Apply',
+  secondaryActionLabel: 'Cancel'
+};
 var FilterFlyout = function FilterFlyout(_ref) {
   var _cx2;
-  var _ref$updateMethod = _ref.updateMethod,
-    updateMethod = _ref$updateMethod === void 0 ? BATCH : _ref$updateMethod,
+  var updateMethod = _ref.updateMethod,
     _ref$flyoutIconDescri = _ref.flyoutIconDescription,
-    flyoutIconDescription = _ref$flyoutIconDescri === void 0 ? 'Open filters' : _ref$flyoutIconDescri,
+    flyoutIconDescription = _ref$flyoutIconDescri === void 0 ? defaults.flyoutIconDescription : _ref$flyoutIconDescri,
     _ref$filters = _ref.filters,
     filters = _ref$filters === void 0 ? [] : _ref$filters,
     _ref$title = _ref.title,
-    title = _ref$title === void 0 ? 'Filter' : _ref$title,
+    title = _ref$title === void 0 ? defaults.title : _ref$title,
     _ref$primaryActionLab = _ref.primaryActionLabel,
-    primaryActionLabel = _ref$primaryActionLab === void 0 ? 'Apply' : _ref$primaryActionLab,
+    primaryActionLabel = _ref$primaryActionLab === void 0 ? defaults.primaryActionLabel : _ref$primaryActionLab,
     _ref$onFlyoutOpen = _ref.onFlyoutOpen,
     onFlyoutOpen = _ref$onFlyoutOpen === void 0 ? function () {} : _ref$onFlyoutOpen,
     _ref$onFlyoutClose = _ref.onFlyoutClose,
@@ -42,7 +47,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
     _ref$onCancel = _ref.onCancel,
     onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
     _ref$secondaryActionL = _ref.secondaryActionLabel,
-    secondaryActionLabel = _ref$secondaryActionL === void 0 ? 'Cancel' : _ref$secondaryActionL,
+    secondaryActionLabel = _ref$secondaryActionL === void 0 ? defaults.secondaryActionLabel : _ref$secondaryActionL,
     setAllFilters = _ref.setAllFilters,
     _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
@@ -88,6 +93,9 @@ var FilterFlyout = function FilterFlyout(_ref) {
     _useShouldDisableButt2 = _slicedToArray(_useShouldDisableButt, 2),
     shouldDisableButtons = _useShouldDisableButt2[0],
     setShouldDisableButtons = _useShouldDisableButt2[1];
+
+  // Skip resize testing
+  /* istanbul ignore next */
   var handleResize = function handleResize(current) {
     var filterFlyoutRefPosition = flyoutInnerRef === null || flyoutInnerRef === void 0 ? void 0 : flyoutInnerRef.current.getBoundingClientRect();
     var originalFlyoutWidth = parseInt(window.getComputedStyle(flyoutInnerRef === null || flyoutInnerRef === void 0 ? void 0 : flyoutInnerRef.current).getPropertyValue('width'));
@@ -177,9 +185,13 @@ var FilterFlyout = function FilterFlyout(_ref) {
   };
 
   /** Effects */
+  // Close flyout when clicking outside
   useClickOutside(filterFlyoutRef, function (target) {
     var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
     var hasClickedOnDropdown = target.className === "".concat(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/es/components/Datagrid/Datagrid/addons/Filtering/FilterPanel.js

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-/* eslint-disable react/jsx-key */
 /**
  * Copyright IBM Corp. 2022, 2024
  *
@@ -24,14 +23,21 @@ import { useFilters, useSubscribeToEventEmitter, useShouldDisableButtons } from
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var componentClass = "".concat(blockClass, "-filter-panel");
 var MotionActionSet = motion(ActionSet);
+var defaults = {
+  title: 'Filter',
+  closeIconDescription: 'Close filter panel',
+  primaryActionLabel: 'Apply',
+  secondaryActionLabel: 'Cancel',
+  searchLabelText: 'Filter search',
+  searchPlaceholder: 'Find filters'
+};
 var FilterPanel = function FilterPanel(_ref) {
   var _cx;
   var _ref$title = _ref.title,
-    title = _ref$title === void 0 ? 'Filter' : _ref$title,
+    title = _ref$title === void 0 ? defaults.title : _ref$title,
     _ref$closeIconDescrip = _ref.closeIconDescription,
-    closeIconDescription = _ref$closeIconDescrip === void 0 ? 'Close filter panel' : _ref$closeIconDescrip,
-    _ref$updateMethod = _ref.updateMethod,
-    updateMethod = _ref$updateMethod === void 0 ? BATCH : _ref$updateMethod,
+    closeIconDescription = _ref$closeIconDescrip === void 0 ? defaults.closeIconDescription : _ref$closeIconDescrip,
+    updateMethod = _ref.updateMethod,
     filterSections = _ref.filterSections,
     setAllFilters = _ref.setAllFilters,
     _ref$onApply = _ref.onApply,
@@ -47,13 +53,13 @@ var FilterPanel = function FilterPanel(_ref) {
     _ref$filterPanelMinHe = _ref.filterPanelMinHeight,
     filterPanelMinHeight = _ref$filterPanelMinHe === void 0 ? 600 : _ref$filterPanelMinHe,
     _ref$primaryActionLab = _ref.primaryActionLabel,
-    primaryActionLabel = _ref$primaryActionLab === void 0 ? 'Apply' : _ref$primaryActionLab,
+    primaryActionLabel = _ref$primaryActionLab === void 0 ? defaults.primaryActionLabel : _ref$primaryActionLab,
     _ref$secondaryActionL = _ref.secondaryActionLabel,
-    secondaryActionLabel = _ref$secondaryActionL === void 0 ? 'Cancel' : _ref$secondaryActionL,
+    secondaryActionLabel = _ref$secondaryActionL === void 0 ? defaults.secondaryActionLabel : _ref$secondaryActionL,
     _ref$searchLabelText = _ref.searchLabelText,
-    searchLabelText = _ref$searchLabelText === void 0 ? 'Filter search' : _ref$searchLabelText,
+    searchLabelText = _ref$searchLabelText === void 0 ? defaults.searchLabelText : _ref$searchLabelText,
     _ref$searchPlaceholde = _ref.searchPlaceholder,
-    searchPlaceholder = _ref$searchPlaceholde === void 0 ? 'Find filters' : _ref$searchPlaceholde,
+    searchPlaceholder = _ref$searchPlaceholde === void 0 ? defaults.searchPlaceholder : _ref$searchPlaceholde,
     _ref$reactTableFilter = _ref.reactTableFiltersState,
     reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter,
     _ref$isFetching = _ref.isFetching,
@@ -177,7 +183,8 @@ var FilterPanel = function FilterPanel(_ref) {
     var filterHeadingHeight = (_filterHeadingRef$cur = filterHeadingRef.current) === null || _filterHeadingRef$cur === void 0 ? void 0 : _filterHeadingRef$cur.getBoundingClientRect().height;
     var filterSearchHeight = (_filterSearchRef$curr = filterSearchRef.current) === null || _filterSearchRef$curr === void 0 ? void 0 : _filterSearchRef$curr.getBoundingClientRect().height;
     var actionSetHeight = (_actionSetRef$current = actionSetRef.current) === null || _actionSetRef$current === void 0 ? void 0 : _actionSetRef$current.getBoundingClientRect().height;
-    var height = "calc(100vh - ".concat(filterHeadingHeight, "px - ").concat(showFilterSearch ? filterSearchHeight : 0, "px - ").concat(updateMethod === BATCH ? actionSetHeight : 0, "px)");
+    var height = panelOpen ? "calc(100vh - ".concat(filterHeadingHeight, "px - ").concat( /* istanbul ignore next */
+    showFilterSearch ? filterSearchHeight : 0, "px - ").concat(updateMethod === BATCH ? actionSetHeight : 0, "px)") : 0;
     return height;
   };
   return /*#__PURE__*/React.createElement(motion.div, {
@@ -203,7 +210,10 @@ var FilterPanel = function FilterPanel(_ref) {
     tooltipPosition: "bottom",
     tooltipAlignment: "end",
     onClick: closePanel
-  }), showFilterSearch && /*#__PURE__*/React.createElement("div", {
+  }), showFilterSearch &&
+  /*#__PURE__*/
+  /* istanbul ignore next */
+  React.createElement("div", {
     ref: filterSearchRef,
     className: "".concat(componentClass, "__search")
   }, /*#__PURE__*/React.createElement(Search, {

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

@@ -4,14 +4,15 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
- * Copyright IBM Corp. 2022, 2023
+ * 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.
  */
-import React, { createContext, useState } from 'react';
+
+import React, { createContext, useState, useReducer } from 'react';
 import PropTypes from 'prop-types';
-import { DATE, DROPDOWN, NUMBER, RADIO, CHECKBOX, CLEAR_SINGLE_FILTER } from './constants';
+import { DATE, DROPDOWN, NUMBER, RADIO, CHECKBOX, CLEAR_SINGLE_FILTER, SAVED_FILTERS } from './constants';
 export var FilterContext = /*#__PURE__*/createContext();
 var EventEmitter = {
   events: {},
@@ -141,22 +142,45 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
   });
   return tags;
 };
-export 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 SAVED_FILTERS:
+      {
+        var _ref3 = action.payload || {},
+          savedFilters = _ref3.savedFilters;
+        return _objectSpread(_objectSpread({}, state), {}, {
+          savedFilters: savedFilters
+        });
+      }
+    default:
+      return state;
+  }
+};
+export 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 = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     panelOpen = _useState2[0],
     setPanelOpen = _useState2[1];
+  var initialState = {
+    savedFilters: []
+  };
+  var _useReducer = useReducer(filteringReducer, initialState),
+    _useReducer2 = _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.createElement(FilterContext.Provider, {
     value: value

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

@@ -1,9 +1,10 @@
 /**
- * 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 */
 export var BATCH = 'batch';
 export var INSTANT = 'instant';
@@ -25,4 +26,7 @@ export var CLEAR_SINGLE_FILTER = 'clearSingleFilter';
 
 /** Constants for panel dimensions */
 export var PANEL_WIDTH = 320;
-export var ACTION_SET_HEIGHT = 64;
+export var ACTION_SET_HEIGHT = 64;
+
+/** Constants for local reducer */
+export var SAVED_FILTERS = 'savedFilters';

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

@@ -1,3 +1,10 @@
+/**
+ * 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.
+ */
+
 import { FilterContext } from '../FilterProvider';
 import { useContext } from 'react';
 var useFilterContext = function useFilterContext() {

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

@@ -4,18 +4,19 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2023
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * 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.
  */
-import React, { useState, useRef, useEffect, useCallback } from 'react';
+
+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 } from '../constants';
+import { INSTANT, BATCH, DATE, CHECKBOX, NUMBER, RADIO, DROPDOWN, PANEL, SAVED_FILTERS } from '../constants';
 import { getInitialStateFromFilters } from '../utils';
 import { usePreviousValue } from '../../../../../../global/js/hooks';
+import { FilterContext } from '../FilterProvider';
 var useFilters = function useFilters(_ref) {
   var updateMethod = _ref.updateMethod,
     _ref$filters = _ref.filters,
@@ -23,10 +24,13 @@ var useFilters = function useFilters(_ref) {
     setAllFilters = _ref.setAllFilters,
     variation = _ref.variation,
     reactTableFiltersState = _ref.reactTableFiltersState,
-    _ref$onCancel = _ref.onCancel,
-    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
+    onCancel = _ref.onCancel,
     panelOpen = _ref.panelOpen,
     isFetching = _ref.isFetching;
+  var _useContext = useContext(FilterContext),
+    state = _useContext.state,
+    localDispatch = _useContext.dispatch;
+  var savedFilters = state.savedFilters;
   /** State */
   var _useState = useState(getInitialStateFromFilters(filters, variation, reactTableFiltersState)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -166,6 +170,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: SAVED_FILTERS,
+      payload: {
+        savedFilters: filtersObjectArrayCopy
+      }
+    });
+
     // // Automatically apply the filters if the updateMethod is instant
     if (updateMethod === INSTANT) {
       setAllFilters(filtersObjectArrayCopy);
@@ -345,10 +359,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 === BATCH) {