@salutejs/plasma-new-hope 0.174.0-canary.1452.11462555994.0 → 0.174.0-canary.1497.11463811587.0

package/styled-components/es/components/Dropdown/Dropdown.js

@@ -8,30 +8,33 @@ 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; }
-import React, { forwardRef, useReducer } from 'react';
-import { cx, getPlacements } from '../../utils';
+import React, { createContext, forwardRef, useReducer, useRef } from 'react';
+import { safeUseId } from '@salutejs/plasma-core';
+import { cx } from '../../utils';
+import { useOutsideClick } from '../../hooks';
 import { pathReducer } from './reducers/pathReducer';
 import { focusedPathReducer } from './reducers/focusedPathReducer';
 import { DropdownInner } from './ui';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
-import { Ul, StyledPopover, base } from './Dropdown.styles';
-import { childrenWithProps } from './utils';
+import { Ul, base } from './Dropdown.styles';
+import { childrenWithProps, getItemByFocused, getItemId, getPlacement } from './utils';
 import { classes } from './Dropdown.tokens';
 import { useKeyNavigation } from './hooks/useKeyboardNavigation';
 import { useHashMaps } from './hooks/useHashMaps';
+import { FloatingPopover } from './FloatingPopover';
+export var Context = /*#__PURE__*/createContext({});
 
 /**
  * Выпадающий список.
  */
 export var dropdownRoot = function dropdownRoot(Root) {
   return /*#__PURE__*/forwardRef(function (_ref, ref) {
+    var _getItemByFocused;
     var items = _ref.items,
       children = _ref.children,
-      _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,
+      placement = _ref.placement,
+      offset = _ref.offset,
       _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
       closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
       onToggle = _ref.onToggle,
@@ -68,6 +71,25 @@ export var dropdownRoot = function dropdownRoot(Root) {
       _useHashMaps2 = _slicedToArray(_useHashMaps, 2),
       pathMap = _useHashMaps2[0],
       focusedToValueMap = _useHashMaps2[1];
+    var activeDescendantItemValue = ((_getItemByFocused = getItemByFocused(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
+    var floatingPopoverRef = useRef(null);
+    var treeId = safeUseId();
+
+    // Логика работы при клике за пределами выпадающего списка
+    var targetRef = 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({
@@ -99,66 +121,64 @@ export var dropdownRoot = function dropdownRoot(Root) {
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
     var isCurrentListOpen = Boolean(path[0]);
-    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.createElement(StyledPopover, {
+    return /*#__PURE__*/React.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.createElement(FloatingPopover, {
+      ref: floatingPopoverRef,
       opened: isCurrentListOpen,
       onToggle: handleGlobalToggle,
+      placement: getPlacement(placement),
       offset: offset,
-      placement: getPlacements(placement),
+      portal: portal,
       trigger: trigger,
-      closeOnOverlayClick: closeOnOverlayClick,
-      isFocusTrapped: false,
       target: childrenWithProps(children, {
         role: 'combobox',
-        'aria-controls': 'tree_level_1',
+        'aria-controls': "".concat(treeId, "_tree_level_1"),
         'aria-expanded': isCurrentListOpen,
-        'aria-activedescendant': getActiveDescendant(),
+        'aria-activedescendant': activeDescendantItemValue ? getItemId(treeId, activeDescendantItemValue.toString()) : '',
         onKeyDown: onKeyDown
-      }),
-      preventOverflow: false,
-      usePortal: Boolean(portal),
-      frame: portal
+      })
     }, /*#__PURE__*/React.createElement(Root, _extends({
       className: cx(className, classes.dropdownRoot),
       ref: ref,
       view: view,
-      size: size
+      size: size,
+      style: {
+        display: 'inline-block'
+      }
     }, rest), /*#__PURE__*/React.createElement(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.createElement(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,
-        handleGlobalToggle: handleGlobalToggle,
-        closeOnSelect: closeOnSelect,
-        onHover: onHover,
-        onItemSelect: onItemSelect,
-        onItemClick: onItemClick,
-        listWidth: listWidth,
-        variant: variant,
-        hasArrow: hasArrow,
-        size: size
+        listWidth: listWidth
       });
-    }))));
+    })))));
   });
 };
 export var dropdownConfig = {

package/styled-components/es/components/Dropdown/Dropdown.styles.js

@@ -1,26 +1,20 @@
 import styled from 'styled-components';
 import { css } from 'styled-components';
-import { component } from '../../engines';
-import { popoverConfig, popoverClasses } from '../Popover';
 import { getCorrectHeight } from './utils';
-import { tokens } from './Dropdown.tokens';
-var Popover = /*#__PURE__*/component(popoverConfig);
-export var StyledPopover = /*#__PURE__*/styled(Popover).withConfig({
-  componentId: "plasma-new-hope__sc-13ezpo5-0"
-})([".", ",.", "{display:block;}"], /*#__PURE__*/String(popoverClasses.wrapper), /*#__PURE__*/String(popoverClasses.target));
+import { tokens, constants } from './Dropdown.tokens';
 export var Ul = /*#__PURE__*/styled.ul.withConfig({
-  componentId: "plasma-new-hope__sc-13ezpo5-1"
-})(["box-sizing:border-box;background:var(", ");box-shadow:var(", ");border-radius:var(", ");width:", ";height:", ";overflow:", ";margin:", ";padding:var(", ");"], tokens.background, tokens.boxShadow, tokens.borderRadius, function (_ref) {
+  componentId: "plasma-new-hope__sc-13ezpo5-0"
+})(["box-sizing:border-box;width:", ";height:", ";margin:", ";padding:var(", ") 0;overflow:", ";background:var(", ");box-shadow:", ";border-radius:var(", ");"], function (_ref) {
   var listWidth = _ref.listWidth;
   return listWidth || "var(".concat(tokens.width, ")");
 }, function (_ref2) {
   var listHeight = _ref2.listHeight;
   return listHeight ? getCorrectHeight(listHeight) : 'auto';
 }, function (_ref3) {
-  var listOverflow = _ref3.listOverflow;
+  var isInnerUl = _ref3.isInnerUl;
+  return isInnerUl ? "calc(var(".concat(tokens.padding, ") * -1) 0.125rem 0") : 0;
+}, tokens.padding, function (_ref4) {
+  var listOverflow = _ref4.listOverflow;
   return listOverflow || 'initial';
-}, function (_ref4) {
-  var isInnerUl = _ref4.isInnerUl;
-  return isInnerUl ? "calc(var(".concat(tokens.padding, ") * -1) 0 0 var(").concat(tokens.padding, ")") : 0;
-}, tokens.padding);
-export var base = /*#__PURE__*/css(["display:inline-block;"]);
+}, constants.background, constants.boxShadow, tokens.borderRadius);
+export var base = /*#__PURE__*/css([""]);

