@carbon/ibm-products 2.0.1 → 2.1.1

package/lib/components/AddSelect/AddSelectRow.js

@@ -47,6 +47,7 @@ var AddSelectRow = function AddSelectRow(_ref) {
     setMultiSelection = _ref.setMultiSelection,
     setParentSelected = _ref.setParentSelected,
     setSingleSelection = _ref.setSingleSelection,
+    setSize = _ref.setSize,
     singleSelection = _ref.singleSelection;
   var ref = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
@@ -129,14 +130,20 @@ var AddSelectRow = function AddSelectRow(_ref) {
   var hasModifiers = (modifiers === null || modifiers === void 0 ? void 0 : (_modifiers$options = modifiers.options) === null || _modifiers$options === void 0 ? void 0 : _modifiers$options.length) > 0;
   var tabIndex = getTabIndex();
   var selected = isSelected();
+  var expanded = parentSelected === item.id;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(blockClass, "-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "-row--selected"), isSelected(item.id)), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "-row-meta--selected"), isInMetaPanel(item.id)), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "-row--active"), parentSelected === item.id), _cx)),
+    className: (0, _classnames.default)("".concat(blockClass, "-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "-row--selected"), isSelected()), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "-row-meta--selected"), isInMetaPanel(item.id)), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "-row--active"), expanded), _cx)),
     onKeyDown: onSelectKeyDown,
     tabIndex: tabIndex,
     ref: ref,
-    role: "row"
+    role: "row",
+    "aria-selected": selected,
+    "aria-posinset": index,
+    "aria-setsize": setSize,
+    "aria-expanded": expanded
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "-cell")
+    className: "".concat(blockClass, "-cell"),
+    role: "gridcell"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "-cell-wrapper")
   }, multi ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_AddSelectFormControl.AddSelectFormControl, {
@@ -149,7 +156,7 @@ var AddSelectRow = function AddSelectRow(_ref) {
     type: "inline",
     items: modifiers.options,
     label: modifiers.label,
-    disabled: !isSelected(item.id),
+    disabled: !isSelected(),
     className: "".concat(blockClass, "-dropdown"),
     initialSelectedItem: item[modifiers.id],
     onChange: function onChange(_ref3) {
@@ -174,7 +181,9 @@ var AddSelectRow = function AddSelectRow(_ref) {
     hasIconOnly: true,
     onClick: onNavigateItem,
     kind: "ghost",
-    size: "sm"
+    size: "sm",
+    tabIndex: -1,
+    "aria-hidden": true
   }), item.meta && /*#__PURE__*/_react.default.createElement(_react2.Button, {
     className: "".concat(blockClass, "-view-meta"),
     renderIcon: function renderIcon(props) {
@@ -212,6 +221,7 @@ AddSelectRow.propTypes = {
   setMultiSelection: _propTypes.default.func,
   setParentSelected: _propTypes.default.func,
   setSingleSelection: _propTypes.default.func,
+  setSize: _propTypes.default.number,
   singleSelection: _propTypes.default.string
 };
 AddSelectRow.displayName = componentName;

package/lib/components/BreadcrumbWithOverflow/BreadcrumbWithOverflow.js

@@ -257,13 +257,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/ButtonMenu/ButtonMenu.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ButtonMenu = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -58,15 +59,14 @@ var ButtonMenu = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   return /*#__PURE__*/_react.default.createElement(_react2.OverflowMenu, (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass,
     // Apply the block class to the main HTML element
-    className // Apply any supplied class names to the main HTML element.
-    ),
-
+    className, // Apply any supplied class names to the main HTML element.
+    "".concat(carbonPrefix, "--btn--").concat(size), (0, _defineProperty2.default)({}, "".concat(blockClass, "__wrapper--").concat(kind), kind)),
     "aria-label": menuAriaLabel,
     menuOptionsClass: (0, _classnames.default)("".concat(blockClass, "__options"), menuOptionsClass),
     size: size,
     renderIcon: function renderIcon() {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)(["".concat(blockClass, "__trigger"), "".concat(carbonPrefix, "--btn"), "".concat(carbonPrefix, "--btn--").concat(kind), "".concat(carbonPrefix, "--btn--").concat(size)])
+        className: (0, _classnames.default)("".concat(blockClass, "__trigger"))
       }, label, Icon && /*#__PURE__*/_react.default.createElement(Icon, {
         "aria-hidden": "true",
         "aria-label": iconDescription,

package/lib/components/ButtonSetWithOverflow/ButtonSetWithOverflow.js

@@ -145,15 +145,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

@@ -59,9 +59,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, _react2.useRef)(initialFilters);
-
+    _ref$reactTableFilter = _ref.reactTableFiltersState,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
   /** State */
   var _useState = (0, _react2.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, _react2.useRef)(null);
@@ -117,26 +116,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 === "".concat(carbonPrefix, "--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() {
@@ -163,6 +146,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(carbonPrefix, "--list-box__menu-item__option");
+    if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
+      return;
+    }
+    closeFlyout();
+    cancel();
+  });
+  (0, _hooks2.useSubscribeToEventEmitter)(_constants.CLEAR_FILTERS, reset);
+  (0, _react2.useEffect)(function reflectLastAppliedFiltersWhenReactTableUpdates() {
+    lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
+  }, [reactTableFiltersState, lastAppliedFilters]);
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: "".concat(componentClass, "__container")
   }, /*#__PURE__*/_react2.default.createElement(_react.Button, {
@@ -206,14 +204,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
    */
@@ -234,6 +224,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

@@ -66,11 +66,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),
@@ -81,15 +78,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)();
@@ -119,14 +118,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, {
@@ -254,20 +250,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 _useFilters = _interopRequireDefault(require("./useFilters"));
 var _useShouldDisableButtons = _interopRequireDefault(require("./useShouldDisableButtons"));

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 _react2 = require("@carbon/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; }
@@ -31,19 +30,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 */
@@ -52,6 +54,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
@@ -163,8 +166,11 @@ var useFilters = function useFilters(_ref) {
     var type = _ref3.type,
       column = _ref3.column,
       components = _ref3.props;
-    var isPanel = variation === _constants.PANEL;
     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:
         filter = /*#__PURE__*/_react.default.createElement(_react2.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
@@ -290,10 +296,31 @@ var useFilters = function useFilters(_ref) {
         break;
     }
     if (isPanel) {
-      return /*#__PURE__*/_react.default.createElement(_react2.Layer, null, filter);
+      return /*#__PURE__*/_react.default.createElement(_react2.Layer, {
+        key: column
+      }, filter);
     }
-    return filter;
+    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,
@@ -302,7 +329,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

@@ -79,7 +79,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/useStickyColumn.js

@@ -26,10 +26,13 @@ var OFFSET_SCROLL_CLASS = "".concat(styleClassPrefix, "-offset-scroll");
 var useStickyColumn = function useStickyColumn(hooks) {
   var tableBodyRef = (0, _react.useRef)();
   var stickyHeaderCellRef = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(window.innerWidth),
+  var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
+  (0, _react.useEffect)(function () {
+    setWindowSize(window.innerWidth);
+  }, []);
   (0, _react.useLayoutEffect)(function () {
     function updateSize() {
       setWindowSize(window.innerWidth);
@@ -58,9 +61,13 @@ var useStickyColumn = function useStickyColumn(hooks) {
         headerCellElement.classList.add(OFFSET_SCROLL_CLASS);
       }
       var boundListener = (0, _debounce.default)(onBodyResize.bind(null, tableBodyElement, headerCellElement), 250);
-      window.addEventListener('resize', boundListener);
+      if (typeof window !== 'undefined') {
+        window.addEventListener('resize', boundListener);
+      }
       return function () {
-        window.removeEventListener('resize', boundListener);
+        if (typeof window !== 'undefined') {
+          window.removeEventListener('resize', boundListener);
+        }
       };
     }, [instance.rows, instance.isFetching]);
     (0, _react.useEffect)(function () {

package/lib/components/PageHeader/PageHeader.js

@@ -320,12 +320,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

@@ -451,9 +451,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

@@ -164,7 +164,8 @@ var TagSet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     if (sizingTags.length > 0) {
       var spaceAvailable = tagSetRef.current.offsetWidth;
       for (var i in sizingTags) {
-        var tagWidth = sizingTags[i].offsetWidth;
+        var _sizingTags$i;
+        var tagWidth = ((_sizingTags$i = sizingTags[i]) === null || _sizingTags$i === void 0 ? void 0 : _sizingTags$i.offsetWidth) || 0;
         if (spaceAvailable >= tagWidth) {
           spaceAvailable -= tagWidth;
           willFit += 1;
@@ -206,12 +207,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

package/lib/components/UserProfileImage/UserProfileImage.js

@@ -15,7 +15,7 @@ require("../../global/js/utils/props-helper");
 var _settings = require("../../settings");
 var _icons = require("@carbon/react/icons");
 var _react2 = require("@carbon/react");
-var _excluded = ["backgroundColor", "className", "kind", "icon", "initials", "image", "imageDescription", "size", "theme", "tooltipText"];
+var _excluded = ["backgroundColor", "className", "kind", "icon", "initials", "image", "imageDescription", "size", "theme", "tooltipText", "tooltipAlignment"];
 /**
  * Copyright IBM Corp. 2021, 2021
  *
@@ -31,6 +31,10 @@ var componentName = 'UserProfileImage';
 
 // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
+// Default values for props
+var defaults = {
+  tooltipAlignment: 'bottom'
+};
 /**
  * This is a user profile image component which displays an image, or initials or icon for a user.
  */
@@ -45,6 +49,8 @@ var UserProfileImage = /*#__PURE__*/_react.default.forwardRef(function (_ref, re
     size = _ref.size,
     theme = _ref.theme,
     tooltipText = _ref.tooltipText,
+    _ref$tooltipAlignment = _ref.tooltipAlignment,
+    tooltipAlignment = _ref$tooltipAlignment === void 0 ? defaults.tooltipAlignment : _ref$tooltipAlignment,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var icons = {
     user: {
@@ -124,7 +130,8 @@ var UserProfileImage = /*#__PURE__*/_react.default.forwardRef(function (_ref, re
   return FillItem && (tooltipText ? /*#__PURE__*/_react.default.createElement(_react2.IconButton, {
     label: tooltipText,
     className: "".concat(blockClass, "__tooltip"),
-    kind: "ghost"
+    kind: "ghost",
+    align: tooltipAlignment
   }, renderUserProfileImage()) : renderUserProfileImage());
 });
 
@@ -173,6 +180,10 @@ UserProfileImage.propTypes = {
    * Set theme in which the component will be rendered
    */
   theme: _propTypes.default.oneOf(['light', 'dark']).isRequired,
+  /**
+   * Specify how the trigger should align with the tooltip
+   */
+  tooltipAlignment: _propTypes.default.oneOf(['top', 'top-left', 'top-right', 'bottom', 'bottom-left', 'bottom-right', 'left', 'right']),
   /**
    * Pass in the display name to have it shown on hover
    */