@carbon/ibm-products 2.43.2-canary.25 → 2.43.2-canary.252

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

@@ -12,10 +12,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var index = require('../../../../../node_modules/prop-types/index.js');
+require('../../../../Tearsheet/Tearsheet.js');
+var TearsheetNarrow = require('../../../../Tearsheet/TearsheetNarrow.js');
 var Columns = require('./Columns.js');
 var Actions = require('./Actions.js');
 var settings = require('../../../../../settings.js');
-var TearsheetNarrow = require('../../../../Tearsheet/TearsheetNarrow.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -66,6 +67,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     _useState10 = _rollupPluginBabelHelpers.slicedToArray(_useState9, 2),
     isDirty = _useState10[0],
     setIsDirty = _useState10[1];
+  var prevColumnDefinitions = React.useRef();
   var onRequestClose = function onRequestClose() {
     setColumnObjects(columnDefinitions);
     setIsTearsheetOpen(false);
@@ -81,21 +83,40 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     onSaveColumnPrefs(updatedColumns);
   };
   var onCheckboxCheck = function onCheckboxCheck(col, value) {
+    // Update the visibility of columns based on a single column or an array of columns
     var changedDefinitions = columnObjects.map(function (definition) {
-      if ((Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) && definition.canFilter && !definition.disabled) {
-        return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, definition), {}, {
+      // If select all is clicked
+      if (Array.isArray(col)) {
+        return col.includes(definition) && definition.canFilter && !definition.disabled ? _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, definition), {}, {
           isVisible: value
-        });
+        }) : definition;
       }
-      return definition;
+      // If a single checkbox is clicked which is written below as a default return
+      return col.id === definition.id ? _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, definition), {}, {
+        isVisible: value
+      }) : definition;
     });
-    setColumnObjects(changedDefinitions);
-    setDirty();
-  };
-  var setDirty = function setDirty() {
-    if (!isDirty) {
-      setIsDirty(true);
-    }
+
+    // Count the number of visible columns excluding certain IDs after 1st mutation
+    var selectedColumnsCount = changedDefinitions.filter(function (definition) {
+      return definition.isVisible && !['datagridSelection', 'actions'].includes(definition.id);
+    }).length;
+
+    // Ensure special columns are visible if any other columns are visible
+    var finalDefinitions = changedDefinitions.map(function (definition) {
+      // If at least 1 column is visible after mutation, we add selection column and actions column (coming from various extensions)
+      if (selectedColumnsCount > 0) {
+        return ['datagridSelection', 'actions'].includes(definition.id) ? _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, definition), {}, {
+          isVisible: true
+        }) : definition;
+      }
+      // Else we remove selection column and actions column
+      return ['datagridSelection', 'actions'].includes(definition.id) ? _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, definition), {}, {
+        isVisible: false
+      }) : definition;
+    });
+    setColumnObjects(finalDefinitions);
+    setIsDirty(selectedColumnsCount !== 0);
   };
   var getVisibleColumnsCount = React.useCallback(function () {
     return columnObjects.filter(function (col) {
@@ -104,15 +125,19 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   }, [columnObjects]);
   var string = searchText.trim().toLowerCase();
   React.useEffect(function () {
-    var notFilterableCount = columnObjects.filter(function (col) {
-      return !col.canFilter;
-    }).length;
+    if (prevColumnDefinitions.current !== columnDefinitions) {
+      setColumnObjects(columnDefinitions);
+    }
     var actionCount = columnObjects.filter(function (col) {
       return col.id === 'actions';
     }).length;
-    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount - actionCount);
-    setTotalColumns(columnObjects.length - notFilterableCount - actionCount);
-  }, [getVisibleColumnsCount, columnObjects]);
+    var datagridSelectionCount = columnObjects.filter(function (col) {
+      return col.id === 'datagridSelection';
+    }).length;
+    setVisibleColumnsCount(getVisibleColumnsCount() - actionCount - datagridSelectionCount < 0 ? 0 : getVisibleColumnsCount() - actionCount - datagridSelectionCount);
+    setTotalColumns(columnObjects.length - actionCount - datagridSelectionCount);
+    prevColumnDefinitions.current = columnDefinitions;
+  }, [getVisibleColumnsCount, columnObjects, columnDefinitions]);
   return /*#__PURE__*/React__default["default"].createElement(TearsheetNarrow.TearsheetNarrow, {
     className: "".concat(blockClass, "__customize-columns-tearsheet"),
     open: isOpen,
@@ -134,7 +159,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     searchText: searchText,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(true);
     },
     setSearchText: setSearchText,
     findColumnPlaceholderLabel: findColumnPlaceholderLabel,
@@ -148,7 +173,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     onSelectColumn: onCheckboxCheck,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(getVisibleColumnsCount() !== 0);
     },
     selectAllLabel: selectAllLabel,
     customizeTearsheetHeadingLabel: customizeTearsheetHeadingLabel

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/DraggableItemsList.js

