@carbon/ibm-products 2.43.2-canary.30 → 2.43.2-canary.301

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

@@ -7,7 +7,7 @@
 
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import * as React from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import { Column } from '@carbon/react/icons';
 import { Button } from '@carbon/react';
 import { pkg } from '../../../../../settings.js';

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

@@ -7,7 +7,7 @@
 
 import { slicedToArray as _slicedToArray, defineProperty as _defineProperty } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useRef } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import { Checkbox } from '@carbon/react';
 import update from 'immutability-helper';
 import { pkg } from '../../../../../settings.js';

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

@@ -6,12 +6,13 @@
  */
 
 import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2 } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useState, useCallback, useEffect } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import React__default, { useState, useRef, useCallback, useEffect } from 'react';
+import PropTypes from '../../../../../_virtual/index.js';
+import '../../../../Tearsheet/Tearsheet.js';
+import { TearsheetNarrow } from '../../../../Tearsheet/TearsheetNarrow.js';
 import Columns from './Columns.js';
 import Actions from './Actions.js';
 import { pkg } from '../../../../../settings.js';
-import { TearsheetNarrow } from '../../../../Tearsheet/TearsheetNarrow.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
@@ -58,6 +59,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     isDirty = _useState10[0],
     setIsDirty = _useState10[1];
