@carbon/ibm-products 2.0.1 → 2.1.0

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

@@ -11,10 +11,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * US Government Users Restricted Rights - Use, duplication or disclosure
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import { Checkbox, DatePicker, DatePickerInput, Dropdown, FormGroup, NumberInput, RadioButton, RadioButtonGroup, Layer } from '@carbon/react';
-import { INSTANT, DATE, CHECKBOX, NUMBER, RADIO, DROPDOWN, PANEL } from '../constants';
-import useInitialStateFromFilters from './useInitialStateFromFilters';
+import { INSTANT, BATCH, DATE, CHECKBOX, NUMBER, RADIO, DROPDOWN, PANEL } from '../constants';
 import { getInitialStateFromFilters } from '../utils';
 var useFilters = function useFilters(_ref) {
   var updateMethod = _ref.updateMethod,
@@ -22,19 +21,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 = useInitialStateFromFilters(filters, variation, initialFilters),
-    _useInitialStateFromF2 = _slicedToArray(_useInitialStateFromF, 2),
-    filtersState = _useInitialStateFromF2[0],
-    setFiltersState = _useInitialStateFromF2[1];
-  var _useState = useState(initialFilters),
+  var _useState = useState(getInitialStateFromFilters(filters, variation, reactTableFiltersState)),
     _useState2 = _slicedToArray(_useState, 2),
-    filtersObjectArray = _useState2[0],
-    setFiltersObjectArray = _useState2[1];
+    filtersState = _useState2[0],
+    setFiltersState = _useState2[1];
+  var _useState3 = useState(reactTableFiltersState),
+    _useState4 = _slicedToArray(_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 = useRef(JSON.stringify(filtersState));
+  var lastAppliedFilters = useRef(JSON.stringify(reactTableFiltersState));
   var prevFiltersObjectArrayRef = useRef(JSON.stringify(filtersObjectArray));
 
   /** Methods */
@@ -43,6 +45,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
@@ -154,8 +157,11 @@ var useFilters = function useFilters(_ref) {
     var type = _ref3.type,
       column = _ref3.column,
       components = _ref3.props;
-    var isPanel = variation === PANEL;
     var filter;
+    var isPanel = variation === PANEL;
+    if (!type) {
+      return console.error("type: ".concat(type, "; does not exist as a type of filter."));
+    }
     switch (type) {
       case DATE:
         filter = /*#__PURE__*/React.createElement(DatePicker, _extends({}, components.DatePicker, {
@@ -281,10 +287,31 @@ var useFilters = function useFilters(_ref) {
         break;
     }
     if (isPanel) {
-      return /*#__PURE__*/React.createElement(Layer, null, filter);
+      return /*#__PURE__*/React.createElement(Layer, {
+        key: column
+      }, filter);
     }
-    return filter;
+    return /*#__PURE__*/React.createElement(React.Fragment, {
+      key: column
+    }, filter);
   };
+  var cancel = function cancel() {
+    // Reverting to previous filters only applies when using batch actions
+    if (updateMethod === 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 */
+  useEffect(function updateStateAndFiltersToReflectExternalFilterChanges() {
+    var newFiltersState = 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,
@@ -293,7 +320,9 @@ var useFilters = function useFilters(_ref) {
     revertToPreviousFilters: revertToPreviousFilters,
     reset: reset,
     renderFilter: renderFilter,
-    filtersObjectArray: filtersObjectArray
+    filtersObjectArray: filtersObjectArray,
+    lastAppliedFilters: lastAppliedFilters,
+    cancel: cancel
   };
 };
 export default useFilters;

package/es/components/Datagrid/useFiltering.js

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

package/es/components/UserProfileImage/UserProfileImage.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-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
  *
@@ -28,6 +28,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.
  */
@@ -42,6 +46,8 @@ export var UserProfileImage = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     size = _ref.size,
     theme = _ref.theme,
     tooltipText = _ref.tooltipText,
+    _ref$tooltipAlignment = _ref.tooltipAlignment,
+    tooltipAlignment = _ref$tooltipAlignment === void 0 ? defaults.tooltipAlignment : _ref$tooltipAlignment,
     rest = _objectWithoutProperties(_ref, _excluded);
   var icons = {
     user: {
@@ -121,7 +127,8 @@ export var UserProfileImage = /*#__PURE__*/React.forwardRef(function (_ref, ref)
   return FillItem && (tooltipText ? /*#__PURE__*/React.createElement(IconButton, {
     label: tooltipText,
     className: "".concat(blockClass, "__tooltip"),
-    kind: "ghost"
+    kind: "ghost",
+    align: tooltipAlignment
   }, renderUserProfileImage()) : renderUserProfileImage());
 });
 
@@ -169,6 +176,10 @@ UserProfileImage.propTypes = {
    * Set theme in which the component will be rendered
    */
   theme: PropTypes.oneOf(['light', 'dark']).isRequired,
+  /**
+   * Specify how the trigger should align with the tooltip
+   */
+  tooltipAlignment: PropTypes.oneOf(['top', 'top-left', 'top-right', 'bottom', 'bottom-left', 'bottom-right', 'left', 'right']),
   /**
    * Pass in the display name to have it shown on hover
    */

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/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
    */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -94,5 +94,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "54e21d74eb1784d7d20149f19fc106eee92a69b2"
+  "gitHead": "7d5b5013039a6d98e3aab8375a7ea249c44ee4ae"
 }

package/scss/components/NotificationsPanel/_notifications-panel.scss

@@ -54,7 +54,7 @@ $block-class: #{c4p-settings.$pkg-prefix}--notifications-panel;
   top: $spacing-09;
   right: 0;
   overflow: auto;
-  min-width: 22.75rem;
+  min-width: 20rem;
   max-width: 22.75rem;
   min-height: 38.5rem;
   max-height: 38.5rem;

package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useInitialStateFromFilters.js

@@ -1,21 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2022
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-import { useState } from 'react';
-import { FLYOUT } from '../constants';
-import { getInitialStateFromFilters } from '../utils';
-var useInitialStateFromFilters = function useInitialStateFromFilters(filters) {
-  var variation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : FLYOUT;
-  var initialFilters = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  var _useState = useState(getInitialStateFromFilters(filters, variation, initialFilters)),
-    _useState2 = _slicedToArray(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
-  return [state, setState];
-};
-export default useInitialStateFromFilters;

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

@@ -1,30 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = require("react");
-var _constants = require("../constants");
-var _utils = require("../utils");
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2022
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-var useInitialStateFromFilters = function useInitialStateFromFilters(filters) {
-  var variation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constants.FLYOUT;
-  var initialFilters = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, initialFilters)),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
-  return [state, setState];
-};
-var _default = useInitialStateFromFilters;
-exports.default = _default;