@salutejs/plasma-new-hope 0.327.0-canary.1741.15743877104.0 → 0.327.0-canary.1741.15775036215.0

package/emotion/cjs/components/Calendar/ui/CalendarDays/CalendarDays.js

@@ -183,6 +183,9 @@ var CalendarDays = function(param) {
     };
     var getRefs = function(element, isDayInCurrentMonth, i, j) {
         if (isDayInCurrentMonth) {
+            if (!outerRefs.current[i + offset]) {
+                outerRefs.current[i + offset] = [];
+            }
             outerRefs.current[i + offset][j] = element;
         }
     };

package/emotion/cjs/components/Calendar/ui/CalendarMonths/CalendarMonths.js

@@ -189,6 +189,9 @@ var CalendarMonths = function(param) {
         return onHoverMonth === null || onHoverMonth === void 0 ? void 0 : onHoverMonth(undefined);
     };
     var getRefs = (0, _react.useCallback)(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         offset,

package/emotion/cjs/components/Calendar/ui/CalendarQuarters/CalendarQuarters.js

@@ -188,6 +188,9 @@ var CalendarQuarters = function(param) {
         return onHoverQuarter === null || onHoverQuarter === void 0 ? void 0 : onHoverQuarter(undefined);
     };
     var getRefs = (0, _react.useCallback)(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         offset,

package/emotion/cjs/components/Calendar/ui/CalendarYears/CalendarYears.js

@@ -189,6 +189,9 @@ var CalendarYears = function(param) {
         return onHoverYear === null || onHoverYear === void 0 ? void 0 : onHoverYear(undefined);
     };
     var getRefs = (0, _react.useCallback)(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         outerRefs

package/emotion/cjs/components/Drawer/Drawer.js

@@ -18,10 +18,10 @@ _export(exports, {
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../utils");
 var _Popup = require("../Popup");
 var _Overlay = require("../Overlay");
-var _utils = require("../Popup/utils");
-var _utils1 = require("../../utils");
+var _utils1 = require("../Popup/utils");
 var _hooks = require("../../hooks");
 var _Drawertokens = require("./Drawer.tokens");
 var _base = require("./variations/_view/base");
@@ -160,11 +160,11 @@ var drawerRoot = function(Root) {
         var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef);
         var popupController = (0, _Popup.usePopupContext)();
         var innerRef = (0, _plasmacore.useForkRef)(trapRef, outerRef);
-        var uniqId = (0, _plasmacore.safeUseId)();
+        var uniqId = (0, _utils.safeUseId)();
         var innerId = id || uniqId;
         var overlayBackgroundToken = withBlur ? "var(".concat(_Drawertokens.tokens.drawerOverlayWithBlurColor, ")") : "var(".concat(_Drawertokens.tokens.drawerOverlayColor, ")");
-        var innerWidth = width ? (0, _utils1.getSizeValueFromProp)(width) : '100%';
-        var innerHeight = height ? (0, _utils1.getSizeValueFromProp)(height) : '100%';
+        var innerWidth = width ? (0, _utils.getSizeValueFromProp)(width) : '100%';
+        var innerHeight = height ? (0, _utils.getSizeValueFromProp)(height) : '100%';
         var placementClass = placement ? _Drawertokens.classes["".concat(placement, "Placement")] : undefined;
         var drawerInfo = (0, _hooks1.useDrawer)({
             id: innerId,
@@ -176,7 +176,7 @@ var drawerRoot = function(Root) {
             disableScroll: asModal
         }).drawerInfo;
         var transparent = (0, _react.useMemo)(function() {
-            return (0, _DrawerContext.getIdLastDrawer)(popupController.items) !== innerId;
+            return (0, _DrawerContext.getIdLastDrawer)(Array.from(popupController.items.values())) !== innerId;
         }, [
             innerId,
             popupController.items
@@ -193,7 +193,7 @@ var drawerRoot = function(Root) {
         return /*#__PURE__*/ _react.default.createElement(_Drawerstyles.StyledPopup, _object_spread({
             id: innerId,
             ref: asModal ? innerRef : outerRef,
-            className: (0, _utils1.cx)(placementClass),
+            className: (0, _utils.cx)(placementClass),
             opened: innerIsOpen,
             zIndex: zIndex,
             placement: placement,
@@ -207,7 +207,7 @@ var drawerRoot = function(Root) {
                 view: view
             }, /*#__PURE__*/ _react.default.createElement(_Overlay.Overlay, {
                 className: _Drawertokens.classes.overlay,
-                zIndex: zIndex || _utils.DEFAULT_Z_INDEX,
+                zIndex: zIndex || _utils1.DEFAULT_Z_INDEX,
                 backgroundColorProperty: overlayBackgroundToken,
                 withBlur: withBlur,
                 transparent: transparent,

package/emotion/cjs/components/Drawer/hooks/useDrawer.js

@@ -50,7 +50,7 @@ var useDrawer = function(param) {
         if (!closeOnEsc) {
             return;
         }
-        if (event.keyCode === ESCAPE_KEYCODE && (0, _DrawerContext.getIdLastDrawer)(popupController.items) === id) {
+        if (event.keyCode === ESCAPE_KEYCODE && (0, _DrawerContext.getIdLastDrawer)(Array.from(popupController.items.values())) === id) {
             if (onEscKeyDown) {
                 onEscKeyDown(event);
                 return;
@@ -90,7 +90,7 @@ var useDrawer = function(param) {
         if (!_utils.canUseDOM) {
             return;
         }
-        if (!isOpen && !(0, _DrawerContext.hasDrawers)(popupController.items)) {
+        if (!isOpen && !(0, _DrawerContext.hasDrawers)(Array.from(popupController.items.values()))) {
             document.body.style.overflow = overflow.current;
         }
     }, [

package/emotion/cjs/components/Mask/Mask.js

@@ -158,14 +158,14 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 var defaultFormatChars = [
-    {
-        str: '0',
-        regexp: /[0-9]/
-    },
     {
         str: '*',
         regexp: /./
     },
+    {
+        str: '0',
+        regexp: /[0-9]/
+    },
     {
         str: 'a',
         regexp: /[a-zA-Z]/

package/emotion/cjs/components/Modal/Modal.js

@@ -18,11 +18,12 @@ _export(exports, {
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../utils");
 var _engines = require("../../engines");
+var _hooks = require("../../hooks");
 var _Popup = require("../Popup");
 var _Overlay = require("../Overlay");
-var _utils = require("../Popup/utils");
-var _hooks = require("../../hooks");
+var _utils1 = require("../Popup/utils");
 var _IconClose = require("../_Icon/Icons/IconClose");
 var _Modaltokens = require("./Modal.tokens");
 var _hooks1 = require("./hooks");
@@ -154,7 +155,7 @@ var modalRoot = function(Root) {
         var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef, true);
         var popupController = (0, _Popup.usePopupContext)();
         var innerRef = (0, _plasmacore.useForkRef)(trapRef, outerRootRef);
-        var uniqId = (0, _plasmacore.safeUseId)();
+        var uniqId = (0, _utils.safeUseId)();
         var innerId = id || uniqId;
         var overlayBackgroundToken = withBlur ? "var(".concat(_Modaltokens.tokens.modalOverlayWithBlurColor, ")") : "var(".concat(_Modaltokens.tokens.modalOverlayColor, ")");
         var modalInfo = (0, _hooks1.useModal)({
@@ -166,7 +167,7 @@ var modalRoot = function(Root) {
             popupInfo: popupInfo
         }).modalInfo;
         var transparent = (0, _react.useMemo)(function() {
-            return (0, _ModalContext.getIdLastModal)(popupController.items) !== innerId;
+            return (0, _ModalContext.getIdLastModal)(Array.from(popupController.items.values())) !== innerId;
         }, [
             innerId,
             popupController.items
@@ -186,7 +187,7 @@ var modalRoot = function(Root) {
         ]);
         var overlayNode = /*#__PURE__*/ _react.default.createElement(_Overlay.Overlay, {
             className: _Modaltokens.classes.overlay,
-            zIndex: zIndex || _utils.DEFAULT_Z_INDEX,
+            zIndex: zIndex || _utils1.DEFAULT_Z_INDEX,
             backgroundColorProperty: overlayBackgroundToken,
             withBlur: withBlur,
             transparent: transparent,

package/emotion/cjs/components/Modal/hooks/useModal.js

@@ -48,7 +48,7 @@ var useModal = function(param) {
         if (!closeOnEsc) {
             return;
         }
-        if (event.keyCode === ESCAPE_KEYCODE && (0, _ModalContext.getIdLastModal)(popupController.items) === id) {
+        if (event.keyCode === ESCAPE_KEYCODE && (0, _ModalContext.getIdLastModal)(Array.from(popupController.items.values())) === id) {
             if (onEscKeyDown) {
                 onEscKeyDown(event);
                 return;

package/emotion/cjs/components/Popup/Popup.js

@@ -246,7 +246,7 @@ var popupRoot = function(Root) {
             "className"
         ]);
         var innerIsOpen = isOpen || opened;
-        var uniqId = (0, _plasmacore.safeUseId)();
+        var uniqId = (0, _utils.safeUseId)();
         var innerId = id || uniqId;
         var _usePopup = (0, _hooks.usePopup)({
             isOpen: innerIsOpen,

package/emotion/cjs/components/Popup/PopupContext.js

@@ -20,9 +20,9 @@ _export(exports, {
     }
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
+var _utils = require("../../utils");
 var _Portal = require("../Portal");
 var _ModalContext = require("../Modal/ModalContext");
-var _utils = require("../../utils");
 var _ClientOnlyPortal = require("./ClientOnlyPortal");
 var _Popupstyles = require("./Popup.styles");
 function _array_like_to_array(arr, len) {
@@ -33,9 +33,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -77,9 +74,6 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -107,15 +101,9 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     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 _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -125,9 +113,9 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 var POPUP_PORTAL_ID = 'plasma-popup-root';
-var items = [];
+var initialItems = new Map();
 var PopupContext = /*#__PURE__*/ (0, _react.createContext)({
-    items: items,
+    items: initialItems,
     rootId: POPUP_PORTAL_ID,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     register: function register(_info) {
@@ -144,7 +132,7 @@ var usePopupContext = function() {
 var PopupProvider = function(param) {
     var children = param.children, UNSAFE_SSR_ENABLED = param.UNSAFE_SSR_ENABLED;
     var prevBodyOverflowY = (0, _react.useRef)(_utils.canUseDOM ? document.body.style.overflowY : '');
-    var _useState = _sliced_to_array((0, _react.useState)([]), 2), items = _useState[0], setItems = _useState[1];
+    var _useState = _sliced_to_array((0, _react.useState)(initialItems), 2), items = _useState[0], setItems = _useState[1];
     var uuid = (0, _utils.safeUseId)();
     var rootId = "".concat(POPUP_PORTAL_ID, "-").concat(uuid);
     var register = function(info) {
@@ -153,13 +141,13 @@ var PopupProvider = function(param) {
         }
         setItems(function(prevItems) {
             var _info_info;
-            if (((_info_info = info.info) === null || _info_info === void 0 ? void 0 : _info_info.isModal) && !(0, _ModalContext.hasModals)(prevItems)) {
+            var newItems = new Map(prevItems);
+            if (((_info_info = info.info) === null || _info_info === void 0 ? void 0 : _info_info.isModal) && !(0, _ModalContext.hasModals)(Array.from(prevItems.values()))) {
                 prevBodyOverflowY.current = document.body.style.overflowY;
                 document.body.style.overflowY = 'hidden';
             }
-            return _to_consumable_array(prevItems).concat([
-                info
-            ]);
+            newItems.set(info.id, info);
+            return newItems;
         });
     };
     var unregister = function(id) {
@@ -167,19 +155,16 @@ var PopupProvider = function(param) {
             return;
         }
         setItems(function(prevItems) {
-            var index = prevItems.findIndex(function(item) {
-                return id === item.id;
-            });
-            if (index === -1) {
+            if (!prevItems.has(id)) {
                 return prevItems;
             }
-            var prevHasModals = (0, _ModalContext.hasModals)(prevItems);
-            prevItems.splice(index, 1);
-            if (prevHasModals && !(0, _ModalContext.hasModals)(prevItems)) {
+            var newItems = new Map(prevItems);
+            var prevHasModals = (0, _ModalContext.hasModals)(Array.from(newItems.values()));
+            newItems.delete(id);
+            if (prevHasModals && !(0, _ModalContext.hasModals)(Array.from(newItems.values()))) {
                 document.body.style.overflowY = prevBodyOverflowY.current;
             }
-            // при return prevItems не обновится контекст
-            return _to_consumable_array(prevItems);
+            return newItems;
         });
     };
     var context = {

package/emotion/es/components/Calendar/CalendarBase/CalendarBase.js

@@ -193,6 +193,20 @@ import { IsOutOfRange, StyledCalendar } from "./CalendarBase.styles";
         }, [
             calendarState
         ]);
+        useEffect(function() {
+            if (prevType !== type) {
+                dispatch({
+                    type: ActionType.UPDATE_CALENDAR_STATE,
+                    payload: {
+                        calendarState: type,
+                        size: sizeMap[type].single
+                    }
+                });
+                setPrevType(type);
+            }
+        }, [
+            type
+        ]);
         useEffect(function() {
             if (value && prevValue && isValueUpdate(value, prevValue) || value && !prevValue) {
                 dispatch({

package/emotion/es/components/Calendar/CalendarDouble/CalendarDouble.js

@@ -239,6 +239,20 @@ import { StyledCalendar, StyledSeparator, StyledWrapper } from "./CalendarDouble
         }, [
             calendarState
         ]);
+        useEffect(function() {
+            if (prevType !== type) {
+                dispatch({
+                    type: ActionType.UPDATE_CALENDAR_STATE,
+                    payload: {
+                        calendarState: type,
+                        size: sizeMap[type].double
+                    }
+                });
+                setPrevType(type);
+            }
+        }, [
+            type
+        ]);
         useEffect(function() {
             if (value && prevValue && isValueUpdate(value, prevValue) || value && !prevValue) {
                 var _getBoundaryDates = _sliced_to_array(getBoundaryDates(), 2), minVisibleDate = _getBoundaryDates[0], maxVisibleDate = _getBoundaryDates[1];

package/emotion/es/components/Calendar/ui/CalendarDays/CalendarDays.js

@@ -134,6 +134,9 @@ import { StyledCalendarDays, StyledCalendarDaysHint } from "./CalendarDays.style
     };
     var getRefs = function(element, isDayInCurrentMonth, i, j) {
         if (isDayInCurrentMonth) {
+            if (!outerRefs.current[i + offset]) {
+                outerRefs.current[i + offset] = [];
+            }
             outerRefs.current[i + offset][j] = element;
         }
     };

package/emotion/es/components/Calendar/ui/CalendarMonths/CalendarMonths.js

@@ -140,6 +140,9 @@ import { StyledCalendarMonths } from "./CalendarMonths.styles";
         return onHoverMonth === null || onHoverMonth === void 0 ? void 0 : onHoverMonth(undefined);
     };
     var getRefs = useCallback(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         offset,

package/emotion/es/components/Calendar/ui/CalendarQuarters/CalendarQuarters.js

@@ -139,6 +139,9 @@ import { StyledCalendarQuarters } from "./CalendarQuarters.styles";
         return onHoverQuarter === null || onHoverQuarter === void 0 ? void 0 : onHoverQuarter(undefined);
     };
     var getRefs = useCallback(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         offset,

package/emotion/es/components/Calendar/ui/CalendarYears/CalendarYears.js

@@ -140,6 +140,9 @@ import { StyledCalendarYears } from "./CalendarYears.styles";
         return onHoverYear === null || onHoverYear === void 0 ? void 0 : onHoverYear(undefined);
     };
     var getRefs = useCallback(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         outerRefs

package/emotion/es/components/Drawer/Drawer.js

@@ -54,11 +54,11 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 import React, { forwardRef, useMemo } from "react";
-import { useForkRef, safeUseId } from "@salutejs/plasma-core";
+import { useForkRef } from "@salutejs/plasma-core";
+import { cx, getSizeValueFromProp, safeUseId } from "../../utils";
 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";
@@ -118,7 +118,7 @@ export var drawerRoot = function(Root) {
             disableScroll: asModal
         }).drawerInfo;
         var transparent = useMemo(function() {
-            return getIdLastDrawer(popupController.items) !== innerId;
+            return getIdLastDrawer(Array.from(popupController.items.values())) !== innerId;
         }, [
             innerId,
             popupController.items

package/emotion/es/components/Drawer/hooks/useDrawer.js

@@ -40,7 +40,7 @@ export var useDrawer = function(param) {
         if (!closeOnEsc) {
             return;
         }
-        if (event.keyCode === ESCAPE_KEYCODE && getIdLastDrawer(popupController.items) === id) {
+        if (event.keyCode === ESCAPE_KEYCODE && getIdLastDrawer(Array.from(popupController.items.values())) === id) {
             if (onEscKeyDown) {
                 onEscKeyDown(event);
                 return;
@@ -80,7 +80,7 @@ export var useDrawer = function(param) {
         if (!canUseDOM) {
             return;
         }
-        if (!isOpen && !hasDrawers(popupController.items)) {
+        if (!isOpen && !hasDrawers(Array.from(popupController.items.values()))) {
             document.body.style.overflow = overflow.current;
         }
     }, [

package/emotion/es/components/Mask/Mask.js

@@ -102,14 +102,14 @@ function _unsupported_iterable_to_array(o, minLen) {
 import React, { forwardRef, useImperativeHandle, useState } from "react";
 import maskInputCompose from "@salutejs/react-maskinput";
 var defaultFormatChars = [
-    {
-        str: '0',
-        regexp: /[0-9]/
-    },
     {
         str: '*',
         regexp: /./
     },
+    {
+        str: '0',
+        regexp: /[0-9]/
+    },
     {
         str: 'a',
         regexp: /[a-zA-Z]/

package/emotion/es/components/Modal/Modal.js

@@ -54,12 +54,13 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 import React, { forwardRef, useCallback, useMemo } from "react";
-import { useForkRef, safeUseId } from "@salutejs/plasma-core";
+import { useForkRef } from "@salutejs/plasma-core";
+import { safeUseId } from "../../utils";
 import { component } from "../../engines";
+import { useFocusTrap } from "../../hooks";
 import { popupConfig, usePopupContext } from "../Popup";
 import { Overlay } from "../Overlay";
 import { DEFAULT_Z_INDEX } from "../Popup/utils";
-import { useFocusTrap } from "../../hooks";
 import { IconClose } from "../_Icon/Icons/IconClose";
 import { classes, tokens } from "./Modal.tokens";
 import { useModal } from "./hooks";
@@ -110,7 +111,7 @@ var Popup = component(popupConfig);
             popupInfo: popupInfo
         }).modalInfo;
         var transparent = useMemo(function() {
-            return getIdLastModal(popupController.items) !== innerId;
+            return getIdLastModal(Array.from(popupController.items.values())) !== innerId;
         }, [
             innerId,
             popupController.items

package/emotion/es/components/Modal/hooks/useModal.js

@@ -38,7 +38,7 @@ export var useModal = function(param) {
         if (!closeOnEsc) {
             return;
         }
-        if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(popupController.items) === id) {
+        if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(Array.from(popupController.items.values())) === id) {
             if (onEscKeyDown) {
                 onEscKeyDown(event);
                 return;

package/emotion/es/components/Popup/Popup.js

@@ -100,8 +100,8 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 import React, { forwardRef, useRef } from "react";
-import { useForkRef, safeUseId } from "@salutejs/plasma-core";
-import { canUseDOM, cx } from "../../utils";
+import { useForkRef } from "@salutejs/plasma-core";
+import { canUseDOM, cx, safeUseId } from "../../utils";
 import { Portal } from "../Portal";
 import { PopupRoot } from "./PopupRoot";
 import { usePopup } from "./hooks";

package/emotion/es/components/Popup/PopupContext.js

@@ -6,12 +6,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -39,15 +33,9 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     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 _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -57,15 +45,15 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 import React, { createContext, useState, useContext, useRef } from "react";
+import { canUseDOM, safeUseId } from "../../utils";
 import { Portal } from "../Portal";
 import { hasModals } from "../Modal/ModalContext";
-import { canUseDOM, safeUseId } from "../../utils";
 import { ClientOnlyPortal } from "./ClientOnlyPortal";
 import { StyledPortal } from "./Popup.styles";
 export var POPUP_PORTAL_ID = 'plasma-popup-root';
-var items = [];
+var initialItems = new Map();
 var PopupContext = /*#__PURE__*/ createContext({
-    items: items,
+    items: initialItems,
     rootId: POPUP_PORTAL_ID,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     register: function register(_info) {
@@ -83,7 +71,7 @@ export var usePopupContext = function() {
 export var PopupProvider = function(param) {
     var children = param.children, UNSAFE_SSR_ENABLED = param.UNSAFE_SSR_ENABLED;
     var prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');
-    var _useState = _sliced_to_array(useState([]), 2), items = _useState[0], setItems = _useState[1];
+    var _useState = _sliced_to_array(useState(initialItems), 2), items = _useState[0], setItems = _useState[1];
     var uuid = safeUseId();
     var rootId = "".concat(POPUP_PORTAL_ID, "-").concat(uuid);
     var register = function(info) {
@@ -92,13 +80,13 @@ export var PopupProvider = function(param) {
         }
         setItems(function(prevItems) {
             var _info_info;
-            if (((_info_info = info.info) === null || _info_info === void 0 ? void 0 : _info_info.isModal) && !hasModals(prevItems)) {
+            var newItems = new Map(prevItems);
+            if (((_info_info = info.info) === null || _info_info === void 0 ? void 0 : _info_info.isModal) && !hasModals(Array.from(prevItems.values()))) {
                 prevBodyOverflowY.current = document.body.style.overflowY;
                 document.body.style.overflowY = 'hidden';
             }
-            return _to_consumable_array(prevItems).concat([
-                info
-            ]);
+            newItems.set(info.id, info);
+            return newItems;
         });
     };
     var unregister = function(id) {
@@ -106,19 +94,16 @@ export var PopupProvider = function(param) {
             return;
         }
         setItems(function(prevItems) {
-            var index = prevItems.findIndex(function(item) {
-                return id === item.id;
-            });
-            if (index === -1) {
+            if (!prevItems.has(id)) {
                 return prevItems;
             }
-            var prevHasModals = hasModals(prevItems);
-            prevItems.splice(index, 1);
-            if (prevHasModals && !hasModals(prevItems)) {
+            var newItems = new Map(prevItems);
+            var prevHasModals = hasModals(Array.from(newItems.values()));
+            newItems.delete(id);
+            if (prevHasModals && !hasModals(Array.from(newItems.values()))) {
                 document.body.style.overflowY = prevBodyOverflowY.current;
             }
-            // при return prevItems не обновится контекст
-            return _to_consumable_array(prevItems);
+            return newItems;
         });
     };
     var context = {

package/es/components/Calendar/CalendarBase/CalendarBase.js

@@ -104,6 +104,18 @@ const calendarBaseRoot = Root => /*#__PURE__*/forwardRef(({
       setPrevType(calendarState);
     }
   }, [calendarState]);
+  useEffect(() => {
+    if (prevType !== type) {
+      dispatch({
+        type: ActionType.UPDATE_CALENDAR_STATE,
+        payload: {
+          calendarState: type,
+          size: sizeMap[type].single
+        }
+      });
+      setPrevType(type);
+    }
+  }, [type]);
   useEffect(() => {
     if (value && prevValue && isValueUpdate(value, prevValue) || value && !prevValue) {
       dispatch({