@carbon/ibm-products 2.0.1 → 2.1.1

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

@@ -12,7 +12,7 @@ import { Filter } from '@carbon/react/icons';
 import { Button, usePrefix } from '@carbon/react';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import { useClickOutside } from '../../../../../global/js/hooks';
 import { pkg } from '../../../../../settings';
 import { ActionSet } from '../../../../ActionSet';
@@ -45,11 +45,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 = useRef(initialFilters);
-
+    _ref$reactTableFilter = _ref.reactTableFiltersState,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
   /** State */
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -60,15 +57,17 @@ var FilterFlyout = function FilterFlyout(_ref) {
       filters: filters,
       setAllFilters: setAllFilters,
       variation: 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 = useRef(null);
@@ -107,26 +106,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 === BATCH) {
-      revertToPreviousFilters();
-      onCancel();
-    }
-    closeFlyout();
-  };
 
-  /** Effects */
-  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();
-  });
-  useSubscribeToEventEmitter(CLEAR_FILTERS, reset);
+    // Update the last applied filters
+    lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
+  };
 
   /** Renders all filters */
   var renderFilters = function renderFilters() {
@@ -153,6 +136,21 @@ var FilterFlyout = function FilterFlyout(_ref) {
       buttonSize: "md"
     });
   };
+
+  /** Effects */
+  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();
+  });
+  useSubscribeToEventEmitter(CLEAR_FILTERS, reset);
+  useEffect(function reflectLastAppliedFiltersWhenReactTableUpdates() {
+    lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
+  }, [reactTableFiltersState, lastAppliedFilters]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(componentClass, "__container")
   }, /*#__PURE__*/React.createElement(Button, {
@@ -196,14 +194,6 @@ FilterFlyout.propTypes = {
    * Icon description for the filter flyout button
    */
   flyoutIconDescription: PropTypes.string,
-  /**
-   * Filters that should be applied on load
-   */
-  initialFilters: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    type: PropTypes.string.isRequired,
-    value: PropTypes.any.isRequired
-  })),
   /**
    * Callback when the apply button is clicked
    */
@@ -224,6 +214,14 @@ FilterFlyout.propTypes = {
    * Label text of the primary action in the flyout
    */
   primaryActionLabel: PropTypes.string,
+  /**
+   * Filters from react table's state
+   */
+  reactTableFiltersState: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    type: PropTypes.string.isRequired,
+    value: PropTypes.any.isRequired
+  })),
   /**
    * Label text of the secondary action in the flyout
    */

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

@@ -56,11 +56,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 = useRef(initialFilters);
-
+    _ref$reactTableFilter = _ref.reactTableFiltersState,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
   /** State */
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -71,15 +68,17 @@ var FilterPanel = function FilterPanel(_ref) {
       filters: filterSections,
       setAllFilters: setAllFilters,
       variation: 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 = useRef();
@@ -109,14 +108,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 === BATCH) {
-      revertToPreviousFilters();
-      onCancel();
-    }
+    cancel();
+    setPanelOpen(false);
   };
   var apply = function apply() {
     setAllFilters(filtersObjectArray);
@@ -128,6 +121,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.createElement(MotionActionSet, {
@@ -244,20 +240,20 @@ FilterPanel.propTypes = {
   closeIconDescription: PropTypes.string,
   filterPanelMinHeight: PropTypes.number,
   filterSections: PropTypes.array,
-  /**
-   * Filters that should be applied on load
-   */
-  initialFilters: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    type: PropTypes.string.isRequired,
-    value: PropTypes.any.isRequired
-  })),
   onApply: PropTypes.func,
   onCancel: PropTypes.func,
   onPanelClose: PropTypes.func,
   onPanelOpen: PropTypes.func,
   open: PropTypes.bool,
   primaryActionLabel: PropTypes.string,
+  /**
+   * Filters from react table's state
+   */
+  reactTableFiltersState: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    type: PropTypes.string.isRequired,
+    value: PropTypes.any.isRequired
+  })),
   searchLabelText: PropTypes.string,
   searchPlaceholder: PropTypes.string,
   secondaryActionLabel: PropTypes.string,

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

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-export { default as useInitialStateFromFilters } from './useInitialStateFromFilters';
 export { default as useSubscribeToEventEmitter } from './useSubscribeToEventEmitter';
 export { default as useFilters } from './useFilters';
 export { default as useShouldDisableButtons } from './useShouldDisableButtons';

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/Datagrid/useStickyColumn.js

