intergalactic 15.109.0 → 15.110.0-prerelease.0

package/dropdown-menu/lib/cjs/DropdownMenu.js

@@ -7,13 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -21,57 +23,45 @@ var _index = require("intergalactic/utils/lib/core/index");
 var _core = _interopRequireWildcard(require("intergalactic/core"));
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _dropdown = _interopRequireDefault(require("intergalactic/dropdown"));
+var _dropdown = _interopRequireWildcard(require("intergalactic/dropdown"));
 var _flexBox = require("intergalactic/flex-box");
 var _scrollArea = _interopRequireWildcard(require("intergalactic/scroll-area"));
-var _uniqueID = _interopRequireWildcard(require("intergalactic/utils/lib/uniqueID"));
-var _i18nEnhance = _interopRequireDefault(require("intergalactic/utils/lib/enhances/i18nEnhance"));
+var _uniqueID = require("intergalactic/utils/lib/uniqueID");
 var _intergalacticDynamicLocales = require("./translations/__intergalactic-dynamic-locales");
-var _setFocus = require("intergalactic/utils/lib/focus-lock/setFocus");
-var _isFocusInside = require("intergalactic/utils/lib/focus-lock/isFocusInside");
 var _keyboardFocusEnhance = require("intergalactic/utils/lib/enhances/keyboardFocusEnhance");
 var _findComponent = require("intergalactic/utils/lib/findComponent");
+var _ref28 = require("intergalactic/utils/lib/ref");
+var _assignProps13 = require("intergalactic/utils/lib/assignProps");
 var _button = _interopRequireDefault(require("intergalactic/button"));
-var _ref31 = require("intergalactic/utils/lib/ref");
-var _focusSourceEnhance = _interopRequireDefault(require("intergalactic/utils/lib/enhances/focusSourceEnhance"));
 var _excluded = ["className"];
 /*__reshadow-styles__:"./style/dropdown-menu.shadow.css"*/
