@salutejs/plasma-new-hope 0.326.1-canary.2018.15778039519.0 → 0.326.1-canary.2019.15674501487.0

package/styled-components/es/components/Carousel/CarouselNew/Carousel.tokens.js

@@ -8,17 +8,9 @@ export var classes = {
   shrinking: 'dot-shrinking',
   availableDotsLeft: 'dot-available-dots-left',
   availableDotsRight: 'dot-available-dots-right',
-  leftControlButton: 'carousel-left-control-button',
   rightControlButton: 'carousel-right-control-button'
 };
 export var tokens = {
   paginationDotBackground: '--plasma-carousel-pagination-dot-background',
-  paginationDotActiveBackground: '--plasma-carousel-pagination-dot-active-background',
-  controlIconButtonRadius: '--plasma-carousel-control-icon-button-radius',
-  controlIconButtonColor: '--plasma-carousel-control-icon-button-color',
-  controlIconButtonBackgroundColor: '--plasma-carousel-control-icon-button-background-color',
-  controlIconButtonColorHover: '--plasma-carousel-control-icon-button-color-hover',
-  controlIconButtonBackgroundColorHover: '--plasma-carousel-control-icon-button-background-color-hover',
-  controlIconButtonColorActive: '--plasma-carousel-control-icon-button-color-active',
-  controlIconButtonBackgroundColorActive: '--plasma-carousel-control-icon-button-background-color-active'
+  paginationDotActiveBackground: '--plasma-carousel-pagination-dot-active-background'
 };

package/styled-components/es/components/Carousel/CarouselNew/hooks/useCarousel.js

@@ -1,65 +1,364 @@
-import { useEffect, useRef } from 'react';
+import { useEffect, useCallback, useRef, useMemo } from 'react';
+import throttle from 'lodash.throttle';
 /**
- * Подсчет отступа для скролла до переданного индекса.
+ * Подсчет смещения из-за паддингов.
  */
