@carbon/ibm-products 2.43.2-canary.19 → 2.43.2-canary.194

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

@@ -33,6 +33,7 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     selectedRowIds = datagridState.state.selectedRowIds,
     toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     toolbarBatchActions = datagridState.toolbarBatchActions,
+    toolbarBatchActionsDisplayMin = datagridState.toolbarBatchActionsDisplayMin,
     setGlobalFilter = datagridState.setGlobalFilter,
     rows = datagridState.rows,
     dispatch = datagridState.dispatch,
@@ -80,7 +81,7 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     var minWidthBeforeOverflowIcon = 380;
     // Do not render ButtonMenu when there are 3 or less items
     // and if there is enough available space to render all the items
-    if (toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= 3 && !displayAllInMenu) {
+    if (toolbarBatchActions && !displayAllInMenu && (!toolbarBatchActionsDisplayMin && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= 3 || toolbarBatchActionsDisplayMin !== undefined && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= toolbarBatchActionsDisplayMin)) {
       return;
     }
     var renderItem = function renderItem(batchAction, index) {
@@ -98,7 +99,10 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       tabIndex: totalSelected > 0 ? 0 : -1,
       menuAlignment: "bottom"
     }, toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
-      var hidden = index < 2 && !displayAllInMenu;
+      var hidden = toolbarBatchActionsDisplayMin === undefined && index < 2 && !displayAllInMenu;
+      if (toolbarBatchActionsDisplayMin !== undefined && index < toolbarBatchActionsDisplayMin && !displayAllInMenu) {
+        hidden = true;
+      }
       if (!hidden) {
         return renderItem(batchAction, index);
       }
@@ -144,13 +148,14 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     totalCount: rows && rows.length,
     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) {
+    if (!toolbarBatchActionsDisplayMin && index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3 || toolbarBatchActionsDisplayMin !== undefined && index < toolbarBatchActionsDisplayMin) {
       return /*#__PURE__*/React__default.createElement(TableBatchAction, {
         key: "".concat(batchAction.label, "-").concat(index),
         renderIcon: batchAction.renderIcon,
         onClick: function onClick(event) {
           return onClickHandler(event, batchAction);
         },
+        className: cx(_defineProperty({}, "".concat(carbon.prefix, "--noLabel"), !batchAction.label || batchAction.label === '')),
         iconDescription: batchAction.label,
         tabIndex: totalSelected > 0 ? 0 : -1
       }, batchAction.label);

package/es/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -6,12 +6,13 @@
  */
 
 import { extends as _extends, objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useEffect, useRef } from 'react';
+import React__default, { useRef, useEffect } from 'react';
 import { VariableSizeList } from 'react-window';
 import { TableBody } from '@carbon/react';
 import { pkg } from '../../../settings.js';
 import DatagridHead from './DatagridHead.js';
 import { useResizeObserver } from '../../../global/js/hooks/useResizeObserver.js';
+import { useIsomorphicEffect } from '../../../global/js/hooks/useIsomorphicEffect.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var rowSizeMap = {
@@ -23,7 +24,6 @@ var rowSizeMap = {
 };
 var defaultRowHeight = rowSizeMap.lg;
 var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
-  var _gridRef$current, _gridRef$current2;
   var getTableBodyProps = datagridState.getTableBodyProps,
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow,
@@ -40,11 +40,15 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     gridRef = datagridState.gridRef,
     tableId = datagridState.tableId,
     onVirtualScroll = datagridState.onVirtualScroll;
+  var headWrapRef = useRef(null);
+  var innerRef = useRef(null);
 
   /* istanbul ignore next */
   var handleVirtualGridResize = function handleVirtualGridResize() {
     var gridRefElement = gridRef === null || gridRef === void 0 ? void 0 : gridRef.current;
-    if (gridRefElement) {
+    // isHidden checks for an edge case where if the table is hidden by something like a Tab that the width can't be calculated to 0
+    var isHidden = (gridRefElement === null || gridRefElement === void 0 ? void 0 : gridRefElement.offsetParent) === null;
+    if (gridRefElement && !isHidden) {
       var _gridRefElement$clien;
       gridRefElement.style.width = gridRefElement === null || gridRefElement === void 0 || (_gridRefElement$clien = gridRefElement.clientWidth) === null || _gridRefElement$clien === void 0 ? void 0 : _gridRefElement$clien.toString();
     }
@@ -58,7 +62,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     if (listRef && listRef.current) {
       listRef.current.resetAfterIndex(0);
     }
-  }, [listRef]);
+  }, [listRef, rowHeight]);
   var visibleRows = DatagridPagination && page || rows;
   var testRef = useRef(null);
 