-var style = ( /*__reshadow_css_start__*/_index.sstyled.insert( /*__inner_css_start__*/".___SDropdownMenuList_15tyi_gg_{max-height:240px;padding:var(--intergalactic-spacing-1x, 4px)0;position:relative;min-height:26px;min-width:32px;box-sizing:content-box;z-index:0;color:var(--intergalactic-text-primary, #191b23)}.___SDropdownMenuList_15tyi_gg_ .___SShadowHorizontal_15tyi_gg_:after,.___SDropdownMenuList_15tyi_gg_ .___SShadowHorizontal_15tyi_gg_:before{width:16px;height:100%;border-radius:var(--intergalactic-control-rounded, 6px)}.___SDropdownMenuList_15tyi_gg_ .___SShadowHorizontal_15tyi_gg_._position_median_15tyi_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-left,\n        linear-gradient(to right, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_15tyi_gg_ .___SShadowHorizontal_15tyi_gg_._position_median_15tyi_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-right,\n        linear-gradient(to left, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_15tyi_gg_ .___SShadowHorizontal_15tyi_gg_._position_start_15tyi_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-left,\n        linear-gradient(to right, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_15tyi_gg_ .___SShadowHorizontal_15tyi_gg_._position_end_15tyi_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-right,\n        linear-gradient(to left, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_15tyi_gg_ .___SShadowVertical_15tyi_gg_:after,.___SDropdownMenuList_15tyi_gg_ .___SShadowVertical_15tyi_gg_:before{width:100%;height:16px;border-radius:var(--intergalactic-control-rounded, 6px)}.___SDropdownMenuList_15tyi_gg_ .___SShadowVertical_15tyi_gg_._position_median_15tyi_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-top,\n        linear-gradient(to bottom, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_15tyi_gg_ .___SShadowVertical_15tyi_gg_._position_median_15tyi_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-bottom,\n        linear-gradient(to top, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_15tyi_gg_ .___SShadowVertical_15tyi_gg_._position_start_15tyi_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-top,\n        linear-gradient(to bottom, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_15tyi_gg_ .___SShadowVertical_15tyi_gg_._position_end_15tyi_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-bottom,\n        linear-gradient(to top, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuItemContainer_15tyi_gg_{position:relative;-webkit-text-decoration:none;text-decoration:none;box-sizing:border-box;cursor:pointer;width:100%;text-align:left;line-height:normal;color:var(--intergalactic-text-primary, #191b23)}@media (hover:hover){.___SDropdownMenuItemContainer_15tyi_gg_:hover{background-color:var(--intergalactic-dropdown-menu-item-hover, #f4f5f9)}}.___SDropdownMenuItemContainer_15tyi_gg_:focus{outline:0}.___SDropdownMenuItemContainer_15tyi_gg_.__selected_15tyi_gg_{background-color:var(--intergalactic-dropdown-menu-item-selected, rgba(196, 229, 254, 0.7));box-shadow:2px 0 0 0 var(--intergalactic-control-primary-info, #008ff8) inset}@media (hover:hover){.___SDropdownMenuItemContainer_15tyi_gg_.__selected_15tyi_gg_:hover{background-color:var(--intergalactic-dropdown-menu-item-selected-hover, #c4e5fe)}}.___SDropdownMenuItemContainer_15tyi_gg_.__highlighted_15tyi_gg_{z-index:1;box-shadow:var(--intergalactic-keyboard-focus, 0px 0px 0px 3px rgba(0, 143, 248, 0.5)) inset}.___SDropdownMenuItemContainer_15tyi_gg_.__disabled_15tyi_gg_{opacity:var(--intergalactic-disabled-opacity, 0.3);cursor:default;pointer-events:none}.___SDropdownMenuItemContainer_15tyi_gg_._size_l_15tyi_gg_{font-size:var(--intergalactic-fs-300, 16px);line-height:var(--intergalactic-lh-300, 150%);padding:var(--intergalactic-spacing-2x, 8px) var(--intergalactic-spacing-3x, 12px);min-height:40px}.___SDropdownMenuItemContainer_15tyi_gg_._size_m_15tyi_gg_{font-size:var(--intergalactic-fs-200, 14px);line-height:var(--intergalactic-lh-200, 142%);padding:calc(var(--intergalactic-spacing-1x, 4px) + var(--intergalactic-spacing-05x, 2px)) var(--intergalactic-spacing-2x, 8px);min-height:32px}.___SDropdownMenuItemContainer_15tyi_gg_.__notInteractive_15tyi_gg_{cursor:default}@media (hover:hover){.___SDropdownMenuItemContainer_15tyi_gg_.__notInteractive_15tyi_gg_:hover{background:0 0}}.___SDropdownMenuItemContainer_15tyi_gg_._variant_hint_15tyi_gg_{color:var(--intergalactic-text-secondary, #6c6e79);cursor:default}@media (hover:hover){.___SDropdownMenuItemContainer_15tyi_gg_._variant_hint_15tyi_gg_:hover{background:0 0}}.___SDropdownMenuItemContainer_15tyi_gg_._variant_title_15tyi_gg_{font-weight:var(--intergalactic-bold, 700);cursor:default}@media (hover:hover){.___SDropdownMenuItemContainer_15tyi_gg_._variant_title_15tyi_gg_:hover{background:0 0}}.___SDropdownMenuItemContainer_15tyi_gg_.__visible_15tyi_gg_{background-color:var(--intergalactic-dropdown-menu-item-hover, #f4f5f9)}.___SDropdownMenuItemContainer_15tyi_gg_.__nesting-trigger_15tyi_gg_{justify-content:space-between}.___SDropdownMenuItemAddon_15tyi_gg_{display:inline-flex;margin-left:var(--intergalactic-spacing-2x, 8px);margin-right:var(--intergalactic-spacing-2x, 8px)}.___SDropdownMenuItemAddon_15tyi_gg_:first-child{margin-left:0}.___SDropdownMenuItemAddon_15tyi_gg_:last-child{margin-right:0}.___SDropdownMenuNesting_15tyi_gg_,.___SDropdownMenuNesting_15tyi_gg_._size_l_15tyi_gg_,.___SDropdownMenuNesting_15tyi_gg_._size_m_15tyi_gg_{padding:0}.___SDropdownMenuNesting_15tyi_gg_.__highlighted_15tyi_gg_{z-index:1;box-shadow:var(--intergalactic-keyboard-focus, 0px 0px 0px 3px rgba(0, 143, 248, 0.5)) inset}.___SDropdownNestingItem_15tyi_gg_._size_l_15tyi_gg_,.___SDropdownNestingItem_15tyi_gg_._size_m_15tyi_gg_{padding-right:0}.___SDropdownNestingItem_15tyi_gg_ .___SDropdownMenuItemContainer_15tyi_gg_{width:auto;padding-top:0;padding-bottom:0;padding-left:0;min-height:auto}.___SGroupTitle_15tyi_gg_{font-weight:var(--intergalactic-bold, 700)}.___SGroupHint_15tyi_gg_,.___SItemHint_15tyi_gg_{color:var(--intergalactic-text-secondary, #6c6e79)}.___SItemContent_15tyi_gg_:focus{outline:0}" /*__inner_css_end__*/, "15tyi_gg_") /*__reshadow_css_end__*/, {
-  "__SDropdownMenuItemContainer": "___SDropdownMenuItemContainer_15tyi_gg_",
-  "_highlighted": "__highlighted_15tyi_gg_",
-  "_disabled": "__disabled_15tyi_gg_",
-  "_size_l": "_size_l_15tyi_gg_",
-  "_size_m": "_size_m_15tyi_gg_",
-  "_visible": "__visible_15tyi_gg_",
-  "_nesting-trigger": "__nesting-trigger_15tyi_gg_",
-  "__SDropdownMenuNesting": "___SDropdownMenuNesting_15tyi_gg_",
-  "__SDropdownNestingItem": "___SDropdownNestingItem_15tyi_gg_",
-  "__SGroupTitle": "___SGroupTitle_15tyi_gg_",
-  "__SGroupHint": "___SGroupHint_15tyi_gg_",
-  "__SItemHint": "___SItemHint_15tyi_gg_",
-  "__SItemContent": "___SItemContent_15tyi_gg_",
-  "__SDropdownMenuList": "___SDropdownMenuList_15tyi_gg_",
-  "__SShadowHorizontal": "___SShadowHorizontal_15tyi_gg_",
-  "_position_median": "_position_median_15tyi_gg_",
-  "_position_start": "_position_start_15tyi_gg_",
-  "_position_end": "_position_end_15tyi_gg_",
-  "__SShadowVertical": "___SShadowVertical_15tyi_gg_",
-  "_selected": "__selected_15tyi_gg_",
-  "_notInteractive": "__notInteractive_15tyi_gg_",
-  "_variant_hint": "_variant_hint_15tyi_gg_",
-  "_variant_title": "_variant_title_15tyi_gg_",
-  "__SDropdownMenuItemAddon": "___SDropdownMenuItemAddon_15tyi_gg_"
+var style = ( /*__reshadow_css_start__*/_index.sstyled.insert( /*__inner_css_start__*/".___SDropdownMenuList_14fg8_gg_{max-height:240px;padding:var(--intergalactic-spacing-1x, 4px)0;position:relative;min-height:26px;min-width:32px;box-sizing:content-box;z-index:0;color:var(--intergalactic-text-primary, #191b23)}.___SDropdownMenuList_14fg8_gg_ .___SShadowHorizontal_14fg8_gg_:after,.___SDropdownMenuList_14fg8_gg_ .___SShadowHorizontal_14fg8_gg_:before{width:16px;height:100%;border-radius:var(--intergalactic-control-rounded, 6px)}.___SDropdownMenuList_14fg8_gg_ .___SShadowHorizontal_14fg8_gg_._position_median_14fg8_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-left,\n        linear-gradient(to right, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_14fg8_gg_ .___SShadowHorizontal_14fg8_gg_._position_median_14fg8_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-right,\n        linear-gradient(to left, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_14fg8_gg_ .___SShadowHorizontal_14fg8_gg_._position_start_14fg8_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-left,\n        linear-gradient(to right, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_14fg8_gg_ .___SShadowHorizontal_14fg8_gg_._position_end_14fg8_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-right,\n        linear-gradient(to left, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_14fg8_gg_ .___SShadowVertical_14fg8_gg_:after,.___SDropdownMenuList_14fg8_gg_ .___SShadowVertical_14fg8_gg_:before{width:100%;height:16px;border-radius:var(--intergalactic-control-rounded, 6px)}.___SDropdownMenuList_14fg8_gg_ .___SShadowVertical_14fg8_gg_._position_median_14fg8_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-top,\n        linear-gradient(to bottom, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_14fg8_gg_ .___SShadowVertical_14fg8_gg_._position_median_14fg8_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-bottom,\n        linear-gradient(to top, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_14fg8_gg_ .___SShadowVertical_14fg8_gg_._position_start_14fg8_gg_:before{background:var(--intergalactic-scroll-area-dropdown-menu-top,\n        linear-gradient(to bottom, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuList_14fg8_gg_ .___SShadowVertical_14fg8_gg_._position_end_14fg8_gg_:after{background:var(--intergalactic-scroll-area-dropdown-menu-bottom,\n        linear-gradient(to top, rgba(255, 255, 255, 1) 34.38%, rgba(255, 255, 255, 0) 100%)\n      )}.___SDropdownMenuItemContainer_14fg8_gg_.__nesting-trigger_14fg8_gg_{justify-content:space-between}.___SDropdownMenuItemAddon_14fg8_gg_{display:inline-flex;margin-left:var(--intergalactic-spacing-2x, 8px);margin-right:var(--intergalactic-spacing-2x, 8px)}.___SDropdownMenuItemAddon_14fg8_gg_:first-child{margin-left:0}.___SDropdownMenuItemAddon_14fg8_gg_:last-child{margin-right:0}.___SDropdownMenuNesting_14fg8_gg_,.___SDropdownMenuNesting_14fg8_gg_._size_l_14fg8_gg_,.___SDropdownMenuNesting_14fg8_gg_._size_m_14fg8_gg_{padding:0}.___SDropdownMenuNesting_14fg8_gg_.__highlighted_14fg8_gg_{z-index:1;box-shadow:var(--intergalactic-keyboard-focus, 0px 0px 0px 3px rgba(0, 143, 248, 0.5)) inset}.___SDropdownNestingItem_14fg8_gg_._size_l_14fg8_gg_,.___SDropdownNestingItem_14fg8_gg_._size_m_14fg8_gg_{padding-right:0}.___SDropdownNestingItem_14fg8_gg_ .___SDropdownMenuItemContainer_14fg8_gg_{width:auto;padding-top:0;padding-bottom:0;padding-left:0;min-height:auto}.___SItemContent_14fg8_gg_:focus{outline:0}.___SItemHint_14fg8_gg_{color:var(--intergalactic-text-secondary, #6c6e79)}" /*__inner_css_end__*/, "14fg8_gg_") /*__reshadow_css_end__*/, {
+  "__SDropdownMenuItemContainer": "___SDropdownMenuItemContainer_14fg8_gg_",
+  "_nesting-trigger": "__nesting-trigger_14fg8_gg_",
+  "__SDropdownMenuNesting": "___SDropdownMenuNesting_14fg8_gg_",
+  "_size_l": "_size_l_14fg8_gg_",
+  "_size_m": "_size_m_14fg8_gg_",
+  "_highlighted": "__highlighted_14fg8_gg_",
+  "__SDropdownNestingItem": "___SDropdownNestingItem_14fg8_gg_",
+  "__SItemContent": "___SItemContent_14fg8_gg_",
+  "__SItemHint": "___SItemHint_14fg8_gg_",
+  "__SDropdownMenuList": "___SDropdownMenuList_14fg8_gg_",
+  "__SShadowHorizontal": "___SShadowHorizontal_14fg8_gg_",
+  "_position_median": "_position_median_14fg8_gg_",
+  "_position_start": "_position_start_14fg8_gg_",
+  "_position_end": "_position_end_14fg8_gg_",
+  "__SShadowVertical": "___SShadowVertical_14fg8_gg_",
+  "__SDropdownMenuItemAddon": "___SDropdownMenuItemAddon_14fg8_gg_"
 });
-var ListBoxContextProvider = function ListBoxContextProvider(_ref22) {
-  var children = _ref22.children;
+var ListBoxContextProvider = function ListBoxContextProvider(_ref20) {
+  var children = _ref20.children;
   return /*#__PURE__*/_react["default"].createElement(_scrollArea.hideScrollBarsFromScreenReadersContext.Provider, {
     value: true
   }, children);
 };
-var selectedIndexContext = /*#__PURE__*/_react["default"].createContext(0);
 var menuItemContext = /*#__PURE__*/_react["default"].createContext({});
-var DropdownMenuRoot = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(DropdownMenuRoot, _Component);
+var DropdownMenuRoot = /*#__PURE__*/function (_AbstractDropdown) {
+  (0, _inherits2["default"])(DropdownMenuRoot, _AbstractDropdown);
   var _super = (0, _createSuper2["default"])(DropdownMenuRoot);
   function DropdownMenuRoot() {
     var _this;
@@ -80,281 +70,65 @@ var DropdownMenuRoot = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "popperRef", /*#__PURE__*/_react["default"].createRef());
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "triggerRef", /*#__PURE__*/_react["default"].createRef());
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "menuRef", /*#__PURE__*/_react["default"].createRef());
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "itemProps", []);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "itemRefs", []);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "highlightedItemRef", /*#__PURE__*/_react["default"].createRef());
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "prevHighlightedIndex", null);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleClickTrigger", function (e) {
-      e.preventDefault();
-      _this.handlers.visible(true);
-      setTimeout(function () {
-        var element = _this.itemRefs[_this.asProps.highlightedIndex];
-        element === null || element === void 0 ? void 0 : element.focus();
-      }, 0);
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "bindHandlerKeyDown", function (place) {
-      return function (e) {
-        var amount = e.shiftKey ? 5 : 1;
-        var targetTagName = e.target.tagName;
-        var _this$asProps = _this.asProps,
-          visible = _this$asProps.visible,
-          highlightedIndex = _this$asProps.highlightedIndex,
-          placement = _this$asProps.placement,
-          inlineActions = _this$asProps.inlineActions;
-        if (e.key === ' ' && ['INPUT', 'TEXTAREA'].includes(targetTagName)) return;
-        if (e.key === 'Enter' && targetTagName === 'TEXTAREA') return;
-        if (place === 'popper' && (e.key === ' ' || e.key === 'Enter') && (targetTagName === 'BUTTON' || targetTagName === 'A')) return;
-        if (place === 'trigger' && ['ArrowDown', 'ArrowUp', 'Enter', ' '].includes(e.key) && e.target.getAttribute('role') !== 'menuitem') {
-          _this.handleClickTrigger(e);
-        }
-        var show = e.key === 'ArrowRight' && placement.startsWith('right') || e.key === 'ArrowLeft' && placement.startsWith('left');
-        var hide = e.key === 'ArrowLeft' && placement.startsWith('right') || e.key === 'ArrowRight' && placement.startsWith('left') || e.key === 'Escape';
-        var isMenuItem = e.target.getAttribute('role') === 'menuitem';
-        if (place === 'trigger' && (!visible || inlineActions) && show && isMenuItem) {
-          _this.handlers.visible(true);
-          _this.handlers.highlightedIndex(0);
-          setTimeout(function () {
-            var _this$itemRefs$_this$;
-            (_this$itemRefs$_this$ = _this.itemRefs[_this.asProps.highlightedIndex]) === null || _this$itemRefs$_this$ === void 0 ? void 0 : _this$itemRefs$_this$.focus();
-          }, 0);
-          e.preventDefault();
-          e.stopPropagation();
-          return;
-        }
-        if (place === 'list' && visible && hide && isMenuItem) {
-          if (!inlineActions || inlineActions && (e.key === 'Escape' || _this.asProps.highlightedIndex === 0)) {
-            var _this$triggerRef$curr;
-            _this.handlers.visible(false);
-            (_this$triggerRef$curr = _this.triggerRef.current) === null || _this$triggerRef$curr === void 0 ? void 0 : _this$triggerRef$curr.focus();
-            e.preventDefault();
-            e.stopPropagation();
-            return;
-          }
-        }
-        if (place === 'list') {
-          switch (e.key) {
-            case 'ArrowDown':
-              {
-                if (visible && !inlineActions) {
-                  var _this$itemRefs$newHig;
-                  var newHighlightedIndex = _this.getHighlightedIndex(amount);
-                  (_this$itemRefs$newHig = _this.itemRefs[newHighlightedIndex]) === null || _this$itemRefs$newHig === void 0 ? void 0 : _this$itemRefs$newHig.focus();
-                  _this.handlers.highlightedIndex(newHighlightedIndex, e);
-                  e.preventDefault();
-                  e.stopPropagation();
-                }
-                break;
-              }
-            case 'ArrowRight':
-              {
-                if (visible && inlineActions) {
-                  var _this$itemRefs$_newHi;
-                  var _newHighlightedIndex = _this.getHighlightedIndex(amount);
-                  (_this$itemRefs$_newHi = _this.itemRefs[_newHighlightedIndex]) === null || _this$itemRefs$_newHi === void 0 ? void 0 : _this$itemRefs$_newHi.focus();
-                  _this.handlers.highlightedIndex(_newHighlightedIndex, e);
-                  e.preventDefault();
-                  e.stopPropagation();
-                }
-                break;
-              }
-            case 'ArrowUp':
-              {
-                if (visible && !inlineActions) {
-                  var _this$itemRefs$_newHi2;
-                  var _newHighlightedIndex2 = _this.getHighlightedIndex(-amount);
-                  (_this$itemRefs$_newHi2 = _this.itemRefs[_newHighlightedIndex2]) === null || _this$itemRefs$_newHi2 === void 0 ? void 0 : _this$itemRefs$_newHi2.focus();
-                  _this.handlers.highlightedIndex(_newHighlightedIndex2, e);
-                  e.preventDefault();
-                  e.stopPropagation();
-                }
-                break;
-              }
-            case 'ArrowLeft':
-              {
-                if (visible && inlineActions) {
-                  var _this$itemRefs$_newHi3;
-                  var _newHighlightedIndex3 = _this.getHighlightedIndex(-amount);
-                  (_this$itemRefs$_newHi3 = _this.itemRefs[_newHighlightedIndex3]) === null || _this$itemRefs$_newHi3 === void 0 ? void 0 : _this$itemRefs$_newHi3.focus();
-                  _this.handlers.highlightedIndex(_newHighlightedIndex3, e);
-                  e.preventDefault();
-                  e.stopPropagation();
-                }
-                break;
-              }
-            case ' ':
-            case 'Enter':
-              if (_this.highlightedItemRef.current && highlightedIndex !== null) {
-                e.stopPropagation();
-                e.preventDefault();
-                _this.highlightedItemRef.current.click();
-              }
-              break;
-          }
-        }
-      };
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "scrollToNode", function (node) {
-      if (node) {
-        _this.highlightedItemRef.current = node;
-      }
-      setTimeout(function () {
-        if (node !== null && node !== void 0 && node.scrollIntoView) {
-          if (_this.asProps.highlightedIndex !== _this.prevHighlightedIndex) {
-            _this.prevHighlightedIndex = _this.asProps.highlightedIndex;
-            node.scrollIntoView({
-              block: 'nearest',
-              inline: 'nearest'
-            });
-          }
-        }
-      }, 0);
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getHighlightedIndex", function (amount) {
-      var _this$itemProps$newIn;
-      var highlightedIndex = _this.asProps.highlightedIndex;
-      var itemsLastIndex = _this.itemProps.length - 1;
-      var selectedIndex = _this.itemProps.findIndex(function (item) {
-        return item.selected;
-      });
-      if (itemsLastIndex < 0) return;
-      if (highlightedIndex == null) {
-        if (selectedIndex !== -1) {
-          highlightedIndex = selectedIndex;
-        } else if (_this.highlightedItemRef.current) {
-          highlightedIndex = _this.prevHighlightedIndex;
-        } else {
-          highlightedIndex = amount < 0 ? 0 : itemsLastIndex;
-        }
-      }
-      var newIndex = highlightedIndex + amount;
-      if (newIndex < 0) {
-        newIndex = amount + itemsLastIndex + 1;
-      } else if (newIndex > itemsLastIndex) {
-        newIndex = newIndex - itemsLastIndex - 1;
-      }
-      if ((_this$itemProps$newIn = _this.itemProps[newIndex]) !== null && _this$itemProps$newIn !== void 0 && _this$itemProps$newIn.disabled) {
-        _this.getHighlightedIndex(amount < 0 ? amount - 1 : amount + 1);
-      } else if (!_this.itemProps[newIndex]) {
-        return 0;
-      } else {
-        return newIndex;
-      }
-    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "role", 'menu');
     return _this;
   }
   (0, _createClass2["default"])(DropdownMenuRoot, [{
-    key: "uncontrolledProps",
-    value: function uncontrolledProps() {
-      var _this2 = this;
-      return {
-        selectedIndex: null,
-        highlightedIndex: [null, function (index) {
-          _this2.handlers.selectedIndex(index);
-        }],
-        visible: null
-      };
+    key: "itemRef",
+    value: function itemRef(props, index, node) {
+      (0, _get2["default"])((0, _getPrototypeOf2["default"])(DropdownMenuRoot.prototype), "itemRef", this).call(this, props, index, node);
+      if (node === document.activeElement) {
+        (0, _get2["default"])((0, _getPrototypeOf2["default"])(DropdownMenuRoot.prototype), "scrollToNode", this).call(this, node);
+      }
     }
   }, {
     key: "getTriggerProps",
     value: function getTriggerProps() {
-      var _this$asProps2 = this.asProps,
-        size = _this$asProps2.size,
-        uid = _this$asProps2.uid,
-        disablePortal = _this$asProps2.disablePortal,
-        visible = _this$asProps2.visible,
-        getI18nText = _this$asProps2.getI18nText;
-      return {
-        size: size,
-        id: "igc-".concat(uid, "-trigger"),
-        'aria-controls': visible ? "igc-".concat(uid, "-list") : undefined,
-        focusHint: visible && !disablePortal ? getI18nText('triggerHint') : undefined,
-        'aria-expanded': visible ? 'true' : 'false',
-        onKeyDown: this.bindHandlerKeyDown('trigger'),
-        onClick: this.handleClickTrigger,
-        ref: this.triggerRef
-      };
+      var _this$asProps = this.asProps,
+        Children = _this$asProps.Children,
+        uid = _this$asProps.uid,
+        visible = _this$asProps.visible;
+      var hasMenu = (0, _findComponent.isAdvanceMode)(Children, [DropdownMenu.Menu.displayName]);
+      var ariaControls = hasMenu ? "igc-".concat(uid, "-list") : "igc-".concat(uid, "-popper");
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _get2["default"])((0, _getPrototypeOf2["default"])(DropdownMenuRoot.prototype), "getTriggerProps", this).call(this)), {}, {
+        onKeyDown: (0, _assignProps13.callAllEventHandlers)(this.handlePreventCommonKeyDown.bind(this), this.handleOpenKeyDown.bind(this), this.handleKeyDownForMenu('trigger')),
+        'aria-controls': visible ? ariaControls : undefined,
+        'aria-haspopup': hasMenu ? 'true' : 'dialog'
+      });
     }
   }, {
     key: "getListProps",
     value: function getListProps() {
-      var _this$triggerRef$curr2;
-      var _this$asProps3 = this.asProps,
-        size = _this$asProps3.size,
-        uid = _this$asProps3.uid;
-      var triggerId = (_this$triggerRef$curr2 = this.triggerRef.current) === null || _this$triggerRef$curr2 === void 0 ? void 0 : _this$triggerRef$curr2.id;
-      return {
-        size: size,
-        index: this.asProps.highlightedIndex,
-        tabIndex: -1,
-        onKeyDown: this.bindHandlerKeyDown('list'),
-        ref: this.menuRef,
-        id: "igc-".concat(uid, "-list"),
-        role: 'menu',
-        'aria-labelledby': triggerId
-      };
-    }
-  }, {
-    key: "getActionsProps",
-    value: function getActionsProps() {
-      return this.getListProps();
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _get2["default"])((0, _getPrototypeOf2["default"])(DropdownMenuRoot.prototype), "getListProps", this).call(this)), {}, {
+        onKeyDown: (0, _assignProps13.callAllEventHandlers)(this.handlePreventCommonKeyDown.bind(this), this.handleKeyDownForMenu('list'), this.handleArrowKeyDown.bind(this))
+      });
     }
   }, {
     key: "getPopperProps",
     value: function getPopperProps() {
-      var _this$asProps4 = this.asProps,
-        uid = _this$asProps4.uid,
-        disablePortal = _this$asProps4.disablePortal,
-        ignorePortalsStacking = _this$asProps4.ignorePortalsStacking,
-        interaction = _this$asProps4.interaction,
-        highlightedIndex = _this$asProps4.highlightedIndex;
-      return {
-        ref: this.popperRef,
-        tabIndex: -1,
-        id: "igc-".concat(uid, "-popper"),
-        disablePortal: disablePortal,
-        ignorePortalsStacking: ignorePortalsStacking,
-        focusMaster: interaction === 'click',
-        hideFocus: highlightedIndex !== null,
-        'use:role': null,
-        'use:autoFocus': false
-      };
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _get2["default"])((0, _getPrototypeOf2["default"])(DropdownMenuRoot.prototype), "getPopperProps", this).call(this)), {}, {
+        onKeyDown: (0, _assignProps13.callAllEventHandlers)(this.handlePreventCommonKeyDown.bind(this), this.handlePreventPopperKeyDown.bind(this)
+        // this.handleKeyDownForPopper.bind(this),
+        )
+      });
     }
   }, {
-    key: "getGroupProps",
-    value: function getGroupProps() {
-      var size = this.asProps.size;
-      return {
-        size: size
-      };
+    key: "getActionsProps",
+    value: function getActionsProps() {
+      return this.getListProps();
     }
   }, {
     key: "getItemProps",
     value: function getItemProps(props, index) {
-      var _this3 = this;
-      var _this$asProps5 = this.asProps,
-        size = _this$asProps5.size,
-        uid = _this$asProps5.uid;
-      var ref = function ref(node) {
-        if ((node === null || node === void 0 ? void 0 : node.getAttribute('role')) === 'menuitem') {
-          _this3.itemRefs[index] = node;
-        }
-        if (node === document.activeElement) {
-          _this3.scrollToNode(node);
-        }
-      };
-      this.itemProps[index] = props;
-      var itemProps = {
-        id: "igc-".concat(uid, "-option-").concat(index),
-        size: size,
-        ref: ref,
-        index: index,
-        onMouseEnter: function onMouseEnter() {
-          return _this3.handlers.selectedIndex(index);
+      var _this2 = this;
+      var highlightedIndex = this.asProps.highlightedIndex;
+      var isHighlighted = index === highlightedIndex;
+      var itemProps = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _get2["default"])((0, _getPrototypeOf2["default"])(DropdownMenuRoot.prototype), "getItemProps", this).call(this, props, index)), {}, {
+        tabIndex: isHighlighted ? 0 : -1,
+        ref: function ref(node) {
+          return _this2.itemRef(props, index, node);
         }
-      };
+      });
       if (props.tag === _button["default"]) {
         var _props$use, _props$theme, _props$size;
         itemProps.use = (_props$use = props.use) !== null && _props$use !== void 0 ? _props$use : 'tertiary';
@@ -364,46 +138,52 @@ var DropdownMenuRoot = /*#__PURE__*/function (_Component) {
       return itemProps;
     }
   }, {
-    key: "getItemHintProps",
-    value: function getItemHintProps() {
-      var size = this.asProps.size;
-      return {
-        size: size
-      };
-    }
-  }, {
-    key: "getItemTitleProps",
-    value: function getItemTitleProps() {
-      var size = this.asProps.size;
-      return {
-        size: size
-      };
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var visibilityChanged = this.asProps.visible !== prevProps.visible;
-      if (visibilityChanged && prevProps.visible !== undefined) {
-        if (!this.asProps.visible) {
-          this.handlers.highlightedIndex(null);
-          this.highlightedItemRef.current = null;
-          if ((document.activeElement === document.body || (0, _isFocusInside.isFocusInside)(this.popperRef.current)) && this.asProps.focusSourceRef.current === 'keyboard') {
-            (0, _setFocus.setFocus)(this.triggerRef.current);
+    key: "handleKeyDownForMenu",
+    value: function handleKeyDownForMenu(place) {
+      var _this3 = this;
+      return function (e) {
+        var _this3$asProps = _this3.asProps,
+          visible = _this3$asProps.visible,
+          placement = _this3$asProps.placement,
+          inlineActions = _this3$asProps.inlineActions;
+        var show = e.key === 'ArrowRight' && (placement === null || placement === void 0 ? void 0 : placement.startsWith('right')) || e.key === 'ArrowLeft' && (placement === null || placement === void 0 ? void 0 : placement.startsWith('left'));
+        var hide = e.key === 'ArrowLeft' && (placement === null || placement === void 0 ? void 0 : placement.startsWith('right')) || e.key === 'ArrowRight' && (placement === null || placement === void 0 ? void 0 : placement.startsWith('left')) || e.key === 'Escape';
+        var isMenuItem = e.target.getAttribute('role') === (0, _get2["default"])((0, _getPrototypeOf2["default"])(DropdownMenuRoot.prototype), "childRole", _this3);
+        if (place === 'trigger' && (!visible || inlineActions) && show && isMenuItem) {
+          _this3.handlers.visible(true);
+          _this3.handlers.highlightedIndex(0);
+          setTimeout(function () {
+            var _this3$itemRefs$highl;
+            var highlightedIndex = _this3.asProps.highlightedIndex;
+            (_this3$itemRefs$highl = _this3.itemRefs[highlightedIndex]) === null || _this3$itemRefs$highl === void 0 ? void 0 : _this3$itemRefs$highl.focus();
+          }, 0);
+          e.preventDefault();
+          e.stopPropagation();
+          return false;
+        }
+        if (place === 'list' && visible && hide && isMenuItem) {
+          if (!inlineActions || inlineActions && (e.key === 'Escape' || _this3.asProps.highlightedIndex === 0)) {
+            var _this3$triggerRef$cur;
+            _this3.handlers.visible(false);
+            (_this3$triggerRef$cur = _this3.triggerRef.current) === null || _this3$triggerRef$cur === void 0 ? void 0 : _this3$triggerRef$cur.focus();
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
           }
         }
-      }
+      };
     }
   }, {
     key: "render",
     value: function render() {
       var _ref = this.asProps;
-      var _this$asProps6 = this.asProps,
-        Children = _this$asProps6.Children,
-        selectedIndex = _this$asProps6.selectedIndex,
-        interaction = _this$asProps6.interaction,
-        timeout = _this$asProps6.timeout;
+      var _this$asProps2 = this.asProps,
+        Children = _this$asProps2.Children,
+        selectedIndex = _this$asProps2.selectedIndex,
+        interaction = _this$asProps2.interaction,
+        timeout = _this$asProps2.timeout;
       this.itemProps = [];
-      return /*#__PURE__*/_react["default"].createElement(selectedIndexContext.Provider, {
+      return /*#__PURE__*/_react["default"].createElement(_dropdown.selectedIndexContext.Provider, {
         value: selectedIndex
       }, /*#__PURE__*/_react["default"].createElement(_dropdown["default"], (0, _core.assignProps)({
         "timeout": timeout || (interaction === 'hover' ? [0, 100] : undefined)
@@ -411,10 +191,10 @@ var DropdownMenuRoot = /*#__PURE__*/function (_Component) {
     }
   }]);
   return DropdownMenuRoot;
-}(_core.Component);
+}(_dropdown.AbstractDropdown);
 (0, _defineProperty2["default"])(DropdownMenuRoot, "displayName", 'DropdownMenu');
 (0, _defineProperty2["default"])(DropdownMenuRoot, "style", style);
-(0, _defineProperty2["default"])(DropdownMenuRoot, "enhance", [(0, _uniqueID["default"])(), (0, _i18nEnhance["default"])(_intergalacticDynamicLocales.localizedMessages), (0, _focusSourceEnhance["default"])()]);
+(0, _defineProperty2["default"])(DropdownMenuRoot, "enhance", Object.values(_dropdown.enhance));
 (0, _defineProperty2["default"])(DropdownMenuRoot, "defaultProps", {
   size: 'm',
   defaultVisible: false,
@@ -427,28 +207,28 @@ var DropdownMenuRoot = /*#__PURE__*/function (_Component) {
   placement: 'bottom-start',
   timeout: 0
 });
-function List(_ref23) {
+function List(_ref21) {
   var _ref2 = arguments[0],
-    _ref14;
-  var styles = _ref23.styles,
-    Children = _ref23.Children;
+    _ref13;
+  var styles = _ref21.styles,
+    Children = _ref21.Children;
   var SDropdownMenuList = _scrollArea["default"];
-  return _ref14 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(ListBoxContextProvider, _ref14.cn("ListBoxContextProvider", {}), /*#__PURE__*/_react["default"].createElement(SDropdownMenuList, _ref14.cn("SDropdownMenuList", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
+  return _ref13 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(ListBoxContextProvider, _ref13.cn("ListBoxContextProvider", {}), /*#__PURE__*/_react["default"].createElement(SDropdownMenuList, _ref13.cn("SDropdownMenuList", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
     "shadow": true
   }, _ref2))), /*#__PURE__*/_react["default"].createElement(_scrollArea["default"].Container, {
     tabIndex: undefined
-  }, /*#__PURE__*/_react["default"].createElement(Children, _ref14.cn("Children", {}))), /*#__PURE__*/_react["default"].createElement(_scrollArea["default"].Bar, {
+  }, /*#__PURE__*/_react["default"].createElement(Children, _ref13.cn("Children", {}))), /*#__PURE__*/_react["default"].createElement(_scrollArea["default"].Bar, {
     orientation: "horizontal"
   }), /*#__PURE__*/_react["default"].createElement(_scrollArea["default"].Bar, {
     orientation: "vertical"
   })));
 }
-function Actions(_ref24) {
+function Actions(_ref22) {
   var _ref3 = arguments[0],
-    _ref15;
-  var styles = _ref24.styles;
+    _ref14;
+  var styles = _ref22.styles;
   var SDropdownMenuActions = _flexBox.Flex;
-  return _ref15 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(SDropdownMenuActions, _ref15.cn("SDropdownMenuActions", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({}, _ref3))));
+  return _ref14 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(SDropdownMenuActions, _ref14.cn("SDropdownMenuActions", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({}, _ref3))));
 }
 function Menu(props) {
   var _ref4 = arguments[0];
@@ -468,17 +248,20 @@ function Menu(props) {
     autoFocus: autoFocus,
     animationsDisabled: animationsDisabled
   };
-  return /*#__PURE__*/_react["default"].createElement(ListBoxContextProvider, null, /*#__PURE__*/_react["default"].createElement(DropdownMenu.Popper, popperProps, /*#__PURE__*/_react["default"].createElement(DropdownMenu.List, (0, _core.assignProps)({}, _ref4))));
+  return /*#__PURE__*/_react["default"].createElement(ListBoxContextProvider, null, /*#__PURE__*/_react["default"].createElement(DropdownMenu.Popper, (0, _extends2["default"])({}, popperProps, {
+    role: null
+  }), /*#__PURE__*/_react["default"].createElement(DropdownMenu.List, (0, _core.assignProps)({}, _ref4))));
 }
-function Item(_ref25) {
+function Item(_ref23) {
   var _ref5 = arguments[0],
-    _ref16;
-  var id = _ref25.id,
-    styles = _ref25.styles,
-    disabled = _ref25.disabled,
-    Children = _ref25.Children,
-    forwardRef = _ref25.forwardRef;
-  var SDropdownMenuItemContainer = _flexBox.Box;
+    _ref15;
+  var id = _ref23.id,
+    styles = _ref23.styles,
+    disabled = _ref23.disabled,
+    Children = _ref23.Children,
+    forwardRef = _ref23.forwardRef,
+    role = _ref23.role;
+  var SDropdownMenuItemContainer = _dropdown["default"].Item;
   var itemRef = _react["default"].useRef();
   var _React$useState = _react["default"].useState(false),
     _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
@@ -486,7 +269,8 @@ function Item(_ref25) {
     setHighlighted = _React$useState2[1];
   var menuItemContextValue = {
     contentId: id,
-    ref: (0, _ref31.forkRef)(forwardRef, itemRef)
+    ref: (0, _ref28.forkRef)(forwardRef, itemRef),
+    role: role
   };
   var ariaDescribes = [];
   var hasSubMenu = (0, _findComponent.isAdvanceMode)(Children, [DropdownMenu.displayName], true);
@@ -531,15 +315,15 @@ function Item(_ref25) {
     };
   }, [itemRef.current]);
   var focusSourceRef = (0, _keyboardFocusEnhance.useFocusSource)();
-  return _ref16 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(menuItemContext.Provider, {
+  return _ref15 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(menuItemContext.Provider, {
     value: menuItemContextValue
-  }, /*#__PURE__*/_react["default"].createElement(SDropdownMenuItemContainer, _ref16.cn("SDropdownMenuItemContainer", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
+  }, /*#__PURE__*/_react["default"].createElement(SDropdownMenuItemContainer, _ref15.cn("SDropdownMenuItemContainer", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
     "ref": advancedMode ? undefined : menuItemContextValue.ref,
     "use:highlighted": !disabled && highlighted && focusSourceRef.current === 'keyboard',
-    "role": advancedMode ? undefined : 'menuitem',
+    "use:role": advancedMode ? undefined : role,
     "use:id": advancedMode ? undefined : id,
     "tabIndex": advancedMode ? undefined : -1
-  }, _ref5))), /*#__PURE__*/_react["default"].createElement(Children, _ref16.cn("Children", {}))));
+  }, _ref5))), /*#__PURE__*/_react["default"].createElement(Children, _ref15.cn("Children", {}))));
 }
 function Addon(props) {
   var _useBox = (0, _flexBox.useBox)(props, props.forwardRef),
@@ -555,47 +339,12 @@ function Addon(props) {
 }
 function Trigger() {
   var _ref6 = arguments[0];
-  return /*#__PURE__*/_react["default"].createElement(_dropdown["default"].Trigger, (0, _core.assignProps)({
-    "aria-haspopup": 'true'
-  }, _ref6));
+  return /*#__PURE__*/_react["default"].createElement(_dropdown["default"].Trigger, (0, _core.assignProps)({}, _ref6));
 }
-function Group(_ref26) {
+function ItemContent(_ref24) {
   var _ref7 = arguments[0],
-    _ref17;
-  var styles = _ref26.styles,
-    title = _ref26.title,
-    Children = _ref26.Children,
-    subTitle = _ref26.subTitle,
-    size = _ref26.size;
-  var SGroup = _flexBox.Box;
-  var SDropdownMenuItemContainer = _flexBox.Box;
-  var SGroupTitle = _flexBox.Flex;
-  var SGroupHint = _flexBox.Flex;
-  var uidTitle = (0, _uniqueID.useUID)('title_mi_group');
-  var uidSubTitle = (0, _uniqueID.useUID)('sub_title_mi_group');
-  var groupAriaProps = {
-    'aria-labelledby': uidTitle,
-    'aria-describedby': subTitle ? uidSubTitle : undefined
-  };
-  return _ref17 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(SDropdownMenuItemContainer, _ref17.cn("SDropdownMenuItemContainer", {
-    "notInteractive": true,
-    "aria-hidden": 'true',
-    "tabindex": -1,
-    "size": size
-  }), /*#__PURE__*/_react["default"].createElement(SGroupTitle, _ref17.cn("SGroupTitle", {
-    "id": uidTitle
-  }), title), subTitle && /*#__PURE__*/_react["default"].createElement(SGroupHint, _ref17.cn("SGroupHint", {
-    "id": uidSubTitle
-  }), subTitle)), /*#__PURE__*/_react["default"].createElement(SGroup, _ref17.cn("SGroup", (0, _objectSpread2["default"])({}, (0, _core.assignProps)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-    "role": 'group'
-  }, groupAriaProps), {}, {
-    "__excludeProps": ['title']
-  }), _ref7))), /*#__PURE__*/_react["default"].createElement(Children, _ref17.cn("Children", {}))));
-}
-function ItemContent(_ref27) {
-  var _ref8 = arguments[0],
-    _ref18;
-  var styles = _ref27.styles;
+    _ref16;
+  var styles = _ref24.styles;
   var SItemContent = _flexBox.Flex;
   var ref = _react["default"].useRef();
   var menuItemCtxValue = _react["default"].useContext(menuItemContext);
@@ -617,76 +366,76 @@ function ItemContent(_ref27) {
       });
     }
   }, [menuItemCtxValue.ariaDescribes]);
