@salutejs/plasma-new-hope 0.77.1-canary.1201.8930079977.0 → 0.77.1-canary.1202.8938243709.0

package/styled-components/cjs/examples/sds_engineer/components/Dropdown/Dropdown.stories.tsx

@@ -0,0 +1,277 @@
+import React, { useRef, useState } from 'react';
+import type { ComponentProps } from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import styled from 'styled-components';
+import { css } from 'styled-components';
+import { action } from '@storybook/addon-actions';
+
+import { WithTheme, argTypesFromConfig } from '../../../_helpers';
+import { mergeConfig } from '../../../../engines';
+import { dropdownConfig } from '../../../../components/Dropdown';
+import { Checkbox } from '../Checkbox/Checkbox';
+import { Radiobox } from '../Radiobox/Radiobox';
+import { Button } from '../Button/Button';
+
+import { Dropdown, DropdownDivider, DropdownFooter, DropdownGroup, DropdownHeader, DropdownItem } from './Dropdown';
+import { config } from './Dropdown.config';
+
+type StoryDropdownPropsCustom = {
+    skidding?: number;
+    distance?: number;
+};
+
+type StoryDropdownProps = ComponentProps<typeof Dropdown> & StoryDropdownPropsCustom;
+
+const placements: Array<string> = ['top', 'bottom', 'right', 'left', 'auto'];
+const triggers: Array<string> = ['click', 'hover'];
+
+const meta: Meta<StoryDropdownProps> = {
+    title: 'sds_engineer/Dropdown',
+    decorators: [WithTheme],
+    component: Dropdown,
+    argTypes: {
+        placement: {
+            options: placements,
+            control: {
+                type: 'select',
+            },
+        },
+        trigger: {
+            options: triggers,
+            control: {
+                type: 'select',
+            },
+        },
+        ...argTypesFromConfig(mergeConfig(dropdownConfig, config)),
+    },
+    args: {
+        placement: 'bottom',
+        trigger: 'click',
+        closeOnOverlayClick: true,
+        closeOnEsc: true,
+        isFocusTrapped: true,
+        skidding: 0,
+        distance: 6,
+    },
+};
+
+export default meta;
+
+const StyledCheckbox = styled(Checkbox)`
+    margin-left: 0rem;
+    margin-bottom: 0rem;
+`;
+
+const StyledRadiobox = styled(Radiobox)`
+    margin-left: 0rem;
+    margin-bottom: 0rem;
+`;
+
+const headerClass = css`
+    text-transform: uppercase;
+    color: rgba(23, 23, 23, 0.56);
+`;
+
+const TrashIcon = (props) => (
+    <svg width="100%" viewBox="0 0 24 24" fill="none" {...props}>
+        <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M8 5.5A2.5 2.5 0 0110.5 3h3A2.5 2.5 0 0116 5.5V6h-2v-.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5V6H8v-.5zM4 8a1 1 0 011-1h14a1 1 0 110 2h-1v9.5a2.5 2.5 0 01-2.5 2.5h-7A2.5 2.5 0 016 18.5V9H5a1 1 0 01-1-1z"
+            fill="currentColor"
+        />
+    </svg>
+);
+
+const StyledTrashIcon = styled(TrashIcon)`
+    width: 1.25rem;
+    height: 1.25rem;
+`;
+
+const onChange = action('onChange');
+const onSelect = action('onSelect');
+const onClick = action('onClick');
+
+const dropdownItems = [...Array(4).keys()].map((num) => ({
+    value: `item_${num}`,
+    child: `Item ${num}`,
+}));
+
+const StoryDefault = (args: StoryDropdownProps) => {
+    const [selected, setSelected] = useState('');
+    const [isOpen, setIsOpen] = useState(false);
+    const [isOpenDropdown2, setIsOpenDropdown2] = useState(false);
+
+    const onMainClose = () => {
+        setIsOpen(false);
+        setIsOpenDropdown2(false);
+    };
+
+    const onMainToggle = (openValue: boolean) => {
+        setIsOpen(openValue);
+
+        if (!openValue) {
+            onMainClose();
+        }
+    };
+
+    const handleSelect = (value: string, text: string) => {
+        setSelected(value);
+        onSelect(value, text);
+    };
+
+    return (
+        <div>
+            <h3>This is header</h3>
+            <Dropdown target={<Button>Target</Button>} isOpen={isOpen} onToggle={onMainToggle} {...args}>
+                <DropdownHeader className={headerClass}>Header</DropdownHeader>
+                <DropdownDivider />
+                {dropdownItems.map((item) => (
+                    <DropdownItem
+                        key={item.value}
+                        isSelected={item.value === selected}
+                        onSelect={() => handleSelect(item.value, item.child)}
+                        onClick={onClick}
+                        value={item.value}
+                    >
+                        {item.child}
+                    </DropdownItem>
+                ))}
+                <Dropdown
+                    target={<DropdownItem>Nested dropdown ➞</DropdownItem>}
+                    onToggle={(is) => setIsOpenDropdown2(is)}
+                    isOpen={isOpenDropdown2}
+                    offset={[0, 0]}
+                >
+                    <DropdownGroup label="This is radiogroup">
+                        <DropdownItem
+                            contentLeft={StyledRadiobox}
+                            name="test"
+                            value="1"
+                            onChange={onChange}
+                            text="Nested 1"
+                        />
+
+                        <DropdownItem
+                            contentLeft={StyledRadiobox}
+                            name="test"
+                            value="2"
+                            onChange={onChange}
+                            text="Nested 2"
+                        />
+                        <DropdownItem
+                            contentLeft={StyledRadiobox}
+                            name="test"
+                            value="3"
+                            onChange={onChange}
+                            text="Nested 3"
+                        />
+                    </DropdownGroup>
+                    <DropdownItem contentLeft={StyledCheckbox} text="Nested 4" />
+                    <DropdownItem contentRight={StyledCheckbox} text="Nested 5" />
+
+                    <DropdownItem contentLeft={StyledTrashIcon} text="Nested 6" />
+                    <Button onClick={() => setIsOpenDropdown2(false)}>Close nested</Button>
+                </Dropdown>
+
+                <DropdownItem onClick={onClick} value="disabled" disabled>
+                    disabled
+                </DropdownItem>
+
+                <DropdownGroup label="Group">
+                    <DropdownItem
+                        contentLeft={StyledRadiobox}
+                        name="test"
+                        value="1"
+                        disabled
+                        onChange={onChange}
+                        text="Disabled 1"
+                    />
+
+                    <DropdownItem name="test" value="2" disabled text="Disabled group 2" />
+                </DropdownGroup>
+
+                <DropdownDivider />
+                <DropdownFooter className={headerClass}>Footer</DropdownFooter>
+            </Dropdown>
+        </div>
+    );
+};
+
+export const Default: StoryObj<StoryDropdownProps> = {
+    render: (args) => <StoryDefault {...args} />,
+};
+
+const StoryContextMenu = (args: StoryDropdownProps) => {
+    const [contextPosition, setContextPosition] = useState([0, 0]);
+    const dropdownRef = useRef<HTMLDivElement | null>(null);
+    const [selected, setSelected] = useState('');
+    const [isOpen, setIsOpen] = useState(false);
+
+    const onMainToggle = (openValue: boolean) => {
+        setIsOpen(openValue);
+    };
+
+    const handleSelect = (value: string, text: string) => {
+        setSelected(value);
+        onSelect(value, text);
+        setIsOpen(false);
+    };
+
+    const onClickAway = (event: React.MouseEvent<HTMLDivElement>) => {
+        event.preventDefault();
+        if (dropdownRef?.current && !dropdownRef.current?.contains(event.target as Element)) {
+            setIsOpen(false);
+        }
+    };
+
+    const onContextMenu = (event: React.MouseEvent<HTMLDivElement>) => {
+        event.preventDefault();
+
+        const { clientX, clientY } = event;
+
+        setContextPosition([clientX, clientY]);
+        setIsOpen(true);
+    };
+
+    return (
+        <div
+            style={{
+                width: '100%',
+                height: '100%',
+                background: 'gainsboro',
+            }}
+            onClick={onClickAway}
+            onContextMenu={onContextMenu}
+        >
+            <div>Right-click the mouse button - to open</div>
+            <div>Left-click the mouse button - to close</div>
+            <div
+                ref={dropdownRef}
+                style={{ position: 'absolute', top: `${contextPosition[1]}px`, left: `${contextPosition[0]}px` }}
+            >
+                <Dropdown isOpen={isOpen} onToggle={onMainToggle} {...args}>
+                    <DropdownHeader className={headerClass}>Header</DropdownHeader>
+                    <DropdownDivider />
+                    {dropdownItems.map((item) => (
+                        <DropdownItem
+                            key={item.value}
+                            isSelected={item.value === selected}
+                            onSelect={() => handleSelect(item.value, item.child)}
+                            onClick={onClick}
+                            value={item.value}
+                        >
+                            {item.child}
+                        </DropdownItem>
+                    ))}
+                    <DropdownDivider />
+                    <DropdownFooter className={headerClass}>Footer</DropdownFooter>
+                </Dropdown>
+            </div>
+        </div>
+    );
+};
+
+export const ContextMenu: StoryObj<StoryDropdownProps> = {
+    render: (args) => <StoryContextMenu {...args} />,
+};

