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

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

@@ -11,15 +11,12 @@ 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');
+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 }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
@@ -66,6 +63,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 +79,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,16 +121,20 @@ 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]);
-  return /*#__PURE__*/React__default["default"].createElement(TearsheetNarrow.TearsheetNarrow, {
+    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.createElement(TearsheetNarrow.TearsheetNarrow, {
     className: "".concat(blockClass, "__customize-columns-tearsheet"),
     open: isOpen,
     title: "".concat(customizeTearsheetHeadingLabel, " (").concat(visibleColumnsCount, "/").concat(totalColumns, ")"),
@@ -128,18 +149,18 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
       onClick: onRequestSubmit,
       disabled: !isDirty
     }]
-  }, /*#__PURE__*/React__default["default"].createElement(Actions["default"], {
+  }, /*#__PURE__*/React.createElement(Actions.default, {
     columns: columnObjects,
     originalColumnDefinitions: originalColumnDefinitions,
     searchText: searchText,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(true);
     },
     setSearchText: setSearchText,
     findColumnPlaceholderLabel: findColumnPlaceholderLabel,
     resetToDefaultLabel: resetToDefaultLabel
-  }), isOpen && /*#__PURE__*/React__default["default"].createElement(Columns["default"], {
+  }), isOpen && /*#__PURE__*/React.createElement(Columns.default, {
     assistiveTextInstructionsLabel: assistiveTextInstructionsLabel,
     assistiveTextDisabledInstructionsLabel: assistiveTextDisabledInstructionsLabel,
     getVisibleColumnsCount: getVisibleColumnsCount,
@@ -148,28 +169,28 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     onSelectColumn: onCheckboxCheck,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(getVisibleColumnsCount() !== 0);
     },
     selectAllLabel: selectAllLabel,
     customizeTearsheetHeadingLabel: customizeTearsheetHeadingLabel
   }));
 };
 CustomizeColumnsTearsheet.propTypes = {
-  assistiveTextDisabledInstructionsLabel: index["default"].string,
-  assistiveTextInstructionsLabel: index["default"].string,
-  columnDefinitions: index["default"].array.isRequired,
-  customizeTearsheetHeadingLabel: index["default"].string,
-  findColumnPlaceholderLabel: index["default"].string,
-  instructionsLabel: index["default"].string,
-  isOpen: index["default"].bool.isRequired,
-  onSaveColumnPrefs: index["default"].func.isRequired,
-  originalColumnDefinitions: index["default"].array.isRequired,
-  primaryButtonTextLabel: index["default"].string,
-  resetToDefaultLabel: index["default"].string,
-  secondaryButtonTextLabel: index["default"].string,
-  selectAllLabel: index["default"].string,
-  setIsTearsheetOpen: index["default"].func.isRequired
+  assistiveTextDisabledInstructionsLabel: index.default.string,
+  assistiveTextInstructionsLabel: index.default.string,
+  columnDefinitions: index.default.array.isRequired,
+  customizeTearsheetHeadingLabel: index.default.string,
+  findColumnPlaceholderLabel: index.default.string,
+  instructionsLabel: index.default.string,
+  isOpen: index.default.bool.isRequired,
+  onSaveColumnPrefs: index.default.func.isRequired,
+  originalColumnDefinitions: index.default.array.isRequired,
+  primaryButtonTextLabel: index.default.string,
+  resetToDefaultLabel: index.default.string,
+  secondaryButtonTextLabel: index.default.string,
+  selectAllLabel: index.default.string,
+  setIsTearsheetOpen: index.default.func.isRequired
 };
 var CustomizeColumnsTearsheet$1 = CustomizeColumnsTearsheet;
 
-exports["default"] = CustomizeColumnsTearsheet$1;
+exports.default = CustomizeColumnsTearsheet$1;

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

@@ -7,11 +7,9 @@
 
 '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 react = require('@carbon/react');
 var common = require('./common.js');
 var DraggableElement = require('../../DraggableElement.js');
@@ -21,10 +19,6 @@ var core = require('@dnd-kit/core');
 var sortable = require('@dnd-kit/sortable');
 var modifiers = require('@dnd-kit/modifiers');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var matchedColsById = function matchedColsById(col1, col2) {
   return col1 && col2 && col1.id === col2.id;
@@ -148,34 +142,34 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
       return false;
     }
   };
