@salutejs/plasma-new-hope 0.78.0-canary.1201.8968491632.0 → 0.78.0-canary.1203.8970261959.0

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

@@ -1,169 +1,82 @@
-var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow"];
+var _excluded = ["id", "target", "children", "hasArrow", "role", "view", "size", "frame", "onToggle", "isFocusTrapped", "isOpen", "placement", "trigger", "offset", "preventOverflow", "closeOnOverlayClick", "closeOnEsc"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-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 } from '../../utils';
-import { pathReducer } from './reducers/pathReducer';
-import { focusedPathReducer } from './reducers/focusedPathReducer';
-import { DropdownInner } from './ui';
+import React, { forwardRef, useRef } from 'react';
+import { useFocusTrap, useForkRef, useUniqId } from '@salutejs/plasma-core';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
-import { Ul, StyledPopover, base } from './Dropdown.styles';
-import { getPlacements, childrenWithProps } from './utils';
-import { classes } from './Dropdown.tokens';
-import { useKeyNavigation } from './hooks/useKeyboardNavigation';
-import { useHashMaps } from './hooks/useHashMaps';
-
+import { StyledDropdown, StyledPopover } from './Dropdown.styles';
+import { getPlacements } from './utils';
 /**
- * Выпадающий список.
+ * Выпадающий список без внешнего контроля видимости.
  */
 export var dropdownRoot = function dropdownRoot(Root) {
-  return /*#__PURE__*/forwardRef(function (_ref, ref) {
-    var items = _ref.items,
+  return /*#__PURE__*/forwardRef(function (_ref, outerRootRef) {
+    var id = _ref.id,
+      target = _ref.target,
       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,
-      _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
-      closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
-      onToggle = _ref.onToggle,
-      size = _ref.size,
+      hasArrow = _ref.hasArrow,
+      role = _ref.role,
       view = _ref.view,
-      _ref$itemRole = _ref.itemRole,
-      itemRole = _ref$itemRole === void 0 ? 'treeitem' : _ref$itemRole,
-      className = _ref.className,
-      listWidth = _ref.listWidth,
-      listHeight = _ref.listHeight,
-      listOverflow = _ref.listOverflow,
-      _ref$closeOnSelect = _ref.closeOnSelect,
-      closeOnSelect = _ref$closeOnSelect === void 0 ? true : _ref$closeOnSelect,
-      onHover = _ref.onHover,
-      onItemSelect = _ref.onItemSelect,
-      onItemClick = _ref.onItemClick,
+      size = _ref.size,
+      frame = _ref.frame,
+      _onToggle = _ref.onToggle,
+      _ref$isFocusTrapped = _ref.isFocusTrapped,
+      isFocusTrapped = _ref$isFocusTrapped === void 0 ? true : _ref$isFocusTrapped,
+      _ref$isOpen = _ref.isOpen,
+      isOpen = _ref$isOpen === void 0 ? false : _ref$isOpen,
+      _ref$placement = _ref.placement,
+      placement = _ref$placement === void 0 ? 'auto' : _ref$placement,
       _ref$trigger = _ref.trigger,
       trigger = _ref$trigger === void 0 ? 'click' : _ref$trigger,
-      _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'normal' : _ref$variant,
-      _ref$hasArrow = _ref.hasArrow,
-      hasArrow = _ref$hasArrow === void 0 ? true : _ref$hasArrow,
+      _ref$offset = _ref.offset,
+      offset = _ref$offset === void 0 ? [0, 6] : _ref$offset,
+      _ref$preventOverflow = _ref.preventOverflow,
+      preventOverflow = _ref$preventOverflow === void 0 ? false : _ref$preventOverflow,
+      _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
+      closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? false : _ref$closeOnOverlayCl,
+      _ref$closeOnEsc = _ref.closeOnEsc,
+      closeOnEsc = _ref$closeOnEsc === void 0 ? false : _ref$closeOnEsc,
       rest = _objectWithoutProperties(_ref, _excluded);
-    var _useReducer = useReducer(pathReducer, []),
-      _useReducer2 = _slicedToArray(_useReducer, 2),
-      path = _useReducer2[0],
-      dispatchPath = _useReducer2[1];
-    var _useReducer3 = useReducer(focusedPathReducer, []),
-      _useReducer4 = _slicedToArray(_useReducer3, 2),
-      focusedPath = _useReducer4[0],
-      dispatchFocusedPath = _useReducer4[1];
-    var _useHashMaps = useHashMaps(items),
-      _useHashMaps2 = _slicedToArray(_useHashMaps, 2),
-      pathMap = _useHashMaps2[0],
-      focusedToValueMap = _useHashMaps2[1];
-    var handleGlobalToggle = function handleGlobalToggle(opened, event) {
-      if (opened) {
-        dispatchPath({
-          type: 'opened_first_level'
-        });
-      } else {
-        dispatchFocusedPath({
-          type: 'reset'
-        });
-        dispatchPath({
-          type: 'reset'
-        });
-      }
-      if (onToggle) {
-        onToggle(opened, event);
-      }
-    };
-    var _useKeyNavigation = useKeyNavigation({
-        focusedPath: focusedPath,
-        dispatchFocusedPath: dispatchFocusedPath,
-        path: path,
-        dispatchPath: dispatchPath,
-        pathMap: pathMap,
-        focusedToValueMap: focusedToValueMap,
-        handleGlobalToggle: handleGlobalToggle,
-        closeOnSelect: closeOnSelect,
-        onItemSelect: onItemSelect,
-        onItemClick: onItemClick
-      }),
-      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(Root, _extends({
-      className: cx(className, classes.dropdownRoot),
-      ref: ref,
-      view: view,
-      size: size,
-      items: items
-    }, rest), /*#__PURE__*/React.createElement(StyledPopover, {
-      isOpen: isCurrentListOpen,
+    var uniqId = useUniqId();
+    var innerId = id || uniqId;
+    var rootRef = useRef(null);
+    var dropdownRef = useRef(null);
+    var handleRef = useForkRef(rootRef, outerRootRef);
+    var trapRef = useFocusTrap(isOpen && isFocusTrapped);
+    var dropdownForkRef = useForkRef(dropdownRef, trapRef);
+    return /*#__PURE__*/React.createElement(StyledPopover, {
+      role: role,
+      isOpen: isOpen,
       usePortal: false,
-      onToggle: handleGlobalToggle,
+      onToggle: function onToggle(is, event) {
+        return _onToggle === null || _onToggle === void 0 ? void 0 : _onToggle(is, event);
+      },
+      id: innerId,
+      ref: dropdownForkRef,
+      target: target,
       offset: offset,
+      preventOverflow: preventOverflow,
+      hasArrow: hasArrow,
       placement: getPlacements(placement),
       trigger: trigger,
       closeOnOverlayClick: closeOnOverlayClick,
-      isFocusTrapped: false,
-      target: childrenWithProps(children, {
-        role: 'combobox',
-        'aria-controls': 'listbox1',
-        'aria-expanded': isCurrentListOpen,
-        'aria-activedescendant': getActiveDescendant(),
-        onKeyDown: onKeyDown
-      }),
-      preventOverflow: false
-    }, /*#__PURE__*/React.createElement(Ul, {
-      listHeight: listHeight,
-      listOverflow: listOverflow,
-      role: "tree",
-      id: "listbox1",
-      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
-      });
-    }))));
+      closeOnEsc: closeOnEsc,
+      isFocusTrapped: isFocusTrapped,
+      frame: frame
+    }, /*#__PURE__*/React.createElement(Root, _extends({
+      ref: handleRef,
+      view: view,
+      size: size
+    }, rest), /*#__PURE__*/React.createElement(StyledDropdown, null, children)));
   });
 };
 export var dropdownConfig = {
   name: 'Dropdown',
   tag: 'div',
   layout: dropdownRoot,
-  base: base,
+  base: '',
   variations: {
     view: {
       css: viewCSS

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

@@ -1,26 +1,13 @@
 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';
+
+// issue #823
 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));
-export var Ul = /*#__PURE__*/styled.ul.withConfig({
+})([".", "{display:block;}"], /*#__PURE__*/String(popoverClasses.target));
+export var StyledDropdown = /*#__PURE__*/styled.div.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) {
-  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;
-  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;"]);
+})(["box-sizing:border-box;background:var(", ");box-shadow:var(", ");border-radius:var(", ");width:var(", ");height:var(", ");padding:var(", ") var(", ") var(", ") var(", ");"], tokens.background, tokens.boxShadow, tokens.borderRadius, tokens.width, tokens.height, tokens.paddingTop, tokens.paddingRight, tokens.paddingBottom, tokens.paddingLeft);

