@salutejs/plasma-new-hope 0.174.0-canary.1497.11501781410.0 → 0.174.0-canary.1503.11500823810.0

package/emotion/cjs/components/Dropdown/Dropdown.js

@@ -4,11 +4,9 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.dropdownRoot = exports.dropdownConfig = exports.Context = void 0;
+exports.dropdownRoot = exports.dropdownConfig = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
-var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
 var _utils = /*#__PURE__*/require("../../utils");
-var _hooks = /*#__PURE__*/require("../../hooks");
 var _pathReducer = /*#__PURE__*/require("./reducers/pathReducer");
 var _focusedPathReducer = /*#__PURE__*/require("./reducers/focusedPathReducer");
 var _ui = /*#__PURE__*/require("./ui");
@@ -19,7 +17,6 @@ var _utils2 = /*#__PURE__*/require("./utils");
 var _Dropdown2 = /*#__PURE__*/require("./Dropdown.tokens");
 var _useKeyboardNavigation = /*#__PURE__*/require("./hooks/useKeyboardNavigation");
 var _useHashMaps3 = /*#__PURE__*/require("./hooks/useHashMaps");
-var _FloatingPopover = /*#__PURE__*/require("./FloatingPopover");
 var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "portal"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -32,18 +29,17 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var Context = exports.Context = /*#__PURE__*/(0, _react.createContext)({});
-
 /**
  * Выпадающий список.
  */
 var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
   return /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-    var _getItemByFocused;
     var items = _ref.items,
       children = _ref.children,
-      placement = _ref.placement,
-      offset = _ref.offset,
+      _ref$placement = _ref.placement,
+      placement = _ref$placement === void 0 ? 'bottom' : _ref$placement,
+      _ref$offset = _ref.offset,
+      offset = _ref$offset === void 0 ? [0, 0] : _ref$offset,
       _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
       closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
       onToggle = _ref.onToggle,
@@ -80,25 +76,6 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
       _useHashMaps2 = _slicedToArray(_useHashMaps, 2),
       pathMap = _useHashMaps2[0],
       focusedToValueMap = _useHashMaps2[1];
