@carbon/ibm-products 1.53.1 → 1.54.1

package/es/global/js/hooks/useResizeObserver.js

@@ -5,14 +5,8 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * 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 { useRef, useState, useLayoutEffect } from 'react';
-export var useResizeObserver = function useResizeObserver(ref) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-    callback: null,
-    throttleInterval: 0
-  };
-  var callback = options.callback,
-    throttleInterval = options.throttleInterval;
+import { useRef, useState, useLayoutEffect, useEffect } from 'react';
+export var useResizeObserver = function useResizeObserver(ref, callback) {
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     width = _useState2[0],
@@ -21,8 +15,14 @@ export var useResizeObserver = function useResizeObserver(ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     height = _useState4[0],
     setHeight = _useState4[1];
-  var throttleTimeout = useRef(null);
   var entriesToHandle = useRef(null);
+  var cb = useRef(callback);
+  useEffect(function () {
+    // ref for callback removes it as dependency fro useLayoutEffect
+    // This significantly reduces repeated calls if a function is redefined on every
+    // render
+    cb.current = callback;
+  }, [callback]);
   useLayoutEffect(function () {
     if (!(ref !== null && ref !== void 0 && ref.current)) {
       return;
@@ -34,29 +34,15 @@ export var useResizeObserver = function useResizeObserver(ref) {
       var entry = entriesToHandle.current[0];
       setWidth(entry.contentRect.width);
       setHeight(entry.contentRect.height);
-      throttleTimeout.current = null;
-      callback && callback(entry.contentRect);
+      cb.current && cb.current(entry.contentRect);
     };
     var observer = new ResizeObserver(function (entries) {
       // always update entriesToHandle
       entriesToHandle.current = entries;
-      if (throttleInterval) {
-        // if a throttleInterval check for running timeout
-        if (throttleTimeout.current === null) {
-          // no live timeout set entries to handle and move on
-
-          // set up throttle
-          throttleTimeout.current = setTimeout(function () {
-            // do callbacks
-            doCallbacks();
-            // reset throttle
-            throttleTimeout.current = null;
-          }, throttleInterval);
-        }
-      } else {
-        // no throttle do callbacks every time
+      window.requestAnimationFrame(function () {
+        // do callbacks
         doCallbacks();
-      }
+      });
     });
 
     // observe all refs passed
@@ -66,7 +52,7 @@ export var useResizeObserver = function useResizeObserver(ref) {
       observer = null;
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [ref, options]);
+  }, [ref]);
   return {
     width: width,
     height: height

package/es/global/js/utils/story-helper.js

@@ -66,7 +66,7 @@ export var prepareStory = function prepareStory(template, options) {
 export var CodesandboxLink = function CodesandboxLink(_ref) {
   var exampleDirectory = _ref.exampleDirectory;
   return /*#__PURE__*/React.createElement("a", {
-    href: "https://codesandbox.io/s/github/carbon-design-system/ibm-cloud-cognitive/tree/main_v1/examples/carbon-for-ibm-products/".concat(exampleDirectory)
+    href: "https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/main_v1/examples/carbon-for-ibm-products/".concat(exampleDirectory)
   }, /*#__PURE__*/React.createElement("img", {
     alt: "Edit on CodeSandbox",
     src: "https://codesandbox.io/static/img/play-codesandbox.svg"

package/lib/components/AboutModal/AboutModal.js

@@ -71,9 +71,7 @@ var AboutModal = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   }, [bodyRef]);
 
   // Detect resize of the ModalBody to recalculate whether scrolling is enabled
-  (0, _useResizeObserver.useResizeObserver)(bodyRef, {
-    callback: handleResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(bodyRef, handleResize);
   return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ComposedModal, (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass,
     // Apply the block class to the main HTML element

package/lib/components/ActionBar/ActionBar.js

@@ -181,12 +181,10 @@ var ActionBar = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     /* istanbul ignore next */ // not sure how to fake window resize
     checkFullyVisibleItems();
   };
-  (0, _useResizeObserver.useResizeObserver)(sizingRef, {
-    callback: handleResize
-  });
-  (0, _useResizeObserver.useResizeObserver)(localRef, {
-    callback: handleResize
-  });
+
+  // // resize of the items
+  (0, _useResizeObserver.useResizeObserver)(sizingRef, handleResize);
+  (0, _useResizeObserver.useResizeObserver)(localRef, handleResize);
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)([blockClass, className]),
     ref: localRef

package/lib/components/BreadcrumbWithOverflow/BreadcrumbWithOverflow.js

@@ -240,13 +240,9 @@ var BreadcrumbWithOverflow = function BreadcrumbWithOverflow(_ref) {
   }
 
   // container resize
-  (0, _useResizeObserver.useResizeObserver)(sizingContainerRef, {
-    callback: handleResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(sizingContainerRef, handleResize);
   // item resize
-  (0, _useResizeObserver.useResizeObserver)(breadcrumbItemWithOverflow, {
-    callback: handleResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(breadcrumbItemWithOverflow, handleResize);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(blockClass, className, (0, _defineProperty2.default)({}, "".concat(blockClass, "__with-items"), displayedBreadcrumbItems.length > 1)),
     ref: breadcrumbItemWithOverflow

package/lib/components/ButtonSetWithOverflow/ButtonSetWithOverflow.js

@@ -138,15 +138,9 @@ var ButtonSetWithOverflow = function ButtonSetWithOverflow(_ref) {
       }, (0, _propsHelper.prepareProps)(other, ['iconDescription', 'renderIcon'])));
     }).reverse());
   });
-  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefSet, {
-    callback: checkFullyVisibleItems
-  });
-  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefCombo, {
-    callback: checkFullyVisibleItems
-  });
-  (0, _useResizeObserver.useResizeObserver)(spaceAvailableRef, {
-    callback: checkFullyVisibleItems
-  });
+  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefSet, checkFullyVisibleItems);
+  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefCombo, checkFullyVisibleItems);
+  (0, _useResizeObserver.useResizeObserver)(spaceAvailableRef, checkFullyVisibleItems);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)([blockClass, className, (0, _defineProperty2.default)({}, "".concat(blockClass, "--right"), rightAlign)]),
     ref: spaceAvailableRef

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -54,9 +54,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     var gridRefElement = gridRef === null || gridRef === void 0 ? void 0 : gridRef.current;
     gridRefElement.style.width = gridRefElement === null || gridRefElement === void 0 ? void 0 : gridRefElement.clientWidth;
   };