@@ -169,10 +169,10 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     strategy: sortable.verticalListSortingStrategy
   }, visibleCols.map(function (colDef) {
     var colHeaderTitle = getNodeTextContent.getNodeTextContent(colDef.Header);
-    var searchString = new RegExp('(' + filterString + ')');
-    var res = filterString.length ? colHeaderTitle.toLowerCase().split(searchString) : null;
-    var firstWord = res !== null ? res[0] === '' ? res[1].charAt(0).toUpperCase() + res[1].substring(1) : res[0].charAt(0).toUpperCase() + res[0].substring(1) : null;
-    var highlightedText = res !== null ? res[0] === '' ? "<strong>".concat(firstWord, "</strong>") + res[2] : firstWord + "<strong>".concat(res[1], "</strong>") + res[2] : colHeaderTitle;
+    var parts = colHeaderTitle.split(new RegExp("(".concat(filterString, ")"), 'gi'));
+    var highlightedText = parts.map(function (part) {
+      return part.toLowerCase() === filterString.toLowerCase() ? "<strong>".concat(part, "</strong>") : part;
+    }).join('');
     var isFrozenColumn = !!colDef.sticky;
     var isDisabled = colDef.disabled;
     var listContents = /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(react.Checkbox, {

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/TearsheetWrapper.js

@@ -44,20 +44,22 @@ var TearsheetWrapper = function TearsheetWrapper(_ref) {
     columnDefinitions: instance.allColumns,
     originalColumnDefinitions: instance.columns,
     onSaveColumnPrefs: function onSaveColumnPrefs(updatedColDefs) {
-      var hiddenIds = updatedColDefs.filter(function (colDef) {
-        return !colDef.isVisible;
-      }).map(function (colDef) {
-        return colDef.id;
-      });
-      instance.setHiddenColumns(hiddenIds);
-      if (typeof instance.setColumnOrder === 'function') {
-        instance.setColumnOrder(updatedColDefs.map(function (colDef) {
+      setTimeout(function () {
+        var hiddenIds = updatedColDefs.filter(function (colDef) {
+          return !colDef.isVisible;
+        }).map(function (colDef) {
           return colDef.id;
-        }));
-      } else {
-        // eslint-disable-next-line no-console
-        console.warn("Column order can not be updated. Did you forget to add 'useColumnOrder' in 'useDatagrid'");
-      }
+        });
+        instance.setHiddenColumns(hiddenIds);
+        if (typeof instance.setColumnOrder === 'function') {
+          instance.setColumnOrder(updatedColDefs.map(function (colDef) {
+            return colDef.id;
+          }));
+        } else {
+          // eslint-disable-next-line no-console
+          console.warn("Column order can not be updated. Did you forget to add 'useColumnOrder' in 'useDatagrid'");
+        }
+      }, 0);
       if (typeof _onSaveColumnPrefs === 'function') {
         _onSaveColumnPrefs(updatedColDefs);
       }

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

@@ -1,7 +1,8 @@
 export default FilterFlyout;
-declare function FilterFlyout({ updateMethod, flyoutIconDescription, filters, title, primaryActionLabel, onFlyoutOpen, onFlyoutClose, onApply, onCancel, secondaryActionLabel, setAllFilters, data, reactTableFiltersState, }: {
+declare function FilterFlyout({ updateMethod, flyoutIconDescription, align, filters, title, primaryActionLabel, onFlyoutOpen, onFlyoutClose, onApply, onCancel, secondaryActionLabel, setAllFilters, data, reactTableFiltersState, }: {
     updateMethod: any;
     flyoutIconDescription?: string | undefined;
+    align?: string | undefined;
     filters?: any[] | undefined;
     title?: string | undefined;
     primaryActionLabel?: string | undefined;
@@ -16,6 +17,7 @@ declare function FilterFlyout({ updateMethod, flyoutIconDescription, filters, ti
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace FilterFlyout {
     namespace propTypes {
+        let align: PropTypes.Requireable<string>;
         let data: PropTypes.Validator<any[]>;
         let filters: PropTypes.Validator<(PropTypes.InferProps<{
             type: PropTypes.Validator<string>;

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

@@ -14,16 +14,17 @@ var constants = require('./constants.js');
 var react = require('@carbon/react');
 var React = require('react');
 var layout = require('@carbon/layout');
+var ActionSet = require('../../../../ActionSet/ActionSet.js');
 var icons = require('@carbon/react/icons');
 var index = require('../../../../../node_modules/prop-types/index.js');
 var cx = require('classnames');
 var settings = require('../../../../../settings.js');
+var FilterProvider = require('./FilterProvider.js');
 var useFilters = require('./hooks/useFilters.js');
 var useShouldDisableButtons = require('./hooks/useShouldDisableButtons.js');
 var useWindowResize = require('../../../../../global/js/hooks/useWindowResize.js');
 var useClickOutside = require('../../../../../global/js/hooks/useClickOutside.js');
 var useSubscribeToEventEmitter = require('./hooks/useSubscribeToEventEmitter.js');
-var ActionSet = require('../../../../ActionSet/ActionSet.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -37,14 +38,20 @@ var defaults = {
   flyoutIconDescription: 'Open filters',
   title: 'Filter',
   primaryActionLabel: 'Apply',
-  secondaryActionLabel: 'Cancel'
+  secondaryActionLabel: 'Cancel',
+  align: 'bottom'
 };
+
+// Use same empty array every time, for benefit of useEffect() etc. dependency checking.
+var emptyArray = [];
 var FilterFlyout = function FilterFlyout(_ref) {
   var updateMethod = _ref.updateMethod,
     _ref$flyoutIconDescri = _ref.flyoutIconDescription,
     flyoutIconDescription = _ref$flyoutIconDescri === void 0 ? defaults.flyoutIconDescription : _ref$flyoutIconDescri,
+    _ref$align = _ref.align,
+    align = _ref$align === void 0 ? defaults.align : _ref$align,
     _ref$filters = _ref.filters,
-    filters = _ref$filters === void 0 ? [] : _ref$filters,
+    filters = _ref$filters === void 0 ? emptyArray : _ref$filters,
     _ref$title = _ref.title,
     title = _ref$title === void 0 ? defaults.title : _ref$title,
     _ref$primaryActionLab = _ref.primaryActionLabel,
@@ -61,9 +68,9 @@ var FilterFlyout = function FilterFlyout(_ref) {
     secondaryActionLabel = _ref$secondaryActionL === void 0 ? defaults.secondaryActionLabel : _ref$secondaryActionL,
     setAllFilters = _ref.setAllFilters,
     _ref$data = _ref.data,
-    data = _ref$data === void 0 ? [] : _ref$data,
+    data = _ref$data === void 0 ? emptyArray : _ref$data,
     _ref$reactTableFilter = _ref.reactTableFiltersState,
-    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? emptyArray : _ref$reactTableFilter;
   /** State */
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
@@ -141,6 +148,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
     handleResize(current);
   });
 
+  /** Context */
+  var _useContext = React.useContext(FilterProvider.FilterContext),
+    localDispatch = _useContext.dispatch;
+
   /** Memos */
   var showActionSet = updateMethod === constants.BATCH;
   var carbonPrefix = react.usePrefix();
@@ -177,6 +188,16 @@ var FilterFlyout = function FilterFlyout(_ref) {
 
     // Update the last applied filters
     lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
+
+    // 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: filtersObjectArray
+      }
+    });
   };
 
   /** Renders all filters */
@@ -233,7 +254,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
   }, /*#__PURE__*/React__default["default"].createElement(react.IconButton, {
     label: flyoutIconDescription,
     kind: "ghost",
-    align: "bottom",
+    align: align,
     onClick: open ? closeFlyout : openFlyout,
     className: cx__default["default"]("".concat(componentClass, "__trigger"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "__trigger--open"), open)),
     disabled: data.length === 0
@@ -250,6 +271,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
   }, renderFilters())), renderActionSet()));
 };
 FilterFlyout.propTypes = {
+  /**
+   * Tooltip alignment for the filter button
+   */
+  align: index["default"].string,
   /**
    * All data rows in the table
    */

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

@@ -15,16 +15,17 @@ var constants = require('./constants.js');
 var React = require('react');
 var variants = require('./motion/variants.js');
 var framerMotion = require('framer-motion');
+var ActionSet = require('../../../../ActionSet/ActionSet.js');
 var icons = require('@carbon/react/icons');
 var FilterProvider = require('./FilterProvider.js');
 var index = require('../../../../../node_modules/prop-types/index.js');
 var cx = require('classnames');
 var settings = require('../../../../../settings.js');
 var layout = require('@carbon/layout');
-var ActionSet = require('../../../../ActionSet/ActionSet.js');
 var useFilters = require('./hooks/useFilters.js');
 var useShouldDisableButtons = require('./hooks/useShouldDisableButtons.js');
 var useSubscribeToEventEmitter = require('./hooks/useSubscribeToEventEmitter.js');
+var useIsomorphicEffect = require('../../../../../global/js/hooks/useIsomorphicEffect.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -42,6 +43,9 @@ var defaults = {
   searchLabelText: 'Filter search',
   searchPlaceholder: 'Find filters'
 };
+
+// Use same empty array every time, for benefit of useEffect() etc. dependency checking.
+var emptyArray = [];
 var FilterPanel = function FilterPanel(_ref) {
   var _ref$title = _ref.title,
     title = _ref$title === void 0 ? defaults.title : _ref$title,
@@ -71,7 +75,7 @@ var FilterPanel = function FilterPanel(_ref) {
     _ref$searchPlaceholde = _ref.searchPlaceholder,
     searchPlaceholder = _ref$searchPlaceholde === void 0 ? defaults.searchPlaceholder : _ref$searchPlaceholde,
     _ref$reactTableFilter = _ref.reactTableFiltersState,
-    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? emptyArray : _ref$reactTableFilter,
     _ref$autoHideFilters = _ref.autoHideFilters,
     autoHideFilters = _ref$autoHideFilters === void 0 ? false : _ref$autoHideFilters,
     _ref$isFetching = _ref.isFetching,
@@ -85,7 +89,8 @@ var FilterPanel = function FilterPanel(_ref) {
   /** Context */
   var _useContext = React.useContext(FilterProvider.FilterContext),
     panelOpen = _useContext.panelOpen,
-    setPanelOpen = _useContext.setPanelOpen;
+    setPanelOpen = _useContext.setPanelOpen,
+    localDispatch = _useContext.dispatch;
   var _useFilters = useFilters["default"]({
       updateMethod: updateMethod,
       filters: filterSections,
@@ -111,7 +116,7 @@ var FilterPanel = function FilterPanel(_ref) {
   var filterHeadingRef = React.useRef();
   var filterSearchRef = React.useRef();
   var actionSetRef = React.useRef();
-
+  var innerContainerRef = React.useRef();
   /** State from hooks */
   var _useShouldDisableButt = useShouldDisableButtons["default"]({
       initialValue: true,
@@ -150,6 +155,16 @@ var FilterPanel = function FilterPanel(_ref) {
 
     // Update the last applied filters
     lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
+
+    // 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: filtersObjectArray
+      }
+    });
   };
   var renderActionSet = function renderActionSet() {
     return showActionSet && /*#__PURE__*/React__default["default"].createElement(MotionActionSet, {
@@ -194,11 +209,11 @@ var FilterPanel = function FilterPanel(_ref) {
   }, [filterPanelMinHeight]);
 
   // tableId is passed in from the event emitter from the FilterSummary component
-  // in  DatagridContent
+  // in DatagridContent
   useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, function (tableId) {
     reset(tableId);
   });
-  var getScrollableContainerHeight = function getScrollableContainerHeight() {
+  var getScrollableContainerHeight = React.useCallback(function () {
     var _filterHeadingRef$cur, _filterSearchRef$curr, _actionSetRef$current;
     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;
@@ -206,7 +221,13 @@ var FilterPanel = function FilterPanel(_ref) {
     var height = panelOpen ? "calc(100vh - ".concat(filterHeadingHeight, "px - ").concat( /* istanbul ignore next */
     showFilterSearch ? filterSearchHeight : 0, "px - ").concat(updateMethod === constants.BATCH ? actionSetHeight : 0, "px)") : 0;
     return height;
-  };
+  }, [filterHeadingRef, filterSearchRef, actionSetRef, panelOpen, showFilterSearch, updateMethod]);
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    var height = getScrollableContainerHeight();
+    if (innerContainerRef.current && innerContainerRef.current.style) {
+      innerContainerRef.current.style.height = height;
+    }
+  }, [getScrollableContainerHeight, innerContainerRef]);
   return /*#__PURE__*/React__default["default"].createElement(framerMotion.motion.div, {
     ref: filterPanelRef,
     className: cx__default["default"](componentClass, "".concat(componentClass, "__container"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "--open"), panelOpen), "".concat(componentClass, "--batch"), showActionSet), "".concat(componentClass, "--instant"), !showActionSet)),
@@ -246,9 +267,7 @@ var FilterPanel = function FilterPanel(_ref) {
     size: "sm"
   })))), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(componentClass, "__inner-container"),
-    style: {
-      height: getScrollableContainerHeight()
-    },
+    ref: innerContainerRef,
     onScroll: onInnerContainerScroll
   }, filterSections.map(function (_ref2, index) {
     var _ref2$categoryTitle = _ref2.categoryTitle,

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

@@ -1,8 +1,9 @@
 export const FilterContext: React.Context<any>;
-export function clearSingleFilter({ key, value }: {
+export function clearSingleFilter({ key, value, tableId }: {
     key: any;
     value: any;
-}, setAllFilters: any, state: any): void;
+    tableId: any;
+}, setAllFilters: any, state: any, contextTableId: any): void;
 export function FilterProvider({ children, filters, filterProps, tableId }: {
     children: any;
     filters: any;

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

@@ -55,9 +55,13 @@ var updateFilterState = function updateFilterState(state, type, value) {
   });
   return removeFilterItem(state, filterTagIndex);
 };
-var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
+var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state, contextTableId) {
   var key = _ref.key,
-    value = _ref.value;
+    value = _ref.value,
+    tableId = _ref.tableId;
+  if (tableId !== contextTableId) {
+    return;
+  }
   var tempState = _rollupPluginBabelHelpers.toConsumableArray(state.filters);
   tempState.forEach(function (f, filterIndex) {
     if (f.id === key) {
@@ -70,7 +74,7 @@ var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
           This checks if all the checkboxes are selected = false and removes it from the array
         */
         var valueIndex = filterValues.findIndex(function (val) {
-          return val.id === value;
+          return val.value === value;
         });
         filterValues[valueIndex].selected = false;
         var updatedFilterObject = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, f), {}, {
@@ -93,10 +97,11 @@ var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
   });
   setAllFilters(tempState);
 };
-var handleSingleFilterRemoval = function handleSingleFilterRemoval(key, value) {
+var handleSingleFilterRemoval = function handleSingleFilterRemoval(key, value, tableId) {
   EventEmitter.dispatch(constants.CLEAR_SINGLE_FILTER, {
     key: key,
-    value: value
+    value: value,
+    tableId: tableId
   });
 };
 var formatDateRange = function formatDateRange(startDate, endDate) {
@@ -104,7 +109,7 @@ var formatDateRange = function formatDateRange(startDate, endDate) {
   var endDateObj = new Date(endDate);
   return "".concat(startDateObj.toLocaleDateString(), " - ").concat(endDateObj.toLocaleDateString());
 };
-var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLabel) {
+var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLabel, tableId) {
   var tags = [];
   filters.forEach(function (_ref2) {
     var id = _ref2.id,
@@ -113,7 +118,7 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
     var sharedFilterProps = {
       filter: true,
       onClose: function onClose() {
-        return handleSingleFilterRemoval(id, value);
+        return handleSingleFilterRemoval(id, value, tableId);
       }
     };
     if (type === constants.DROPDOWN || type === constants.RADIO || type === constants.NUMBER) {
@@ -138,7 +143,7 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
             value: option.value
           }, sharedFilterProps), {}, {
             onClose: function onClose() {
-              return handleSingleFilterRemoval(id, option.value);
+              return handleSingleFilterRemoval(id, option.value, tableId);
             }
           }));
         }
@@ -168,7 +173,7 @@ var FilterProvider = function FilterProvider(_ref4) {
     tableId = _ref4.tableId;
   var _ref5 = filterProps || {},
     renderDateLabel = _ref5.renderDateLabel;
-  var filterTags = prepareFiltersForTags(filters, renderDateLabel);
+  var filterTags = prepareFiltersForTags(filters, renderDateLabel, tableId);
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     panelOpen = _useState2[0],

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

@@ -11,6 +11,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../../../_virtual/_rollupPluginBabelHelpers.js');
 
+/**
+ * Copyright IBM Corp. 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 handleCheckboxChange = function handleCheckboxChange(_ref) {
   var _option$onChange;
   var checked = _ref.checked,

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

@@ -17,16 +17,19 @@ var OverflowCheckboxes = require('../OverflowCheckboxes.js');
 var utils = require('../utils.js');
 var FilterProvider = require('../FilterProvider.js');
 var handleCheckboxChange = require('../handleCheckboxChange.js');
+var uuidv4 = require('../../../../../../global/js/utils/uuidv4.js');
 var usePreviousValue = require('../../../../../../global/js/hooks/usePreviousValue.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+// Use same empty array every time, for benefit of useEffect() etc. dependency checking.
+var emptyArray = [];
 var useFilters = function useFilters(_ref) {
   var updateMethod = _ref.updateMethod,
     _ref$filters = _ref.filters,
-    filters = _ref$filters === void 0 ? [] : _ref$filters,
+    filters = _ref$filters === void 0 ? emptyArray : _ref$filters,
     setAllFilters = _ref.setAllFilters,
     variation = _ref.variation,
     reactTableFiltersState = _ref.reactTableFiltersState,
@@ -36,7 +39,6 @@ var useFilters = function useFilters(_ref) {
     isFetching = _ref.isFetching;
   var _useContext = React.useContext(FilterProvider.FilterContext),
     state = _useContext.state,
-    localDispatch = _useContext.dispatch,
     contextTableId = _useContext.tableId;
   var savedFilters = state.savedFilters;
   /** State */
@@ -55,6 +57,7 @@ var useFilters = function useFilters(_ref) {
   var previousState = usePreviousValue.usePreviousValue({
     panelOpen: panelOpen
   });
+  var filteredItemsRef = React.useRef();
 
   // When using batch actions we have to store the filters to then apply them later
   var prevFiltersRef = React.useRef(JSON.stringify(filtersState));
@@ -140,16 +143,6 @@ 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);
     }
@@ -315,8 +308,18 @@ var useFilters = function useFilters(_ref) {
             }
             return null;
           }).filter(Boolean);
+          var isEqual = compareFilterItems(filteredItems);
+          if (!isEqual) {
+            filteredItemsRef.current = _rollupPluginBabelHelpers.toConsumableArray(filteredItems);
+          }
+          var getKey = function getKey() {
+            return isEqual ? {
+              key: uuidv4["default"]()
+            } : column;
+          };
           filter = /*#__PURE__*/React__default["default"].createElement(react.MultiSelect, _rollupPluginBabelHelpers["extends"]({}, components.MultiSelect, {
             selectedItems: filteredItems,
+            key: getKey(),
             onChange: function onChange(_ref9) {
               var _components$MultiSele, _components$MultiSele2;
               var selectedItems = _ref9.selectedItems;
@@ -332,6 +335,7 @@ var useFilters = function useFilters(_ref) {
                 }
                 return null;
               }).filter(Boolean);
+              filteredItemsRef.current = _rollupPluginBabelHelpers.toConsumableArray(foundItems);
 
               // Change selected state for those items that have been selected
               allOptions.map(function (a) {
@@ -374,6 +378,25 @@ var useFilters = function useFilters(_ref) {
       key: column
     }, filter);
   };
+  var compareFilterItems = function compareFilterItems(filteredItems) {
+    var _filteredItems$map, _filteredItemsRef$cur, _filteredItemsRef$cur2;
+    var filteredItemsId = (_filteredItems$map = filteredItems.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItems$map !== void 0 ? _filteredItems$map : [];
+    var previousFilteredItemsId = (_filteredItemsRef$cur = filteredItemsRef === null || filteredItemsRef === void 0 || (_filteredItemsRef$cur2 = filteredItemsRef.current) === null || _filteredItemsRef$cur2 === void 0 ? void 0 : _filteredItemsRef$cur2.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItemsRef$cur !== void 0 ? _filteredItemsRef$cur : [];
+    var set1 = new Set(filteredItemsId);
+    var set2 = new Set(previousFilteredItemsId);
+    // Check if the sets have the same size (same number of unique elements)
+    if (set1.size !== set2.size) {
+      return false;
+    }
+    // Check if all elements in set1 are also present in set2 (using spread syntax)
+    return _rollupPluginBabelHelpers.toConsumableArray(set1).every(function (element) {
+      return set2.has(element);
+    });
+  };
 
   /** This useEffect will properly handle the previous filters when the panel closes
    * 1. If the panel closes we need to call the reset fn but also store the

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditButton/InlineEditButton.js

@@ -36,8 +36,7 @@ var InlineEditButton = function InlineEditButton(_ref) {
     tabIndex: isActiveCell ? 0 : -1,
     "data-disabled": disabledCell,
     "aria-disabled": disabledCell,
-    role: "button",
-    title: label
+    role: "button"
   }, LabelIcon && /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(blockClass, "__label-icon")
   }, /*#__PURE__*/React__default["default"].createElement(LabelIcon, null)), label !== '' ? /*#__PURE__*/React__default["default"].createElement("span", {
@@ -57,7 +56,7 @@ InlineEditButton.propTypes = {
   nonEditCell: index["default"].bool,
   placeholder: index["default"].string,
   renderIcon: index["default"].oneOfType([index["default"].func, index["default"].object]),
-  type: index["default"].oneOf(['text', 'number', 'selection', 'date']),
+  type: index["default"].oneOf(['text', 'number', 'selection', 'date', 'checkbox']),
   value: index["default"].oneOfType([index["default"].string, index["default"].node])
 };