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

package/styled-components/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/styled-components/cjs/components/Dropdown/Dropdown.styles.js

@@ -4,25 +4,31 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.base = exports.Ul = void 0;
+exports.base = exports.Ul = exports.StyledPopover = void 0;
 var _styledComponents = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("styled-components"));
+var _engines = /*#__PURE__*/require("../../engines");
+var _Popover = /*#__PURE__*/require("../Popover");
 var _utils = /*#__PURE__*/require("./utils");
 var _Dropdown = /*#__PURE__*/require("./Dropdown.tokens");
 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 Ul = exports.Ul = /*#__PURE__*/_styledComponents["default"].ul.withConfig({
+var Popover = /*#__PURE__*/(0, _engines.component)(_Popover.popoverConfig);
+var StyledPopover = exports.StyledPopover = /*#__PURE__*/(0, _styledComponents["default"])(Popover).withConfig({
   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) {
+})([".", ",.", "{display:block;}"], /*#__PURE__*/String(_Popover.popoverClasses.wrapper), /*#__PURE__*/String(_Popover.popoverClasses.target));
+var Ul = exports.Ul = /*#__PURE__*/_styledComponents["default"].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(", ");"], _Dropdown.tokens.background, _Dropdown.tokens.boxShadow, _Dropdown.tokens.borderRadius, function (_ref) {
   var listWidth = _ref.listWidth;
   return listWidth || "var(".concat(_Dropdown.tokens.width, ")");
 }, function (_ref2) {
   var listHeight = _ref2.listHeight;
   return listHeight ? (0, _utils.getCorrectHeight)(listHeight) : 'auto';
 }, function (_ref3) {
-  var isInnerUl = _ref3.isInnerUl;
-  return isInnerUl ? "calc(var(".concat(_Dropdown.tokens.padding, ") * -1) 0.125rem 0") : 0;
-}, _Dropdown.tokens.padding, function (_ref4) {
-  var listOverflow = _ref4.listOverflow;
+  var listOverflow = _ref3.listOverflow;
   return listOverflow || 'initial';
-}, _Dropdown.constants.background, _Dropdown.constants.boxShadow, _Dropdown.tokens.borderRadius);
-var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)([""]);
+}, function (_ref4) {
+  var isInnerUl = _ref4.isInnerUl;
+  return isInnerUl ? "calc(var(".concat(_Dropdown.tokens.padding, ") * -1) 0 0 var(").concat(_Dropdown.tokens.padding, ")") : 0;
+}, _Dropdown.tokens.padding);
+var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)(["display:inline-block;"]);

package/styled-components/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',
-  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/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/styled-components/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, {

package/styled-components/cjs/components/Dropdown/ui/DropdownItem/DropdownItem.styles.js

@@ -3,26 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Wrapper = exports.StyledCell = exports.Divider = exports.DisclosureIconWrapper = exports.CellWrapper = void 0;
+exports.Wrapper = exports.StyledText = exports.StyledContentRight = exports.StyledContentLeft = exports.Divider = exports.DisclosureIconWrapper = void 0;
 var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
 var _Dropdown = /*#__PURE__*/require("../../Dropdown.tokens");
 var _mixins = /*#__PURE__*/require("../../../../mixins");
-var _Cell = /*#__PURE__*/require("../../../Cell");
-var _engines = /*#__PURE__*/require("../../../../engines");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-var mergedCellConfig = /*#__PURE__*/(0, _engines.mergeConfig)(_Cell.cellConfig);
-var Cell = /*#__PURE__*/(0, _engines.component)(mergedCellConfig);
-var CellWrapper = exports.CellWrapper = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+var StyledContentLeft = exports.StyledContentLeft = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-hs0ek1-0"
-})(["", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");width:100%;"], _Cell.cellTokens.cellTitleColor, _Dropdown.constants.cellTitleColor, _Cell.cellTokens.cellBackgroundColor, _Dropdown.constants.cellBackgroundColor, _Cell.cellTokens.cellPadding, _Dropdown.tokens.cellPadding, _Cell.cellTokens.cellPaddingLeftContent, _Dropdown.tokens.cellPaddingLeftContent, _Cell.cellTokens.cellPaddingContent, _Dropdown.tokens.cellPaddingContent, _Cell.cellTokens.cellPaddingRightContent, _Dropdown.tokens.cellPaddingRightContent, _Cell.cellTokens.cellTextboxGap, _Dropdown.tokens.cellTextboxGap, _Cell.cellTokens.cellGap, _Dropdown.tokens.cellGap, _Cell.cellTokens.cellTitleFontFamily, _Dropdown.tokens.cellTitleFontFamily, _Cell.cellTokens.cellTitleFontSize, _Dropdown.tokens.cellTitleFontSize, _Cell.cellTokens.cellTitleFontStyle, _Dropdown.tokens.cellTitleFontStyle, _Cell.cellTokens.cellTitleFontWeight, _Dropdown.tokens.cellTitleFontWeight, _Cell.cellTokens.cellTitleLetterSpacing, _Dropdown.tokens.cellTitleLetterSpacing, _Cell.cellTokens.cellTitleLineHeight, _Dropdown.tokens.cellTitleLineHeight);
-var StyledCell = exports.StyledCell = /*#__PURE__*/(0, _styledComponents["default"])(Cell).withConfig({
+})(["display:inline-flex;"]);
+var StyledContentRight = exports.StyledContentRight = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-hs0ek1-1"
-})([""]);
+})(["margin-left:auto;display:inline-flex;"]);
 var DisclosureIconWrapper = exports.DisclosureIconWrapper = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-hs0ek1-2"