-  return /*#__PURE__*/React__default["default"].createElement(core.DndContext, {
+  return /*#__PURE__*/React.createElement(core.DndContext, {
     collisionDetection: core.closestCenter,
     onDragEnd: handleDragEnd,
     onDragStart: handleDragStart,
     onDragMove: handleDragUpdate,
     sensors: sensors,
     modifiers: [modifiers.restrictToParentElement, modifiers.restrictToVerticalAxis]
-  }, /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__draggable-underlay"),
     "aria-hidden": "true",
     key: "draggable-underlay-".concat(id)
   }, visibleCols.map(function (colDef) {
-    return /*#__PURE__*/React__default["default"].createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "__draggable-underlay-item"),
       key: colDef.id
     });
-  })), /*#__PURE__*/React__default["default"].createElement(sortable.SortableContext, {
+  })), /*#__PURE__*/React.createElement(sortable.SortableContext, {
     items: updatedDragCols,
     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, {
+    var listContents = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(react.Checkbox, {
       checked: common.isColumnVisible(colDef),
       disabled: isDisabled || isFrozenColumn,
       onChange: function onChange(_, _ref2) {
@@ -190,13 +184,13 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
       onKeyDown: function onKeyDown(event) {
         return handleCheckboxKeydown(event, colDef);
       }
-    }), /*#__PURE__*/React__default["default"].createElement("div", {
+    }), /*#__PURE__*/React.createElement("div", {
       dangerouslySetInnerHTML: {
         __html: highlightedText
       },
       className: "".concat(blockClass, "__customize-columns-checkbox-visible-label")
     }));
-    return /*#__PURE__*/React__default["default"].createElement(DraggableElement["default"], {
+    return /*#__PURE__*/React.createElement(DraggableElement.default, {
       classList: draggableClass,
       key: colDef.id,
       id: colDef.id,

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

@@ -12,14 +12,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../../../../_virtual/_rollupPluginBabelHelpers.js');
 require('../../../../../feature-flags.js');
 var React = require('react');
-var index = require('../../../../../node_modules/prop-types/index.js');
+var index = require('../../../../../_virtual/index.js');
 var CustomizeColumnsTearsheet = require('./CustomizeColumnsTearsheet.js');
 var InlineEditContext = require('../InlineEdit/InlineEditContext/InlineEditContext.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-
 var _excluded = ["onSaveColumnPrefs", "isTearsheetOpen", "setIsTearsheetOpen", "labels"];
 var TearsheetWrapper = function TearsheetWrapper(_ref) {
   var instance = _ref.instance;
@@ -38,26 +34,28 @@ var TearsheetWrapper = function TearsheetWrapper(_ref) {
       console.error("Datagrid useCustomizeColumns extension has not been enabled via feature flag.");
     }
   }, [featureFlags]);
-  return /*#__PURE__*/React__default["default"].createElement(CustomizeColumnsTearsheet["default"], _rollupPluginBabelHelpers["extends"]({}, rest, labels, {
+  return /*#__PURE__*/React.createElement(CustomizeColumnsTearsheet.default, _rollupPluginBabelHelpers.extends({}, rest, labels, {
     isOpen: isTearsheetOpen,
     setIsTearsheetOpen: setIsTearsheetOpen,
     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);
       }
@@ -65,8 +63,8 @@ var TearsheetWrapper = function TearsheetWrapper(_ref) {
   }));
 };
 TearsheetWrapper.propTypes = {
-  instance: index["default"].object.isRequired
+  instance: index.default.object.isRequired
 };
 var CustomizeColumnsTearsheetWrapper = TearsheetWrapper;
 
-exports["default"] = CustomizeColumnsTearsheetWrapper;
+exports.default = CustomizeColumnsTearsheetWrapper;

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

@@ -7,16 +7,10 @@
 
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var isBoolean = require('lodash/isBoolean');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var isBoolean__default = /*#__PURE__*/_interopDefaultLegacy(isBoolean);
-
 var isColumnVisible = function isColumnVisible(colDef) {
-  return isBoolean__default["default"](colDef.isVisible) ? colDef.isVisible : true;
+  return isBoolean(colDef.isVisible) ? colDef.isVisible : true;
 };
 
 exports.isColumnVisible = isColumnVisible;

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,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',
@@ -218,94 +234,103 @@ var FilterFlyout = function FilterFlyout(_ref) {
     closeFlyout();
     cancel();
   });
-  useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, reset);
+
+  // tableId is passed in from the event emitter from the FilterSummary component
+  // in  DatagridContent
+  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;