package/styled-components/es/components/Combobox/ui/ComboboxItem/ComboboxItem.js

@@ -1,95 +1,8 @@
-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", "view", "size", "disabled", "role", "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 '../../Combobox.tokens';
-import { getValidComponent } from '../../utils';
-import { cx } from '../../../../utils';
+import { dropdownItemRoot } from '../../../Dropdown';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
-import { StyledContentLeft, StyledContentRight, StyledText, base } from './ComboboxItem.styles';
-export var comboboxItemRoot = function comboboxItemRoot(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,
-      view = _ref.view,
-      size = _ref.size,
-      disabled = _ref.disabled,
-      _ref$role = _ref.role,
-      role = _ref$role === void 0 ? 'option' : _ref$role,
-      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 withComboboxItemIsSelected = checked || isSelected ? classes.comboboxItemIsDisabled : undefined;
-    var withComboboxItemIsDisabled = disabled ? classes.comboboxItemIsDisabled : 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: -1
-    }, !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(withComboboxItemIsSelected, withComboboxItemIsDisabled, className),
-      view: view,
-      size: size,
-      id: innerId,
-      isSelected: isSelected,
-      role: role,
-      ref: outerRootRef,
-      tabIndex: 0,
-      "aria-disabled": disabled,
-      "aria-selected": isSelected,
-      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);
-  });
-};
+import { base } from './ComboboxItem.styles';
+export var comboboxItemRoot = dropdownItemRoot;
 export var comboboxItemConfig = {
   name: 'ComboboxItem',
   tag: 'div',

package/styled-components/es/components/Combobox/ui/ComboboxItem/ComboboxItem.styles.js

@@ -1,25 +1,8 @@
-var _templateObject;
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 import { css } from 'styled-components';
-import styled from 'styled-components';
-import { classes, tokens } from '../../Combobox.tokens';
-import { addFocus, applyEllipsis } from '../../../../mixins';
-export var StyledContentLeft = /*#__PURE__*/styled.div.withConfig({
-  componentId: "plasma-new-hope__sc-i4bkda-0"
-})(["display:inline-flex;min-width:var(", ");color:var(", ");"], tokens.itemContentLeftWidth, tokens.itemContentLeftColor);
-export var StyledContentRight = /*#__PURE__*/styled.div.withConfig({
-  componentId: "plasma-new-hope__sc-i4bkda-1"
-})(["margin-left:auto;display:inline-flex;min-width:var(", ");color:var(", ");"], tokens.itemContentRightWidth, tokens.itemContentRightColor);
-export var StyledText = /*#__PURE__*/styled.div.withConfig({
-  componentId: "plasma-new-hope__sc-i4bkda-2"
-})(["", ";"], /*#__PURE__*/applyEllipsis());
+import { tokens } from '../../Combobox.tokens';
+import { dropdownTokens } from '../../../Dropdown';
+import { baseContent as dropdownItemBase } from '../../../Dropdown/ui/DropdownItem/DropdownItem.styles';
 
-// INFO: Для возможности переиспользования стилей в других компонентах
-export var baseContent = /*#__PURE__*/"\n    box-sizing: content-box;\n    display: flex;\n    align-items: center;\n    user-select: none;\n\n    :focus {\n        outline: none;\n    }\n\n    ".concat(addFocus({
-  outlineSize: '0.0625rem',
-  outlineOffset: '0',
-  outlineColor: "var(".concat(tokens.focusColor, ")"),
-  outlineRadius: "var(".concat(tokens.itemBorderRadius, ")"),
-  hasTransition: false
-}), ";\n\n    width: 100%;\n\n    font-family: var(").concat(tokens.itemFontFamily, ");\n    font-size: var(").concat(tokens.itemFontSize, ");\n    font-style: var(").concat(tokens.itemFontStyle, ");\n    font-weight: var(").concat(tokens.itemFontWeightBold, ");\n    letter-spacing: var(").concat(tokens.itemFontLetterSpacing, ");\n    line-height: var(").concat(tokens.itemFontLineHeight, ");\n\n    background: var(").concat(tokens.itemBackground, ");\n    color: var(").concat(tokens.itemColor, ");\n    border-radius: var(").concat(tokens.itemBorderRadius, ");\n\n    width: var(").concat(tokens.itemWidth, ");\n    height: var(").concat(tokens.itemHeight, ");\n\n    padding: var(").concat(tokens.itemPaddingTop, ") var(").concat(tokens.itemPaddingRight, ") var(").concat(tokens.itemPaddingBottom, ")\n        var(").concat(tokens.itemPaddingLeft, ");\n\n    margin: var(").concat(tokens.itemMarginTop, ") var(").concat(tokens.itemMarginRight, ") var(").concat(tokens.itemMarginBottom, ")\n        var(").concat(tokens.itemMarginLeft, ");\n\n    &:hover:not(.").concat(classes.comboboxItemIsDisabled, ") {\n        cursor: pointer;\n        background: var(").concat(tokens.itemBackgroundHover, ");\n    }\n\n    &.").concat(String(classes.comboboxItemIsSelected), " {\n        color: var(").concat(tokens.itemColorSelected, ");\n        background: var(").concat(tokens.itemBackgroundSelected, ");\n\n        &:hover:not(.").concat(classes.comboboxItemIsDisabled, ") {\n            background: var(").concat(tokens.itemBackgroundSelectedHover, ");\n        }\n    }\n\n    &.").concat(classes.comboboxItemIsDisabled, " {\n        opacity: var(").concat(tokens.disabledOpacity, ");\n        cursor: not-allowed;\n    }\n");
-export var base = /*#__PURE__*/css(_templateObject || (_templateObject = /*#__PURE__*/_taggedTemplateLiteral(["\n    ", ";\n"])), baseContent);
+// NOTE: Необходимое переопределение токенов из компонента DropdownItem т.к. используются его части
+export var mappingOverride = /*#__PURE__*/"\n    ".concat(dropdownTokens.itemBackground, ": var(").concat(tokens.itemBackground, ");\n    ").concat(dropdownTokens.itemColor, ": var(").concat(tokens.itemColor, ");\n    ").concat(dropdownTokens.itemBackgroundHover, ": var(").concat(tokens.itemBackgroundHover, ");\n    ").concat(dropdownTokens.itemBackgroundSelected, ": var(").concat(tokens.itemBackgroundSelected, ");\n    ").concat(dropdownTokens.itemColorSelected, ": var(").concat(tokens.itemColorSelected, ");\n    ").concat(dropdownTokens.itemBackgroundSelectedHover, ": var(").concat(tokens.itemBackgroundSelectedHover, ");\n    ").concat(dropdownTokens.itemColorSelectedHover, ": var(").concat(tokens.itemColorSelectedHover, ");\n    ").concat(dropdownTokens.itemContentLeftColor, ": var(").concat(tokens.itemContentLeftColor, ");\n    ").concat(dropdownTokens.itemContentRightColor, ": var(").concat(tokens.itemContentRightColor, ");\n    ").concat(dropdownTokens.disabledOpacity, ": var(").concat(tokens.disabledOpacity, ");\n    ").concat(dropdownTokens.focusColor, ": var(").concat(tokens.focusColor, ");\n    ").concat(dropdownTokens.itemWidth, ": var(").concat(tokens.itemWidth, ");\n    ").concat(dropdownTokens.itemHeight, ": var(").concat(tokens.itemHeight, ");\n    ").concat(dropdownTokens.itemBorderRadius, ": var(").concat(tokens.itemBorderRadius, ");\n    ").concat(dropdownTokens.itemPaddingTop, ": var(").concat(tokens.itemPaddingTop, ");\n    ").concat(dropdownTokens.itemPaddingRight, ": var(").concat(tokens.itemPaddingRight, ");\n    ").concat(dropdownTokens.itemPaddingBottom, ": var(").concat(tokens.itemPaddingBottom, ");\n    ").concat(dropdownTokens.itemPaddingLeft, ": var(").concat(tokens.itemPaddingLeft, ");\n    ").concat(dropdownTokens.itemMarginTop, ": var(").concat(tokens.itemMarginTop, ");\n    ").concat(dropdownTokens.itemMarginRight, ": var(").concat(tokens.itemMarginRight, ");\n    ").concat(dropdownTokens.itemMarginBottom, ": var(").concat(tokens.itemMarginBottom, ");\n    ").concat(dropdownTokens.itemMarginLeft, ": var(").concat(tokens.itemMarginLeft, ");\n    ").concat(dropdownTokens.itemFontFamily, ": var(").concat(tokens.itemFontFamily, ");\n    ").concat(dropdownTokens.itemFontSize, ": var(").concat(tokens.itemFontSize, ");\n    ").concat(dropdownTokens.itemFontStyle, ": var(").concat(tokens.itemFontStyle, ");\n    ").concat(dropdownTokens.itemFontWeightBold, ": var(").concat(tokens.itemFontWeightBold, ");\n    ").concat(dropdownTokens.itemFontLetterSpacing, ": var(").concat(tokens.itemFontLetterSpacing, ");\n    ").concat(dropdownTokens.itemFontLineHeight, ": var(").concat(tokens.itemFontLineHeight, ");\n    ").concat(dropdownTokens.itemContentLeftWidth, ": var(").concat(tokens.itemContentLeftWidth, ");\n    ").concat(dropdownTokens.itemContentRightWidth, ": var(").concat(tokens.itemContentRightWidth, ");\n");
+export var base = /*#__PURE__*/css(["", ";", ";"], dropdownItemBase, mappingOverride);

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 ? 'option' : _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-haspopup': 'listbox',
-        'aria-activedescendant': getActiveDescendant(),
-        onKeyDown: onKeyDown
-      })
-    }, /*#__PURE__*/React.createElement(Ul, {
-      listHeight: listHeight,
-      listOverflow: listOverflow,
-      role: "listbox",
-      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