@@ -21,10 +21,13 @@ var OFFSET_SCROLL_CLASS = "".concat(styleClassPrefix, "-offset-scroll");
 var useStickyColumn = function useStickyColumn(hooks) {
   var tableBodyRef = useRef();
   var stickyHeaderCellRef = useRef();
-  var _useState = useState(window.innerWidth),
+  var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
+  useEffect(function () {
+    setWindowSize(window.innerWidth);
+  }, []);
   useLayoutEffect(function () {
     function updateSize() {
       setWindowSize(window.innerWidth);
@@ -53,9 +56,13 @@ var useStickyColumn = function useStickyColumn(hooks) {
         headerCellElement.classList.add(OFFSET_SCROLL_CLASS);
       }
       var boundListener = debounce(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]);
     useEffect(function () {

package/es/components/PageHeader/PageHeader.js

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

package/es/components/SidePanel/SidePanel.js

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

package/es/components/TagSet/TagSet.js

@@ -156,7 +156,8 @@ export var TagSet = /*#__PURE__*/React.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;
@@ -198,12 +199,8 @@ export var TagSet = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var handleModalClose = function handleModalClose() {
     setShowAllModalOpen(false);
   };
-  useResizeObserver(sizingContainerRef, {
-    callback: handleSizerTagsResize
-  });
-  useResizeObserver(tagSetRef, {
-    callback: handleResize
-  });
+  useResizeObserver(sizingContainerRef, handleSizerTagsResize);
+  useResizeObserver(tagSetRef, handleResize);
   return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
     className: cx([blockClass, className]),
     ref: tagSetRef

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/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/lib/components/AboutModal/AboutModal.js

@@ -81,9 +81,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(_react2.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

@@ -192,12 +192,8 @@ var ActionBar = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   };
 
   // // resize of the items
-  (0, _useResizeObserver.useResizeObserver)(sizingRef, {
-    callback: handleResize
-  });
-  (0, _useResizeObserver.useResizeObserver)(localRef, {
-    callback: handleResize
-  });
+  (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/AddSelect/AddSelectFormControl.js

@@ -14,16 +14,15 @@ var _UserProfileImage = require("../UserProfileImage");
 var componentName = 'AddSelectFormControl';
 var blockClass = "".concat(_settings.pkg.prefix, "--add-select__selections");
 var AddSelectFormControl = function AddSelectFormControl(_ref) {
-  var _controlProps;
   var item = _ref.item,
     onClick = _ref.onClick,
     selected = _ref.selected,
     type = _ref.type;
-  var controlProps = (_controlProps = {
+  var controlProps = (0, _defineProperty2.default)({
     onClick: onClick,
-    id: item.id,
-    className: "".concat(blockClass, "-form-control-wrapper")
-  }, (0, _defineProperty2.default)(_controlProps, "aria-label", item.title), (0, _defineProperty2.default)(_controlProps, "size", 20), _controlProps);
+    className: "".concat(blockClass, "-form-control-wrapper ").concat(blockClass, "-form-control-wrapper--").concat(type),
+    size: 20
+  }, "aria-labelledby", "control-label-".concat(item.id));
   var getCheckbox = function getCheckbox() {
     if (selected) {
       return /*#__PURE__*/_react.default.createElement(_icons.CheckboxCheckedFilled, controlProps);
@@ -75,7 +74,8 @@ var AddSelectFormControl = function AddSelectFormControl(_ref) {
   }, getItemIcon(item)), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "-form-control-label-text")
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "".concat(blockClass, "-cell-title")
+    className: "".concat(blockClass, "-cell-title"),
+    id: "control-label-".concat(item.id)
   }, item.title), item.subtitle && /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(blockClass, "-cell-subtitle")
   }, item.subtitle))));