-  (0, _useResizeObserver.useResizeObserver)(gridRef, {
-    callback: handleVirtualGridResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(gridRef, handleVirtualGridResize);
   var syncScroll = function syncScroll(e) {
     var virtualBody = e.target;
     document.querySelector(".".concat(blockClass, "__head-wrap")).scrollLeft = virtualBody.scrollLeft;

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

@@ -55,11 +55,8 @@ var FilterFlyout = function FilterFlyout(_ref) {
     setAllFilters = _ref.setAllFilters,
     _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
-    _ref$initialFilters = _ref.initialFilters,
-    initialFilters = _ref$initialFilters === void 0 ? [] : _ref$initialFilters;
-  //  Save the initial filters we only need the filters once when it loads
-  var initialFiltersRef = (0, _react.useRef)(initialFilters);
-
+    _ref$reactTableFilter = _ref.reactTableFiltersState,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
   /** State */
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -70,15 +67,17 @@ var FilterFlyout = function FilterFlyout(_ref) {
       filters: filters,
       setAllFilters: setAllFilters,
       variation: _constants.FLYOUT,
-      initialFilters: initialFiltersRef.current
+      reactTableFiltersState: reactTableFiltersState,
+      onCancel: onCancel
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
     prevFiltersRef = _useFilters.prevFiltersRef,
-    revertToPreviousFilters = _useFilters.revertToPreviousFilters,
+    cancel = _useFilters.cancel,
     reset = _useFilters.reset,
     renderFilter = _useFilters.renderFilter,
-    filtersObjectArray = _useFilters.filtersObjectArray;
+    filtersObjectArray = _useFilters.filtersObjectArray,
+    lastAppliedFilters = _useFilters.lastAppliedFilters;
 
   /** Refs */
   var filterFlyoutRef = (0, _react.useRef)(null);
@@ -115,26 +114,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
     // updates the ref so next time the flyout opens we have records of the previous filters
     prevFiltersRef.current = JSON.stringify(filtersState);
     prevFiltersObjectArrayRef.current = JSON.stringify(filtersObjectArray);
-  };
-  var cancel = function cancel() {
-    // Reverting to previous filters only applies when using batch actions
-    if (updateMethod === _constants.BATCH) {
-      revertToPreviousFilters();
-      onCancel();
-    }
-    closeFlyout();
-  };
 
-  /** Effects */
-  (0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
-    var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
-    var hasClickedOnDropdown = target.className === 'bx--list-box__menu-item__option';
-    if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
-      return;
-    }
-    cancel();
-  });
-  (0, _hooks2.useSubscribeToEventEmitter)(_constants.CLEAR_FILTERS, reset);
+    // Update the last applied filters
+    lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
+  };
 
   /** Renders all filters */
   var renderFilters = function renderFilters() {
@@ -161,6 +144,21 @@ var FilterFlyout = function FilterFlyout(_ref) {
       buttonSize: "md"
     });
   };