-    var activeDescendantItemValue = ((_getItemByFocused = (0, _utils2.getItemByFocused)(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
-    var floatingPopoverRef = (0, _react.useRef)(null);
-    var treeId = (0, _plasmaCore.safeUseId)();
-
-    // Логика работы при клике за пределами выпадающего списка
-    var targetRef = (0, _hooks.useOutsideClick)(function (event) {
-      if (!isCurrentListOpen || !closeOnOverlayClick) {
-        return;
-      }
-      dispatchPath({
-        type: 'reset'
-      });
-      dispatchFocusedPath({
-        type: 'reset'
-      });
-      if (onToggle) {
-        onToggle(false, event);
-      }
-    }, floatingPopoverRef);
     var handleGlobalToggle = function handleGlobalToggle(opened, event) {
       if (opened) {
         dispatchPath({
@@ -130,64 +107,66 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
     var isCurrentListOpen = Boolean(path[0]);
-    return /*#__PURE__*/_react["default"].createElement(Context.Provider, {
-      value: {
-        focusedPath: focusedPath,
-        size: size,
-        variant: variant,
-        itemRole: itemRole,
-        handleGlobalToggle: handleGlobalToggle,
-        closeOnSelect: closeOnSelect,
-        onHover: onHover,
-        onItemClick: onItemClick,
-        onItemSelect: onItemSelect,
-        hasArrow: hasArrow,
-        treeId: treeId
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_FloatingPopover.FloatingPopover, {
-      ref: floatingPopoverRef,
+    var getActiveDescendant = function getActiveDescendant() {
+      var _focusedToValueMap$ge;
+      var focusedPathAsString = focusedPath.reduce(function (acc, n) {
+        return "".concat(acc, "/").concat(n);
+      }, '').replace(/^(\/)/, '');
+      return focusedToValueMap === null || focusedToValueMap === void 0 || (_focusedToValueMap$ge = focusedToValueMap.get(focusedPathAsString)) === null || _focusedToValueMap$ge === void 0 ? void 0 : _focusedToValueMap$ge.value.toString();
+    };
+    return /*#__PURE__*/_react["default"].createElement(_Dropdown.StyledPopover, {
       opened: isCurrentListOpen,
       onToggle: handleGlobalToggle,
-      placement: (0, _utils2.getPlacement)(placement),
       offset: offset,
-      portal: portal,
+      placement: (0, _utils.getPlacements)(placement),
       trigger: trigger,
+      closeOnOverlayClick: closeOnOverlayClick,
+      isFocusTrapped: false,
       target: (0, _utils2.childrenWithProps)(children, {
         role: 'combobox',
-        'aria-controls': "".concat(treeId, "_tree_level_1"),
+        'aria-controls': 'tree_level_1',
         'aria-expanded': isCurrentListOpen,
-        'aria-activedescendant': activeDescendantItemValue ? (0, _utils2.getItemId)(treeId, activeDescendantItemValue.toString()) : '',
+        'aria-activedescendant': getActiveDescendant(),
         onKeyDown: onKeyDown
-      })
+      }),
+      preventOverflow: false,
+      usePortal: Boolean(portal),
+      frame: portal
     }, /*#__PURE__*/_react["default"].createElement(Root, _extends({
       className: (0, _utils.cx)(className, _Dropdown2.classes.dropdownRoot),
       ref: ref,
       view: view,
-      size: size,
-      style: {
-        display: 'inline-block'
-      }
+      size: size
     }, rest), /*#__PURE__*/_react["default"].createElement(_Dropdown.Ul, {
-      ref: targetRef,
-      id: "".concat(treeId, "_tree_level_1"),
-      role: "tree",
       listHeight: listHeight,
       listOverflow: listOverflow,
+      role: "tree",
+      id: "tree_level_1",
       listWidth: listWidth
     }, items.map(function (item, index) {
       return /*#__PURE__*/_react["default"].createElement(_ui.DropdownInner, {
         key: "".concat(index, "/0"),
         item: item,
         currentLevel: 0,
+        focusedPath: focusedPath,
         trigger: trigger,
         path: path,
         dispatchPath: dispatchPath,
         index: index,
+        itemRole: itemRole,
         listHeight: listHeight,
         listOverflow: listOverflow,
-        listWidth: listWidth
+        handleGlobalToggle: handleGlobalToggle,
+        closeOnSelect: closeOnSelect,
+        onHover: onHover,
+        onItemSelect: onItemSelect,
+        onItemClick: onItemClick,
+        listWidth: listWidth,
+        variant: variant,
+        hasArrow: hasArrow,
+        size: size
       });
-    })))));
+    }))));
   });
 };
 var dropdownConfig = exports.dropdownConfig = {

package/emotion/cjs/components/Dropdown/Dropdown.styles.js

@@ -3,26 +3,42 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.base = exports.Ul = void 0;
+exports.base = exports.Ul = exports.StyledPopover = void 0;
 var _base = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@emotion/styled/base"));
 var _react = /*#__PURE__*/require("@emotion/react");
+var _engines = /*#__PURE__*/require("../../engines");
+var _Popover = /*#__PURE__*/require("../Popover");
 var _utils = /*#__PURE__*/require("./utils");
 var _Dropdown = /*#__PURE__*/require("./Dropdown.tokens");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
+var Popover = /*#__PURE__*/(0, _engines.component)(_Popover.popoverConfig);
+var StyledPopover = exports.StyledPopover = /*#__PURE__*/(0, _base["default"])(Popover, {
+  target: "euqmbvx1",
+  label: "plasma-new-hope__StyledPopover"
+})(".", /*#__PURE__*/String(_Popover.popoverClasses.wrapper), ",.", /*#__PURE__*/String(_Popover.popoverClasses.target), "{display:block;}" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvRHJvcGRvd24vRHJvcGRvd24uc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVk0QyIsImZpbGUiOiIuLi8uLi8uLi8uLi9zcmMtZW1vdGlvbi9jb21wb25lbnRzL0Ryb3Bkb3duL0Ryb3Bkb3duLnN0eWxlcy50cyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBzdHlsZWQgZnJvbSAnQGVtb3Rpb24vc3R5bGVkJztcbmltcG9ydCB7IGNzcyB9IGZyb20gJ0BlbW90aW9uL3JlYWN0JztcblxuaW1wb3J0IHsgY29tcG9uZW50IH0gZnJvbSAnLi4vLi4vZW5naW5lcyc7XG5pbXBvcnQgeyBwb3BvdmVyQ29uZmlnLCBwb3BvdmVyQ2xhc3NlcyB9IGZyb20gJy4uL1BvcG92ZXInO1xuXG5pbXBvcnQgeyBnZXRDb3JyZWN0SGVpZ2h0IH0gZnJvbSAnLi91dGlscyc7XG5pbXBvcnQgeyBEcm9wZG93blByb3BzIH0gZnJvbSAnLi9Ecm9wZG93bi50eXBlcyc7XG5pbXBvcnQgeyB0b2tlbnMgfSBmcm9tICcuL0Ryb3Bkb3duLnRva2Vucyc7XG5cbmNvbnN0IFBvcG92ZXIgPSBjb21wb25lbnQocG9wb3ZlckNvbmZpZyk7XG5cbmV4cG9ydCBjb25zdCBTdHlsZWRQb3BvdmVyID0gc3R5bGVkKFBvcG92ZXIpYFxuICAgIC4ke1N0cmluZyhwb3BvdmVyQ2xhc3Nlcy53cmFwcGVyKX0sIC4ke1N0cmluZyhwb3BvdmVyQ2xhc3Nlcy50YXJnZXQpfSB7XG4gICAgICAgIGRpc3BsYXk6IGJsb2NrO1xuICAgIH1cbmA7XG5cbmV4cG9ydCBjb25zdCBVbCA9IHN0eWxlZC51bDx7XG4gICAgbGlzdEhlaWdodDogRHJvcGRvd25Qcm9wc1snbGlzdEhlaWdodCddO1xuICAgIGxpc3RPdmVyZmxvdzogRHJvcGRvd25Qcm9wc1snbGlzdE92ZXJmbG93J107XG4gICAgaXNJbm5lclVsPzogYm9vbGVhbjtcbiAgICBsaXN0V2lkdGg/OiBEcm9wZG93blByb3BzWydsaXN0V2lkdGgnXTtcbn0+YFxuICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7XG5cbiAgICBiYWNrZ3JvdW5kOiB2YXIoJHt0b2tlbnMuYmFja2dyb3VuZH0pO1xuICAgIGJveC1zaGFkb3c6IHZhcigke3Rva2Vucy5ib3hTaGFkb3d9KTtcblxuICAgIGJvcmRlci1yYWRpdXM6IHZhcigke3Rva2Vucy5ib3JkZXJSYWRpdXN9KTtcbiAgICB3aWR0aDogJHsoeyBsaXN0V2lkdGggfSkgPT4gbGlzdFdpZHRoIHx8IGB2YXIoJHt0b2tlbnMud2lkdGh9KWB9O1xuICAgIGhlaWdodDogJHsoeyBsaXN0SGVpZ2h0IH0pID0+IChsaXN0SGVpZ2h0ID8gZ2V0Q29ycmVjdEhlaWdodChsaXN0SGVpZ2h0KSA6ICdhdXRvJyl9O1xuICAgIG92ZXJmbG93OiAkeyh7IGxpc3RPdmVyZmxvdyB9KSA9PiBsaXN0T3ZlcmZsb3cgfHwgJ2luaXRpYWwnfTtcblxuICAgIG1hcmdpbjogJHsoeyBpc0lubmVyVWwgfSkgPT4gKGlzSW5uZXJVbCA/IGBjYWxjKHZhcigke3Rva2Vucy5wYWRkaW5nfSkgKiAtMSkgMCAwIHZhcigke3Rva2Vucy5wYWRkaW5nfSlgIDogMCl9O1xuICAgIHBhZGRpbmc6IHZhcigke3Rva2Vucy5wYWRkaW5nfSk7XG5gO1xuXG5leHBvcnQgY29uc3QgYmFzZSA9IGNzc2BcbiAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XG5gO1xuIl19 */"));
 var Ul = exports.Ul = /*#__PURE__*/(0, _base["default"])("ul", {
   target: "euqmbvx0",
   label: "plasma-new-hope__Ul"
-})("box-sizing:border-box;width:", function (_ref) {
+})("box-sizing:border-box;background:var(", _Dropdown.tokens.background, ");box-shadow:var(", _Dropdown.tokens.boxShadow, ");border-radius:var(", _Dropdown.tokens.borderRadius, ");width:", function (_ref) {
   var listWidth = _ref.listWidth;
   return listWidth || "var(".concat(_Dropdown.tokens.width, ")");
 }, ";height:", function (_ref2) {
   var listHeight = _ref2.listHeight;
   return listHeight ? (0, _utils.getCorrectHeight)(listHeight) : 'auto';
-}, ";margin:", function (_ref3) {
-  var isInnerUl = _ref3.isInnerUl;
-  return isInnerUl ? "calc(var(".concat(_Dropdown.tokens.padding, ") * -1) 0.125rem 0") : 0;
-}, ";padding:var(", _Dropdown.tokens.padding, ") 0;overflow:", function (_ref4) {
-  var listOverflow = _ref4.listOverflow;
+}, ";overflow:", function (_ref3) {
+  var listOverflow = _ref3.listOverflow;
   return listOverflow || 'initial';
-}, ";background:var(", _Dropdown.constants.background, ");box-shadow:", _Dropdown.constants.boxShadow, ";border-radius:var(", _Dropdown.tokens.borderRadius, ");" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvRHJvcGRvd24vRHJvcGRvd24uc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVlFIiwiZmlsZSI6Ii4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvRHJvcGRvd24vRHJvcGRvd24uc3R5bGVzLnRzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHN0eWxlZCBmcm9tICdAZW1vdGlvbi9zdHlsZWQnO1xuaW1wb3J0IHsgY3NzIH0gZnJvbSAnQGVtb3Rpb24vcmVhY3QnO1xuXG5pbXBvcnQgeyBnZXRDb3JyZWN0SGVpZ2h0IH0gZnJvbSAnLi91dGlscyc7XG5pbXBvcnQgeyBEcm9wZG93blByb3BzIH0gZnJvbSAnLi9Ecm9wZG93bi50eXBlcyc7XG5pbXBvcnQgeyB0b2tlbnMsIGNvbnN0YW50cyB9IGZyb20gJy4vRHJvcGRvd24udG9rZW5zJztcblxuZXhwb3J0IGNvbnN0IFVsID0gc3R5bGVkLnVsPHtcbiAgICBsaXN0SGVpZ2h0OiBEcm9wZG93blByb3BzWydsaXN0SGVpZ2h0J107XG4gICAgbGlzdE92ZXJmbG93OiBEcm9wZG93blByb3BzWydsaXN0T3ZlcmZsb3cnXTtcbiAgICBsaXN0V2lkdGg/OiBEcm9wZG93blByb3BzWydsaXN0V2lkdGgnXTtcbiAgICBpc0lubmVyVWw/OiBib29sZWFuO1xufT5gXG4gICAgYm94LXNpemluZzogYm9yZGVyLWJveDtcbiAgICB3aWR0aDogJHsoeyBsaXN0V2lkdGggfSkgPT4gbGlzdFdpZHRoIHx8IGB2YXIoJHt0b2tlbnMud2lkdGh9KWB9O1xuICAgIGhlaWdodDogJHsoeyBsaXN0SGVpZ2h0IH0pID0+IChsaXN0SGVpZ2h0ID8gZ2V0Q29ycmVjdEhlaWdodChsaXN0SGVpZ2h0KSA6ICdhdXRvJyl9O1xuICAgIG1hcmdpbjogJHsoeyBpc0lubmVyVWwgfSkgPT4gKGlzSW5uZXJVbCA/IGBjYWxjKHZhcigke3Rva2Vucy5wYWRkaW5nfSkgKiAtMSkgMC4xMjVyZW0gMGAgOiAwKX07XG4gICAgcGFkZGluZzogdmFyKCR7dG9rZW5zLnBhZGRpbmd9KSAwO1xuICAgIG92ZXJmbG93OiAkeyh7IGxpc3RPdmVyZmxvdyB9KSA9PiBsaXN0T3ZlcmZsb3cgfHwgJ2luaXRpYWwnfTtcbiAgICBiYWNrZ3JvdW5kOiB2YXIoJHtjb25zdGFudHMuYmFja2dyb3VuZH0pO1xuICAgIGJveC1zaGFkb3c6ICR7Y29uc3RhbnRzLmJveFNoYWRvd307XG4gICAgYm9yZGVyLXJhZGl1czogdmFyKCR7dG9rZW5zLmJvcmRlclJhZGl1c30pO1xuYDtcblxuZXhwb3J0IGNvbnN0IGJhc2UgPSBjc3NgYDtcbiJdfQ== */"));
-var base = exports.base = /*#__PURE__*/(0, _react.css)(";label:plasma-new-hope__base;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvRHJvcGRvd24vRHJvcGRvd24uc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXdCdUIiLCJmaWxlIjoiLi4vLi4vLi4vLi4vc3JjLWVtb3Rpb24vY29tcG9uZW50cy9Ecm9wZG93bi9Ecm9wZG93bi5zdHlsZXMudHMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBjc3MgfSBmcm9tICdAZW1vdGlvbi9yZWFjdCc7XG5cbmltcG9ydCB7IGdldENvcnJlY3RIZWlnaHQgfSBmcm9tICcuL3V0aWxzJztcbmltcG9ydCB7IERyb3Bkb3duUHJvcHMgfSBmcm9tICcuL0Ryb3Bkb3duLnR5cGVzJztcbmltcG9ydCB7IHRva2VucywgY29uc3RhbnRzIH0gZnJvbSAnLi9Ecm9wZG93bi50b2tlbnMnO1xuXG5leHBvcnQgY29uc3QgVWwgPSBzdHlsZWQudWw8e1xuICAgIGxpc3RIZWlnaHQ6IERyb3Bkb3duUHJvcHNbJ2xpc3RIZWlnaHQnXTtcbiAgICBsaXN0T3ZlcmZsb3c6IERyb3Bkb3duUHJvcHNbJ2xpc3RPdmVyZmxvdyddO1xuICAgIGxpc3RXaWR0aD86IERyb3Bkb3duUHJvcHNbJ2xpc3RXaWR0aCddO1xuICAgIGlzSW5uZXJVbD86IGJvb2xlYW47XG59PmBcbiAgICBib3gtc2l6aW5nOiBib3JkZXItYm94O1xuICAgIHdpZHRoOiAkeyh7IGxpc3RXaWR0aCB9KSA9PiBsaXN0V2lkdGggfHwgYHZhcigke3Rva2Vucy53aWR0aH0pYH07XG4gICAgaGVpZ2h0OiAkeyh7IGxpc3RIZWlnaHQgfSkgPT4gKGxpc3RIZWlnaHQgPyBnZXRDb3JyZWN0SGVpZ2h0KGxpc3RIZWlnaHQpIDogJ2F1dG8nKX07XG4gICAgbWFyZ2luOiAkeyh7IGlzSW5uZXJVbCB9KSA9PiAoaXNJbm5lclVsID8gYGNhbGModmFyKCR7dG9rZW5zLnBhZGRpbmd9KSAqIC0xKSAwLjEyNXJlbSAwYCA6IDApfTtcbiAgICBwYWRkaW5nOiB2YXIoJHt0b2tlbnMucGFkZGluZ30pIDA7XG4gICAgb3ZlcmZsb3c6ICR7KHsgbGlzdE92ZXJmbG93IH0pID0+IGxpc3RPdmVyZmxvdyB8fCAnaW5pdGlhbCd9O1xuICAgIGJhY2tncm91bmQ6IHZhcigke2NvbnN0YW50cy5iYWNrZ3JvdW5kfSk7XG4gICAgYm94LXNoYWRvdzogJHtjb25zdGFudHMuYm94U2hhZG93fTtcbiAgICBib3JkZXItcmFkaXVzOiB2YXIoJHt0b2tlbnMuYm9yZGVyUmFkaXVzfSk7XG5gO1xuXG5leHBvcnQgY29uc3QgYmFzZSA9IGNzc2BgO1xuIl19 */"));
+}, ";margin:", function (_ref4) {
+  var isInnerUl = _ref4.isInnerUl;
+  return isInnerUl ? "calc(var(".concat(_Dropdown.tokens.padding, ") * -1) 0 0 var(").concat(_Dropdown.tokens.padding, ")") : 0;
+}, ";padding:var(", _Dropdown.tokens.padding, ");" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvRHJvcGRvd24vRHJvcGRvd24uc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXVCRSIsImZpbGUiOiIuLi8uLi8uLi8uLi9zcmMtZW1vdGlvbi9jb21wb25lbnRzL0Ryb3Bkb3duL0Ryb3Bkb3duLnN0eWxlcy50cyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBzdHlsZWQgZnJvbSAnQGVtb3Rpb24vc3R5bGVkJztcbmltcG9ydCB7IGNzcyB9IGZyb20gJ0BlbW90aW9uL3JlYWN0JztcblxuaW1wb3J0IHsgY29tcG9uZW50IH0gZnJvbSAnLi4vLi4vZW5naW5lcyc7XG5pbXBvcnQgeyBwb3BvdmVyQ29uZmlnLCBwb3BvdmVyQ2xhc3NlcyB9IGZyb20gJy4uL1BvcG92ZXInO1xuXG5pbXBvcnQgeyBnZXRDb3JyZWN0SGVpZ2h0IH0gZnJvbSAnLi91dGlscyc7XG5pbXBvcnQgeyBEcm9wZG93blByb3BzIH0gZnJvbSAnLi9Ecm9wZG93bi50eXBlcyc7XG5pbXBvcnQgeyB0b2tlbnMgfSBmcm9tICcuL0Ryb3Bkb3duLnRva2Vucyc7XG5cbmNvbnN0IFBvcG92ZXIgPSBjb21wb25lbnQocG9wb3ZlckNvbmZpZyk7XG5cbmV4cG9ydCBjb25zdCBTdHlsZWRQb3BvdmVyID0gc3R5bGVkKFBvcG92ZXIpYFxuICAgIC4ke1N0cmluZyhwb3BvdmVyQ2xhc3Nlcy53cmFwcGVyKX0sIC4ke1N0cmluZyhwb3BvdmVyQ2xhc3Nlcy50YXJnZXQpfSB7XG4gICAgICAgIGRpc3BsYXk6IGJsb2NrO1xuICAgIH1cbmA7XG5cbmV4cG9ydCBjb25zdCBVbCA9IHN0eWxlZC51bDx7XG4gICAgbGlzdEhlaWdodDogRHJvcGRvd25Qcm9wc1snbGlzdEhlaWdodCddO1xuICAgIGxpc3RPdmVyZmxvdzogRHJvcGRvd25Qcm9wc1snbGlzdE92ZXJmbG93J107XG4gICAgaXNJbm5lclVsPzogYm9vbGVhbjtcbiAgICBsaXN0V2lkdGg/OiBEcm9wZG93blByb3BzWydsaXN0V2lkdGgnXTtcbn0+YFxuICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7XG5cbiAgICBiYWNrZ3JvdW5kOiB2YXIoJHt0b2tlbnMuYmFja2dyb3VuZH0pO1xuICAgIGJveC1zaGFkb3c6IHZhcigke3Rva2Vucy5ib3hTaGFkb3d9KTtcblxuICAgIGJvcmRlci1yYWRpdXM6IHZhcigke3Rva2Vucy5ib3JkZXJSYWRpdXN9KTtcbiAgICB3aWR0aDogJHsoeyBsaXN0V2lkdGggfSkgPT4gbGlzdFdpZHRoIHx8IGB2YXIoJHt0b2tlbnMud2lkdGh9KWB9O1xuICAgIGhlaWdodDogJHsoeyBsaXN0SGVpZ2h0IH0pID0+IChsaXN0SGVpZ2h0ID8gZ2V0Q29ycmVjdEhlaWdodChsaXN0SGVpZ2h0KSA6ICdhdXRvJyl9O1xuICAgIG92ZXJmbG93OiAkeyh7IGxpc3RPdmVyZmxvdyB9KSA9PiBsaXN0T3ZlcmZsb3cgfHwgJ2luaXRpYWwnfTtcblxuICAgIG1hcmdpbjogJHsoeyBpc0lubmVyVWwgfSkgPT4gKGlzSW5uZXJVbCA/IGBjYWxjKHZhcigke3Rva2Vucy5wYWRkaW5nfSkgKiAtMSkgMCAwIHZhcigke3Rva2Vucy5wYWRkaW5nfSlgIDogMCl9O1xuICAgIHBhZGRpbmc6IHZhcigke3Rva2Vucy5wYWRkaW5nfSk7XG5gO1xuXG5leHBvcnQgY29uc3QgYmFzZSA9IGNzc2BcbiAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XG5gO1xuIl19 */"));
+var base = exports.base = process.env.NODE_ENV === "production" ? {
+  name: "1mufh2u-plasma-new-hope__base",
+  styles: "display:inline-block;label:plasma-new-hope__base;"
+} : {
+  name: "1mufh2u-plasma-new-hope__base",
+  styles: "display:inline-block;label:plasma-new-hope__base;",
+  map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvRHJvcGRvd24vRHJvcGRvd24uc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXNDdUIiLCJmaWxlIjoiLi4vLi4vLi4vLi4vc3JjLWVtb3Rpb24vY29tcG9uZW50cy9Ecm9wZG93bi9Ecm9wZG93bi5zdHlsZXMudHMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBjc3MgfSBmcm9tICdAZW1vdGlvbi9yZWFjdCc7XG5cbmltcG9ydCB7IGNvbXBvbmVudCB9IGZyb20gJy4uLy4uL2VuZ2luZXMnO1xuaW1wb3J0IHsgcG9wb3ZlckNvbmZpZywgcG9wb3ZlckNsYXNzZXMgfSBmcm9tICcuLi9Qb3BvdmVyJztcblxuaW1wb3J0IHsgZ2V0Q29ycmVjdEhlaWdodCB9IGZyb20gJy4vdXRpbHMnO1xuaW1wb3J0IHsgRHJvcGRvd25Qcm9wcyB9IGZyb20gJy4vRHJvcGRvd24udHlwZXMnO1xuaW1wb3J0IHsgdG9rZW5zIH0gZnJvbSAnLi9Ecm9wZG93bi50b2tlbnMnO1xuXG5jb25zdCBQb3BvdmVyID0gY29tcG9uZW50KHBvcG92ZXJDb25maWcpO1xuXG5leHBvcnQgY29uc3QgU3R5bGVkUG9wb3ZlciA9IHN0eWxlZChQb3BvdmVyKWBcbiAgICAuJHtTdHJpbmcocG9wb3ZlckNsYXNzZXMud3JhcHBlcil9LCAuJHtTdHJpbmcocG9wb3ZlckNsYXNzZXMudGFyZ2V0KX0ge1xuICAgICAgICBkaXNwbGF5OiBibG9jaztcbiAgICB9XG5gO1xuXG5leHBvcnQgY29uc3QgVWwgPSBzdHlsZWQudWw8e1xuICAgIGxpc3RIZWlnaHQ6IERyb3Bkb3duUHJvcHNbJ2xpc3RIZWlnaHQnXTtcbiAgICBsaXN0T3ZlcmZsb3c6IERyb3Bkb3duUHJvcHNbJ2xpc3RPdmVyZmxvdyddO1xuICAgIGlzSW5uZXJVbD86IGJvb2xlYW47XG4gICAgbGlzdFdpZHRoPzogRHJvcGRvd25Qcm9wc1snbGlzdFdpZHRoJ107XG59PmBcbiAgICBib3gtc2l6aW5nOiBib3JkZXItYm94O1xuXG4gICAgYmFja2dyb3VuZDogdmFyKCR7dG9rZW5zLmJhY2tncm91bmR9KTtcbiAgICBib3gtc2hhZG93OiB2YXIoJHt0b2tlbnMuYm94U2hhZG93fSk7XG5cbiAgICBib3JkZXItcmFkaXVzOiB2YXIoJHt0b2tlbnMuYm9yZGVyUmFkaXVzfSk7XG4gICAgd2lkdGg6ICR7KHsgbGlzdFdpZHRoIH0pID0+IGxpc3RXaWR0aCB8fCBgdmFyKCR7dG9rZW5zLndpZHRofSlgfTtcbiAgICBoZWlnaHQ6ICR7KHsgbGlzdEhlaWdodCB9KSA9PiAobGlzdEhlaWdodCA/IGdldENvcnJlY3RIZWlnaHQobGlzdEhlaWdodCkgOiAnYXV0bycpfTtcbiAgICBvdmVyZmxvdzogJHsoeyBsaXN0T3ZlcmZsb3cgfSkgPT4gbGlzdE92ZXJmbG93IHx8ICdpbml0aWFsJ307XG5cbiAgICBtYXJnaW46ICR7KHsgaXNJbm5lclVsIH0pID0+IChpc0lubmVyVWwgPyBgY2FsYyh2YXIoJHt0b2tlbnMucGFkZGluZ30pICogLTEpIDAgMCB2YXIoJHt0b2tlbnMucGFkZGluZ30pYCA6IDApfTtcbiAgICBwYWRkaW5nOiB2YXIoJHt0b2tlbnMucGFkZGluZ30pO1xuYDtcblxuZXhwb3J0IGNvbnN0IGJhc2UgPSBjc3NgXG4gICAgZGlzcGxheTogaW5saW5lLWJsb2NrO1xuYDtcbiJdfQ== */",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};

package/emotion/cjs/components/Dropdown/Dropdown.tokens.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tokens = exports.constants = exports.classes = void 0;
+exports.tokens = exports.classes = void 0;
 var classes = exports.classes = {
   dropdownRoot: 'dropdown-root',
   dropdownItemIsFocused: 'dropdown-item-is-focused',
   dropdownItemIsDisabled: 'dropdown-item-is-disabled',
   dropdownItemIsActive: 'dropdown-item-is-active',
-  dropdownItemIsSelected: 'dropdown-item-is-selected'
+  dropdownItemIsSelected: 'dropdownItemIsSelected'
 };
 var tokens = exports.tokens = {
   background: '--plasma-dropdown-background',
@@ -20,8 +20,6 @@ var tokens = exports.tokens = {
   disclosureIconColor: '--plasma-dropdown-disclosure-icon-color',
   disabledOpacity: '--plasma-dropdown-disabled-opacity',
   focusColor: '--plasma-dropdown-focus-color',
-  // Old
-
   dividerColor: '--plasma-dropdown-divider-color',
   dividerMarginTop: '--plasma-dropdown-divider-margin-top',
   dividerMarginTopTight: '--plasma-dropdown-divider-margin-top-tight',
@@ -36,7 +34,6 @@ var tokens = exports.tokens = {
   itemBackgroundSelectedHover: '--plasma-dropdown-item-background-selected-hover',
   // Old
   itemColor: '--plasma-dropdown-item-color',
-  // Old
   itemColorSelected: '--plasma-dropdown-item-color-selected',
   // Old
   itemColorSelectedHover: '--plasma-dropdown-item-color-selected-hover',
@@ -55,17 +52,11 @@ var tokens = exports.tokens = {
   itemMarginLeft: '--plasma-dropdown-item-margin-left',
   // Old
   itemPaddingTop: '--plasma-dropdown-item-padding-top',
-  // Old
   itemPaddingTopTight: '--plasma-dropdown-item-padding-top-tight',
-  // Old
   itemPaddingRight: '--plasma-dropdown-item-padding-right',
-  // Old
   itemPaddingBottom: '--plasma-dropdown-item-padding-bottom',
-  // Old
   itemPaddingBottomTight: '--plasma-dropdown-item-padding-bottom-tight',
-  // Old
   itemPaddingLeft: '--plasma-dropdown-item-padding-left',
-  // Old
   itemContentLeftWidth: '--plasma-dropdown-item-content-left-width',
   // Old
   itemContentLeftColor: '--plasma-dropdown-item-content-left-color',
@@ -80,20 +71,6 @@ var tokens = exports.tokens = {
   itemFontWeightBold: '--plasma-dropdown-item-letter-spacing',
   itemFontLetterSpacing: '--plasma-dropdown-item-line-height',
   itemFontLineHeight: '--plasma-dropdown-item-font-weight',
-  itemPadding: '--plasma-dropdown-item-padding',
-  itemPaddingTight: '--plasma-dropdown-item-padding-tight',
-  cellPadding: '--plasma-dropdown-cell-padding',
-  cellPaddingLeftContent: '--plasma-dropdown-cell-padding-left-content',
-  cellPaddingContent: '--plasma-dropdown-cell-padding-content',
-  cellPaddingRightContent: '--plasma-dropdown-cell-padding-right-content',
-  cellTextboxGap: '--plasma-dropdown-cell-textbox-gap',
-  cellGap: '--plasma-dropdown-cell-gap',
-  cellTitleFontFamily: '--plasma-dropdown-cell-title-font-family',
-  cellTitleFontSize: '--plasma-dropdown-cell-title-font-size',
-  cellTitleFontStyle: '--plasma-dropdown-cell-title-font-style',
-  cellTitleFontWeight: '--plasma-dropdown-cell-title-font-weight',
-  cellTitleLetterSpacing: '--plasma-dropdown-cell-title-letter-spacing',
-  cellTitleLineHeight: '--plasma-dropdown-cell-title-line-height',
   // TODO: Remove below tokens as soon as they are no longer needed
   footerBackground: '--plasma-dropdown-footer-background',
   footerWidth: '--plasma-dropdown-footer-width',
@@ -157,15 +134,4 @@ var tokens = exports.tokens = {
   groupLabelMarginRight: '--plasma-dropdown-group-label-margin-right',
   groupLabelMarginBottom: '--plasma-dropdown-group-label-margin-bottom',
   groupLabelMarginLeft: '--plasma-dropdown-group-label-margin-left'
-};
-var constants = exports.constants = {
-  focusColor: '--surface-accent',
-  background: '--surface-solid-card-brightness',
-  boxShadow: '0px 4px 14px -4px rgba(8, 8, 8, 0.08), 0px 1px 4px -1px rgba(0, 0, 0, 0.04)',
-  disclosureIconColor: '--text-secondary',
-  itemBackground: '--plasma-colors-transparent',
-  itemBackgroundHover: '--surface-transparent-secondary',
-  opacity: '0.4',
-  cellTitleColor: '--text-primary',
-  cellBackgroundColor: '--plasma-colors-transparent'
 };

package/emotion/cjs/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -5,21 +5,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DropdownInner = void 0;
 var _react = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("react"));
-var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
 var _ = /*#__PURE__*/require("..");
 var _Dropdown = /*#__PURE__*/require("../../Dropdown.styles");
-var _FloatingPopover = /*#__PURE__*/require("../../FloatingPopover");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var DropdownInner = exports.DropdownInner = function DropdownInner(_ref) {
   var item = _ref.item,
     currentLevel = _ref.currentLevel,
+    focusedPath = _ref.focusedPath,
     path = _ref.path,
     dispatchPath = _ref.dispatchPath,
     index = _ref.index,
     trigger = _ref.trigger,
+    itemRole = _ref.itemRole,
     listHeight = _ref.listHeight,
     listOverflow = _ref.listOverflow,
-    listWidth = _ref.listWidth;
+    handleGlobalToggle = _ref.handleGlobalToggle,
+    closeOnSelect = _ref.closeOnSelect,
+    onHover = _ref.onHover,
+    onItemSelect = _ref.onItemSelect,
+    onItemClick = _ref.onItemClick,
+    listWidth = _ref.listWidth,
+    variant = _ref.variant,
+    hasArrow = _ref.hasArrow,
+    size = _ref.size;
   var handleToggle = function handleToggle(opened) {
     if (opened) {
       dispatchPath({
@@ -35,53 +43,79 @@ var DropdownInner = exports.DropdownInner = function DropdownInner(_ref) {
     }
   };
   var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
-  var treeId = (0, _plasmaCore.safeUseId)();
-  var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
+  var listId = "tree_level_".concat(currentLevel + 2);
   var nextLevel = currentLevel + 1;
   if (item !== null && item !== void 0 && item.items) {
-    return /*#__PURE__*/_react["default"].createElement(_FloatingPopover.FloatingPopover, {
-      placement: "right-start",
+    return /*#__PURE__*/_react["default"].createElement(_Dropdown.StyledPopover, {
       opened: isCurrentListOpen,
-      onToggle: handleToggle,
+      usePortal: false,
+      placement: "right-start",
       trigger: trigger,
       target: /*#__PURE__*/_react["default"].createElement(_.DropdownItem, {
         item: item,
         index: index,
         path: path,
+        focusedPath: focusedPath,
         currentLevel: currentLevel,
+        itemRole: itemRole,
+        onHover: onHover,
+        onItemSelect: onItemSelect,
+        onItemClick: onItemClick,
+        variant: variant,
+        hasArrow: hasArrow,
         ariaControls: listId,
         ariaExpanded: isCurrentListOpen,
         ariaLevel: nextLevel,
-        ariaLabel: item.label
+        ariaLabel: item.label,
+        size: size
       }),
-      isInner: true
+      onToggle: handleToggle,
+      isFocusTrapped: false,
+      preventOverflow: false
     }, /*#__PURE__*/_react["default"].createElement(_Dropdown.Ul, {
-      id: listId,
-      role: "group",
-      isInnerUl: true,
       listHeight: listHeight,
       listOverflow: listOverflow,
-      listWidth: listWidth
+      role: "group",
+      id: listId,
+      listWidth: listWidth,
+      isInnerUl: true
     }, item.items.map(function (innerItem, innerIndex) {
       return /*#__PURE__*/_react["default"].createElement(DropdownInner, {
         key: "".concat(innerIndex, "/").concat(currentLevel),
         item: innerItem,
         currentLevel: nextLevel,
+        focusedPath: focusedPath,
         path: path,
         dispatchPath: dispatchPath,
         index: innerIndex,
         trigger: trigger,
+        itemRole: itemRole,
         listHeight: listHeight,
         listOverflow: listOverflow,
-        listWidth: listWidth
+        handleGlobalToggle: handleGlobalToggle,
+        closeOnSelect: closeOnSelect,
+        onHover: onHover,
+        onItemSelect: onItemSelect,
+        onItemClick: onItemClick,
+        listWidth: listWidth,
+        variant: variant,
+        hasArrow: hasArrow,
+        size: size
       });
     })));
   }
   return /*#__PURE__*/_react["default"].createElement(_.DropdownItem, {
     item: item,
-    path: path,
     index: index,
+    focusedPath: focusedPath,
     currentLevel: currentLevel,
-    ariaLevel: nextLevel
+    itemRole: itemRole,
+    handleGlobalToggle: handleGlobalToggle,
+    closeOnSelect: closeOnSelect,
+    onHover: onHover,
+    onItemSelect: onItemSelect,
+    onItemClick: onItemClick,
+    variant: variant,
+    size: size
   });
 };

package/emotion/cjs/components/Dropdown/ui/DropdownItem/DropdownItem.js

@@ -9,20 +9,29 @@ var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react")
 var _Dropdown = /*#__PURE__*/require("../../Dropdown.tokens");
 var _utils = /*#__PURE__*/require("../../../../utils");
 var _Icon = /*#__PURE__*/require("../../../_Icon");
-var _Dropdown2 = /*#__PURE__*/require("../../Dropdown");
-var _utils2 = /*#__PURE__*/require("../../utils");
 var _DropdownItem = /*#__PURE__*/require("./DropdownItem.styles");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DropdownItem = exports.DropdownItem = function DropdownItem(_ref) {
   var item = _ref.item,
     path = _ref.path,
+    focusedPath = _ref.focusedPath,
     currentLevel = _ref.currentLevel,
     index = _ref.index,
+    itemRole = _ref.itemRole,
+    closeOnSelect = _ref.closeOnSelect,
+    handleGlobalToggle = _ref.handleGlobalToggle,
+    onHover = _ref.onHover,
+    onItemSelect = _ref.onItemSelect,
+    onItemClick = _ref.onItemClick,
     ariaControls = _ref.ariaControls,
     ariaExpanded = _ref.ariaExpanded,
+    ariaHasPopup = _ref.ariaHasPopup,
     ariaLevel = _ref.ariaLevel,
-    ariaLabel = _ref.ariaLabel;
+    ariaLabel = _ref.ariaLabel,
+    variant = _ref.variant,
+    hasArrow = _ref.hasArrow,
+    size = _ref.size;
   var value = item.value,
     label = item.label,
     disabled = item.disabled,
@@ -32,19 +41,6 @@ var DropdownItem = exports.DropdownItem = function DropdownItem(_ref) {
     dividerBefore = item.dividerBefore,
     dividerAfter = item.dividerAfter;
   var ref = (0, _react.useRef)(null);
-  var _useContext = (0, _react.useContext)(_Dropdown2.Context),
-    focusedPath = _useContext.focusedPath,
-    size = _useContext.size,
-    variant = _useContext.variant,
-    itemRole = _useContext.itemRole,
-    handleGlobalToggle = _useContext.handleGlobalToggle,
-    closeOnSelect = _useContext.closeOnSelect,
-    onHover = _useContext.onHover,
-    onItemSelect = _useContext.onItemSelect,
-    onItemClick = _useContext.onItemClick,
-    hasArrow = _useContext.hasArrow,
-    treeId = _useContext.treeId;
-  var hasDescendants = Boolean(item.items);
   var disclosureIconSize = size === 'xs' ? 'xs' : 's';
   var isDisabledClassName = disabled || isDisabled ? _Dropdown.classes.dropdownItemIsDisabled : undefined;
   var focusedClass = currentLevel === focusedPath.length - 1 && index === (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[currentLevel]) ? _Dropdown.classes.dropdownItemIsFocused : undefined;
@@ -68,9 +64,7 @@ var DropdownItem = exports.DropdownItem = function DropdownItem(_ref) {
     if (onItemClick) {
       onItemClick(item, event);
     }
-
-    // Закрываем весь дропдаун целиком при клике на айтем без потомков. Только при closeOnSelect === true.
-    if (closeOnSelect && !hasDescendants) {
+    if (handleGlobalToggle && closeOnSelect) {
       handleGlobalToggle(false, event);
     }
   };
@@ -82,25 +76,20 @@ var DropdownItem = exports.DropdownItem = function DropdownItem(_ref) {
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, dividerBefore && /*#__PURE__*/_react["default"].createElement(_DropdownItem.Divider, {
     variant: variant
   }), /*#__PURE__*/_react["default"].createElement(_DropdownItem.Wrapper, {
-    ref: ref,
     className: (0, _utils.cx)(isDisabledClassName, focusedClass, activeClass),
-    id: (0, _utils2.getItemId)(treeId, value.toString()),
+    id: value.toString(),
     role: itemRole,
+    ref: ref,
+    "aria-disabled": disabled || isDisabled,
     onClick: handleClick,
     onMouseEnter: handleHover,
     variant: variant,
-    "aria-disabled": disabled || isDisabled,
     "aria-controls": ariaControls,
     "aria-expanded": ariaExpanded,
+    "aria-haspopup": ariaHasPopup,
     "aria-level": ariaLevel,
     "aria-label": ariaLabel
-  }, /*#__PURE__*/_react["default"].createElement(_DropdownItem.CellWrapper, null, /*#__PURE__*/_react["default"].createElement(_DropdownItem.StyledCell, {
-    contentLeft: contentLeft,
-    contentRight: contentRight,
-    alignContentLeft: "center",
-    alignContentRight: "center",
-    title: label
-  })), item.items && hasArrow && /*#__PURE__*/_react["default"].createElement(_DropdownItem.DisclosureIconWrapper, null, /*#__PURE__*/_react["default"].createElement(_Icon.IconDisclosureRight, {
+  }, contentLeft && /*#__PURE__*/_react["default"].createElement(_DropdownItem.StyledContentLeft, null, contentLeft), /*#__PURE__*/_react["default"].createElement(_DropdownItem.StyledText, null, label), contentRight && /*#__PURE__*/_react["default"].createElement(_DropdownItem.StyledContentRight, null, contentRight), item.items && hasArrow && /*#__PURE__*/_react["default"].createElement(_DropdownItem.DisclosureIconWrapper, null, /*#__PURE__*/_react["default"].createElement(_Icon.IconDisclosureRight, {
     size: disclosureIconSize,
     color: "inherit"
   }))), dividerAfter && /*#__PURE__*/_react["default"].createElement(_DropdownItem.Divider, {