-  return _ref18 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(SItemContent, _ref18.cn("SItemContent", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
-    "role": 'menuitem',
+  return _ref16 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(SItemContent, _ref16.cn("SItemContent", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
+    "role": menuItemCtxValue.role,
     "id": menuItemCtxValue.contentId,
     "tabIndex": -1,
-    "ref": (0, _ref31.forkRef)(menuItemCtxValue.ref, ref),
+    "ref": (0, _ref28.forkRef)(menuItemCtxValue.ref, ref),
     "use:aria-describedby": (0, _toConsumableArray2["default"])(describedby).join(' '),
     "aria-haspopup": menuItemCtxValue.hasSubMenu ? 'true' : undefined,
     "aria-expanded": subMenu,
     "alignItems": menuItemCtxValue.hasSubMenu ? 'center' : undefined,
     "justifyContent": menuItemCtxValue.hasSubMenu ? 'space-between' : undefined
-  }, _ref8))));
+  }, _ref7))));
 }
-function ItemHint(_ref28) {
-  var _ref9 = arguments[0],
-    _ref19;
-  var styles = _ref28.styles;
+function ItemHint(_ref25) {
+  var _ref8 = arguments[0],
+    _ref17;
+  var styles = _ref25.styles;
   var SItemHint = _flexBox.Flex;
   var _React$useContext = _react["default"].useContext(menuItemContext),
     hintId = _React$useContext.hintId;
-  return _ref19 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(SItemHint, _ref19.cn("SItemHint", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
+  return _ref17 = (0, _core.sstyled)(styles), /*#__PURE__*/_react["default"].createElement(SItemHint, _ref17.cn("SItemHint", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
     "id": hintId,
     "aria-hidden": 'true'
-  }, _ref9))));
+  }, _ref8))));
 }
 
 /**
  * @deprecated Use Item hint
  */
 function Hint(props) {
-  var _ref10 = arguments[0],
-    _ref20;
-  var SDropdownMenuItemContainer = _flexBox.Flex;
-  return _ref20 = (0, _core.sstyled)(props.styles), /*#__PURE__*/_react["default"].createElement(SDropdownMenuItemContainer, _ref20.cn("SDropdownMenuItemContainer", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
+  var _ref9 = arguments[0],
+    _ref18;
+  var SDropdownMenuItemContainer = _dropdown["default"].Item;
+  return _ref18 = (0, _core.sstyled)(props.styles), /*#__PURE__*/_react["default"].createElement(SDropdownMenuItemContainer, _ref18.cn("SDropdownMenuItemContainer", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
     "variant": 'hint'
-  }, _ref10))));
+  }, _ref9))));
 }
 /**
  * @deprecated Use Group with title prop
  */
 function Title(props) {
-  var _ref11 = arguments[0],
-    _ref21;
-  var SDropdownMenuItemContainer = _flexBox.Flex;
-  return _ref21 = (0, _core.sstyled)(props.styles), /*#__PURE__*/_react["default"].createElement(SDropdownMenuItemContainer, _ref21.cn("SDropdownMenuItemContainer", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
+  var _ref10 = arguments[0],
+    _ref19;
+  var SDropdownMenuItemContainer = _dropdown["default"].Item;
+  return _ref19 = (0, _core.sstyled)(props.styles), /*#__PURE__*/_react["default"].createElement(SDropdownMenuItemContainer, _ref19.cn("SDropdownMenuItemContainer", (0, _objectSpread2["default"])({}, (0, _core.assignProps)({
     "variant": 'title'
-  }, _ref11))));
+  }, _ref10))));
 }
 
 /**
  * @deprecated
  */