-})(["line-height:0;color:var(", ");"], _Dropdown.constants.disclosureIconColor);
-var Divider = exports.Divider = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+})(["line-height:0;color:var(", ");"], _Dropdown.tokens.disclosureIconColor);
+var StyledText = exports.StyledText = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-hs0ek1-3"
+})(["", ";flex:1;"], /*#__PURE__*/(0, _mixins.applyEllipsis)());
+var Divider = exports.Divider = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  componentId: "plasma-new-hope__sc-hs0ek1-4"
 })(["height:1px;margin-top:", ";margin-right:var(", ");margin-bottom:", ";margin-left:var(", ");background:var(", ");"], function (_ref) {
   var variant = _ref.variant;
   return "var(".concat(variant === 'tight' ? _Dropdown.tokens.dividerMarginTopTight : _Dropdown.tokens.dividerMarginTop, ")");
@@ -31,15 +30,18 @@ var Divider = exports.Divider = /*#__PURE__*/_styledComponents["default"].div.wi
   return "var(".concat(variant === 'tight' ? _Dropdown.tokens.dividerMarginBottomTight : _Dropdown.tokens.dividerMarginBottom, ")");
 }, _Dropdown.tokens.dividerMarginLeft, _Dropdown.tokens.dividerColor);
 var Wrapper = exports.Wrapper = /*#__PURE__*/_styledComponents["default"].li.withConfig({
-  componentId: "plasma-new-hope__sc-hs0ek1-4"
-})(["display:flex;align-items:center;min-height:var(", ");margin:0;box-sizing:content-box;padding:", ";font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");background-color:var(", ");border-radius:var(", ");user-select:none;border-right:0.125rem solid transparent;border-left:0.125rem solid transparent;background-clip:padding-box;&:hover:not(.", "){cursor:pointer;background-color:var(", ");}&.", "{background-color:var(", ");}&.", "{opacity:", ";cursor:not-allowed;}:focus{outline:none;}", ";"], _Dropdown.tokens.itemHeight, function (_ref3) {
+  componentId: "plasma-new-hope__sc-hs0ek1-5"
+})(["display:flex;align-items:center;margin:0;box-sizing:content-box;padding-top:", ";padding-right:var(", ");padding-bottom:", ";padding-left:var(", ");font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");background:var(", ");color:var(", ");border-radius:var(", ");user-select:none;&:hover:not(.", "){cursor:pointer;background:var(", ");}&.", "{background:var(", ");}&.", "{opacity:var(", ");cursor:not-allowed;}:focus{outline:none;}", ";"], function (_ref3) {
   var variant = _ref3.variant;
-  return "var(".concat(variant === 'tight' ? _Dropdown.tokens.itemPaddingTight : _Dropdown.tokens.itemPadding, ")");
-}, _Dropdown.tokens.itemFontFamily, _Dropdown.tokens.itemFontSize, _Dropdown.tokens.itemFontStyle, _Dropdown.tokens.itemFontWeightBold, _Dropdown.tokens.itemFontLetterSpacing, _Dropdown.tokens.itemFontLineHeight, _Dropdown.constants.itemBackground, _Dropdown.tokens.borderRadius, _Dropdown.classes.dropdownItemIsDisabled, _Dropdown.constants.itemBackgroundHover, _Dropdown.classes.dropdownItemIsActive, _Dropdown.constants.itemBackgroundHover, _Dropdown.classes.dropdownItemIsDisabled, _Dropdown.constants.opacity, /*#__PURE__*/(0, _mixins.addFocus)({
+  return "var(".concat(variant === 'tight' ? _Dropdown.tokens.itemPaddingTopTight : _Dropdown.tokens.itemPaddingTop, ")");
+}, _Dropdown.tokens.itemPaddingRight, function (_ref4) {
+  var variant = _ref4.variant;
+  return "var(".concat(variant === 'tight' ? _Dropdown.tokens.itemPaddingBottomTight : _Dropdown.tokens.itemPaddingBottom, ")");
+}, _Dropdown.tokens.itemPaddingLeft, _Dropdown.tokens.itemFontFamily, _Dropdown.tokens.itemFontSize, _Dropdown.tokens.itemFontStyle, _Dropdown.tokens.itemFontWeightBold, _Dropdown.tokens.itemFontLetterSpacing, _Dropdown.tokens.itemFontLineHeight, _Dropdown.tokens.itemBackground, _Dropdown.tokens.itemColor, _Dropdown.tokens.itemBorderRadius, _Dropdown.classes.dropdownItemIsDisabled, _Dropdown.tokens.itemBackgroundHover, _Dropdown.classes.dropdownItemIsActive, _Dropdown.tokens.itemBackgroundHover, _Dropdown.classes.dropdownItemIsDisabled, _Dropdown.tokens.disabledOpacity, /*#__PURE__*/(0, _mixins.addFocus)({
   outlineSize: '0.0625rem',
   outlineOffset: '0',
-  outlineColor: /*#__PURE__*/"var(".concat(_Dropdown.constants.focusColor, ")"),
+  outlineColor: /*#__PURE__*/"var(".concat(_Dropdown.tokens.focusColor, ")"),
   outlineRadius: /*#__PURE__*/"var(".concat(_Dropdown.tokens.itemBorderRadius, ")"),
   hasTransition: false,
-  customFocusRules: /*#__PURE__*/"\n            &.".concat(_Dropdown.classes.dropdownItemIsFocused, ":before {\n                outline: none;\n                box-shadow: 0 0 0 0.0625rem var(").concat(_Dropdown.constants.focusColor, ");\n            }\n        ")
+  customFocusRules: /*#__PURE__*/"\n            &.".concat(_Dropdown.classes.dropdownItemIsFocused, ":before {\n                outline: none;\n                box-shadow: 0 0 0 0.0625rem var(").concat(_Dropdown.tokens.focusColor, ");\n            }\n        ")
 }));