package/styled-components/es/components/Dropdown/Dropdown.tokens.js

@@ -3,7 +3,7 @@ export var classes = {
   dropdownItemIsFocused: 'dropdown-item-is-focused',
   dropdownItemIsDisabled: 'dropdown-item-is-disabled',
   dropdownItemIsActive: 'dropdown-item-is-active',
-  dropdownItemIsSelected: 'dropdownItemIsSelected'
+  dropdownItemIsSelected: 'dropdown-item-is-selected'
 };
 export var tokens = {
   background: '--plasma-dropdown-background',
@@ -14,6 +14,8 @@ export var 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',
@@ -28,6 +30,7 @@ export var 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',
@@ -46,11 +49,17 @@ export var 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',
@@ -65,6 +74,20 @@ export var 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',
@@ -128,4 +151,15 @@ export var tokens = {
   groupLabelMarginRight: '--plasma-dropdown-group-label-margin-right',
   groupLabelMarginBottom: '--plasma-dropdown-group-label-margin-bottom',
   groupLabelMarginLeft: '--plasma-dropdown-group-label-margin-left'
+};
+export var constants = {
+  focusColor: '--surface-accent',
+  background: '--surface-solid-card',
+  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/styled-components/es/components/Dropdown/FloatingPopover.js

@@ -0,0 +1,102 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { flip, shift, useFloating, FloatingPortal, offset as offsetMiddleware, autoPlacement } from '@floating-ui/react';
+import React, { forwardRef } from 'react';
+import { safeUseId } from '@salutejs/plasma-core';
+var FloatingPopover = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var target = _ref.target,
+    children = _ref.children,
+    opened = _ref.opened,
+    onToggle = _ref.onToggle,
+    placement = _ref.placement,
+    portal = _ref.portal,
+    _ref$offset = _ref.offset,
+    offset = _ref$offset === void 0 ? [0, 0] : _ref$offset,
+    isInner = _ref.isInner,
+    trigger = _ref.trigger;
+  var _useFloating = useFloating({
+      placement: placement === 'auto' ? undefined : placement,
+      open: opened,
+      middleware: [placement === 'auto' && autoPlacement(), offsetMiddleware({
+        mainAxis: offset[1],
+        crossAxis: offset[0]
+      }), flip({
+        fallbackAxisSideDirection: 'end'
+      }), shift()]
+    }),
+    refs = _useFloating.refs,
+    floatingStyles = _useFloating.floatingStyles;
+  var wrappedId = safeUseId();
+  var handleTargetClick = function handleTargetClick(event) {
+    if (trigger === 'hover') {
+      return;
+    }
+    if (onToggle) {
+      onToggle(!opened, event);
+    }
+  };
+  var handleTargetMouseEnter = function handleTargetMouseEnter(event) {
+    if (trigger === 'click' || opened) {
+      return;
+    }
+    onToggle(true, event);
+  };
+  var handleTargetMouseLeave = function handleTargetMouseLeave(event) {
+    if (event.relatedTarget instanceof HTMLElement && refs.floating.current instanceof HTMLElement) {
+      var _refs$floating$curren;
+      if (trigger === 'click' || !opened || event.relatedTarget && refs.floating && (_refs$floating$curren = refs.floating.current) !== null && _refs$floating$curren !== void 0 && _refs$floating$curren.contains(event.relatedTarget)) {
+        return;
+      }
+      onToggle(false, event);
+    }
+  };
+  var handleFloatingMouseLeave = function handleFloatingMouseLeave(event) {
+    if (event.relatedTarget instanceof HTMLElement && refs.reference.current instanceof HTMLElement) {
+      var _refs$reference$curre;
+      if (trigger === 'click' || !opened || event.relatedTarget && refs.reference && (_refs$reference$curre = refs.reference.current) !== null && _refs$reference$curre !== void 0 && _refs$reference$curre.contains(event.relatedTarget)) {
+        return;
+      }
+      onToggle(false, event);
+    }
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    id: wrappedId,
+    style: {
+      display: isInner ? 'block' : 'inline-block'
+    },
+    ref: ref
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: refs.setReference,
+    onClick: handleTargetClick,
+    onMouseEnter: handleTargetMouseEnter,
+    onMouseLeave: handleTargetMouseLeave
+  }, target), opened && /*#__PURE__*/React.createElement(FloatingPortal, getFloatingPortalProps(portal, wrappedId), /*#__PURE__*/React.createElement("div", {
+    ref: refs.setFloating,
+    onMouseLeave: handleFloatingMouseLeave,
+    style: _objectSpread(_objectSpread({}, floatingStyles), {}, {
+      zIndex: 1
+    })
+  }, children)));
+});
+// root - принимает ref контейнера портала.
+// id - если есть портал - не используется, если портала нет - подставляется 'wrappedId'.
+var getFloatingPortalProps = function getFloatingPortalProps(portal, wrappedId) {
+  if (!portal) {
+    return {
+      id: wrappedId
+    };
+  }
+  if (typeof portal === 'string') {
+    return {
+      id: portal
+    };
+  }
+  return {
+    root: portal
+  };
+};
+export { FloatingPopover };