+  var prevColumnDefinitions = useRef(undefined);
   var onRequestClose = function onRequestClose() {
     setColumnObjects(columnDefinitions);
     setIsTearsheetOpen(false);
@@ -73,21 +75,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 _objectSpread2(_objectSpread2({}, definition), {}, {
+      // If select all is clicked
+      if (Array.isArray(col)) {
+        return col.includes(definition) && definition.canFilter && !definition.disabled ? _objectSpread2(_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 ? _objectSpread2(_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) ? _objectSpread2(_objectSpread2({}, definition), {}, {
+          isVisible: true
+        }) : definition;
+      }
+      // Else we remove selection column and actions column
+      return ['datagridSelection', 'actions'].includes(definition.id) ? _objectSpread2(_objectSpread2({}, definition), {}, {
+        isVisible: false
+      }) : definition;
+    });
+    setColumnObjects(finalDefinitions);
+    setIsDirty(selectedColumnsCount !== 0);
   };
   var getVisibleColumnsCount = useCallback(function () {
     return columnObjects.filter(function (col) {
@@ -96,15 +117,19 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   }, [columnObjects]);
   var string = searchText.trim().toLowerCase();
   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.createElement(TearsheetNarrow, {
     className: "".concat(blockClass, "__customize-columns-tearsheet"),
     open: isOpen,
@@ -126,7 +151,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     searchText: searchText,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(true);
     },
     setSearchText: setSearchText,
     findColumnPlaceholderLabel: findColumnPlaceholderLabel,
@@ -140,7 +165,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     onSelectColumn: onCheckboxCheck,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(getVisibleColumnsCount() !== 0);
     },
     selectAllLabel: selectAllLabel,
     customizeTearsheetHeadingLabel: customizeTearsheetHeadingLabel

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

@@ -7,7 +7,7 @@
 
 import { objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
-import { p as propTypesExports } from '../../../../../node_modules/prop-types/index.js';
+import { p as propTypesExports } from '../../../../../_virtual/index.js';
 import { Checkbox } from '@carbon/react';
 import { isColumnVisible } from './common.js';
 import DraggableElement from '../../DraggableElement.js';
@@ -161,10 +161,10 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     strategy: verticalListSortingStrategy
   }, visibleCols.map(function (colDef) {
     var colHeaderTitle = 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.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Checkbox, {

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

@@ -8,7 +8,7 @@
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import '../../../../../feature-flags.js';
 import React__default, { useContext, useEffect } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import CustomizeColumnsTearsheet from './CustomizeColumnsTearsheet.js';
 import { InlineEditContext } from '../InlineEdit/InlineEditContext/InlineEditContext.js';
 
@@ -36,20 +36,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/es/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/es/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js

@@ -6,20 +6,21 @@
  */
 
 import { slicedToArray as _slicedToArray, defineProperty as _defineProperty } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
-import { BATCH, INSTANT, FLYOUT, CLEAR_FILTERS } from './constants.js';
+import { BATCH, INSTANT, FLYOUT, CLEAR_FILTERS, SAVED_FILTERS } from './constants.js';
 import { usePrefix, IconButton } from '@carbon/react';
-import React__default, { useState, useRef, useEffect } from 'react';
+import React__default, { useState, useRef, useContext, useEffect } from 'react';
 import { breakpoints, px } from '@carbon/layout';
+import { ActionSet } from '../../../../ActionSet/ActionSet.js';
 import { Filter } from '@carbon/react/icons';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import cx from 'classnames';
 import { pkg } from '../../../../../settings.js';
+import { FilterContext } from './FilterProvider.js';
 import useFilters from './hooks/useFilters.js';
 import useShouldDisableButtons from './hooks/useShouldDisableButtons.js';
 import { useWindowResize } from '../../../../../global/js/hooks/useWindowResize.js';
 import { useClickOutside } from '../../../../../global/js/hooks/useClickOutside.js';
 import useSubscribeToEventEmitter from './hooks/useSubscribeToEventEmitter.js';
-import { ActionSet } from '../../../../ActionSet/ActionSet.js';
 
 var _Filter;
 var blockClass = "".concat(pkg.prefix, "--datagrid");
@@ -28,14 +29,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,
@@ -52,9 +59,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 = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -132,6 +139,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
     handleResize(current);
   });
 
+  /** Context */
+  var _useContext = useContext(FilterContext),
+    localDispatch = _useContext.dispatch;
+
   /** Memos */
   var showActionSet = updateMethod === BATCH;
   var carbonPrefix = usePrefix();
@@ -168,6 +179,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: SAVED_FILTERS,
+      payload: {
+        savedFilters: filtersObjectArray
+      }
+    });
   };
 
   /** Renders all filters */
@@ -224,7 +245,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
   }, /*#__PURE__*/React__default.createElement(IconButton, {
     label: flyoutIconDescription,
     kind: "ghost",
-    align: "bottom",
+    align: align,
     onClick: open ? closeFlyout : openFlyout,
     className: cx("".concat(componentClass, "__trigger"), _defineProperty({}, "".concat(componentClass, "__trigger--open"), open)),
     disabled: data.length === 0
@@ -241,6 +262,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
   }, renderFilters())), renderActionSet()));
 };
 FilterFlyout.propTypes = {
+  /**
+   * Tooltip alignment for the filter button
+   */
+  align: PropTypes.string,
   /**
    * All data rows in the table
    */

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

@@ -7,20 +7,21 @@
 
 import { slicedToArray as _slicedToArray, defineProperty as _defineProperty, extends as _extends } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import { Button, Layer, Search, Accordion, AccordionItem } from '@carbon/react';
-import { PANEL, BATCH, CLEAR_FILTERS, INSTANT } from './constants.js';
-import React__default, { useState, useContext, useRef, useMemo, useEffect } from 'react';
+import { PANEL, BATCH, CLEAR_FILTERS, INSTANT, SAVED_FILTERS } from './constants.js';
+import React__default, { useState, useContext, useRef, useMemo, useEffect, useCallback } from 'react';
 import { panelVariants, innerContainerVariants, actionSetVariants } from './motion/variants.js';
 import { motion, useReducedMotion } from 'framer-motion';
+import { ActionSet } from '../../../../ActionSet/ActionSet.js';
 import { Close } from '@carbon/react/icons';
 import { FilterContext } from './FilterProvider.js';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import cx from 'classnames';
 import { pkg } from '../../../../../settings.js';
 import { rem } from '@carbon/layout';
-import { ActionSet } from '../../../../ActionSet/ActionSet.js';
 import useFilters from './hooks/useFilters.js';
 import useShouldDisableButtons from './hooks/useShouldDisableButtons.js';
 import useSubscribeToEventEmitter from './hooks/useSubscribeToEventEmitter.js';
+import { useIsomorphicEffect } from '../../../../../global/js/hooks/useIsomorphicEffect.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var componentClass = "".concat(blockClass, "-filter-panel");
@@ -33,6 +34,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,
@@ -62,7 +66,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,
@@ -76,7 +80,8 @@ var FilterPanel = function FilterPanel(_ref) {
   /** Context */
   var _useContext = useContext(FilterContext),
     panelOpen = _useContext.panelOpen,
-    setPanelOpen = _useContext.setPanelOpen;
+    setPanelOpen = _useContext.setPanelOpen,
+    localDispatch = _useContext.dispatch;
   var _useFilters = useFilters({
       updateMethod: updateMethod,
       filters: filterSections,
@@ -98,11 +103,11 @@ var FilterPanel = function FilterPanel(_ref) {
     lastAppliedFilters = _useFilters.lastAppliedFilters;
 
   /** Refs */
-  var filterPanelRef = useRef();
-  var filterHeadingRef = useRef();
-  var filterSearchRef = useRef();
-  var actionSetRef = useRef();
-
+  var filterPanelRef = useRef(undefined);
+  var filterHeadingRef = useRef(undefined);
+  var filterSearchRef = useRef(undefined);
+  var actionSetRef = useRef(undefined);
+  var innerContainerRef = useRef(undefined);
   /** State from hooks */
   var _useShouldDisableButt = useShouldDisableButtons({
       initialValue: true,
@@ -141,6 +146,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: SAVED_FILTERS,
+      payload: {
+        savedFilters: filtersObjectArray
+      }
+    });
   };
   var renderActionSet = function renderActionSet() {
     return showActionSet && /*#__PURE__*/React__default.createElement(MotionActionSet, {
@@ -185,11 +200,11 @@ var FilterPanel = function FilterPanel(_ref) {
   }, [filterPanelMinHeight]);
 
   // tableId is passed in from the event emitter from the FilterSummary component
-  // in  DatagridContent
+  // in DatagridContent
   useSubscribeToEventEmitter(CLEAR_FILTERS, function (tableId) {
     reset(tableId);
   });
-  var getScrollableContainerHeight = function getScrollableContainerHeight() {
+  var getScrollableContainerHeight = 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;
@@ -197,7 +212,13 @@ var FilterPanel = function FilterPanel(_ref) {
     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;
-  };
+  }, [filterHeadingRef, filterSearchRef, actionSetRef, panelOpen, showFilterSearch, updateMethod]);
+  useIsomorphicEffect(function () {
+    var height = getScrollableContainerHeight();
+    if (innerContainerRef.current && innerContainerRef.current.style) {
+      innerContainerRef.current.style.height = height;
+    }
+  }, [getScrollableContainerHeight, innerContainerRef]);
   return /*#__PURE__*/React__default.createElement(motion.div, {
     ref: filterPanelRef,
     className: cx(componentClass, "".concat(componentClass, "__container"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentClass, "--open"), panelOpen), "".concat(componentClass, "--batch"), showActionSet), "".concat(componentClass, "--instant"), !showActionSet)),
@@ -237,9 +258,7 @@ var FilterPanel = function FilterPanel(_ref) {
     size: "sm"
   })))), /*#__PURE__*/React__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/es/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/es/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js