-function Nesting(_ref29) {
-  var _ref12 = arguments[0];
-  var forwardRef = _ref29.forwardRef;
+function Nesting(_ref26) {
+  var _ref11 = arguments[0];
+  var forwardRef = _ref26.forwardRef;
   return /*#__PURE__*/_react["default"].createElement(DropdownMenu.Item, (0, _core.assignProps)({
     "ref": forwardRef
-  }, _ref12));
+  }, _ref11));
 }
 
 /**
  * @deprecated
  */
-function NestingTrigger(_ref30) {
-  var _ref13 = arguments[0];
-  var forwardRef = _ref30.forwardRef;
+function NestingTrigger(_ref27) {
+  var _ref12 = arguments[0];
+  var forwardRef = _ref27.forwardRef;
   return /*#__PURE__*/_react["default"].createElement(DropdownMenu.Item.Content, (0, _core.assignProps)({
     "tag": DropdownMenu.Trigger,
     "ref": forwardRef,
     "use:role": 'menuitem'
-  }, _ref13));
+  }, _ref12));
 }
 var DropdownMenu = (0, _core["default"])(DropdownMenuRoot, {
   Trigger: Trigger,
@@ -708,11 +457,11 @@ var DropdownMenu = (0, _core["default"])(DropdownMenuRoot, {
   }],
   ItemTitle: Title,
   ItemHint: Hint,
-  Group: Group
+  Group: _dropdown["default"].Group
 }, {
   parent: [_dropdown["default"]]
 });
-DropdownMenu.selectedIndexContext = selectedIndexContext;
+DropdownMenu.selectedIndexContext = _dropdown.selectedIndexContext;
 var _default = DropdownMenu;
 exports["default"] = _default;
 //# sourceMappingURL=DropdownMenu.js.map