package/styled-components/es/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -1,26 +1,18 @@
 import React from 'react';
+import { safeUseId } from '@salutejs/plasma-core';
 import { DropdownItem } from '..';
-import { Ul, StyledPopover } from '../../Dropdown.styles';
+import { Ul } from '../../Dropdown.styles';
+import { FloatingPopover } from '../../FloatingPopover';
 var 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,
-    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;
+    listWidth = _ref.listWidth;
   var handleToggle = function handleToggle(opened) {
     if (opened) {
       dispatchPath({
@@ -36,80 +28,54 @@ var DropdownInner = function DropdownInner(_ref) {
     }
   };
   var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
-  var listId = "tree_level_".concat(currentLevel + 2);
+  var treeId = safeUseId();
+  var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
   var nextLevel = currentLevel + 1;
   if (item !== null && item !== void 0 && item.items) {
-    return /*#__PURE__*/React.createElement(StyledPopover, {
-      opened: isCurrentListOpen,
-      usePortal: false,
+    return /*#__PURE__*/React.createElement(FloatingPopover, {
       placement: "right-start",
+      opened: isCurrentListOpen,
+      onToggle: handleToggle,
       trigger: trigger,
       target: /*#__PURE__*/React.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,
-        size: size
+        ariaLabel: item.label
       }),
-      onToggle: handleToggle,
-      isFocusTrapped: false,
-      preventOverflow: false
+      isInner: true
     }, /*#__PURE__*/React.createElement(Ul, {
+      id: listId,
+      role: "group",
+      isInnerUl: true,
       listHeight: listHeight,
       listOverflow: listOverflow,
-      role: "group",
-      id: listId,
-      listWidth: listWidth,
-      isInnerUl: true
+      listWidth: listWidth
     }, item.items.map(function (innerItem, innerIndex) {
       return /*#__PURE__*/React.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,
-        handleGlobalToggle: handleGlobalToggle,
-        closeOnSelect: closeOnSelect,
-        onHover: onHover,
-        onItemSelect: onItemSelect,
-        onItemClick: onItemClick,
-        listWidth: listWidth,
-        variant: variant,
-        hasArrow: hasArrow,
-        size: size
+        listWidth: listWidth
       });
     })));
   }
   return /*#__PURE__*/React.createElement(DropdownItem, {
     item: item,
+    path: path,
     index: index,
-    focusedPath: focusedPath,
     currentLevel: currentLevel,
-    itemRole: itemRole,
-    handleGlobalToggle: handleGlobalToggle,
-    closeOnSelect: closeOnSelect,
-    onHover: onHover,
-    onItemSelect: onItemSelect,
-    onItemClick: onItemClick,
-    variant: variant,
-    size: size
+    ariaLevel: nextLevel
   });
 };
 export { DropdownInner };