package/styled-components/es/components/Dropdown/Dropdown.template-doc.mdx

@@ -0,0 +1,80 @@
+---
+id: dropdown
+title: Dropdown
+---
+
+import { PropsTable, Description } from '@site/src/components';
+
+# Dropdown
+Набор компонентов для создания выпадающих списков. 
+
+<Description name="Dropdown" />
+<PropsTable name="Dropdown" exclude={['css']} />
+
+# DropdownItem
+
+<Description name="DropdownItem" />
+<PropsTable name="DropdownItem" exclude={['css']} />
+
+## Использование
+
+```tsx live
+import React, { useState } from 'react';
+import { Dropdown, DropdownItem } from '@salutejs/{{ package }}';
+import { surfaceSolidSecondary } from '@salutejs/{{ theme }}';
+
+export function App() {
+    const [selected, setSelected] = useState('');
+    const [isOpen, setIsOpen] = useState(false);
+
+    const handleSelect = (value: string, text: string) => {
+        setSelected(value);
+        setIsOpen(false);
+    };
+
+    const getDropdownItems = (slug: string, elemCount: number) =>
+    [...Array(elemCount).keys()].map((num) => ({
+        value: `${slug}_${num}`,
+        child: `${slug} ${num}`,
+    }));
+
+    return (
+        <div style=\{{height: "400px", background: surfaceSolidSecondary, padding: "1rem" }}>
+            <Dropdown
+                    target={<Button>Target</Button>}
+                    isOpen={isOpen}
+                    onToggle={() => {
+                        setIsOpen(!isOpen);
+                    }}
+                    offset={[10, 15]}
+                    view="primary"
+                    size="m"
+                    placement="right"
+                    trigger="click"
+                    closeOnOverlayClick={false}
+                    closeOnEsc
+                    isFocusTrapped
+                >
+                    {getDropdownItems('item', 6).map((item) => (
+                        <DropdownItem
+                            key={item.value}
+                            isSelected={Boolean(item.value === selected)}
+                            onSelect={() => handleSelect(item.value, item.child)}
+                            value={item.value}
+                        >
+                            {item.child}
+                        </DropdownItem>
+                    ))}
+                    <DropdownItem
+                        isSelected={selected === 'disabled'}
+                        onSelect={() => handleSelect('disabled', 'disabled')}
+                        value="disabled"
+                        disabled
+                    >
+                        disabled
+                    </DropdownItem>
+                </Dropdown>
+            </div>
+    );
+}
+```

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