+
+  /** Effects */
+  (0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
+    var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
+    var hasClickedOnDropdown = target.className === "".concat(_settings.carbon.prefix, "--list-box__menu-item__option");
+    if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
+      return;
+    }
+    closeFlyout();
+    cancel();
+  });
+  (0, _hooks2.useSubscribeToEventEmitter)(_constants.CLEAR_FILTERS, reset);
+  (0, _react.useEffect)(function reflectLastAppliedFiltersWhenReactTableUpdates() {
+    lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
+  }, [reactTableFiltersState, lastAppliedFilters]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(componentClass, "__container")
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
@@ -200,14 +198,6 @@ FilterFlyout.propTypes = {
    * Icon description for the filter flyout button
    */
   flyoutIconDescription: _propTypes.default.string,
-  /**
-   * Filters that should be applied on load
-   */
-  initialFilters: _propTypes.default.arrayOf(_propTypes.default.shape({
-    id: _propTypes.default.string.isRequired,
-    type: _propTypes.default.string.isRequired,
-    value: _propTypes.default.any.isRequired
-  })),
   /**
    * Callback when the apply button is clicked
    */
@@ -228,6 +218,14 @@ FilterFlyout.propTypes = {
    * Label text of the primary action in the flyout
    */
   primaryActionLabel: _propTypes.default.string,
+  /**
+   * Filters from react table's state
+   */
+  reactTableFiltersState: _propTypes.default.arrayOf(_propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
+    type: _propTypes.default.string.isRequired,
+    value: _propTypes.default.any.isRequired
+  })),
   /**
    * Label text of the secondary action in the flyout
    */

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

@@ -64,11 +64,8 @@ var FilterPanel = function FilterPanel(_ref) {
     searchLabelText = _ref$searchLabelText === void 0 ? 'Filter search' : _ref$searchLabelText,
     _ref$searchPlaceholde = _ref.searchPlaceholder,
     searchPlaceholder = _ref$searchPlaceholde === void 0 ? 'Find filters' : _ref$searchPlaceholde,
-    _ref$initialFilters = _ref.initialFilters,
-    initialFilters = _ref$initialFilters === void 0 ? [] : _ref$initialFilters;
-  //  Save the initial filters we only need the filters once
-  var initialFiltersRef = (0, _react.useRef)(initialFilters);
-
+    _ref$reactTableFilter = _ref.reactTableFiltersState,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
   /** State */
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -79,15 +76,17 @@ var FilterPanel = function FilterPanel(_ref) {
       filters: filterSections,
       setAllFilters: setAllFilters,
       variation: _constants.PANEL,
-      initialFilters: initialFiltersRef.current
+      reactTableFiltersState: reactTableFiltersState,
+      onCancel: onCancel
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
     prevFiltersRef = _useFilters.prevFiltersRef,
-    revertToPreviousFilters = _useFilters.revertToPreviousFilters,
+    cancel = _useFilters.cancel,
     reset = _useFilters.reset,
     renderFilter = _useFilters.renderFilter,
-    filtersObjectArray = _useFilters.filtersObjectArray;
+    filtersObjectArray = _useFilters.filtersObjectArray,
+    lastAppliedFilters = _useFilters.lastAppliedFilters;
 
   /** Refs */
   var filterPanelRef = (0, _react.useRef)();
@@ -117,14 +116,8 @@ var FilterPanel = function FilterPanel(_ref) {
 
   /** Methods */
   var closePanel = function closePanel() {
-    return setPanelOpen(false);
-  };
-  var cancel = function cancel() {
-    // Reverting to previous filters only applies when using batch actions
-    if (updateMethod === _constants.BATCH) {
-      revertToPreviousFilters();
-      onCancel();
-    }
+    cancel();
+    setPanelOpen(false);
   };
   var apply = function apply() {
     setAllFilters(filtersObjectArray);
@@ -138,6 +131,9 @@ var FilterPanel = function FilterPanel(_ref) {
     // updates the ref so next time the flyout opens we have records of the previous filters
     prevFiltersRef.current = JSON.stringify(filtersState);
     prevFiltersObjectArrayRef.current = JSON.stringify(filtersObjectArray);
+
+    // Update the last applied filters
+    lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
   };
   var renderActionSet = function renderActionSet() {
     return showActionSet && /*#__PURE__*/_react.default.createElement(MotionActionSet, {
@@ -223,14 +219,14 @@ var FilterPanel = function FilterPanel(_ref) {
       height: getScrollableContainerHeight()
     },
     onScroll: onInnerContainerScroll
-  }, filterSections.map(function (_ref2) {
+  }, filterSections.map(function (_ref2, index) {
     var _ref2$categoryTitle = _ref2.categoryTitle,
       categoryTitle = _ref2$categoryTitle === void 0 ? null : _ref2$categoryTitle,
       _ref2$filters = _ref2.filters,
       filters = _ref2$filters === void 0 ? [] : _ref2$filters,
       hasAccordion = _ref2.hasAccordion;
     return /*#__PURE__*/_react.default.createElement("div", {
-      key: categoryTitle,
+      key: index,
       className: "".concat(componentClass, "__category")
     }, categoryTitle && /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(componentClass, "__category-title")
@@ -251,20 +247,20 @@ FilterPanel.propTypes = {
   closeIconDescription: _propTypes.default.string,
   filterPanelMinHeight: _propTypes.default.number,
   filterSections: _propTypes.default.array,
-  /**
-   * Filters that should be applied on load
-   */
-  initialFilters: _propTypes.default.arrayOf(_propTypes.default.shape({
-    id: _propTypes.default.string.isRequired,
-    type: _propTypes.default.string.isRequired,
-    value: _propTypes.default.any.isRequired
-  })),
   onApply: _propTypes.default.func,
   onCancel: _propTypes.default.func,
   onPanelClose: _propTypes.default.func,
   onPanelOpen: _propTypes.default.func,
   open: _propTypes.default.bool,
   primaryActionLabel: _propTypes.default.string,
+  /**
+   * Filters from react table's state
+   */
+  reactTableFiltersState: _propTypes.default.arrayOf(_propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
+    type: _propTypes.default.string.isRequired,
+    value: _propTypes.default.any.isRequired
+  })),
   searchLabelText: _propTypes.default.string,
   searchPlaceholder: _propTypes.default.string,
   secondaryActionLabel: _propTypes.default.string,

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

@@ -10,12 +10,6 @@ Object.defineProperty(exports, "useFilters", {
     return _useFilters.default;
   }
 });
-Object.defineProperty(exports, "useInitialStateFromFilters", {
-  enumerable: true,
-  get: function get() {
-    return _useInitialStateFromFilters.default;
-  }
-});
 Object.defineProperty(exports, "useShouldDisableButtons", {
   enumerable: true,
   get: function get() {
@@ -28,7 +22,6 @@ Object.defineProperty(exports, "useSubscribeToEventEmitter", {
     return _useSubscribeToEventEmitter.default;
   }
 });
-var _useInitialStateFromFilters = _interopRequireDefault(require("./useInitialStateFromFilters"));
 var _useSubscribeToEventEmitter = _interopRequireDefault(require("./useSubscribeToEventEmitter"));
 var _useShouldDisableButtons = _interopRequireDefault(require("./useShouldDisableButtons"));
 var _useFilters = _interopRequireDefault(require("./useFilters"));

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

@@ -13,7 +13,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _carbonComponentsReact = require("carbon-components-react");
 var _constants = require("../constants");
-var _useInitialStateFromFilters = _interopRequireDefault(require("./useInitialStateFromFilters"));
 var _utils = require("../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -25,19 +24,22 @@ var useFilters = function useFilters(_ref) {
     filters = _ref$filters === void 0 ? [] : _ref$filters,
     setAllFilters = _ref.setAllFilters,
     variation = _ref.variation,
-    initialFilters = _ref.initialFilters;
+    reactTableFiltersState = _ref.reactTableFiltersState,
+    _ref$onCancel = _ref.onCancel,
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
   /** State */
-  var _useInitialStateFromF = (0, _useInitialStateFromFilters.default)(filters, variation, initialFilters),
-    _useInitialStateFromF2 = (0, _slicedToArray2.default)(_useInitialStateFromF, 2),
-    filtersState = _useInitialStateFromF2[0],
-    setFiltersState = _useInitialStateFromF2[1];
-  var _useState = (0, _react.useState)(initialFilters),
+  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    filtersObjectArray = _useState2[0],
-    setFiltersObjectArray = _useState2[1];
+    filtersState = _useState2[0],
+    setFiltersState = _useState2[1];
+  var _useState3 = (0, _react.useState)(reactTableFiltersState),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    filtersObjectArray = _useState4[0],
+    setFiltersObjectArray = _useState4[1];
 
   // When using batch actions we have to store the filters to then apply them later
   var prevFiltersRef = (0, _react.useRef)(JSON.stringify(filtersState));
+  var lastAppliedFilters = (0, _react.useRef)(JSON.stringify(reactTableFiltersState));
   var prevFiltersObjectArrayRef = (0, _react.useRef)(JSON.stringify(filtersObjectArray));
 
   /** Methods */
@@ -46,6 +48,7 @@ var useFilters = function useFilters(_ref) {
   var revertToPreviousFilters = function revertToPreviousFilters() {
     setFiltersState(JSON.parse(prevFiltersRef.current));
     setFiltersObjectArray(JSON.parse(prevFiltersObjectArrayRef.current));
+    setAllFilters(JSON.parse(lastAppliedFilters.current));
   };
   var reset = function reset() {
     // When we reset we want the "initialFilters" to be an empty array
@@ -157,10 +160,14 @@ var useFilters = function useFilters(_ref) {
     var type = _ref3.type,
       column = _ref3.column,
       components = _ref3.props;
+    var filter;
     var isPanel = variation === _constants.PANEL;
+    if (!type) {
+      return console.error("type: ".concat(type, "; does not exist as a type of filter."));
+    }
     switch (type) {
       case _constants.DATE:
-        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
+        filter = /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
           onChange: function onChange(value) {
             var _components$DatePicke, _components$DatePicke2;
             setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
@@ -184,8 +191,9 @@ var useFilters = function useFilters(_ref) {
           placeholder: "mm/dd/yyyy",
           labelText: "End date"
         }, components.DatePickerInput.end)));
+        break;
       case _constants.NUMBER:
-        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.NumberInput, (0, _extends2.default)({
+        filter = /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.NumberInput, (0, _extends2.default)({
           step: 1,
           allowEmpty: true,
           hideSteppers: true
@@ -206,8 +214,9 @@ var useFilters = function useFilters(_ref) {
           value: filtersState[column].value,
           light: isPanel
         }));
+        break;
       case _constants.CHECKBOX:
-        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
+        filter = /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
           return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Checkbox, (0, _extends2.default)({
             key: option.labelText
           }, option, {
@@ -232,8 +241,9 @@ var useFilters = function useFilters(_ref) {
             checked: option.selected
           }));
         }));
+        break;
       case _constants.RADIO:
-        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FormGroup, components.FormGroup, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.RadioButtonGroup, (0, _extends2.default)({}, components.RadioButtonGroup, {
+        filter = /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FormGroup, components.FormGroup, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.RadioButtonGroup, (0, _extends2.default)({}, components.RadioButtonGroup, {
           valueSelected: ((_filtersState$column = filtersState[column]) === null || _filtersState$column === void 0 ? void 0 : _filtersState$column.value) === '' ? 'Any' : (_filtersState$column2 = filtersState[column]) === null || _filtersState$column2 === void 0 ? void 0 : _filtersState$column2.value,
           onChange: function onChange(selected) {
             var _components$RadioButt, _components$RadioButt2;
@@ -258,8 +268,9 @@ var useFilters = function useFilters(_ref) {
             key: (_ref4 = (_radio$id = radio.id) !== null && _radio$id !== void 0 ? _radio$id : radio.labelText) !== null && _ref4 !== void 0 ? _ref4 : radio.value
           }, radio));
         })));
+        break;
       case _constants.DROPDOWN:
-        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, (0, _extends2.default)({}, components.Dropdown, {
+        filter = /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, (0, _extends2.default)({}, components.Dropdown, {
           items: ['Any'].concat((0, _toConsumableArray2.default)(components.Dropdown.items)),
           selectedItem: filtersState[column].value === '' ? 'Any' : filtersState[column].value,
           onChange: function onChange(_ref5) {
@@ -279,7 +290,27 @@ var useFilters = function useFilters(_ref) {
           light: isPanel
         }));
     }
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
+      key: column
+    }, filter);
+  };
+  var cancel = function cancel() {
+    // Reverting to previous filters only applies when using batch actions
+    if (updateMethod === _constants.BATCH) {
+      revertToPreviousFilters();
+      onCancel();
+    }
   };
+
+  /** The purpose of this function is to sync any changes in react-tables state.filters array and reflect
+      those new filter changes in the panel/flyout state. The external change is triggered if setAllFilters is called outside of the Datagrid */
+  (0, _react.useEffect)(function updateStateAndFiltersToReflectExternalFilterChanges() {
+    var newFiltersState = (0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState);
+    setFiltersState(newFiltersState);
+    prevFiltersRef.current = JSON.stringify(newFiltersState);
+    prevFiltersObjectArrayRef.current = JSON.stringify(reactTableFiltersState);
+    setFiltersObjectArray(reactTableFiltersState);
+  }, [filters, reactTableFiltersState, variation]);
   return {
     filtersState: filtersState,
     setFiltersState: setFiltersState,
@@ -288,7 +319,9 @@ var useFilters = function useFilters(_ref) {
     revertToPreviousFilters: revertToPreviousFilters,
     reset: reset,
     renderFilter: renderFilter,
-    filtersObjectArray: filtersObjectArray
+    filtersObjectArray: filtersObjectArray,
+    lastAppliedFilters: lastAppliedFilters,
+    cancel: cancel
   };
 };
 var _default = useFilters;

package/lib/components/Datagrid/useFiltering.js

@@ -74,7 +74,7 @@ var useFiltering = function useFiltering(hooks) {
       variation: 'flyout',
       updateMethod: _constants.BATCH,
       panelIconDescription: 'Open filter panel',
-      initialFilters: state.filters
+      reactTableFiltersState: state.filters
     };
     var getFilterFlyoutProps = function getFilterFlyoutProps() {
       return _objectSpread(_objectSpread(_objectSpread({}, defaultProps), filterProps), {}, {

package/lib/components/Datagrid/utils/makeData.js

@@ -57,7 +57,7 @@ var getPasswordStrength = function getPasswordStrength() {
 var renderDocLink = function renderDocLink() {
   var chance = Math.random();
   var docLinkObj = {
-    href: chance > 0.66 ? 'http://carbondesignsystem.com/' : chance > 0.33 ? 'https://pages.github.ibm.com/cdai-design/pal/' : 'http://carbon-for-ibm-products.netlify.app/',
+    href: chance > 0.66 ? 'https://carbondesignsystem.com/' : chance > 0.33 ? 'https://pages.github.ibm.com/cdai-design/pal/' : 'https://ibm-products.carbondesignsystem.com/',
     text: chance > 0.66 ? 'Carbon Design System' : chance > 0.33 ? 'Carbon for IBM Products PAL' : 'Carbon for IBM Products storybook'
   };
   return docLinkObj;

package/lib/components/PageHeader/PageHeader.js

@@ -315,12 +315,8 @@ var PageHeader = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
       (0, _PageHeaderUtils.utilSetCollapsed)(collapseHeader, metrics.headerOffset, metrics.headerTopValue);
     }
   }, [collapseHeader, metrics.headerOffset, metrics.headerTopValue]);
-  (0, _useResizeObserver.useResizeObserver)(sizingContainerRef, {
-    callback: handleResizeActionBarColumn
-  });
-  (0, _useResizeObserver.useResizeObserver)(headerRef, {
-    callback: handleResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(sizingContainerRef, handleResizeActionBarColumn);
+  (0, _useResizeObserver.useResizeObserver)(headerRef, handleResize);
 
   // Determine what form of title to display in the breadcrumb
   var breadcrumbItemForTitle = (0, _PageHeaderUtils.utilGetBreadcrumbItemForTitle)(_PageHeaderUtils.blockClass, collapseTitle, title);

package/lib/components/SidePanel/SidePanel.js

@@ -434,9 +434,7 @@ var SidePanel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     }, title));
   };
   var contentRef = ref || sidePanelRef;
-  (0, _useResizeObserver.useResizeObserver)(contentRef, {
-    callback: handleResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(contentRef, handleResize);
   return /*#__PURE__*/_react.default.createElement(_framerMotion.AnimatePresence, null, open && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_framerMotion.motion.div, (0, _extends2.default)({}, (0, _devtools.getDevtoolsProps)(componentName), rest, {
     id: "".concat(blockClass, "-outer"),
     className: mainPanelClassNames,

package/lib/components/TagSet/TagSet.js

@@ -205,12 +205,8 @@ var TagSet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var handleModalClose = function handleModalClose() {
     setShowAllModalOpen(false);
   };
-  (0, _useResizeObserver.useResizeObserver)(sizingContainerRef, {
-    callback: handleSizerTagsResize
-  });
-  (0, _useResizeObserver.useResizeObserver)(tagSetRef, {
-    callback: handleResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(sizingContainerRef, handleSizerTagsResize);
+  (0, _useResizeObserver.useResizeObserver)(tagSetRef, handleResize);
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)([blockClass, className]),
     ref: tagSetRef