package/styled-components/es/components/Dropdown/ui/DropdownItem/DropdownItem.js

@@ -1,28 +1,19 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useContext } from 'react';
 import { classes } from '../../Dropdown.tokens';
 import { cx } from '../../../../utils';
 import { IconDisclosureRight } from '../../../_Icon';
-import { StyledContentLeft, StyledContentRight, StyledText, Wrapper, DisclosureIconWrapper, Divider } from './DropdownItem.styles';
+import { Context } from '../../Dropdown';
+import { getItemId } from '../../utils';
+import { Wrapper, DisclosureIconWrapper, Divider, CellWrapper, StyledCell } from './DropdownItem.styles';
 export var 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,
-    variant = _ref.variant,
-    hasArrow = _ref.hasArrow,
-    size = _ref.size;
+    ariaLabel = _ref.ariaLabel;
   var value = item.value,
     label = item.label,
     disabled = item.disabled,
@@ -32,6 +23,19 @@ export var DropdownItem = function DropdownItem(_ref) {
     dividerBefore = item.dividerBefore,
     dividerAfter = item.dividerAfter;
   var ref = useRef(null);
+  var _useContext = useContext(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 ? classes.dropdownItemIsDisabled : undefined;
   var focusedClass = currentLevel === focusedPath.length - 1 && index === (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[currentLevel]) ? classes.dropdownItemIsFocused : undefined;
@@ -55,7 +59,9 @@ export var DropdownItem = function DropdownItem(_ref) {
     if (onItemClick) {
       onItemClick(item, event);
     }
-    if (handleGlobalToggle && closeOnSelect) {
+
+    // Закрываем весь дропдаун целиком при клике на айтем без потомков. Только при closeOnSelect === true.
+    if (closeOnSelect && !hasDescendants) {
       handleGlobalToggle(false, event);
     }
   };
@@ -67,20 +73,25 @@ export var DropdownItem = function DropdownItem(_ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, dividerBefore && /*#__PURE__*/React.createElement(Divider, {
     variant: variant
   }), /*#__PURE__*/React.createElement(Wrapper, {
+    ref: ref,
     className: cx(isDisabledClassName, focusedClass, activeClass),
-    id: value.toString(),
+    id: getItemId(treeId, 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
-  }, contentLeft && /*#__PURE__*/React.createElement(StyledContentLeft, null, contentLeft), /*#__PURE__*/React.createElement(StyledText, null, label), contentRight && /*#__PURE__*/React.createElement(StyledContentRight, null, contentRight), item.items && hasArrow && /*#__PURE__*/React.createElement(DisclosureIconWrapper, null, /*#__PURE__*/React.createElement(IconDisclosureRight, {
+  }, /*#__PURE__*/React.createElement(CellWrapper, null, /*#__PURE__*/React.createElement(StyledCell, {
+    contentLeft: contentLeft,
+    contentRight: contentRight,
+    alignContentLeft: "center",
+    alignContentRight: "center",
+    title: label
+  })), item.items && hasArrow && /*#__PURE__*/React.createElement(DisclosureIconWrapper, null, /*#__PURE__*/React.createElement(IconDisclosureRight, {
     size: disclosureIconSize,
     color: "inherit"
   }))), dividerAfter && /*#__PURE__*/React.createElement(Divider, {