@@ -1,36 +1,45 @@
 export var classes = {
-  dropdownRoot: 'dropdown-root',
-  dropdownItemIsFocused: 'dropdown-item-is-focused',
-  dropdownItemIsDisabled: 'dropdown-item-is-disabled',
-  dropdownItemIsActive: 'dropdown-item-is-active',
-  dropdownItemIsSelected: 'dropdownItemIsSelected'
+  dropdownItemIsSelected: 'dropdown-item-is-selected',
+  dropdownItemIsDisabled: 'dropdown-item-is-disabled'
 };
 export var tokens = {
   background: '--plasma-dropdown-background',
   boxShadow: '--plasma-dropdown-box-shadow',
   width: '--plasma-dropdown-width',
+  height: '--plasma-dropdown-height',
   borderRadius: '--plasma-dropdown-border-radius',
-  padding: '--plasma-dropdown-padding',
-  disclosureIconColor: '--plasma-dropdown-disclosure-icon-color',
+  paddingTop: '--plasma-dropdown-padding-top',
+  paddingRight: '--plasma-dropdown-padding-right',
+  paddingBottom: '--plasma-dropdown-padding-bottom',
+  paddingLeft: '--plasma-dropdown-padding-left',
   itemBackground: '--plasma-dropdown-item-background',
   itemColor: '--plasma-dropdown-item-color',
   itemBackgroundHover: '--plasma-dropdown-item-background-hover',
+  itemBackgroundSelected: '--plasma-dropdown-item-background-selected',
+  itemColorSelected: '--plasma-dropdown-item-color-selected',
+  itemBackgroundSelectedHover: '--plasma-dropdown-item-background-selected-hover',
+  itemColorSelectedHover: '--plasma-dropdown-item-color-selected-hover',
+  itemWidth: '--plasma-dropdown-item-width',
+  itemHeight: '--plasma-dropdown-item-height',
   itemBorderRadius: '--plasma-dropdown-item-border-radius',
   itemPaddingTop: '--plasma-dropdown-item-padding-top',
-  itemPaddingTopTight: '--plasma-dropdown-item-padding-top-tight',
   itemPaddingRight: '--plasma-dropdown-item-padding-right',
   itemPaddingBottom: '--plasma-dropdown-item-padding-bottom',
-  itemPaddingBottomTight: '--plasma-dropdown-item-padding-bottom-tight',
   itemPaddingLeft: '--plasma-dropdown-item-padding-left',
+  itemMarginTop: '--plasma-dropdown-item-margin-top',
+  itemMarginRight: '--plasma-dropdown-item-margin-right',
+  itemMarginBottom: '--plasma-dropdown-item-margin-bottom',
+  itemMarginLeft: '--plasma-dropdown-item-margin-left',
   itemFontFamily: '--plasma-dropdown-item-font-family',
   itemFontSize: '--plasma-dropdown-item-font-size',
   itemFontStyle: '--plasma-dropdown-item-font-style',
   itemFontWeightBold: '--plasma-dropdown-item-letter-spacing',
   itemFontLetterSpacing: '--plasma-dropdown-item-line-height',
   itemFontLineHeight: '--plasma-dropdown-item-font-weight',
-  disabledOpacity: '--plasma-dropdown-disabled-opacity',
-  focusColor: '--plasma-dropdown-focus-color',
-  // TODO: Remove below tokens as soon as they are no longer needed
+  itemContentLeftColor: '--plasma-dropdown-item-content-left-color',
+  itemContentRightColor: '--plasma-dropdown-item-content-right-color',
+  itemContentLeftWidth: '--plasma-dropdown-item-content-left-width',
+  itemContentRightWidth: '--plasma-dropdown-item-content-right-width',
   footerBackground: '--plasma-dropdown-footer-background',
   footerWidth: '--plasma-dropdown-footer-width',
   footerHeight: '--plasma-dropdown-footer-height',
@@ -98,18 +107,6 @@ export var tokens = {
   groupLabelMarginRight: '--plasma-dropdown-group-label-margin-right',
   groupLabelMarginBottom: '--plasma-dropdown-group-label-margin-bottom',
   groupLabelMarginLeft: '--plasma-dropdown-group-label-margin-left',
-  itemBackgroundSelected: '--plasma-dropdown-item-background-selected',
-  itemColorSelected: '--plasma-dropdown-item-color-selected',
-  itemBackgroundSelectedHover: '--plasma-dropdown-item-background-selected-hover',
-  itemColorSelectedHover: '--plasma-dropdown-item-color-selected-hover',
-  itemContentLeftColor: '--plasma-dropdown-item-content-left-color',
-  itemContentRightColor: '--plasma-dropdown-item-content-right-color',
-  itemWidth: '--plasma-dropdown-item-width',
-  itemHeight: '--plasma-dropdown-item-height',
-  itemMarginTop: '--plasma-dropdown-item-margin-top',
-  itemMarginRight: '--plasma-dropdown-item-margin-right',
-  itemMarginBottom: '--plasma-dropdown-item-margin-bottom',
-  itemMarginLeft: '--plasma-dropdown-item-margin-left',
-  itemContentLeftWidth: '--plasma-dropdown-item-content-left-width',
-  itemContentRightWidth: '--plasma-dropdown-item-content-right-width'
+  disabledOpacity: '--plasma-dropdown-disabled-opacity',
+  focusColor: '--plasma-dropdown-focus-color'
 };

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

@@ -1,4 +1,3 @@
 export { dropdownRoot, dropdownConfig } from './Dropdown';
 export { classes as dropdownClasses, tokens as dropdownTokens } from './Dropdown.tokens';
-export { useKeyNavigation as useDropdownKeyNavigation } from './hooks/useKeyboardNavigation';
 export * from './ui';

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

@@ -1,82 +1,111 @@
-var _DisclosureIconWrappe;
-import React, { useEffect, useRef } from 'react';
+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); }
+var _excluded = ["id", "className", "children", "text", "isSelected", "name", "checked", "value", "role", "view", "size", "disabled", "contentLeft", "contentRight", "onSelect", "onClick", "onChange"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+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); }
+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, useCallback, useMemo } from 'react';
+import { safeUseId } from '@salutejs/plasma-core';
 import { classes } from '../../Dropdown.tokens';
 import { cx } from '../../../../utils';