@@ -7,7 +7,7 @@
 
 import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { createContext, useState, useReducer } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import { DROPDOWN, RADIO, NUMBER, DATE, CHECKBOX, MULTISELECT, SAVED_FILTERS, CLEAR_SINGLE_FILTER } from './constants.js';
 
 var FilterContext = /*#__PURE__*/createContext();
@@ -47,9 +47,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 = _toConsumableArray(state.filters);
   tempState.forEach(function (f, filterIndex) {
     if (f.id === key) {
@@ -62,7 +66,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 = _objectSpread2(_objectSpread2({}, f), {}, {
@@ -85,10 +89,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(CLEAR_SINGLE_FILTER, {
     key: key,
-    value: value
+    value: value,
+    tableId: tableId
   });
 };
 var formatDateRange = function formatDateRange(startDate, endDate) {
@@ -96,7 +101,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,
@@ -105,7 +110,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 === DROPDOWN || type === RADIO || type === NUMBER) {
@@ -130,7 +135,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);
             }
           }));
         }
@@ -160,7 +165,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 = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     panelOpen = _useState2[0],

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

@@ -8,7 +8,7 @@
 import { slicedToArray as _slicedToArray, extends as _extends } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import { FormGroup, Button, Checkbox } from '@carbon/react';
 import React__default, { useState } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import { handleCheckboxChange } from './handleCheckboxChange.js';
 import { pkg } from '../../../../../settings.js';
 

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

@@ -7,6 +7,13 @@
 
 import { objectSpread2 as _objectSpread2, defineProperty as _defineProperty, toConsumableArray as _toConsumableArray } from '../../../../../_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,