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

package/styled-components/cjs/components/Calendar/hooks/useDays.js

@@ -188,7 +188,6 @@ var getDaysWithModifications = function getDaysWithModifications(days) {
   var disabledList = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var min = arguments.length > 3 ? arguments[3] : undefined;
   var max = arguments.length > 4 ? arguments[4] : undefined;
-  var includeEdgeDates = arguments.length > 5 ? arguments[5] : undefined;
   var eventsMap = getPropsMap(eventList);
   var disabledDaysMap = getPropsMap(disabledList);
   var daysList = days.filter(function (_ref3) {
@@ -206,9 +205,7 @@ var getDaysWithModifications = function getDaysWithModifications(days) {
       day = date.day;
     var keyDay = "".concat(year, "-").concat(monthIndex, "-").concat(day);
     var currentDate = new Date(year, monthIndex, day);
-    var minValue = min && (includeEdgeDates ? min > currentDate : min >= currentDate);
-    var maxValue = max && (includeEdgeDates ? max < currentDate : max <= currentDate);
-    var isOutOfMinMaxRange = minValue || maxValue;
+    var isOutOfMinMaxRange = min && min >= currentDate || max && max <= currentDate;
     dayItem.events = eventsMap.get(keyDay);
     dayItem.disabled = disabledDaysMap.has(keyDay) || isOutOfMinMaxRange;
     dayItem.isOutOfMinMaxRange = isOutOfMinMaxRange;
@@ -221,7 +218,7 @@ var getDaysWithModifications = function getDaysWithModifications(days) {
 /**
  * Хук для получения списка дней.
  */
-var useDays = exports.useDays = function useDays(date, value, eventList, disabledList, min, max, includeEdgeDates) {
+var useDays = exports.useDays = function useDays(date, value, eventList, disabledList, min, max) {
   return (0, _react.useMemo)(function () {
     var monthIndex = date.monthIndex,
       year = date.year;
@@ -229,7 +226,7 @@ var useDays = exports.useDays = function useDays(date, value, eventList, disable
     var offsetDayInWeek = (0, _utils.getOffsetDayInWeek)(monthIndex, year);
     var days = [].concat(_toConsumableArray(getDaysInPrevMonth(date, offsetDayInWeek, value)), _toConsumableArray(getDaysInCurrentMonth(date, daysInMonth, value)), _toConsumableArray(getDaysInNextMonth(date, daysInMonth, offsetDayInWeek, value)));
     if (eventList !== null && eventList !== void 0 && eventList.length || disabledList !== null && disabledList !== void 0 && disabledList.length || max || min) {
-      var modifiedDays = getDaysWithModifications(days, eventList, disabledList, min, max, includeEdgeDates);
+      var modifiedDays = getDaysWithModifications(days, eventList, disabledList, min, max);
       return (0, _utils.getMatrix)(modifiedDays);
     }
     return (0, _utils.getMatrix)(days);

package/styled-components/cjs/components/Calendar/ui/CalendarDays/CalendarDays.js

@@ -29,7 +29,6 @@ var CalendarDays = exports.CalendarDays = function CalendarDays(_ref) {
     disabledList = _ref.disabledList,
     min = _ref.min,
     max = _ref.max,
-    includeEdgeDates = _ref.includeEdgeDates,
     hoveredDay = _ref.hoveredDay,
     selectIndexes = _ref.selectIndexes,
     isDouble = _ref.isDouble,
@@ -39,7 +38,7 @@ var CalendarDays = exports.CalendarDays = function CalendarDays(_ref) {
     onHoverDay = _ref.onHoverDay,
     onSetSelected = _ref.onSetSelected,
     onKeyDown = _ref.onKeyDown;
-  var _useDays = (0, _hooks.useDays)(currentDate, value, eventList, disabledList, min, max, includeEdgeDates),
+  var _useDays = (0, _hooks.useDays)(currentDate, value, eventList, disabledList, min, max),
     _useDays2 = _slicedToArray(_useDays, 2),
     days = _useDays2[0],
     selected = _useDays2[1];

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

@@ -1,14 +1,103 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.comboboxItemRoot = exports.comboboxItemConfig = void 0;
-var _Dropdown = /*#__PURE__*/require("../../../Dropdown");
+var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
+var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
+var _Combobox = /*#__PURE__*/require("../../Combobox.tokens");
+var _utils = /*#__PURE__*/require("../../utils");
+var _utils2 = /*#__PURE__*/require("../../../../utils");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _base2 = /*#__PURE__*/require("./variations/_size/base");
 var _ComboboxItem = /*#__PURE__*/require("./ComboboxItem.styles");
-var comboboxItemRoot = exports.comboboxItemRoot = _Dropdown.dropdownItemRoot;
+var _excluded = ["id", "className", "children", "text", "isSelected", "name", "checked", "value", "view", "size", "disabled", "role", "contentLeft", "contentRight", "onSelect", "onClick", "onChange"];
+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 _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; }
+var comboboxItemRoot = exports.comboboxItemRoot = function comboboxItemRoot(Root) {
+  return /*#__PURE__*/(0, _react.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 = (0, _plasmaCore.safeUseId)();
+    var innerId = id || uniqId;
+    var withComboboxItemIsSelected = checked || isSelected ? _Combobox.classes.comboboxItemIsDisabled : undefined;
+    var withComboboxItemIsDisabled = disabled ? _Combobox.classes.comboboxItemIsDisabled : undefined;
+    var handleOnClick = (0, _react.useCallback)(function (event) {
+      if (disabled) {
+        return;
+      }
+      onClick === null || onClick === void 0 || onClick(event);
+      if (onSelect && !ContentLeftComponent) {
+        onSelect(value, text);
+      }
+    }, [onSelect, disabled]);
+    var handleOnChange = (0, _react.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 = (0, _react.useMemo)(function () {
+      return (0, _utils.getValidComponent)(ContentLeftComponent, contentProps);
+    }, [ContentRightComponent, contentProps]);
+    var ContentRight = (0, _react.useMemo)(function () {
+      return (0, _utils.getValidComponent)(ContentRightComponent, contentProps);
+    }, [ContentRightComponent, contentProps]);
+    return /*#__PURE__*/_react["default"].createElement(Root, _extends({
+      className: (0, _utils2.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["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_ComboboxItem.StyledContentLeft, null, ContentLeftComponent && ContentLeft), /*#__PURE__*/_react["default"].createElement(_ComboboxItem.StyledText, null, text), /*#__PURE__*/_react["default"].createElement(_ComboboxItem.StyledContentRight, null, ContentRightComponent && ContentRight)) : children);
+  });
+};
 var comboboxItemConfig = exports.comboboxItemConfig = {
   name: 'ComboboxItem',
   tag: 'div',

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

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

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

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getValidComponent = void 0;
+var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
+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); }
+var isReactObject = function isReactObject(element) {
+  return _typeof(element) === 'object' || typeof element === 'function';
+};
+var getValidComponent = exports.getValidComponent = function getValidComponent(element, props) {
+  if ( /*#__PURE__*/(0, _react.isValidElement)(element)) {
+    return /*#__PURE__*/(0, _react.cloneElement)(element, props);
+  }
+  if (isReactObject(element)) {
+    var Component = element;
+    return /*#__PURE__*/_react["default"].createElement(Component, props);
+  }
+  return element;
+};

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

@@ -6,86 +6,172 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _pathReducer = /*#__PURE__*/require("./reducers/pathReducer");
+var _focusedPathReducer = /*#__PURE__*/require("./reducers/focusedPathReducer");
+var _ui = /*#__PURE__*/require("./ui");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _base2 = /*#__PURE__*/require("./variations/_size/base");
 var _Dropdown = /*#__PURE__*/require("./Dropdown.styles");
-var _utils = /*#__PURE__*/require("./utils");
-var _excluded = ["id", "target", "children", "hasArrow", "role", "view", "size", "frame", "onToggle", "isFocusTrapped", "isOpen", "placement", "trigger", "offset", "preventOverflow", "closeOnOverlayClick", "closeOnEsc"];
+var _utils2 = /*#__PURE__*/require("./utils");
+var _Dropdown2 = /*#__PURE__*/require("./Dropdown.tokens");
+var _useKeyboardNavigation = /*#__PURE__*/require("./hooks/useKeyboardNavigation");
+var _useHashMaps3 = /*#__PURE__*/require("./hooks/useHashMaps");
+var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow"];
 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 _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; }
 /**
- * Выпадающий список без внешнего контроля видимости.
+ * Выпадающий список.
  */
 var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
-  return /*#__PURE__*/(0, _react.forwardRef)(function (_ref, outerRootRef) {
-    var id = _ref.id,
-      target = _ref.target,
+  return /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+    var items = _ref.items,
       children = _ref.children,
-      hasArrow = _ref.hasArrow,
-      role = _ref.role,
-      view = _ref.view,
-      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,
+      placement = _ref$placement === void 0 ? 'bottom' : _ref$placement,
       _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,
+      offset = _ref$offset === void 0 ? [0, 0] : _ref$offset,
       _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
-      closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? false : _ref$closeOnOverlayCl,
-      _ref$closeOnEsc = _ref.closeOnEsc,
-      closeOnEsc = _ref$closeOnEsc === void 0 ? false : _ref$closeOnEsc,
+      closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
+      onToggle = _ref.onToggle,
+      size = _ref.size,
+      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,
+      _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,
       rest = _objectWithoutProperties(_ref, _excluded);
-    var uniqId = (0, _plasmaCore.useUniqId)();
-    var innerId = id || uniqId;
-    var rootRef = (0, _react.useRef)(null);
-    var dropdownRef = (0, _react.useRef)(null);
-    var handleRef = (0, _plasmaCore.useForkRef)(rootRef, outerRootRef);
-    var trapRef = (0, _plasmaCore.useFocusTrap)(isOpen && isFocusTrapped);
-    var dropdownForkRef = (0, _plasmaCore.useForkRef)(dropdownRef, trapRef);
-    return /*#__PURE__*/_react["default"].createElement(_Dropdown.StyledPopover, {
-      role: role,
-      isOpen: isOpen,
+    var _useReducer = (0, _react.useReducer)(_pathReducer.pathReducer, []),
+      _useReducer2 = _slicedToArray(_useReducer, 2),
+      path = _useReducer2[0],
+      dispatchPath = _useReducer2[1];
+    var _useReducer3 = (0, _react.useReducer)(_focusedPathReducer.focusedPathReducer, []),
+      _useReducer4 = _slicedToArray(_useReducer3, 2),
+      focusedPath = _useReducer4[0],
+      dispatchFocusedPath = _useReducer4[1];
+    var _useHashMaps = (0, _useHashMaps3.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 = (0, _useKeyboardNavigation.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["default"].createElement(Root, _extends({
+      className: (0, _utils.cx)(className, _Dropdown2.classes.dropdownRoot),
+      ref: ref,
+      view: view,
+      size: size,
+      items: items
+    }, rest), /*#__PURE__*/_react["default"].createElement(_Dropdown.StyledPopover, {
+      isOpen: isCurrentListOpen,
       usePortal: false,
-      onToggle: function onToggle(is, event) {
-        return _onToggle === null || _onToggle === void 0 ? void 0 : _onToggle(is, event);
-      },
-      id: innerId,
-      ref: dropdownForkRef,
-      target: target,
+      onToggle: handleGlobalToggle,
       offset: offset,
-      preventOverflow: preventOverflow,
-      hasArrow: hasArrow,
-      placement: (0, _utils.getPlacements)(placement),
+      placement: (0, _utils2.getPlacements)(placement),
       trigger: trigger,
       closeOnOverlayClick: closeOnOverlayClick,
-      closeOnEsc: closeOnEsc,
-      isFocusTrapped: isFocusTrapped,
-      frame: frame
-    }, /*#__PURE__*/_react["default"].createElement(Root, _extends({
-      ref: handleRef,
-      view: view,
-      size: size
-    }, rest), /*#__PURE__*/_react["default"].createElement(_Dropdown.StyledDropdown, null, children)));
+      isFocusTrapped: false,
+      target: (0, _utils2.childrenWithProps)(children, {
+        role: 'combobox',
+        'aria-controls': 'tree_level_1',
+        'aria-expanded': isCurrentListOpen,
+        'aria-activedescendant': getActiveDescendant(),
+        onKeyDown: onKeyDown
+      }),
+      preventOverflow: false
+    }, /*#__PURE__*/_react["default"].createElement(_Dropdown.Ul, {
+      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,
+        handleGlobalToggle: handleGlobalToggle,
+        closeOnSelect: closeOnSelect,
+        onHover: onHover,
+        onItemSelect: onItemSelect,
+        onItemClick: onItemClick,
+        listWidth: listWidth,
+        variant: variant,
+        hasArrow: hasArrow
+      });
+    }))));
   });
 };
 var dropdownConfig = exports.dropdownConfig = {
   name: 'Dropdown',
   tag: 'div',
   layout: dropdownRoot,
-  base: '',
+  base: _Dropdown.base,
   variations: {
     view: {
       css: _base.base

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

@@ -1,19 +1,34 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.StyledPopover = exports.StyledDropdown = void 0;
-var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-// issue #823
+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 Popover = /*#__PURE__*/(0, _engines.component)(_Popover.popoverConfig);
 var StyledPopover = exports.StyledPopover = /*#__PURE__*/(0, _styledComponents["default"])(Popover).withConfig({
   componentId: "plasma-new-hope__sc-13ezpo5-0"
-})([".", "{display:block;}"], /*#__PURE__*/String(_Popover.popoverClasses.target));
-var StyledDropdown = exports.StyledDropdown = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+})([".", ",.", "{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:var(", ");height:var(", ");padding:var(", ") var(", ") var(", ") var(", ");"], _Dropdown.tokens.background, _Dropdown.tokens.boxShadow, _Dropdown.tokens.borderRadius, _Dropdown.tokens.width, _Dropdown.tokens.height, _Dropdown.tokens.paddingTop, _Dropdown.tokens.paddingRight, _Dropdown.tokens.paddingBottom, _Dropdown.tokens.paddingLeft);
+})(["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 listOverflow = _ref3.listOverflow;
+  return listOverflow || 'initial';
+}, 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;"]);