-import { IconDisclosureRight } from '../../../_Icon';
-import { StyledContentLeft, StyledContentRight, StyledText, Wrapper, DisclosureIconWrapper } 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;
-  var value = item.value,
-    label = item.label,
-    disabled = item.disabled,
-    isDisabled = item.isDisabled,
-    contentLeft = item.contentLeft,
-    contentRight = item.contentRight;
-  var ref = useRef(null);
-  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;
-  var activeClass = value === (path === null || path === void 0 ? void 0 : path[currentLevel + 1]) ? classes.dropdownItemIsActive : undefined;
-  useEffect(function () {
-    if (focusedClass && ref !== null && ref !== void 0 && ref.current) {
-      ref.current.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center',
-        inline: 'center'
-      });
+import { getValidComponent } from '../../utils';
+import { base as viewCSS } from './variations/_view/base';
+import { base as sizeCSS } from './variations/_size/base';
+import { StyledContentLeft, StyledContentRight, StyledText, base } from './DropdownItem.styles';
+/**
+ * Элемент выпадающего списка
+ */
+export var dropdownItemRoot = function dropdownItemRoot(Root) {
+  return /*#__PURE__*/forwardRef(function (_ref, outerRootRef) {
+    var id = _ref.id,
+      className = _ref.className,
+      children = _ref.children,
+      text = _ref.text,
+      isSelected = _ref.isSelected,
+      name = _ref.name,
+      checked = _ref.checked,
+      value = _ref.value,
+      role = _ref.role,
+      view = _ref.view,
+      size = _ref.size,
+      disabled = _ref.disabled,
+      ContentLeftComponent = _ref.contentLeft,
+      ContentRightComponent = _ref.contentRight,
+      onSelect = _ref.onSelect,
+      onClick = _ref.onClick,
+      onChange = _ref.onChange,
+      rest = _objectWithoutProperties(_ref, _excluded);
+    var uniqId = safeUseId();
+    var innerId = id || uniqId;
+    var withDropdownItemIsSelected = checked || isSelected ? classes.dropdownItemIsSelected : undefined;
+    var withDropdownItemIsDisabled = disabled ? classes.dropdownItemIsDisabled : undefined;
+    var handleOnClick = useCallback(function (event) {
+      if (disabled) {
+        return;
+      }
+      onClick === null || onClick === void 0 || onClick(event);
+      if (onSelect && !ContentLeftComponent) {
+        onSelect(value, text);
+      }
+    }, [onSelect, disabled]);
+    var handleOnChange = useCallback(function (event) {
+      if (disabled) {
+        return;
+      }
+      onChange === null || onChange === void 0 || onChange(event);
+      if (onSelect && ContentLeftComponent) {
+        onSelect(value, text);
+      }
+    }, [onSelect, disabled]);
+    var contentProps = _objectSpread({
+      name: name,
+      value: value,
+      checked: checked || isSelected,
+      disabled: disabled,
+      tabIndex: 0
+    }, !disabled && {
+      onChange: handleOnChange
+    });
+    var ContentLeft = useMemo(function () {
+      return getValidComponent(ContentLeftComponent, contentProps);
+    }, [ContentRightComponent, contentProps]);
+    var ContentRight = useMemo(function () {
+      return getValidComponent(ContentRightComponent, contentProps);
+    }, [ContentRightComponent, contentProps]);
+    return /*#__PURE__*/React.createElement(Root, _extends({
+      className: cx(withDropdownItemIsSelected, withDropdownItemIsDisabled, className),
+      view: view,
+      size: size,
+      id: innerId,
+      isSelected: isSelected,
+      role: role,
+      ref: outerRootRef,
+      tabIndex: 0,
+      "aria-disabled": disabled,
+      onClick: handleOnClick,
+      "data-value": value
+    }, rest), text ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyledContentLeft, null, ContentLeftComponent && ContentLeft), /*#__PURE__*/React.createElement(StyledText, null, text), /*#__PURE__*/React.createElement(StyledContentRight, null, ContentRightComponent && ContentRight)) : children);
+  });
+};
+export var dropdownItemConfig = {
+  name: 'DropdownItem',
+  tag: 'div',
+  layout: dropdownItemRoot,
+  base: base,
+  variations: {
+    view: {
+      css: viewCSS
+    },
+    size: {
+      css: sizeCSS
     }
-  }, [focusedClass]);
-  var handleClick = function handleClick(event) {
-    if (disabled || isDisabled) {
-      return;
-    }
-    if (onItemSelect) {
-      onItemSelect(item, event);
-    }
-    if (onItemClick) {
-      onItemClick(item, event);
-    }
-    if (handleGlobalToggle && closeOnSelect) {
-      handleGlobalToggle(false, event);
-    }
-  };
-  var handleHover = function handleHover() {
-    if (onHover) {
-      onHover(index);
-    }
-  };
-  return /*#__PURE__*/React.createElement(Wrapper, {
-    className: cx(isDisabledClassName, focusedClass, activeClass),
-    id: value.toString(),
-    role: itemRole,
-    ref: ref,
-    "aria-disabled": disabled || isDisabled,
-    onClick: handleClick,
-    onMouseEnter: handleHover,
-    variant: variant,
-    "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 && (_DisclosureIconWrappe || (_DisclosureIconWrappe = /*#__PURE__*/React.createElement(DisclosureIconWrapper, null, /*#__PURE__*/React.createElement(IconDisclosureRight, {
-    size: "xs",
-    color: "inherit"
-  })))));
+  },
+  defaults: {
+    view: 'primary',
+    size: 'm'
+  }
 };