@@ -78,12 +82,21 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       testRefValue === null || testRefValue === void 0 || testRefValue.removeEventListener('scroll', handleScroll);
     };
   });
+  useIsomorphicEffect(function () {
+    if (headWrapRef.current && headWrapRef.current.style) {
+      var _gridRef$current;
+      headWrapRef.current.style.width = "".concat(gridRef === null || gridRef === void 0 || (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth, "px");
+    }
+  }, [headWrapRef, gridRef]);
+  useIsomorphicEffect(function () {
+    if (testRef !== null && testRef !== void 0 && testRef.current && testRef.current.style) {
+      var _gridRef$current2;
+      testRef.current.style.width = "".concat(gridRef === null || gridRef === void 0 || (_gridRef$current2 = gridRef.current) === null || _gridRef$current2 === void 0 ? void 0 : _gridRef$current2.clientWidth, "px");
+    }
+  }, [testRef, gridRef]);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__head-wrap"),
-    style: {
-      width: gridRef === null || gridRef === void 0 || (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth,
-      overflow: 'hidden'
-    }
+    ref: headWrapRef
   }, /*#__PURE__*/React__default.createElement(DatagridHead, datagridState)), /*#__PURE__*/React__default.createElement(TableBody, _extends({}, getTableBodyProps({
     role: undefined
   }), {
@@ -103,10 +116,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     innerRef: innerListRef,
     outerRef: testRef,
     ref: listRef,
-    className: "".concat(blockClass, "__virtual-scrollbar"),
-    style: {
-      width: gridRef === null || gridRef === void 0 || (_gridRef$current2 = gridRef.current) === null || _gridRef$current2 === void 0 ? void 0 : _gridRef$current2.clientWidth
-    }
+    className: "".concat(blockClass, "__virtual-scrollbar")
   }, function (_ref) {
     var _row$RowRenderer;
     var index = _ref.index,
@@ -116,6 +126,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     var _row$getRowProps = row.getRowProps(),
       key = _row$getRowProps.key;
     return /*#__PURE__*/React__default.createElement("div", {
+      ref: innerRef,
       style: _objectSpread2({}, style)
     }, row === null || row === void 0 || (_row$RowRenderer = row.RowRenderer) === null || _row$RowRenderer === void 0 ? void 0 : _row$RowRenderer.call(row, _objectSpread2(_objectSpread2({}, datagridState), {}, {
       row: row,

package/es/components/Datagrid/Datagrid/DraggableElement.d.ts

@@ -1,3 +1,9 @@
+/**
+ * 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.
+ */
 import { PropsWithChildren, ReactNode } from 'react';
 import PropTypes from 'prop-types';
 interface DraggableElementProps extends PropsWithChildren {

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 React__default, { useState, useRef, useCallback, useEffect } from 'react';
 import PropTypes from '../../../../../node_modules/prop-types/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();
   var onRequestClose = function onRequestClose() {
     setColumnObjects(columnDefinitions);
     setIsTearsheetOpen(false);
@@ -73,15 +75,39 @@ 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;
+      }
+      // 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;
+    });
+
+    // 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;
       }
-      return definition;
+      // Else we remove selection column and actions column
+      return ['datagridSelection', 'actions'].includes(definition.id) ? _objectSpread2(_objectSpread2({}, definition), {}, {
+        isVisible: false
+      }) : definition;
     });
-    setColumnObjects(changedDefinitions);
+    setColumnObjects(finalDefinitions);
     setDirty();
   };
   var setDirty = function setDirty() {
@@ -96,15 +122,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,

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/DraggableItemsList.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/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

@@ -10,6 +10,7 @@ import { BATCH, INSTANT, FLYOUT, CLEAR_FILTERS } from './constants.js';
 import { usePrefix, IconButton } from '@carbon/react';
 import React__default, { useState, useRef, 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 cx from 'classnames';
@@ -19,7 +20,6 @@ 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,12 +28,15 @@ var defaults = {
   flyoutIconDescription: 'Open filters',
   title: 'Filter',
   primaryActionLabel: 'Apply',
-  secondaryActionLabel: 'Cancel'
+  secondaryActionLabel: 'Cancel',
+  align: 'bottom'
 };
 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,
     _ref$title = _ref.title,
@@ -209,7 +212,12 @@ var FilterFlyout = function FilterFlyout(_ref) {
     closeFlyout();
     cancel();
   });
-  useSubscribeToEventEmitter(CLEAR_FILTERS, reset);
+
+  // tableId is passed in from the event emitter from the FilterSummary component
+  // in  DatagridContent
+  useSubscribeToEventEmitter(CLEAR_FILTERS, function (tableId) {
+    reset(tableId);
+  });
   useEffect(function reflectLastAppliedFiltersWhenReactTableUpdates() {
     lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
   }, [reactTableFiltersState, lastAppliedFilters]);
@@ -219,7 +227,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
@@ -236,6 +244,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

@@ -8,19 +8,20 @@
 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 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 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");
@@ -102,7 +103,7 @@ var FilterPanel = function FilterPanel(_ref) {
   var filterHeadingRef = useRef();
   var filterSearchRef = useRef();
   var actionSetRef = useRef();
-
+  var innerContainerRef = useRef();
   /** State from hooks */
   var _useShouldDisableButt = useShouldDisableButtons({
       initialValue: true,
@@ -183,8 +184,13 @@ var FilterPanel = function FilterPanel(_ref) {
     var _filterPanelRef$curre;
     (_filterPanelRef$curre = filterPanelRef.current) === null || _filterPanelRef$curre === void 0 || _filterPanelRef$curre.style.setProperty('--filter-panel-min-height', rem(filterPanelMinHeight));
   }, [filterPanelMinHeight]);
-  useSubscribeToEventEmitter(CLEAR_FILTERS, reset);
-  var getScrollableContainerHeight = function getScrollableContainerHeight() {
+
+  // tableId is passed in from the event emitter from the FilterSummary component
+  // in DatagridContent
+  useSubscribeToEventEmitter(CLEAR_FILTERS, function (tableId) {
+    reset(tableId);
+  });
+  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;
@@ -192,7 +198,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)),
@@ -232,9 +244,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,18 +1,21 @@
 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;
-export function FilterProvider({ children, filters, filterProps }: {
+    tableId: any;
+}, setAllFilters: any, state: any, contextTableId: any): void;
+export function FilterProvider({ children, filters, filterProps, tableId }: {
     children: any;
     filters: any;
     filterProps: any;
+    tableId: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace FilterProvider {
     namespace propTypes {
         let children: PropTypes.Validator<NonNullable<NonNullable<PropTypes.ReactNodeLike>>>;
         let filterProps: PropTypes.Requireable<object>;
         let filters: PropTypes.Validator<(object | null | undefined)[]>;
+        let tableId: PropTypes.Requireable<string>;
     }
 }
 import React from 'react';

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

@@ -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);
             }
           }));
         }
