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

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

@@ -14,21 +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 index = require('../../../../../_virtual/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 }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var _Filter;
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
@@ -37,14 +33,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 +63,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),
@@ -77,7 +79,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
     setOpen(false);
     onCancel();
   };
-  var _useFilters = useFilters["default"]({
+  var _useFilters = useFilters.default({
       updateMethod: updateMethod,
       filters: filters,
       setAllFilters: setAllFilters,
@@ -102,7 +104,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
   var flyoutFiltersContainerRef = React.useRef(null);
 
   /** State from hooks */
-  var _useShouldDisableButt = useShouldDisableButtons["default"]({
+  var _useShouldDisableButt = useShouldDisableButtons.default({
       initialValue: true,
       filtersState: filtersState,
       prevFiltersRef: prevFiltersRef
@@ -141,6 +143,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 +183,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 */
@@ -184,7 +200,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
     return filters.map(renderFilter);
   };
   var renderActionSet = function renderActionSet() {
-    return showActionSet && /*#__PURE__*/React__default["default"].createElement(ActionSet.ActionSet, {
+    return showActionSet && /*#__PURE__*/React.createElement(ActionSet.ActionSet, {
       actions: [{
         key: 1,
         kind: 'primary',
@@ -221,96 +237,100 @@ var FilterFlyout = function FilterFlyout(_ref) {
 
   // tableId is passed in from the event emitter from the FilterSummary component
   // in  DatagridContent
-  useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, function (tableId) {
+  useSubscribeToEventEmitter.default(constants.CLEAR_FILTERS, function (tableId) {
     reset(tableId);
   });
   React.useEffect(function reflectLastAppliedFiltersWhenReactTableUpdates() {
     lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
   }, [reactTableFiltersState, lastAppliedFilters]);
-  return /*#__PURE__*/React__default["default"].createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: "".concat(componentClass, "__container"),
     ref: filterFlyoutRef
-  }, /*#__PURE__*/React__default["default"].createElement(react.IconButton, {
+  }, /*#__PURE__*/React.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)),
+    className: cx("".concat(componentClass, "__trigger"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "__trigger--open"), open)),
     disabled: data.length === 0
-  }, _Filter || (_Filter = /*#__PURE__*/React__default["default"].createElement(icons.Filter, null))), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: cx__default["default"](componentClass, _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "--open"), open), "".concat(componentClass, "--batch"), showActionSet), "".concat(componentClass, "--instant"), !showActionSet)),
+  }, _Filter || (_Filter = /*#__PURE__*/React.createElement(icons.Filter, null))), /*#__PURE__*/React.createElement("div", {
+    className: cx(componentClass, _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "--open"), open), "".concat(componentClass, "--batch"), showActionSet), "".concat(componentClass, "--instant"), !showActionSet)),
     ref: flyoutInnerRef
-  }, /*#__PURE__*/React__default["default"].createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(componentClass, "__inner-container")
-  }, /*#__PURE__*/React__default["default"].createElement("span", {
+  }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(componentClass, "__title")
-  }, title), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: cx__default["default"]("".concat(componentClass, "__filters"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "__stacked"), stackedLayout)),
+  }, title), /*#__PURE__*/React.createElement("div", {
+    className: cx("".concat(componentClass, "__filters"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "__stacked"), stackedLayout)),
     ref: flyoutFiltersContainerRef
   }, renderFilters())), renderActionSet()));
 };
 FilterFlyout.propTypes = {
+  /**
+   * Tooltip alignment for the filter button
+   */
+  align: index.default.string,
   /**
    * All data rows in the table
    */
-  data: index["default"].array.isRequired,
+  data: index.default.array.isRequired,
   /**
    * Array of filters to render
    */
-  filters: index["default"].arrayOf(index["default"].shape({
-    type: index["default"].string.isRequired,
-    column: index["default"].string.isRequired,
-    props: index["default"].object.isRequired
+  filters: index.default.arrayOf(index.default.shape({
+    type: index.default.string.isRequired,
+    column: index.default.string.isRequired,
+    props: index.default.object.isRequired
   })).isRequired,
   /**
    * Icon description for the filter flyout button
    */
-  flyoutIconDescription: index["default"].string,
+  flyoutIconDescription: index.default.string,
   /**
    * Callback when the apply button is clicked
    */
-  onApply: index["default"].func,
+  onApply: index.default.func,
   /**
    * Callback when the cancel button is clicked
    */
-  onCancel: index["default"].func,
+  onCancel: index.default.func,
   /**
    * Callback when the flyout closes
    */
-  onFlyoutClose: index["default"].func,
+  onFlyoutClose: index.default.func,
   /**
    * Callback when the flyout opens
    */
-  onFlyoutOpen: index["default"].func,
+  onFlyoutOpen: index.default.func,
   /**
    * Label text of the primary action in the flyout
    */
-  primaryActionLabel: index["default"].string,
+  primaryActionLabel: index.default.string,
   /**
    * Filters from react table's state
    */
-  reactTableFiltersState: index["default"].arrayOf(index["default"].shape({
-    id: index["default"].string.isRequired,
-    type: index["default"].string.isRequired,
-    value: index["default"].any.isRequired
+  reactTableFiltersState: index.default.arrayOf(index.default.shape({
+    id: index.default.string.isRequired,
+    type: index.default.string.isRequired,
+    value: index.default.any.isRequired
   })),
   /**
    * Label text of the secondary action in the flyout
    */
-  secondaryActionLabel: index["default"].string,
+  secondaryActionLabel: index.default.string,
   /**
    * Function that sets all the filters, this comes from the datagridState
    */
-  setAllFilters: index["default"].func.isRequired,
+  setAllFilters: index.default.func.isRequired,
   /**
    * Title of the filter flyout
    */
-  title: index["default"].string,
+  title: index.default.string,
   /**
    * The update method used to apply the filters
    */
-  updateMethod: index["default"].oneOf([constants.BATCH, constants.INSTANT]).isRequired
+  updateMethod: index.default.oneOf([constants.BATCH, constants.INSTANT]).isRequired
 };
 var FilterFlyout$1 = FilterFlyout;
 
-exports["default"] = FilterFlyout$1;
+exports.default = FilterFlyout$1;

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

@@ -15,21 +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 index = require('../../../../../_virtual/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');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var useIsomorphicEffect = require('../../../../../global/js/hooks/useIsomorphicEffect.js');
 
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var componentClass = "".concat(blockClass, "-filter-panel");
@@ -42,6 +38,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 +70,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,8 +84,9 @@ var FilterPanel = function FilterPanel(_ref) {
   /** Context */
   var _useContext = React.useContext(FilterProvider.FilterContext),
     panelOpen = _useContext.panelOpen,
-    setPanelOpen = _useContext.setPanelOpen;
-  var _useFilters = useFilters["default"]({
+    setPanelOpen = _useContext.setPanelOpen,
+    localDispatch = _useContext.dispatch;
+  var _useFilters = useFilters.default({
       updateMethod: updateMethod,
       filters: filterSections,
       setAllFilters: setAllFilters,
@@ -111,9 +111,9 @@ 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"]({
+  var _useShouldDisableButt = useShouldDisableButtons.default({
       initialValue: true,
       filtersState: filtersState,
       prevFiltersRef: prevFiltersRef
@@ -150,9 +150,19 @@ 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, {
+    return showActionSet && /*#__PURE__*/React.createElement(MotionActionSet, {
       actions: [{
         key: 1,
         kind: 'primary',
@@ -194,11 +204,11 @@ var FilterPanel = function FilterPanel(_ref) {
   }, [filterPanelMinHeight]);
 
   // tableId is passed in from the event emitter from the FilterSummary component
-  // in  DatagridContent
-  useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, function (tableId) {
+  // 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,26 +216,32 @@ 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;
-  };
-  return /*#__PURE__*/React__default["default"].createElement(framerMotion.motion.div, {
+  }, [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.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)),
+    className: cx(componentClass, "".concat(componentClass, "__container"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "--open"), panelOpen), "".concat(componentClass, "--batch"), showActionSet), "".concat(componentClass, "--instant"), !showActionSet)),
     initial: false,
     animate: panelOpen ? 'visible' : 'hidden',
     custom: shouldReduceMotion,
     variants: variants.panelVariants
-  }, /*#__PURE__*/React__default["default"].createElement(framerMotion.motion.div, {
+  }, /*#__PURE__*/React.createElement(framerMotion.motion.div, {
     custom: shouldReduceMotion,
     variants: variants.innerContainerVariants
-  }, /*#__PURE__*/React__default["default"].createElement("header", {
+  }, /*#__PURE__*/React.createElement("header", {
     ref: filterHeadingRef,
-    className: cx__default["default"]("".concat(componentClass, "__heading"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "__heading--with-divider"), showDividerLine))
-  }, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: cx("".concat(componentClass, "__heading"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "__heading--with-divider"), showDividerLine))
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(componentClass, "__title")
-  }, title), /*#__PURE__*/React__default["default"].createElement(react.Button, {
+  }, title), /*#__PURE__*/React.createElement(react.Button, {
     hasIconOnly: true,
     renderIcon: function renderIcon(props) {
-      return /*#__PURE__*/React__default["default"].createElement(icons.Close, _rollupPluginBabelHelpers["extends"]({
+      return /*#__PURE__*/React.createElement(icons.Close, _rollupPluginBabelHelpers.extends({
         size: 16
       }, props));
     },
@@ -237,18 +253,16 @@ var FilterPanel = function FilterPanel(_ref) {
   }), showFilterSearch &&
   /*#__PURE__*/
   /* istanbul ignore next */
-  React__default["default"].createElement("div", {
+  React.createElement("div", {
     ref: filterSearchRef,
     className: "".concat(componentClass, "__search")
-  }, /*#__PURE__*/React__default["default"].createElement(react.Layer, null, /*#__PURE__*/React__default["default"].createElement(react.Search, {
+  }, /*#__PURE__*/React.createElement(react.Layer, null, /*#__PURE__*/React.createElement(react.Search, {
     labelText: searchLabelText,
     placeholder: searchPlaceholder,
     size: "sm"
-  })))), /*#__PURE__*/React__default["default"].createElement("div", {
+  })))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(componentClass, "__inner-container"),
-    style: {
-      height: getScrollableContainerHeight()
-    },
+    ref: innerContainerRef,
     onScroll: onInnerContainerScroll
   }, filterSections.map(function (_ref2, index) {
     var _ref2$categoryTitle = _ref2.categoryTitle,
@@ -256,15 +270,15 @@ var FilterPanel = function FilterPanel(_ref) {
       _ref2$filters = _ref2.filters,
       filters = _ref2$filters === void 0 ? [] : _ref2$filters,
       hasAccordion = _ref2.hasAccordion;
-    return /*#__PURE__*/React__default["default"].createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
       key: index,
       className: "".concat(componentClass, "__category")
-    }, categoryTitle && /*#__PURE__*/React__default["default"].createElement("div", {
+    }, categoryTitle && /*#__PURE__*/React.createElement("div", {
       className: "".concat(componentClass, "__category-title")
-    }, categoryTitle), hasAccordion ? /*#__PURE__*/React__default["default"].createElement(react.Accordion, null, filters.map(function (_ref3) {
+    }, categoryTitle), hasAccordion ? /*#__PURE__*/React.createElement(react.Accordion, null, filters.map(function (_ref3) {
       var filterLabel = _ref3.filterLabel,
         filter = _ref3.filter;
-      return /*#__PURE__*/React__default["default"].createElement(react.AccordionItem, {
+      return /*#__PURE__*/React.createElement(react.AccordionItem, {
         title: filterLabel,
         key: filterLabel
       }, renderFilter(filter));
@@ -275,34 +289,34 @@ var FilterPanel = function FilterPanel(_ref) {
   })), renderActionSet()));
 };
 FilterPanel.propTypes = {
-  autoHideFilters: index["default"].bool,
-  closeIconDescription: index["default"].string,
-  filterPanelMinHeight: index["default"].number,
-  filterSections: index["default"].array,
-  isFetching: index["default"].bool,
-  onApply: index["default"].func,
-  onCancel: index["default"].func,
-  onPanelClose: index["default"].func,
-  onPanelOpen: index["default"].func,
-  open: index["default"].bool,
-  primaryActionLabel: index["default"].string,
+  autoHideFilters: index.default.bool,
+  closeIconDescription: index.default.string,
+  filterPanelMinHeight: index.default.number,
+  filterSections: index.default.array,
+  isFetching: index.default.bool,
+  onApply: index.default.func,
+  onCancel: index.default.func,
+  onPanelClose: index.default.func,
+  onPanelOpen: index.default.func,
+  open: index.default.bool,
+  primaryActionLabel: index.default.string,
   /**
    * Filters from react table's state
    */
-  reactTableFiltersState: index["default"].arrayOf(index["default"].shape({
-    id: index["default"].string.isRequired,
-    type: index["default"].string.isRequired,
-    value: index["default"].any.isRequired
+  reactTableFiltersState: index.default.arrayOf(index.default.shape({
+    id: index.default.string.isRequired,
+    type: index.default.string.isRequired,
+    value: index.default.any.isRequired
   })),
-  searchLabelText: index["default"].string,
-  searchPlaceholder: index["default"].string,
-  secondaryActionLabel: index["default"].string,
-  setAllFilters: index["default"].func,
-  showFilterSearch: index["default"].bool,
-  title: index["default"].string,
-  updateMethod: index["default"].oneOf([constants.BATCH, constants.INSTANT])
+  searchLabelText: index.default.string,
+  searchPlaceholder: index.default.string,
+  secondaryActionLabel: index.default.string,
+  setAllFilters: index.default.func,
+  showFilterSearch: index.default.bool,
+  title: index.default.string,
+  updateMethod: index.default.oneOf([constants.BATCH, constants.INSTANT])
 };
 var FilterPanel$1 = FilterPanel;
 
 exports.componentClass = componentClass;
-exports["default"] = FilterPanel$1;
+exports.default = FilterPanel$1;

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

@@ -7,17 +7,11 @@
 
 'use strict';
 
-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');
+var index = require('../../../../../_virtual/index.js');
 var constants = require('./constants.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-
 var FilterContext = /*#__PURE__*/React.createContext();
 var EventEmitter = {
   events: {},
@@ -55,9 +49,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 +68,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 +91,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 +103,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 +112,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 +137,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 +167,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],
@@ -189,15 +188,15 @@ var FilterProvider = function FilterProvider(_ref4) {
     dispatch: dispatch,
     tableId: tableId
   };
-  return /*#__PURE__*/React__default["default"].createElement(FilterContext.Provider, {
+  return /*#__PURE__*/React.createElement(FilterContext.Provider, {
     value: value
   }, children);
 };
 FilterProvider.propTypes = {
-  children: index["default"].oneOfType([index["default"].arrayOf(index["default"].node), index["default"].node]).isRequired,
-  filterProps: index["default"].object,
-  filters: index["default"].arrayOf(index["default"].object).isRequired,
-  tableId: index["default"].string
+  children: index.default.oneOfType([index.default.arrayOf(index.default.node), index.default.node]).isRequired,
+  filterProps: index.default.object,
+  filters: index.default.arrayOf(index.default.object).isRequired,
+  tableId: index.default.string
 };
 
 exports.FilterContext = FilterContext;