-export var getCalculatedPos = function getCalculatedPos(_ref) {
-  var scrollRef = _ref.scrollRef,
-    trackRef = _ref.trackRef,
-    itemsCollection = _ref.itemsCollection,
-    index = _ref.index,
-    scrollAlign = _ref.scrollAlign;
-  var item = itemsCollection.item(index);
-  if (!item || !trackRef.current || !scrollRef.current) {
-    return 0;
+export var getCalculatedOffset = function getCalculatedOffset(scrollEl, trackEl) {
+  var paddingProp = 'paddingLeft';
+  return parseInt(getComputedStyle(scrollEl)[paddingProp], 10) + parseInt(getComputedStyle(trackEl)[paddingProp], 10);
+};
+var positionModByScrollAlign = function positionModByScrollAlign(_ref) {
+  var scrollAlign = _ref.scrollAlign,
+    position = _ref.position,
+    carouselSize = _ref.carouselSize,
+    itemSize = _ref.itemSize,
+    offset = _ref.offset,
+    scrollStart = _ref.scrollStart;
+  if (scrollAlign === 'start') {
+    var paddingOffset = 0;
+    return position + paddingOffset;
   }
-  var itemRect = item.getBoundingClientRect();
-  var trackRect = trackRef.current.getBoundingClientRect();
-  var scrollRect = scrollRef.current.getBoundingClientRect();
-  var left = itemRect.left - trackRect.left + trackRef.current.scrollLeft;
-  switch (scrollAlign) {
-    case 'start':
-      {
-        return left;
-      }
-    case 'center':
-      {
-        return left - scrollRect.width / 2 + itemRect.width / 2;
-      }
-    case 'end':
-      {
-        return left - scrollRect.width + itemRect.width;
-      }
-    default:
-      {
-        return 0;
-      }
+  if (scrollAlign === 'center') {
+    return position - carouselSize / 2 + itemSize / 2;
+  }
+  if (scrollAlign === 'end') {
+    return position - carouselSize + itemSize + offset;
+  }
+  if (scrollAlign === 'activeDirection') {
+    if (position >= scrollStart + carouselSize - itemSize) {
+      return position - carouselSize + itemSize + offset;
+    }
+    if (position > scrollStart) {
+      return scrollStart;
+    }
   }
+  return position;
 };
-export var useCarousel = function useCarousel(_ref2) {
-  var index = _ref2.index,
+
+/**
+ * Подсчет скролла до переданного индекса.
+ */
+export var getCalculatedPos = function getCalculatedPos(_ref2) {
+  var _items$item$offsetWid2, _items$item2;
+  var scrollEl = _ref2.scrollEl,
+    items = _ref2.items,
+    index = _ref2.index,
+    offset = _ref2.offset,
     scrollAlign = _ref2.scrollAlign;
+  var position = scrollAlign === 'center' ? offset : 0;
+  if (items.item(index) === null) {
+    return position;
+  }
+  for (var i = 0; i < index; i++) {
+    var _items$item$offsetWid, _items$item;
+    position += (_items$item$offsetWid = (_items$item = items.item(i)) === null || _items$item === void 0 ? void 0 : _items$item.offsetWidth) !== null && _items$item$offsetWid !== void 0 ? _items$item$offsetWid : 0;
+  }
+  var carouselSize = scrollEl.offsetWidth;
+  var itemSize = (_items$item$offsetWid2 = (_items$item2 = items.item(index)) === null || _items$item2 === void 0 ? void 0 : _items$item2.offsetWidth) !== null && _items$item$offsetWid2 !== void 0 ? _items$item$offsetWid2 : 0;
+  var scrollStart = scrollEl.scrollLeft;
+  return positionModByScrollAlign({
+    scrollAlign: scrollAlign,
+    position: position,
+    carouselSize: carouselSize,
+    itemSize: itemSize,
+    offset: offset,
+    scrollStart: scrollStart
+  });
+};
+var DEFAULT_DURATION = 300;
+
+// https://css-tricks.com/emulating-css-timing-functions-javascript/
+var tfs = {
+  linear: function linear(t) {
+    return t;
+  },
+  // eslint-disable-next-line
+  easeIn: function easeIn(t) {
+    return Math.pow(t, 1.675);
+  },
+  // eslint-disable-next-line
+  easeOut: function easeOut(t) {
+    return 1 - Math.pow(1 - t, 1.675);
+  },
+  easeInOut: function easeInOut(t) {
+    return 0.5 * (Math.sin((t - 0.5) * Math.PI) + 1);
+  }
+};
+/**
+ * Плавная прокрутка по горизонтали
+ * @param {Element} elem
+ * @param {number} pos
+ * @param {number} duration
+ * @param {string} timingFunction
+ */
+export var animatedScrollToX = function animatedScrollToX(elem, pos) {
+  var duration = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : DEFAULT_DURATION;
+  var timingFunction = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'easeInOut';
+  var startTime;
+  var startX = elem.scrollLeft;
+  var endX = Math.max(0, Math.min(elem.scrollWidth - elem.clientWidth, pos));
+  var handleNewAnimationFrame = function handleNewAnimationFrame() {
+    startTime = startTime || Date.now();
+    var timePos = Math.min(1, Math.max(1, Date.now() - startTime) / duration);
+    var scrollPos = tfs[timingFunction](timePos);
+    var left = startX + (endX - startX) * scrollPos;
+    elem.scrollTo({
+      left: left
+    });
+    if (timePos !== 1) window.requestAnimationFrame(handleNewAnimationFrame);
+  };
+  window.requestAnimationFrame(handleNewAnimationFrame);
+};
+
+/**
+ * Прокрутка к указанной позиции с анимацией или без.
+ */
+export var scrollToPos = function scrollToPos(_ref3) {
+  var scrollEl = _ref3.scrollEl,
+    pos = _ref3.pos,
+    animated = _ref3.animated,
+    duration = _ref3.duration,
+    timingFunction = _ref3.timingFunction;
+  if (Math.abs(pos - scrollEl.scrollLeft) > 1) {
+    if (animated) {
+      animatedScrollToX(scrollEl, pos, duration, timingFunction);
+    } else {
+      scrollEl.scrollTo({
+        left: pos
+      });
+    }
+  }
+};
+var round = function round(n) {
+  return Math.round(n * 100) / 100;
+};
+
+/**
+ * Получить позицию (слот) айтема в каруселе.
+ * Каждый айтем имеет свой слот относительно вьюпорта карусели.
+ */
+export var getItemSlot = function getItemSlot(itemIndex, itemEnd, itemSize, scrollStart, scrollSize, scrollAlign) {
+  var prevIndex = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 0;
+  var offset = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 0;
+  /**
+   * Граница и центр скролла (видимой части).
+   * Смещение + размер.
+   */
+  var scrollEnd = scrollStart + scrollSize;
+  var scrollCenter = scrollStart + scrollSize / 2;
+  var itemCenter = itemEnd - itemSize / 2;
+  if (scrollAlign === 'center') {
+    return round((itemCenter - scrollCenter) / itemSize);
+  }
+  if (scrollAlign === 'start') {
+    return round((itemEnd - itemSize - scrollStart) / itemSize);
+  }
+  if (scrollAlign === 'end') {
+    return round((itemEnd - (scrollSize + scrollStart)) / itemSize);
+  }
+  if (scrollAlign === 'activeDirection') {
+    var prevStart = offset + itemSize * prevIndex;
+    var prevEnd = prevStart + itemSize;
+    var prevVisible = prevEnd > scrollStart && prevStart < scrollEnd;
+    if (!prevVisible) {
+      if (prevIndex < itemIndex) {
+        return round((itemEnd - (scrollSize + scrollStart)) / itemSize);
+      }
+      return round((itemEnd - itemSize - scrollStart) / itemSize);
+    }
+  }
+  return null;
+};
+export function getCarouselItems(track) {
+  return track.children;
+}
+export function useDebouncedFunction(func, delay, cleanUp) {
+  var timeoutRef = useRef();
+
+  /**
+   * Очистка таймера
+   */
+  function clearTimer() {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+      timeoutRef.current = undefined;
+    }
+  }
+
+  /**
+   * Очищаем таймер при анмаунте компонента, если cleanUp выставлен в true
+   * и тем самым отменяем последний запланированный вызов
+   */
+  useEffect(function () {
+    return cleanUp ? clearTimer : undefined;
+  }, [cleanUp]);
+  return function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    clearTimer();
+    timeoutRef.current = setTimeout(function () {
+      return func.apply(void 0, args);
+    }, delay);
+  };
+}
+var THROTTLE_DEFAULT_MS = 100;
+var DEBOUNCE_DEFAULT_MS = 150;
+export var useCarousel = function useCarousel(_ref4) {
+  var index = _ref4.index,
+    onIndexChange = _ref4.onIndexChange,
+    _ref4$detectActive = _ref4.detectActive,
+    detectActive = _ref4$detectActive === void 0 ? false : _ref4$detectActive,
+    _ref4$detectThreshold = _ref4.detectThreshold,
+    detectThreshold = _ref4$detectThreshold === void 0 ? 0.5 : _ref4$detectThreshold,
+    _ref4$scrollAlign = _ref4.scrollAlign,
+    scrollAlign = _ref4$scrollAlign === void 0 ? 'center' : _ref4$scrollAlign,
+    _ref4$throttleMs = _ref4.throttleMs,
+    throttleMs = _ref4$throttleMs === void 0 ? THROTTLE_DEFAULT_MS : _ref4$throttleMs,
+    _ref4$debounceMs = _ref4.debounceMs,
+    debounceMs = _ref4$debounceMs === void 0 ? DEBOUNCE_DEFAULT_MS : _ref4$debounceMs;
+  var prevIndex = useRef(null);
+  var offset = useRef(0);
   var scrollRef = useRef(null);
   var trackRef = useRef(null);
+  var axis = 'x';
+
+  /**
+   * Для того, чтобы не спамить изменениями индекса.
+   * Задержка дебаунса слегка больше, чем у тротлинга.
+   * Таким образом, событие срабатывает при завершении скролла.
+   */
+  var debouncedOnIndexChange = useDebouncedFunction(function (i) {
+    return onIndexChange === null || onIndexChange === void 0 ? void 0 : onIndexChange(i);
+  }, debounceMs);
+
+  /**
+   * Вычисление центрального элемента.
+   * Подсчет: от 0 до 1, какое количество ширины/высоты
+   * каждого элемента находится по центру скролла.
+   */
+  var throttledDetectActiveItem = useMemo(function () {
+    return throttle(function () {
+      if (!detectActive || scrollRef.current === null || trackRef.current === null) {
+        return;
+      }
+
+      /**
+       * Правая (или нижняя для Оу) граница элемента.
+       */
+      var itemEdge = offset.current;
+
+      /**
+       * Смещение (отрицательный или положительный отступ)
+       * и размер карусели (для Ox - ширина, для Oy - высота).
+       */
+      var scrollPos = scrollRef.current[axis === 'x' ? 'scrollLeft' : 'scrollTop'];
+      var scrollSize = scrollRef.current[axis === 'x' ? 'offsetWidth' : 'offsetHeight'];
 
-  // Прокрутка до нужной позиции индекса, если индекс изменился.
+      /**
+       * Граница скролла (видимой части).
+       * Смещение + размер.
+       */
+      var scrollEdge = scrollPos + scrollSize;
+      var items = getCarouselItems(trackRef.current);
+
+      /**
+       * Проходим по всему списку, суммируя ширины элементов,
+       * пока не найдем один элемент, чей центр будет в центре карусели.
+       */
+      for (var itemIndex = 0; itemIndex < items.length; itemIndex++) {
+        var _prevIndex$current;
+        var item = items.item(itemIndex);
+        if (item === null) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+
+        /**
+         * Для Ox - ширина, для Oy - высота.
+         */
+        var itemSize = item[axis === 'x' ? 'offsetWidth' : 'offsetHeight'];
+
+        /**
+         * Все элементы правее вьюпорта выпадают из процедуры.
+         * Сравниваем по предыдущему элементу.
+         * [ ... ] ...|n| <- Левый край элемента за пределами начала видимой части
+         */
+        if (itemEdge > scrollEdge) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+        itemEdge += itemSize;
+
+        /**
+         * Все элементы левее вьюпорта выпадают из процедуры.
+         * Сравниваем по текущему элементу.
+         * Правый край элемента за пределами начала видимой части -> |p|... [ ... ]
+         */
+        if (scrollPos > itemEdge) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+        var itemSlot = getItemSlot(itemIndex, itemEdge, itemSize, scrollPos, scrollSize, scrollAlign, (_prevIndex$current = prevIndex.current) !== null && _prevIndex$current !== void 0 ? _prevIndex$current : 0, offset.current);
+        if (itemSlot !== null) {
+          if (detectThreshold && Math.abs(itemSlot) <= detectThreshold) {
+            debouncedOnIndexChange === null || debouncedOnIndexChange === void 0 || debouncedOnIndexChange(itemIndex);
+          }
+        }
+      }
+    }, throttleMs);
+  }, [debouncedOnIndexChange, detectActive, detectThreshold, scrollAlign, throttleMs]);
+
+  /**
+   * Прокрутка до нужной позиции индекса.
+   */
+  var toIndex = useCallback(function (i) {
+    var scrollEl = scrollRef.current;
+    var items = trackRef.current ? getCarouselItems(trackRef.current) : null;
+    if (scrollEl && items && items.length > 0 && i >= 0) {
+      scrollToPos({
+        scrollEl: scrollEl,
+        pos: getCalculatedPos({
+          scrollEl: scrollEl,
+          items: items,
+          index: i,
+          offset: offset.current,
+          scrollAlign: scrollAlign
+        })
+      });
+      prevIndex.current = i;
+    }
+  }, [scrollAlign]);
   useEffect(function () {
-    if (!scrollRef.current || !trackRef.current) {
-      return;
+    if (scrollRef.current && trackRef.current) {
+      offset.current = getCalculatedOffset(scrollRef.current, trackRef.current);
     }
-    var itemsCollection = trackRef.current.children;
-    if (itemsCollection && itemsCollection.length > 0) {
-      var pos = getCalculatedPos({
-        scrollRef: scrollRef,
-        trackRef: trackRef,
-        itemsCollection: itemsCollection,
-        index: index,
-        scrollAlign: scrollAlign
-      });
-      scrollRef.current.scrollTo({
-        left: pos
-      });
+  }, []);
+
+  /**
+   * Операции на маунте/анмаунте компонента.
+   * Создать слушатели событи и т.п.
+   */
+  useEffect(function () {
+    var carouselElement = scrollRef.current;
+    if (carouselElement) {
+      carouselElement.addEventListener('scroll', throttledDetectActiveItem);
+    }
+    return function () {
+      if (carouselElement) {
+        carouselElement.removeEventListener('scroll', throttledDetectActiveItem);
+      }
+    };
+  }, [throttledDetectActiveItem]);
+
+  /**
+   * Прокрутка до нужной позиции индекса, если индекс изменился.
+   */
+  useEffect(function () {
+    if (index !== prevIndex.current) {
+      toIndex(index);
     }
-  }, [index]);
+  }, [index, toIndex]);
   return {
     scrollRef: scrollRef,
     trackRef: trackRef

package/styled-components/es/components/Carousel/CarouselNew/ui/Dots/Dots.js

@@ -132,33 +132,26 @@ export var Dots = /*#__PURE__*/memo(function (_ref) {
       }
       if (dotsToAdd > 0) {
         var _loop = function _loop() {
-            var _dotWrapperRef$curren4;
-            var node = document.createElement('div');
-            node.textContent = '';
-            node.classList.add(classes.dot);
-            node.style.opacity = '0';
-            var delay = i * (ANIMATION_DURATION / dotsToAdd);
-            node.style.animationDelay = "".concat(delay, "s");
-            rightAnimationWrapperRef.current.appendChild(node);
-            var duration = ANIMATION_DURATION / dotsToAdd;
-            requestAnimationFrame(function () {
-              node.classList.add(classes.animateIn);
-              node.style.animationDuration = "".concat(duration, "s");
-            });
-            var currentDomNode = (_dotWrapperRef$curren4 = dotWrapperRef.current.children) === null || _dotWrapperRef$curren4 === void 0 ? void 0 : _dotWrapperRef$curren4[i];
-            if (!currentDomNode) {
-              return {
-                v: void 0
-              };
-            }
-            currentDomNode.classList.add(classes.animateOut);
-            currentDomNode.style.animationDelay = "".concat(delay, "s");
-            currentDomNode.style.animationDuration = "".concat(duration, "s");
-          },
-          _ret;
+          var _dotWrapperRef$curren4;
+          var node = document.createElement('div');
+          node.textContent = '';
+          node.classList.add(classes.dot);
+          node.style.opacity = '0';
+          var delay = i * (ANIMATION_DURATION / dotsToAdd);
+          node.style.animationDelay = "".concat(delay, "s");
+          rightAnimationWrapperRef.current.appendChild(node);
+          var duration = ANIMATION_DURATION / dotsToAdd;
+          requestAnimationFrame(function () {
+            node.classList.add(classes.animateIn);
+            node.style.animationDuration = "".concat(duration, "s");
+          });
+          var currentDomNode = (_dotWrapperRef$curren4 = dotWrapperRef.current.children) === null || _dotWrapperRef$curren4 === void 0 ? void 0 : _dotWrapperRef$curren4[i];
+          currentDomNode === null || currentDomNode === void 0 || currentDomNode.classList.add(classes.animateOut);
+          currentDomNode.style.animationDelay = "".concat(delay, "s");
+          currentDomNode.style.animationDuration = "".concat(duration, "s");
+        };
         for (var i = 0; i < dotsToAdd; i++) {
-          _ret = _loop();
-          if (_ret) return _ret.v;
+          _loop();
         }
       }
     } else {
@@ -180,33 +173,26 @@ export var Dots = /*#__PURE__*/memo(function (_ref) {
       }
       if (dotsToAdd > 0) {
         var _loop2 = function _loop2() {
-            var _dotWrapperRef$curren7;
-            var node = document.createElement('div');
-            node.textContent = '';
-            node.classList.add(classes.dot);
-            node.style.opacity = '0';
-            var delay = (dotsToAdd - 1 - _i) * (ANIMATION_DURATION / dotsToAdd);
-            node.style.animationDelay = "".concat(delay, "s");
-            leftAnimationWrapperRef.current.prepend(node);
-            var duration = ANIMATION_DURATION / dotsToAdd;
-            requestAnimationFrame(function () {
-              node.classList.add(classes.animateIn);
-              node.style.animationDuration = "".concat(duration, "s");
-            });
-            var currentDomNode = (_dotWrapperRef$curren7 = dotWrapperRef.current.children) === null || _dotWrapperRef$curren7 === void 0 ? void 0 : _dotWrapperRef$curren7[dotWrapperRef.current.children.length - 1 - _i];
-            if (!currentDomNode) {
-              return {
-                v: void 0
-              };
-            }
-            currentDomNode.classList.add(classes.animateOut);
-            currentDomNode.style.animationDelay = "".concat(_i * (ANIMATION_DURATION / dotsToAdd), "s");
-            currentDomNode.style.animationDuration = "".concat(duration, "s");
-          },
-          _ret2;
+          var _dotWrapperRef$curren7;
+          var node = document.createElement('div');
+          node.textContent = '';
+          node.classList.add(classes.dot);
+          node.style.opacity = '0';
+          var delay = (dotsToAdd - 1 - _i) * (ANIMATION_DURATION / dotsToAdd);
+          node.style.animationDelay = "".concat(delay, "s");
+          leftAnimationWrapperRef.current.prepend(node);
+          var duration = ANIMATION_DURATION / dotsToAdd;
+          requestAnimationFrame(function () {
+            node.classList.add(classes.animateIn);
+            node.style.animationDuration = "".concat(duration, "s");
+          });
+          var currentDomNode = (_dotWrapperRef$curren7 = dotWrapperRef.current.children) === null || _dotWrapperRef$curren7 === void 0 ? void 0 : _dotWrapperRef$curren7[dotWrapperRef.current.children.length - 1 - _i];
+          currentDomNode === null || currentDomNode === void 0 || currentDomNode.classList.add(classes.animateOut);
+          currentDomNode.style.animationDelay = "".concat(_i * (ANIMATION_DURATION / dotsToAdd), "s");
+          currentDomNode.style.animationDuration = "".concat(duration, "s");
+        };
         for (var _i = dotsToAdd - 1; _i >= 0; _i--) {
-          _ret2 = _loop2();
-          if (_ret2) return _ret2.v;
+          _loop2();
         }
       }
     }

package/styled-components/es/components/Carousel/CarouselOld/CarouselItem.js

@@ -6,7 +6,7 @@ import React from 'react';
 import styled from 'styled-components';
 var StyledItem = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-1b1k2uh-0"
-})(["scroll-snap-align:", ";scroll-snap-stop:", ";"], function (_ref) {
+})(["scroll-snap-align:", ";scroll-snap-stop:", ";padding:0 var(--plasma_private-carousel-padding);"], function (_ref) {
   var scrollSnapAlign = _ref.scrollSnapAlign;
   return scrollSnapAlign || 'none';
 }, function (_ref2) {

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

@@ -4,8 +4,7 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import React, { forwardRef, useEffect, useMemo, useRef } from 'react';
-import { useForkRef, extractTextFrom } from '@salutejs/plasma-core';
-import { safeUseId } from "../../utils";
+import { safeUseId, useForkRef, extractTextFrom } from '@salutejs/plasma-core';
 import { cx } from "../../utils";
 import { base as viewCSS } from "./variations/_view/base";
 import { base as sizeCSS } from "./variations/_size/base";

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

@@ -3,7 +3,7 @@ function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.fre
 import { css } from 'styled-components';
 import styled from 'styled-components';
 import { classes, tokens } from "./CodeField.tokens";
-export var base = /*#__PURE__*/css(_templateObject || (_templateObject = /*#__PURE__*/_taggedTemplateLiteral(["\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n    width: min-content;\n    align-items: center;\n\n    &.", " {\n        align-items: start;\n    }\n"])), classes.captionAlignLeft);
+export var base = /*#__PURE__*/css(_templateObject || (_templateObject = /*#__PURE__*/_taggedTemplateLiteral(["\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n    width: min-content;\n    align-items: center;\n\n    &.", " {\n        align-items: flex-start;\n    }\n"])), classes.captionAlignLeft);
 export var CodeWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-1269wxl-0"
 })(["display:flex;align-items:center;"]);

package/styled-components/es/components/Combobox/ComboboxNew/Combobox.js

@@ -14,8 +14,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import React, { forwardRef, useState, useReducer, useMemo, useLayoutEffect, useRef } from 'react';
-import { useForkRef } from '@salutejs/plasma-core';
-import { safeUseId } from "../../../utils";
+import { safeUseId, useForkRef } from '@salutejs/plasma-core';
 import { isEmpty } from "../../../utils";
 import { useOutsideClick } from "../../../hooks";
 import { sizeToIconSize } from "../../Select/utils";

package/styled-components/es/components/Combobox/ComboboxNew/FloatingPopover.js

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { flip, shift, size, useFloating, FloatingPortal, offset as offsetMiddleware, autoUpdate } from '@floating-ui/react';
 import React, { forwardRef } from 'react';
-import { safeUseId } from "../../../utils";
+import { safeUseId } from '@salutejs/plasma-core';
 // TODO: #2003
 var LIST_PADDING = 2;
 var FloatingPopover = /*#__PURE__*/forwardRef(function (_ref, ref) {

package/styled-components/es/components/Combobox/ComboboxNew/ui/Inner/Inner.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { safeUseId } from "../../../../../utils";
+import { safeUseId } from '@salutejs/plasma-core';
 import { FloatingPopover } from "../../FloatingPopover";
 import { isEmpty } from "../../../../../utils";
 import { Ul, ListWrapper } from "../../Combobox.styles";

package/styled-components/es/components/Combobox/ComboboxOld/Combobox.js

@@ -9,8 +9,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import React, { Children, forwardRef, useEffect, useRef, useState } from 'react';
-import { useForkRef } from '@salutejs/plasma-core';
-import { safeUseId } from "../../../utils";
+import { safeUseId, useForkRef } from '@salutejs/plasma-core';
 import { cx, getPlacements } from "../../../utils";
 import { useDidMountEffect, useForceUpdate } from "../../../hooks";
 import { getChildren, getNewSelected, getValues } from "./utils";

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

@@ -9,7 +9,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import React, { forwardRef, useCallback, useMemo } from 'react';
-import { safeUseId } from "../../../../../utils";
+import { safeUseId } from '@salutejs/plasma-core';
 import { classes } from "../../Combobox.tokens";
 import { getValidComponent } from "../../utils";
 import { cx } from "../../../../../utils";

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

@@ -3,11 +3,11 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import React, { forwardRef, useMemo } from 'react';
-import { useForkRef } from '@salutejs/plasma-core';
-import { cx, getSizeValueFromProp, safeUseId } from "../../utils";
+import { useForkRef, safeUseId } from '@salutejs/plasma-core';
 import { usePopupContext } from "../Popup";
 import { Overlay } from "../Overlay";
 import { DEFAULT_Z_INDEX } from "../Popup/utils";
+import { cx, getSizeValueFromProp } from "../../utils";
 import { useFocusTrap } from "../../hooks";
 import { classes, tokens } from "./Drawer.tokens";
 import { base as viewCSS } from "./variations/_view/base";
@@ -74,7 +74,7 @@ export var drawerRoot = function drawerRoot(Root) {
       }),
       drawerInfo = _useDrawer.drawerInfo;
     var transparent = useMemo(function () {
-      return getIdLastDrawer(Array.from(popupController.items.values())) !== innerId;
+      return getIdLastDrawer(popupController.items) !== innerId;
     }, [innerId, popupController.items]);
     var onDrawerOverlayKeyDown = function onDrawerOverlayKeyDown(event) {
       if (onOverlayClick) {