@@ -156,10 +161,11 @@ var filteringReducer = function filteringReducer(state, action) {
 var FilterProvider = function FilterProvider(_ref4) {
   var children = _ref4.children,
     filters = _ref4.filters,
-    filterProps = _ref4.filterProps;
+    filterProps = _ref4.filterProps,
+    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],
@@ -177,7 +183,8 @@ var FilterProvider = function FilterProvider(_ref4) {
     panelOpen: panelOpen,
     setPanelOpen: setPanelOpen,
     state: state,
-    dispatch: dispatch
+    dispatch: dispatch,
+    tableId: tableId
   };
   return /*#__PURE__*/React__default.createElement(FilterContext.Provider, {
     value: value
@@ -186,7 +193,8 @@ var FilterProvider = function FilterProvider(_ref4) {
 FilterProvider.propTypes = {
   children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
   filterProps: PropTypes.object,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  tableId: PropTypes.string
 };
 
 export { FilterContext, FilterProvider, clearSingleFilter };

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,

package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.d.ts

@@ -15,7 +15,7 @@ declare function useFilters({ updateMethod, filters, setAllFilters, variation, r
     prevFiltersObjectArrayRef: React.MutableRefObject<string>;
     prevFiltersRef: React.MutableRefObject<string>;
     revertToPreviousFilters: () => void;
-    reset: () => void;
+    reset: (tableId: any) => void;
     renderFilter: ({ type, column, props: components }: {
         type: any;
         column: any;