package/styled-components/cjs/components/Dropdown/utils/index.js

@@ -3,30 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCorrectHeight = exports.childrenWithProps = void 0;
-Object.defineProperty(exports, "getItemByFocused", {
-  enumerable: true,
-  get: function get() {
-    return _getItemByFocused.getItemByFocused;
-  }
-});
-Object.defineProperty(exports, "getItemId", {
-  enumerable: true,
-  get: function get() {
-    return _getItemId.getItemId;
-  }
-});
-Object.defineProperty(exports, "getPlacement", {
-  enumerable: true,
-  get: function get() {
-    return _getPlacement.getPlacement;
-  }
-});
-exports.getValidComponent = void 0;
+exports.getValidComponent = exports.getCorrectHeight = exports.childrenWithProps = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
-var _getItemId = /*#__PURE__*/require("./getItemId");
-var _getItemByFocused = /*#__PURE__*/require("./getItemByFocused");
-var _getPlacement = /*#__PURE__*/require("./getPlacement");
 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; }
 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); }

package/styled-components/cjs/components/Notification/Notification.js

@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.notificationRoot = exports.noticationConfig = void 0;
+exports.notificationRoot = exports.notificationConfig = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
 var _utils = /*#__PURE__*/require("../../utils");
 var _IconCross2 = /*#__PURE__*/require("../_Icon/Icons/IconCross");
@@ -94,7 +94,7 @@ var notificationRoot = exports.notificationRoot = function notificationRoot(Root
     })))));
   });
 };
-var noticationConfig = exports.noticationConfig = {
+var notificationConfig = exports.notificationConfig = {
   name: 'Notification',
   tag: 'div',
   layout: notificationRoot,