@jetbrains/ring-ui-built 6.0.31 → 6.0.32

package/components/dropdown/dropdown.js

@@ -1,245 +1,214 @@
-import { _ as _defineProperty, a as _inherits, b as _createClass, c as _objectWithoutProperties, e as _extends, f as _classCallCheck, g as _callSuper } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.array.concat.js';
-import React, { cloneElement, Component } from 'react';
+import { _ as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
+import React, { Component, cloneElement } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import joinDataTestAttributes from '../global/data-tests.js';
 import { isArray } from '../global/typescript-utils.js';
 import { m as modules_d9414203, A as Anchor } from '../_helpers/anchor.js';
-import 'core-js/modules/es.array.reduce.js';
-import 'core-js/modules/es.object.entries.js';
-import 'core-js/modules/es.object.to-string.js';
 import '@jetbrains/icons/chevron-10px';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.replace.js';
-import 'core-js/modules/es.string.starts-with.js';
 import '../global/memoize.js';
-import 'core-js/modules/es.array.iterator.js';
-import 'core-js/modules/es.map.js';
-import 'core-js/modules/es.weak-map.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import '../button/button.js';
 import '../link/clickableLink.js';
 import '../global/controls-height.js';
 import '../_helpers/button__classes.js';
 
-var _excluded = ["initShown", "onShow", "onHide", "hoverShowTimeOut", "hoverHideTimeOut", "children", "anchor", "className", "activeClassName", "hoverMode", "clickMode", "data-test", "disabled"];
 /**
  * @name Dropdown
  */
-var Dropdown = /*#__PURE__*/function (_Component) {
-  function Dropdown() {
-    var _this;
-    _classCallCheck(this, Dropdown);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+class Dropdown extends Component {
+  static propTypes = {
+    /**
+     * Can be string, React element, or a function accepting an object with {active, pinned} properties and returning a React element
+     * React element should render some interactive HTML element like `button` or `a`
+     */
+    anchor: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
+    children: PropTypes.oneOfType([PropTypes.element, PropTypes.func]).isRequired,
+    initShown: PropTypes.bool,
+    className: PropTypes.string,
+    activeClassName: PropTypes.string,
+    clickMode: PropTypes.bool,
+    hoverMode: PropTypes.bool,
+    hoverShowTimeOut: PropTypes.number,
+    hoverHideTimeOut: PropTypes.number,
+    disabled: PropTypes.bool,
+    onShow: PropTypes.func,
+    onHide: PropTypes.func,
+    onMouseEnter: PropTypes.func,
+    onMouseLeave: PropTypes.func,
+    'data-test': PropTypes.string
+  };
+  static defaultProps = {
+    initShown: false,
+    clickMode: true,
+    hoverMode: false,
+    hoverShowTimeOut: 300,
+    hoverHideTimeOut: 600,
+    disabled: false,
+    onShow: () => {},
+    onHide: () => {},
+    onMouseEnter: () => {},
+    onMouseLeave: () => {}
+  };
+  state = {
+    show: this.props.initShown,
+    pinned: false
+  };
+  onClick = () => {
+    if (this.props.disabled) {
+      return;
     }
-    _this = _callSuper(this, Dropdown, [].concat(args));
-    _defineProperty(_this, "state", {
-      show: _this.props.initShown,
-      pinned: false
-    });
-    _defineProperty(_this, "onClick", function () {
-      if (_this.props.disabled) {
-        return;
-      }
-      var _this$state = _this.state,
-        show = _this$state.show,
-        pinned = _this$state.pinned;
-      var nextPinned = pinned;
-      if (_this.props.hoverMode) {
-        if (!pinned) {
-          nextPinned = true;
-          if (show) {
-            _this.setState({
-              pinned: true
-            });
-            return;
-          }
-        } else {
-          nextPinned = false;
+    const {
+      show,
+      pinned
+    } = this.state;
+    let nextPinned = pinned;
+    if (this.props.hoverMode) {
+      if (!pinned) {
+        nextPinned = true;
+        if (show) {
+          this.setState({
+            pinned: true
+          });
+          return;
         }
-      }
-      _this._toggle(!show, nextPinned);
-    });
-    _defineProperty(_this, "onChildCloseAttempt", function () {
-      var nextPinned = _this.state.pinned;
-      if (_this.props.hoverMode) {
+      } else {
         nextPinned = false;
       }
-      _this._toggle(false, nextPinned);
-    });
-    _defineProperty(_this, "hoverTimer", void 0);
-    _defineProperty(_this, "onMouseEnter", function (event) {
-      var _this$props$onMouseEn, _this$props;
-      if (_this.props.disabled) {
-        return;
-      }
-      _this._clearTimer();
-      (_this$props$onMouseEn = (_this$props = _this.props).onMouseEnter) === null || _this$props$onMouseEn === void 0 || _this$props$onMouseEn.call(_this$props, event);
-      _this.hoverTimer = window.setTimeout(function () {
-        if (!_this.state.show) {
-          _this._toggle(true);
-        }
-      }, _this.props.hoverShowTimeOut);
-    });
-    _defineProperty(_this, "onMouseLeave", function (event) {
-      var _this$props$onMouseLe, _this$props2;
-      if (_this.props.disabled) {
-        return;
-      }
-      (_this$props$onMouseLe = (_this$props2 = _this.props).onMouseLeave) === null || _this$props$onMouseLe === void 0 || _this$props$onMouseLe.call(_this$props2, event);
-      if (_this.state.pinned) {
-        return;
-      }
-      _this._clearTimer();
-      _this.hoverTimer = window.setTimeout(function () {
-        if (_this.state.show) {
-          _this._toggle(false);
-        }
-      }, _this.props.hoverHideTimeOut);
-    });
-    _defineProperty(_this, "handlePopupInteraction", function () {
-      _this.setState(function (_ref) {
-        var pinned = _ref.pinned;
-        return pinned ? null : {
-          pinned: true
-        };
-      });
-    });
-    return _this;
-  }
-  _inherits(Dropdown, _Component);
-  return _createClass(Dropdown, [{
-    key: "toggle",
-    value: function toggle() {
-      var show = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : !this.state.show;
-      this._toggle(show);
     }
-  }, {
-    key: "_toggle",
-    value: function _toggle(show) {
-      var _this2 = this;
-      var pinned = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.state.pinned;
-      this.setState({
-        show,
-        pinned
-      }, function () {
-        return show ? _this2.props.onShow() : _this2.props.onHide();
-      });
+    this._toggle(!show, nextPinned);
+  };
+  onChildCloseAttempt = () => {
+    let nextPinned = this.state.pinned;
+    if (this.props.hoverMode) {
+      nextPinned = false;
+    }
+    this._toggle(false, nextPinned);
+  };
+  hoverTimer;
+  onMouseEnter = event => {
+    if (this.props.disabled) {
+      return;
     }
-  }, {
-    key: "_clearTimer",
-    value: function _clearTimer() {
-      if (this.hoverTimer) {
-        clearTimeout(this.hoverTimer);
-        this.hoverTimer = null;
+    this._clearTimer();
+    this.props.onMouseEnter?.(event);
+    this.hoverTimer = window.setTimeout(() => {
+      if (!this.state.show) {
+        this._toggle(true);
       }
+    }, this.props.hoverShowTimeOut);
+  };
+  onMouseLeave = event => {
+    if (this.props.disabled) {
+      return;
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$state2 = this.state,
-        show = _this$state2.show,
-        pinned = _this$state2.pinned;
-      var _this$props3 = this.props;
-        _this$props3.initShown;
-        _this$props3.onShow;
-        _this$props3.onHide;
-        _this$props3.hoverShowTimeOut;
-        _this$props3.hoverHideTimeOut;
-        var children = _this$props3.children,
-        anchor = _this$props3.anchor,
-        className = _this$props3.className,
-        activeClassName = _this$props3.activeClassName,
-        hoverMode = _this$props3.hoverMode,
-        clickMode = _this$props3.clickMode,
-        dataTest = _this$props3['data-test'];
-        _this$props3.disabled;
-        var restProps = _objectWithoutProperties(_this$props3, _excluded);
-      var classes = classNames(modules_d9414203.dropdown, className, {
-        [activeClassName !== null && activeClassName !== void 0 ? activeClassName : '']: activeClassName != null && show
-      });
-      var anchorElement;
-      var active = hoverMode ? pinned : show;
-      switch (typeof anchor) {
-        case 'string':
-          anchorElement = /*#__PURE__*/React.createElement(Anchor, {
-            active: active
-          }, anchor);
-          break;
-        case 'function':
-          anchorElement = anchor({
-            active: show,
-            pinned
-          });
-          break;
-        default:
-          if (isArray(anchor) || typeof anchor.type === 'string') {
-            anchorElement = anchor;
-          } else {
-            anchorElement = /*#__PURE__*/cloneElement(anchor, {
-              active
-            });
-          }
+    this.props.onMouseLeave?.(event);
+    if (this.state.pinned) {
+      return;
+    }
+    this._clearTimer();
+    this.hoverTimer = window.setTimeout(() => {
+      if (this.state.show) {
+        this._toggle(false);
       }
-      var childProps = {
-        hidden: !show,
-        onCloseAttempt: this.onChildCloseAttempt,
-        onMouseDown: hoverMode ? this.handlePopupInteraction : undefined,
-        onContextMenu: hoverMode ? this.handlePopupInteraction : undefined,
-        dontCloseOnAnchorClick: true
+    }, this.props.hoverHideTimeOut);
+  };
+  handlePopupInteraction = () => {
+    this.setState(_ref => {
+      let {
+        pinned
+      } = _ref;
+      return pinned ? null : {
+        pinned: true
       };
-      return /*#__PURE__*/React.createElement("div", _extends({
-        "data-test": joinDataTestAttributes('ring-dropdown', dataTest)
-      }, restProps, {
-        onClick: clickMode ? this.onClick : undefined
-        // anchorElement should be a `button` or an `a`
-        ,
-        role: "presentation",
-        onMouseEnter: hoverMode ? this.onMouseEnter : undefined,
-        onMouseLeave: hoverMode ? this.onMouseLeave : undefined,
-        className: classes
-      }), anchorElement, typeof children === 'function' ? children(childProps) : /*#__PURE__*/cloneElement(children, childProps));
+    });
+  };
+  toggle() {
+    let show = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : !this.state.show;
+    this._toggle(show);
+  }
+  _toggle(show) {
+    let pinned = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.state.pinned;
+    this.setState({
+      show,
+      pinned
+    }, () => show ? this.props.onShow() : this.props.onHide());
+  }
+  _clearTimer() {
+    if (this.hoverTimer) {
+      clearTimeout(this.hoverTimer);
+      this.hoverTimer = null;
     }
-  }]);
-}(Component);
-_defineProperty(Dropdown, "propTypes", {
-  /**
-   * Can be string, React element, or a function accepting an object with {active, pinned} properties and returning a React element
-   * React element should render some interactive HTML element like `button` or `a`
-   */
-  anchor: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
-  children: PropTypes.oneOfType([PropTypes.element, PropTypes.func]).isRequired,
-  initShown: PropTypes.bool,
-  className: PropTypes.string,
-  activeClassName: PropTypes.string,
-  clickMode: PropTypes.bool,
-  hoverMode: PropTypes.bool,
-  hoverShowTimeOut: PropTypes.number,
-  hoverHideTimeOut: PropTypes.number,
-  disabled: PropTypes.bool,
-  onShow: PropTypes.func,
-  onHide: PropTypes.func,
-  onMouseEnter: PropTypes.func,
-  onMouseLeave: PropTypes.func,
-  'data-test': PropTypes.string
-});
-_defineProperty(Dropdown, "defaultProps", {
-  initShown: false,
-  clickMode: true,
-  hoverMode: false,
-  hoverShowTimeOut: 300,
-  hoverHideTimeOut: 600,
-  disabled: false,
-  onShow: function onShow() {},
-  onHide: function onHide() {},
-  onMouseEnter: function onMouseEnter() {},
-  onMouseLeave: function onMouseLeave() {}
-});
+  }
+  render() {
+    const {
+      show,
+      pinned
+    } = this.state;
+    const {
+      initShown,
+      onShow,
+      onHide,
+      hoverShowTimeOut,
+      hoverHideTimeOut,
+      children,
+      anchor,
+      className,
+      activeClassName,
+      hoverMode,
+      clickMode,
+      'data-test': dataTest,
+      disabled,
+      ...restProps
+    } = this.props;
+    const classes = classNames(modules_d9414203.dropdown, className, {
+      [activeClassName !== null && activeClassName !== void 0 ? activeClassName : '']: activeClassName != null && show
+    });
+    let anchorElement;
+    const active = hoverMode ? pinned : show;
+    switch (typeof anchor) {
+      case 'string':
+        anchorElement = /*#__PURE__*/React.createElement(Anchor, {
+          active: active
+        }, anchor);
+        break;
+      case 'function':
+        anchorElement = anchor({
+          active: show,
+          pinned
+        });
+        break;
+      default:
+        if (isArray(anchor) || typeof anchor.type === 'string') {
+          anchorElement = anchor;
+        } else {
+          anchorElement = /*#__PURE__*/cloneElement(anchor, {
+            active
+          });
+        }
+    }
+    const childProps = {
+      hidden: !show,
+      onCloseAttempt: this.onChildCloseAttempt,
+      onMouseDown: hoverMode ? this.handlePopupInteraction : undefined,
+      onContextMenu: hoverMode ? this.handlePopupInteraction : undefined,
+      dontCloseOnAnchorClick: true
+    };
+    return /*#__PURE__*/React.createElement("div", _extends({
+      "data-test": joinDataTestAttributes('ring-dropdown', dataTest)
+    }, restProps, {
+      onClick: clickMode ? this.onClick : undefined
+      // anchorElement should be a `button` or an `a`
+      ,
+      role: "presentation",
+      onMouseEnter: hoverMode ? this.onMouseEnter : undefined,
+      onMouseLeave: hoverMode ? this.onMouseLeave : undefined,
+      className: classes
+    }), anchorElement, typeof children === 'function' ? children(childProps) : /*#__PURE__*/cloneElement(children, childProps));
+  }
+}
 
 export { Anchor, Dropdown as default };

package/components/dropdown-menu/dropdown-menu.js

@@ -1,5 +1,4 @@
-import { c as _objectWithoutProperties, d as _objectSpread2, e as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.object.assign.js';
+import { _ as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
 import React, { useMemo, cloneElement } from 'react';
 import PropTypes from 'prop-types';
 import List, { ActiveItemContext } from '../list/list.js';
@@ -8,15 +7,6 @@ import PopupMenu from '../popup-menu/popup-menu.js';
 import getUID from '../global/get-uid.js';
 import { A as Anchor } from '../_helpers/anchor.js';
 import { isArray } from '../global/typescript-utils.js';
-import 'core-js/modules/es.symbol.js';
-import 'core-js/modules/es.symbol.description.js';
-import 'core-js/modules/es.array.concat.js';
-import 'core-js/modules/es.array.find.js';
-import 'core-js/modules/es.array.find-index.js';
-import 'core-js/modules/es.array.includes.js';
-import 'core-js/modules/es.array.map.js';
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/es.string.includes.js';
 import 'classnames';
 import 'react-virtualized/dist/es/List';
 import 'react-virtualized/dist/es/AutoSizer';
@@ -25,25 +15,11 @@ import 'react-virtualized/dist/es/CellMeasurer';
 import 'util-deprecate';
 import 'memoize-one';
 import '../global/data-tests.js';
-import 'core-js/modules/es.array.reduce.js';
-import 'core-js/modules/es.object.entries.js';
 import '../global/schedule-raf.js';
 import '../global/memoize.js';
-import 'core-js/modules/es.array.iterator.js';
-import 'core-js/modules/es.map.js';
-import 'core-js/modules/es.weak-map.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import '../global/dom.js';
-import 'core-js/modules/es.array.filter.js';
-import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.set.js';
-import 'core-js/modules/es.string.split.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
 import '../shortcuts/shortcuts.js';
 import '../shortcuts/core.js';
-import 'core-js/modules/es.array.slice.js';
-import 'core-js/modules/es.array.splice.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';
@@ -54,20 +30,15 @@ import '../link/clickableLink.js';
 import '../_helpers/link.js';
 import '../_helpers/list.js';
 import '../list/list__item.js';
-import 'core-js/modules/es.array.index-of.js';
 import '../avatar/avatar.js';
 import '../global/url.js';
-import 'core-js/modules/es.string.replace.js';
 import '../avatar/fallback-avatar.js';
-import 'core-js/modules/es.array.from.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import '../checkbox/checkbox.js';
 import '@jetbrains/icons/checkmark-12px';
 import '@jetbrains/icons/remove-12px';
 import '../icon/icon.js';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.string.starts-with.js';
 import '../global/prop-types.js';
 import '../global/composeRefs.js';
 import '../list/list__custom.js';
@@ -84,58 +55,60 @@ import '../popup/popup.js';
 import 'react-dom';
 import '../tab-trap/tab-trap.js';
 import '../popup/position.js';
-import 'core-js/modules/es.array.sort.js';
 import '../popup/popup.consts.js';
 import '../popup/popup.target.js';
 
-var _excluded = ["anchor", "pinned", "active", "activeListItemId", "listId"],
-  _excluded2 = ["id", "anchor", "ariaLabel", "data", "onSelect", "menuProps"],
-  _excluded3 = ["pinned", "active"];
-var _ref = Dropdown.propTypes || {};
-  _ref.children;
-  var dropdownPropTypes = _objectWithoutProperties(_ref, ["children"]);
-var _ref2 = PopupMenu.propTypes || {},
-  idPropType = _ref2.id,
-  dataPropType = _ref2.data,
-  ariaLabelPropType = _ref2.ariaLabel,
-  onSelectPropType = _ref2.onSelect;
-var defaultAriaLabel = 'Dropdown menu';
-function DropdownAnchorWrapper(_ref3) {
-  var anchor = _ref3.anchor,
-    pinned = _ref3.pinned,
-    active = _ref3.active,
-    activeListItemId = _ref3.activeListItemId,
-    listId = _ref3.listId,
-    restProps = _objectWithoutProperties(_ref3, _excluded);
-  var anchorAriaProps = useMemo(function () {
-    return _objectSpread2(_objectSpread2(_objectSpread2({}, listId ? {
+const {
+  children,
+  ...dropdownPropTypes
+} = Dropdown.propTypes || {};
+const {
+  id: idPropType,
+  data: dataPropType,
+  ariaLabel: ariaLabelPropType,
+  onSelect: onSelectPropType
+} = PopupMenu.propTypes || {};
+const defaultAriaLabel = 'Dropdown menu';
+function DropdownAnchorWrapper(_ref) {
+  let {
+    anchor,
+    pinned,
+    active,
+    activeListItemId,
+    listId,
+    ...restProps
+  } = _ref;
+  const anchorAriaProps = useMemo(() => ({
+    ...(listId ? {
       'aria-haspopup': true
-    } : {}), activeListItemId ? {
+    } : {}),
+    ...(activeListItemId ? {
       'aria-activedescendant': activeListItemId,
       'aria-owns': listId
-    } : {}), active ? {
+    } : {}),
+    ...(active ? {
       'aria-expanded': true
-    } : {});
-  }, [active, activeListItemId, listId]);
-  var anchorProps = useMemo(function () {
-    return _objectSpread2(_objectSpread2({
-      active,
-      pinned
-    }, restProps), anchorAriaProps);
-  }, [pinned, active, restProps, anchorAriaProps]);
-  var anchorComponentProps = useMemo(function () {
-    return _objectSpread2(_objectSpread2({}, anchorProps), {}, {
-      pinned: "".concat(anchorProps.pinned)
-    });
-  }, [anchorProps]);
+    } : {})
+  }), [active, activeListItemId, listId]);
+  const anchorProps = useMemo(() => ({
+    active,
+    pinned,
+    ...restProps,
+    ...anchorAriaProps
+  }), [pinned, active, restProps, anchorAriaProps]);
+  const anchorComponentProps = useMemo(() => ({
+    ...anchorProps,
+    pinned: `${anchorProps.pinned}`
+  }), [anchorProps]);
   if (typeof anchor === 'string') {
     return /*#__PURE__*/React.createElement(Anchor, anchorComponentProps, anchor);
   }
   if (typeof anchor === 'function') {
-    return anchor(_objectSpread2({
+    return anchor({
       active,
-      pinned
-    }, restProps), anchorAriaProps);
+      pinned,
+      ...restProps
+    }, anchorAriaProps);
   }
   if (!isArray(anchor)) {
     return /*#__PURE__*/cloneElement(anchor, typeof anchor.type === 'string' ? anchorAriaProps : anchorComponentProps);
@@ -149,31 +122,31 @@ DropdownAnchorWrapper.propTypes = {
   activeListItemId: PropTypes.string,
   listId: PropTypes.string
 };
-var DropdownMenu = /*#__PURE__*/React.forwardRef(function DropdownMenu(_ref4, forwardedRef) {
-  var id = _ref4.id,
-    _anchor = _ref4.anchor,
-    ariaLabel = _ref4.ariaLabel,
-    data = _ref4.data,
-    onSelect = _ref4.onSelect,
-    menuProps = _ref4.menuProps,
-    restDropdownProps = _objectWithoutProperties(_ref4, _excluded2);
-  var listId = useMemo(function () {
-    return id || getUID('dropdown-menu-list');
-  }, [id]);
+const DropdownMenu = /*#__PURE__*/React.forwardRef(function DropdownMenu(_ref2, forwardedRef) {
+  let {
+    id,
+    anchor,
+    ariaLabel,
+    data,
+    onSelect,
+    menuProps,
+    ...restDropdownProps
+  } = _ref2;
+  const listId = useMemo(() => id || getUID('dropdown-menu-list'), [id]);
   return /*#__PURE__*/React.createElement(ActiveItemContext.Provider, null, /*#__PURE__*/React.createElement(Dropdown, _extends({
-    anchor: function anchor(_ref5) {
-      var pinned = _ref5.pinned,
-        active = _ref5.active,
-        restAnchorProps = _objectWithoutProperties(_ref5, _excluded3);
-      return /*#__PURE__*/React.createElement(ActiveItemContext.ValueContext.Consumer, null, function (activeItemId) {
-        return /*#__PURE__*/React.createElement(DropdownAnchorWrapper, _extends({
-          anchor: _anchor,
-          pinned: pinned,
-          active: active,
-          activeListItemId: activeItemId,
-          listId: listId
-        }, restAnchorProps));
-      });
+    anchor: _ref3 => {
+      let {
+        pinned,
+        active,
+        ...restAnchorProps
+      } = _ref3;
+      return /*#__PURE__*/React.createElement(ActiveItemContext.ValueContext.Consumer, null, activeItemId => /*#__PURE__*/React.createElement(DropdownAnchorWrapper, _extends({
+        anchor: anchor,
+        pinned: pinned,
+        active: active,
+        activeListItemId: activeItemId,
+        listId: listId
+      }, restAnchorProps)));
     }
   }, restDropdownProps), /*#__PURE__*/React.createElement(PopupMenu, _extends({
     ref: forwardedRef,
@@ -185,13 +158,14 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function DropdownMenu(_ref4, fo
     onSelect: onSelect
   }, menuProps))));
 });
-DropdownMenu.propTypes = _objectSpread2({
+DropdownMenu.propTypes = {
   id: idPropType,
   data: dataPropType,
   ariaLabel: ariaLabelPropType,
   onSelect: onSelectPropType,
-  menuProps: PropTypes.object
-}, dropdownPropTypes);
+  menuProps: PropTypes.object,
+  ...dropdownPropTypes
+};
 var DropdownMenu$1 = Object.assign(DropdownMenu, {
   ListProps: List.ListProps
 });