@salutejs/plasma-new-hope 0.327.0-canary.2022.15758717316.0 → 0.327.0-canary.2024.15751969456.0

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

@@ -7,12 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.modalRoot = exports.modalConfig = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("react"));
 var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
-var _utils = /*#__PURE__*/require("../../utils");
 var _engines = /*#__PURE__*/require("../../engines");
-var _hooks = /*#__PURE__*/require("../../hooks");
 var _Popup = /*#__PURE__*/require("../Popup");
 var _Overlay = /*#__PURE__*/require("../Overlay");
-var _utils2 = /*#__PURE__*/require("../Popup/utils");
+var _utils = /*#__PURE__*/require("../Popup/utils");
+var _hooks = /*#__PURE__*/require("../../hooks");
 var _IconClose2 = /*#__PURE__*/require("../_Icon/Icons/IconClose");
 var _Modal = /*#__PURE__*/require("./Modal.tokens");
 var _hooks2 = /*#__PURE__*/require("./hooks");
@@ -61,7 +60,7 @@ var modalRoot = exports.modalRoot = function modalRoot(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, _utils.safeUseId)();
+    var uniqId = (0, _plasmaCore.safeUseId)();
     var innerId = id || uniqId;
     var overlayBackgroundToken = withBlur ? "var(".concat(_Modal.tokens.modalOverlayWithBlurColor, ")") : "var(".concat(_Modal.tokens.modalOverlayColor, ")");
     var _useModal = (0, _hooks2.useModal)({
@@ -74,7 +73,7 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
       }),
       modalInfo = _useModal.modalInfo;
     var transparent = (0, _react.useMemo)(function () {
-      return (0, _ModalContext.getIdLastModal)(Array.from(popupController.items.values())) !== innerId;
+      return (0, _ModalContext.getIdLastModal)(popupController.items) !== innerId;
     }, [innerId, popupController.items]);
     var onModalOverlayKeyDown = (0, _react.useCallback)(function (event) {
       if (onOverlayClick) {
@@ -87,7 +86,7 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
     }, [closeOnOverlayClick, onOverlayClick, onClose]);
     var overlayNode = /*#__PURE__*/_react["default"].createElement(_Overlay.Overlay, {
       className: _Modal.classes.overlay,
-      zIndex: zIndex || _utils2.DEFAULT_Z_INDEX,
+      zIndex: zIndex || _utils.DEFAULT_Z_INDEX,
       backgroundColorProperty: overlayBackgroundToken,
       withBlur: withBlur,
       transparent: transparent,

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

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

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

@@ -109,7 +109,7 @@ var popupRoot = exports.popupRoot = function popupRoot(Root) {
       className = _ref.className,
       rest = _objectWithoutProperties(_ref, _excluded);
     var innerIsOpen = isOpen || opened;
-    var uniqId = (0, _utils.safeUseId)();
+    var uniqId = (0, _plasmaCore.safeUseId)();
     var innerId = id || uniqId;
     var _usePopup = (0, _hooks.usePopup)({
         isOpen: innerIsOpen,

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

@@ -6,13 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.usePopupContext = exports.PopupProvider = exports.POPUP_PORTAL_ID = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("react"));
-var _utils = /*#__PURE__*/require("../../utils");
 var _Portal = /*#__PURE__*/require("../Portal");
 var _ModalContext = /*#__PURE__*/require("../Modal/ModalContext");
+var _utils = /*#__PURE__*/require("../../utils");
 var _ClientOnlyPortal = /*#__PURE__*/require("./ClientOnlyPortal");
 var _Popup = /*#__PURE__*/require("./Popup.styles");
 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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { 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 _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -20,9 +24,9 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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(r) { if (Array.isArray(r)) return r; }
 var POPUP_PORTAL_ID = exports.POPUP_PORTAL_ID = 'plasma-popup-root';
-var initialItems = /*#__PURE__*/new Map();
+var items = [];
 var PopupContext = /*#__PURE__*/(0, _react.createContext)({
-  items: initialItems,
+  items: items,
   rootId: POPUP_PORTAL_ID,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   register: function register(_info) {
@@ -42,7 +46,7 @@ var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
   var children = _ref.children,
     UNSAFE_SSR_ENABLED = _ref.UNSAFE_SSR_ENABLED;
   var prevBodyOverflowY = (0, _react.useRef)(_utils.canUseDOM ? document.body.style.overflowY : '');
-  var _useState = (0, _react.useState)(initialItems),
+  var _useState = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
     setItems = _useState2[1];
@@ -54,13 +58,11 @@ var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
     }
     setItems(function (prevItems) {
       var _info$info;
-      var newItems = new Map(prevItems);
-      if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !(0, _ModalContext.hasModals)(Array.from(prevItems.values()))) {
+      if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !(0, _ModalContext.hasModals)(prevItems)) {
         prevBodyOverflowY.current = document.body.style.overflowY;
         document.body.style.overflowY = 'hidden';
       }
-      newItems.set(info.id, info);
-      return newItems;
+      return [].concat(_toConsumableArray(prevItems), [info]);
     });
   };
   var unregister = function unregister(id) {
@@ -68,16 +70,20 @@ var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
       return;
     }
     setItems(function (prevItems) {
-      if (!prevItems.has(id)) {
+      var index = prevItems.findIndex(function (item) {
+        return id === item.id;
+      });
+      if (index === -1) {
         return 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()))) {
+      var prevHasModals = (0, _ModalContext.hasModals)(prevItems);
+      prevItems.splice(index, 1);
+      if (prevHasModals && !(0, _ModalContext.hasModals)(prevItems)) {
         document.body.style.overflowY = prevBodyOverflowY.current;
       }
-      return newItems;
+
+      // при return prevItems не обновится контекст
+      return _toConsumableArray(prevItems);
     });
   };
   var context = {

package/emotion/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) {

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

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

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

@@ -11,11 +11,11 @@ function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t =
 import React, { forwardRef, useImperativeHandle, useState } from 'react';
 import maskInputCompose from '@salutejs/react-maskinput';
 var defaultFormatChars = [{
-  str: '*',
-  regexp: /./
-}, {
   str: '0',
   regexp: /[0-9]/
+}, {
+  str: '*',
+  regexp: /./
 }, {
   str: 'a',
   regexp: /[a-zA-Z]/

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

@@ -4,13 +4,12 @@ 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, useCallback, useMemo } from 'react';
-import { useForkRef } from '@salutejs/plasma-core';
-import { safeUseId } from "../../utils";
+import { useForkRef, safeUseId } from '@salutejs/plasma-core';
 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";
@@ -66,7 +65,7 @@ export var modalRoot = function modalRoot(Root) {
       }),
       modalInfo = _useModal.modalInfo;
     var transparent = useMemo(function () {
-      return getIdLastModal(Array.from(popupController.items.values())) !== innerId;
+      return getIdLastModal(popupController.items) !== innerId;
     }, [innerId, popupController.items]);
     var onModalOverlayKeyDown = useCallback(function (event) {
       if (onOverlayClick) {

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

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

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

@@ -9,8 +9,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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(r) { if (Array.isArray(r)) return r; }
 import React, { forwardRef, useRef } from 'react';
-import { useForkRef } from '@salutejs/plasma-core';
-import { canUseDOM, cx, safeUseId } from "../../utils";
+import { useForkRef, safeUseId } from '@salutejs/plasma-core';
+import { canUseDOM, cx } from "../../utils";
 import { Portal } from "../Portal";
 import { PopupRoot } from "./PopupRoot";
 import { usePopup } from "./hooks";

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

@@ -1,3 +1,7 @@
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { 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 _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -5,15 +9,15 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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(r) { if (Array.isArray(r)) return r; }
 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 initialItems = /*#__PURE__*/new Map();
+var items = [];
 var PopupContext = /*#__PURE__*/createContext({
-  items: initialItems,
+  items: items,
   rootId: POPUP_PORTAL_ID,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   register: function register(_info) {
@@ -33,7 +37,7 @@ export var PopupProvider = function PopupProvider(_ref) {
   var children = _ref.children,
     UNSAFE_SSR_ENABLED = _ref.UNSAFE_SSR_ENABLED;
   var prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');
-  var _useState = useState(initialItems),
+  var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
     setItems = _useState2[1];
@@ -45,13 +49,11 @@ export var PopupProvider = function PopupProvider(_ref) {
     }
     setItems(function (prevItems) {
       var _info$info;
-      var newItems = new Map(prevItems);
-      if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !hasModals(Array.from(prevItems.values()))) {
+      if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !hasModals(prevItems)) {
         prevBodyOverflowY.current = document.body.style.overflowY;
         document.body.style.overflowY = 'hidden';
       }
-      newItems.set(info.id, info);
-      return newItems;
+      return [].concat(_toConsumableArray(prevItems), [info]);
     });
   };
   var unregister = function unregister(id) {
@@ -59,16 +61,20 @@ export var PopupProvider = function PopupProvider(_ref) {
       return;
     }
     setItems(function (prevItems) {
-      if (!prevItems.has(id)) {
+      var index = prevItems.findIndex(function (item) {
+        return id === item.id;
+      });
+      if (index === -1) {
         return prevItems;
       }
-      var newItems = new Map(prevItems);
-      var prevHasModals = hasModals(Array.from(newItems.values()));
-      newItems["delete"](id);
-      if (prevHasModals && !hasModals(Array.from(newItems.values()))) {
+      var prevHasModals = hasModals(prevItems);
+      prevItems.splice(index, 1);
+      if (prevHasModals && !hasModals(prevItems)) {
         document.body.style.overflowY = prevBodyOverflowY.current;
       }
-      return newItems;
+
+      // при return prevItems не обновится контекст
+      return _toConsumableArray(prevItems);
     });
   };
   var context = {

package/es/components/Drawer/Drawer.js

@@ -1,8 +1,8 @@
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React, { forwardRef, useMemo } from 'react';
-import { useForkRef } from '@salutejs/plasma-core';
-import { cx } from '../../utils/index.js';
+import { useForkRef, safeUseId } from '@salutejs/plasma-core';
 import { DEFAULT_Z_INDEX } from '../Popup/utils/index.js';
+import { cx } from '../../utils/index.js';
 import { classes, tokens } from './Drawer.tokens.js';
 import { base } from './variations/_view/base.js';
 import { base as base$1 } from './variations/_size/base.js';
@@ -11,7 +11,6 @@ import { StyledPopup, StyledPanel } from './Drawer.styles.js';
 import { getIdLastDrawer } from './DrawerContext.js';
 import { useFocusTrap } from '../../hooks/useFocusTrap.js';
 import { usePopupContext } from '../Popup/PopupContext.js';
-import { safeUseId } from '../../utils/react.js';
 import { useDrawer } from './hooks/useDrawer.js';
 import { Overlay } from '../Overlay/Overlay.js';
 import { getSizeValueFromProp } from '../../utils/getSizeValueFromProp.js';
@@ -75,7 +74,7 @@ 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) {

package/es/components/Drawer/Drawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Drawer.js","sources":["../../../src/components/Drawer/Drawer.tsx"],"sourcesContent":["import React, { forwardRef, useMemo } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\nimport { cx, getSizeValueFromProp, safeUseId } from 'src/utils';\nimport type { RootProps } from 'src/engines';\n\nimport { usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { useFocusTrap } from '../../hooks';\n\nimport { classes, tokens } from './Drawer.tokens';\nimport type { DrawerProps } from './Drawer.types';\nimport { base as viewCSS } from './variations/_view/base';\nimport { base as sizeCSS } from './variations/_size/base';\nimport { base as borderRadiusCSS } from './variations/_borderRadius/base';\nimport { StyledPopup, StyledPanel } from './Drawer.styles';\nimport { getIdLastDrawer } from './DrawerContext';\nimport { useDrawer } from './hooks';\n\n// issue #823\n\nexport const drawerRoot = (Root: RootProps<HTMLDivElement, DrawerProps>) =>\n    forwardRef<HTMLDivElement, DrawerProps>(\n        (\n            {\n                id,\n                zIndex,\n                popupInfo,\n                withBlur,\n                children,\n                view,\n                size,\n                width,\n                height,\n                isOpen,\n                opened,\n                initialFocusRef,\n                focusAfterRef,\n                className,\n                customBackgroundColor,\n                customContentBackgroundColor,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                offset,\n                frame,\n                borderRadius = 'none',\n                placement = 'right',\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                asModal = true,\n                ...rest\n            },\n            outerRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.drawerOverlayWithBlurColor})`\n                : `var(${tokens.drawerOverlayColor})`;\n            const innerWidth = width ? getSizeValueFromProp(width) : '100%';\n            const innerHeight = height ? getSizeValueFromProp(height) : '100%';\n\n            const placementClass = placement ? classes[`${placement}Placement` as keyof typeof classes] : undefined;\n\n            const { drawerInfo } = useDrawer({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n                disableScroll: asModal,\n            });\n            const transparent = useMemo(() => getIdLastDrawer(Array.from(popupController.items.values())) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onDrawerOverlayKeyDown = (event: React.MouseEvent<HTMLDivElement>) => {\n                if (onOverlayClick) {\n                    onOverlayClick(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            };\n\n            return (\n                <StyledPopup\n                    id={innerId}\n                    ref={asModal ? innerRef : outerRef}\n                    className={cx(placementClass)}\n                    opened={innerIsOpen}\n                    zIndex={zIndex}\n                    placement={placement}\n                    popupInfo={drawerInfo}\n                    frame={frame}\n                    width={innerWidth}\n                    height={innerHeight}\n                    offset={offset}\n                    withAnimation\n                    overlay={\n                        asModal && (\n                            <Root view={view}>\n                                <Overlay\n                                    className={classes.overlay}\n                                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                                    backgroundColorProperty={overlayBackgroundToken}\n                                    withBlur={withBlur}\n                                    transparent={transparent}\n                                    isClickable={closeOnOverlayClick}\n                                    onOverlayClick={onDrawerOverlayKeyDown}\n                                />\n                            </Root>\n                        )\n                    }\n                    {...rest}\n                >\n                    <Root\n                        view={view}\n                        size={size}\n                        style={{ width: innerWidth, height: innerHeight }}\n                        borderRadius={borderRadius}\n                    >\n                        <StyledPanel\n                            width={innerWidth}\n                            height={innerHeight}\n                            customBackgroundColor={customBackgroundColor}\n                            customContentBackgroundColor={customContentBackgroundColor}\n                            className={className}\n                        >\n                            {children}\n                        </StyledPanel>\n                    </Root>\n                </StyledPopup>\n            );\n        },\n    );\n\nexport const drawerConfig = {\n    name: 'Drawer',\n    tag: 'div',\n    layout: drawerRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n        size: {\n            css: sizeCSS,\n        },\n        borderRadius: {\n            css: borderRadiusCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n        size: 'm',\n        borderRadius: 'none',\n    },\n};\n"],"names":["drawerRoot","Root","forwardRef","_ref","outerRef","id","zIndex","popupInfo","withBlur","children","view","size","width","height","isOpen","opened","initialFocusRef","focusAfterRef","className","customBackgroundColor","customContentBackgroundColor","onClose","onOverlayClick","onEscKeyDown","offset","frame","_ref$borderRadius","borderRadius","_ref$placement","placement","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","_ref$asModal","asModal","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","drawerOverlayWithBlurColor","drawerOverlayColor","innerWidth","getSizeValueFromProp","innerHeight","placementClass","classes","undefined","_useDrawer","useDrawer","disableScroll","drawerInfo","transparent","useMemo","getIdLastDrawer","Array","from","items","values","onDrawerOverlayKeyDown","event","React","createElement","StyledPopup","_extends","ref","cx","withAnimation","overlay","Overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","style","StyledPanel","drawerConfig","name","tag","layout","base","variations","css","viewCSS","sizeCSS","borderRadiusCSS","defaults"],"mappings":"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"}
+{"version":3,"file":"Drawer.js","sources":["../../../src/components/Drawer/Drawer.tsx"],"sourcesContent":["import React, { forwardRef, useMemo } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport type { RootProps } from '../../engines';\nimport { usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { cx, getSizeValueFromProp } from '../../utils';\nimport { useFocusTrap } from '../../hooks';\n\nimport { classes, tokens } from './Drawer.tokens';\nimport type { DrawerProps } from './Drawer.types';\nimport { base as viewCSS } from './variations/_view/base';\nimport { base as sizeCSS } from './variations/_size/base';\nimport { base as borderRadiusCSS } from './variations/_borderRadius/base';\nimport { StyledPopup, StyledPanel } from './Drawer.styles';\nimport { getIdLastDrawer } from './DrawerContext';\nimport { useDrawer } from './hooks';\n\n// issue #823\n\nexport const drawerRoot = (Root: RootProps<HTMLDivElement, DrawerProps>) =>\n    forwardRef<HTMLDivElement, DrawerProps>(\n        (\n            {\n                id,\n                zIndex,\n                popupInfo,\n                withBlur,\n                children,\n                view,\n                size,\n                width,\n                height,\n                isOpen,\n                opened,\n                initialFocusRef,\n                focusAfterRef,\n                className,\n                customBackgroundColor,\n                customContentBackgroundColor,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                offset,\n                frame,\n                borderRadius = 'none',\n                placement = 'right',\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                asModal = true,\n                ...rest\n            },\n            outerRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.drawerOverlayWithBlurColor})`\n                : `var(${tokens.drawerOverlayColor})`;\n            const innerWidth = width ? getSizeValueFromProp(width) : '100%';\n            const innerHeight = height ? getSizeValueFromProp(height) : '100%';\n\n            const placementClass = placement ? classes[`${placement}Placement` as keyof typeof classes] : undefined;\n\n            const { drawerInfo } = useDrawer({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n                disableScroll: asModal,\n            });\n            const transparent = useMemo(() => getIdLastDrawer(popupController.items) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onDrawerOverlayKeyDown = (event: React.MouseEvent<HTMLDivElement>) => {\n                if (onOverlayClick) {\n                    onOverlayClick(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            };\n\n            return (\n                <StyledPopup\n                    id={innerId}\n                    ref={asModal ? innerRef : outerRef}\n                    className={cx(placementClass)}\n                    opened={innerIsOpen}\n                    zIndex={zIndex}\n                    placement={placement}\n                    popupInfo={drawerInfo}\n                    frame={frame}\n                    width={innerWidth}\n                    height={innerHeight}\n                    offset={offset}\n                    withAnimation\n                    overlay={\n                        asModal && (\n                            <Root view={view}>\n                                <Overlay\n                                    className={classes.overlay}\n                                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                                    backgroundColorProperty={overlayBackgroundToken}\n                                    withBlur={withBlur}\n                                    transparent={transparent}\n                                    isClickable={closeOnOverlayClick}\n                                    onOverlayClick={onDrawerOverlayKeyDown}\n                                />\n                            </Root>\n                        )\n                    }\n                    {...rest}\n                >\n                    <Root\n                        view={view}\n                        size={size}\n                        style={{ width: innerWidth, height: innerHeight }}\n                        borderRadius={borderRadius}\n                    >\n                        <StyledPanel\n                            width={innerWidth}\n                            height={innerHeight}\n                            customBackgroundColor={customBackgroundColor}\n                            customContentBackgroundColor={customContentBackgroundColor}\n                            className={className}\n                        >\n                            {children}\n                        </StyledPanel>\n                    </Root>\n                </StyledPopup>\n            );\n        },\n    );\n\nexport const drawerConfig = {\n    name: 'Drawer',\n    tag: 'div',\n    layout: drawerRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n        size: {\n            css: sizeCSS,\n        },\n        borderRadius: {\n            css: borderRadiusCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n        size: 'm',\n        borderRadius: 'none',\n    },\n};\n"],"names":["drawerRoot","Root","forwardRef","_ref","outerRef","id","zIndex","popupInfo","withBlur","children","view","size","width","height","isOpen","opened","initialFocusRef","focusAfterRef","className","customBackgroundColor","customContentBackgroundColor","onClose","onOverlayClick","onEscKeyDown","offset","frame","_ref$borderRadius","borderRadius","_ref$placement","placement","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","_ref$asModal","asModal","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","drawerOverlayWithBlurColor","drawerOverlayColor","innerWidth","getSizeValueFromProp","innerHeight","placementClass","classes","undefined","_useDrawer","useDrawer","disableScroll","drawerInfo","transparent","useMemo","getIdLastDrawer","items","onDrawerOverlayKeyDown","event","React","createElement","StyledPopup","_extends","ref","cx","withAnimation","overlay","Overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","style","StyledPanel","drawerConfig","name","tag","layout","base","variations","css","viewCSS","sizeCSS","borderRadiusCSS","defaults"],"mappings":"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"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"useDrawer.js","sources":["../../../../src/components/Drawer/hooks/useDrawer.ts"],"sourcesContent":["import { useCallback, useEffect, useRef } from 'react';\n\nimport { DrawerInfo, getIdLastDrawer, hasDrawers } from '../DrawerContext';\nimport { DrawerHookArgs } from '../Drawer.types';\nimport { usePopupContext } from '../../Popup';\nimport { canUseDOM } from '../../../utils';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useDrawer = ({\n    id,\n    isOpen,\n    popupInfo,\n    onEscKeyDown,\n    onClose,\n    closeOnEsc = true,\n    disableScroll = true,\n}: DrawerHookArgs) => {\n    const popupController = usePopupContext();\n    const overflow = useRef<string>(canUseDOM ? document.body.style.overflow : 'initial');\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (\n                event.keyCode === ESCAPE_KEYCODE &&\n                getIdLastDrawer(Array.from(popupController.items.values())) === id\n            ) {\n                if (onEscKeyDown) {\n                    onEscKeyDown(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            }\n        },\n        [onClose, onEscKeyDown, popupController.items, closeOnEsc],\n    );\n\n    useEffect(() => {\n        window.addEventListener('keydown', onKeyDown);\n        return () => {\n            window.removeEventListener('keydown', onKeyDown);\n        };\n    }, [onKeyDown]);\n\n    // linaria не поддерживает динамический global\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (isOpen && disableScroll) {\n            overflow.current = document.body.style.overflow;\n\n            document.body.style.overflow = 'hidden';\n        }\n    }, [isOpen, disableScroll]);\n\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (!isOpen && !hasDrawers(Array.from(popupController.items.values()))) {\n            document.body.style.overflow = overflow.current;\n        }\n    }, [isOpen, popupController.items]);\n\n    const drawerInfo: DrawerInfo = {\n        id,\n        info: {\n            isDrawer: true,\n        },\n        ...popupInfo,\n    };\n\n    return { drawerInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useDrawer","_ref","id","isOpen","popupInfo","onEscKeyDown","onClose","_ref$closeOnEsc","closeOnEsc","_ref$disableScroll","disableScroll","popupController","usePopupContext","overflow","useRef","canUseDOM","document","body","style","onKeyDown","useCallback","event","keyCode","getIdLastDrawer","Array","from","items","values","useEffect","window","addEventListener","removeEventListener","current","hasDrawers","drawerInfo","_objectSpread","info","isDrawer"],"mappings":"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"}
+{"version":3,"file":"useDrawer.js","sources":["../../../../src/components/Drawer/hooks/useDrawer.ts"],"sourcesContent":["import { useCallback, useEffect, useRef } from 'react';\n\nimport { DrawerInfo, getIdLastDrawer, hasDrawers } from '../DrawerContext';\nimport { DrawerHookArgs } from '../Drawer.types';\nimport { usePopupContext } from '../../Popup';\nimport { canUseDOM } from '../../../utils';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useDrawer = ({\n    id,\n    isOpen,\n    popupInfo,\n    onEscKeyDown,\n    onClose,\n    closeOnEsc = true,\n    disableScroll = true,\n}: DrawerHookArgs) => {\n    const popupController = usePopupContext();\n    const overflow = useRef<string>(canUseDOM ? document.body.style.overflow : 'initial');\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (event.keyCode === ESCAPE_KEYCODE && getIdLastDrawer(popupController.items) === id) {\n                if (onEscKeyDown) {\n                    onEscKeyDown(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            }\n        },\n        [onClose, onEscKeyDown, popupController.items, closeOnEsc],\n    );\n\n    useEffect(() => {\n        window.addEventListener('keydown', onKeyDown);\n        return () => {\n            window.removeEventListener('keydown', onKeyDown);\n        };\n    }, [onKeyDown]);\n\n    // linaria не поддерживает динамический global\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (isOpen && disableScroll) {\n            overflow.current = document.body.style.overflow;\n\n            document.body.style.overflow = 'hidden';\n        }\n    }, [isOpen, disableScroll]);\n\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (!isOpen && !hasDrawers(popupController.items)) {\n            document.body.style.overflow = overflow.current;\n        }\n    }, [isOpen, popupController.items]);\n\n    const drawerInfo: DrawerInfo = {\n        id,\n        info: {\n            isDrawer: true,\n        },\n        ...popupInfo,\n    };\n\n    return { drawerInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useDrawer","_ref","id","isOpen","popupInfo","onEscKeyDown","onClose","_ref$closeOnEsc","closeOnEsc","_ref$disableScroll","disableScroll","popupController","usePopupContext","overflow","useRef","canUseDOM","document","body","style","onKeyDown","useCallback","event","keyCode","getIdLastDrawer","items","useEffect","window","addEventListener","removeEventListener","current","hasDrawers","drawerInfo","_objectSpread","info","isDrawer"],"mappings":"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"}

package/es/components/Mask/Mask.js

@@ -4,11 +4,11 @@ import maskInputCompose from '@salutejs/react-maskinput';
 
 var _excluded = ["mask", "maskFormat"];
 var defaultFormatChars = [{
-  str: '*',
-  regexp: /./
-}, {
   str: '0',
   regexp: /[0-9]/
+}, {
+  str: '*',
+  regexp: /./
 }, {
   str: 'a',
   regexp: /[a-zA-Z]/

package/es/components/Mask/Mask.js.map

@@ -1 +1 @@
-{"version":3,"file":"Mask.js","sources":["../../../src/components/Mask/Mask.tsx"],"sourcesContent":["import React, { forwardRef, useImperativeHandle, useState } from 'react';\nimport type { FC } from 'react';\nimport maskInputCompose from '@salutejs/react-maskinput';\n\nimport type { CustomInputProps, MaskProps } from './Mask.types';\n\nconst defaultFormatChars = [\n    {\n        str: '*',\n        regexp: /./,\n    },\n    {\n        str: '0',\n        regexp: /[0-9]/,\n    },\n    {\n        str: 'a',\n        regexp: /[a-zA-Z]/,\n    },\n    {\n        str: 'я',\n        regexp: /[а-яА-ЯёЁ]/,\n    },\n];\n\nexport const composeMask = <T extends CustomInputProps>(InputComponent: FC<T>) => {\n    const MaskedInput = maskInputCompose(InputComponent);\n\n    return forwardRef<HTMLInputElement, T & MaskProps>(\n        ({ mask, maskFormat = defaultFormatChars, ...rest }, outerRef) => {\n            // TODO: replace inside react-maskinput 'getReference' on 'forwardRef'\n            const [ref, setRef] = useState<HTMLInputElement | null>(null);\n\n            useImperativeHandle(outerRef, () => ref as HTMLInputElement, [ref]);\n\n            if (!mask) {\n                return <InputComponent ref={setRef} {...(rest as T)} />;\n            }\n\n            return <MaskedInput getReference={setRef} mask={mask} maskFormat={maskFormat} {...(rest as T)} />;\n        },\n    );\n};\n"],"names":["defaultFormatChars","str","regexp","composeMask","InputComponent","MaskedInput","maskInputCompose","forwardRef","_ref","outerRef","mask","_ref$maskFormat","maskFormat","rest","_objectWithoutProperties","_excluded","_useState","useState","_useState2","_slicedToArray","ref","setRef","useImperativeHandle","React","createElement","_extends","getReference"],"mappings":";;;;;AAMA,IAAMA,kBAAkB,GAAG,CACvB;AACIC,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,GAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,OAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,UAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,YAAA;AACZ,CAAC,CACJ,CAAA;IAEYC,WAAW,GAAG,SAAdA,WAAWA,CAAgCC,cAAqB,EAAK;AAC9E,EAAA,IAAMC,WAAW,GAAGC,gBAAgB,CAACF,cAAc,CAAC,CAAA;AAEpD,EAAA,oBAAOG,UAAU,CACb,UAAAC,IAAA,EAAqDC,QAAQ,EAAK;AAAA,IAAA,IAA/DC,IAAI,GAAAF,IAAA,CAAJE,IAAI;MAAAC,eAAA,GAAAH,IAAA,CAAEI,UAAU;AAAVA,MAAAA,UAAU,GAAAD,eAAA,KAAGX,KAAAA,CAAAA,GAAAA,kBAAkB,GAAAW,eAAA;AAAKE,MAAAA,IAAI,GAAAC,wBAAA,CAAAN,IAAA,EAAAO,SAAA,CAAA,CAAA;AAC7C;AACA,IAAA,IAAAC,SAAA,GAAsBC,QAAQ,CAA0B,IAAI,CAAC;MAAAC,UAAA,GAAAC,cAAA,CAAAH,SAAA,EAAA,CAAA,CAAA;AAAtDI,MAAAA,GAAG,GAAAF,UAAA,CAAA,CAAA,CAAA;AAAEG,MAAAA,MAAM,GAAAH,UAAA,CAAA,CAAA,CAAA,CAAA;IAElBI,mBAAmB,CAACb,QAAQ,EAAE,YAAA;AAAA,MAAA,OAAMW,GAAG,CAAA;AAAA,KAAoB,EAAE,CAACA,GAAG,CAAC,CAAC,CAAA;IAEnE,IAAI,CAACV,IAAI,EAAE;AACP,MAAA,oBAAOa,KAAA,CAAAC,aAAA,CAACpB,cAAc,EAAAqB,QAAA,CAAA;AAACL,QAAAA,GAAG,EAAEC,MAAAA;OAAaR,EAAAA,IAAI,CAAS,CAAC,CAAA;AAC3D,KAAA;AAEA,IAAA,oBAAOU,KAAA,CAAAC,aAAA,CAACnB,WAAW,EAAAoB,QAAA,CAAA;AAACC,MAAAA,YAAY,EAAEL,MAAO;AAACX,MAAAA,IAAI,EAAEA,IAAK;AAACE,MAAAA,UAAU,EAAEA,UAAAA;KAAiBC,EAAAA,IAAI,CAAS,CAAC,CAAA;AACrG,GACJ,CAAC,CAAA;AACL;;;;"}
+{"version":3,"file":"Mask.js","sources":["../../../src/components/Mask/Mask.tsx"],"sourcesContent":["import React, { forwardRef, useImperativeHandle, useState } from 'react';\nimport type { FC } from 'react';\nimport maskInputCompose from '@salutejs/react-maskinput';\n\nimport type { CustomInputProps, MaskProps } from './Mask.types';\n\nconst defaultFormatChars = [\n    {\n        str: '0',\n        regexp: /[0-9]/,\n    },\n    {\n        str: '*',\n        regexp: /./,\n    },\n    {\n        str: 'a',\n        regexp: /[a-zA-Z]/,\n    },\n    {\n        str: 'я',\n        regexp: /[а-яА-ЯёЁ]/,\n    },\n];\n\nexport const composeMask = <T extends CustomInputProps>(InputComponent: FC<T>) => {\n    const MaskedInput = maskInputCompose(InputComponent);\n\n    return forwardRef<HTMLInputElement, T & MaskProps>(\n        ({ mask, maskFormat = defaultFormatChars, ...rest }, outerRef) => {\n            // TODO: replace inside react-maskinput 'getReference' on 'forwardRef'\n            const [ref, setRef] = useState<HTMLInputElement | null>(null);\n\n            useImperativeHandle(outerRef, () => ref as HTMLInputElement, [ref]);\n\n            if (!mask) {\n                return <InputComponent ref={setRef} {...(rest as T)} />;\n            }\n\n            return <MaskedInput getReference={setRef} mask={mask} maskFormat={maskFormat} {...(rest as T)} />;\n        },\n    );\n};\n"],"names":["defaultFormatChars","str","regexp","composeMask","InputComponent","MaskedInput","maskInputCompose","forwardRef","_ref","outerRef","mask","_ref$maskFormat","maskFormat","rest","_objectWithoutProperties","_excluded","_useState","useState","_useState2","_slicedToArray","ref","setRef","useImperativeHandle","React","createElement","_extends","getReference"],"mappings":";;;;;AAMA,IAAMA,kBAAkB,GAAG,CACvB;AACIC,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,OAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,GAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,UAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,YAAA;AACZ,CAAC,CACJ,CAAA;IAEYC,WAAW,GAAG,SAAdA,WAAWA,CAAgCC,cAAqB,EAAK;AAC9E,EAAA,IAAMC,WAAW,GAAGC,gBAAgB,CAACF,cAAc,CAAC,CAAA;AAEpD,EAAA,oBAAOG,UAAU,CACb,UAAAC,IAAA,EAAqDC,QAAQ,EAAK;AAAA,IAAA,IAA/DC,IAAI,GAAAF,IAAA,CAAJE,IAAI;MAAAC,eAAA,GAAAH,IAAA,CAAEI,UAAU;AAAVA,MAAAA,UAAU,GAAAD,eAAA,KAAGX,KAAAA,CAAAA,GAAAA,kBAAkB,GAAAW,eAAA;AAAKE,MAAAA,IAAI,GAAAC,wBAAA,CAAAN,IAAA,EAAAO,SAAA,CAAA,CAAA;AAC7C;AACA,IAAA,IAAAC,SAAA,GAAsBC,QAAQ,CAA0B,IAAI,CAAC;MAAAC,UAAA,GAAAC,cAAA,CAAAH,SAAA,EAAA,CAAA,CAAA;AAAtDI,MAAAA,GAAG,GAAAF,UAAA,CAAA,CAAA,CAAA;AAAEG,MAAAA,MAAM,GAAAH,UAAA,CAAA,CAAA,CAAA,CAAA;IAElBI,mBAAmB,CAACb,QAAQ,EAAE,YAAA;AAAA,MAAA,OAAMW,GAAG,CAAA;AAAA,KAAoB,EAAE,CAACA,GAAG,CAAC,CAAC,CAAA;IAEnE,IAAI,CAACV,IAAI,EAAE;AACP,MAAA,oBAAOa,KAAA,CAAAC,aAAA,CAACpB,cAAc,EAAAqB,QAAA,CAAA;AAACL,QAAAA,GAAG,EAAEC,MAAAA;OAAaR,EAAAA,IAAI,CAAS,CAAC,CAAA;AAC3D,KAAA;AAEA,IAAA,oBAAOU,KAAA,CAAAC,aAAA,CAACnB,WAAW,EAAAoB,QAAA,CAAA;AAACC,MAAAA,YAAY,EAAEL,MAAO;AAACX,MAAAA,IAAI,EAAEA,IAAK;AAACE,MAAAA,UAAU,EAAEA,UAAAA;KAAiBC,EAAAA,IAAI,CAAS,CAAC,CAAA;AACrG,GACJ,CAAC,CAAA;AACL;;;;"}

package/es/components/Modal/Modal.js

@@ -1,6 +1,6 @@
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React, { forwardRef, useMemo, useCallback } from 'react';
-import { useForkRef } from '@salutejs/plasma-core';
+import { useForkRef, safeUseId } from '@salutejs/plasma-core';
 import { DEFAULT_Z_INDEX } from '../Popup/utils/index.js';
 import { IconClose } from '../_Icon/Icons/IconClose.js';
 import { classes, tokens } from './Modal.tokens.js';
@@ -9,7 +9,6 @@ import { getIdLastModal } from './ModalContext.js';
 import { ModalBody, ModalContent, CloseButton } from './Modal.styles.js';
 import { useFocusTrap } from '../../hooks/useFocusTrap.js';
 import { usePopupContext } from '../Popup/PopupContext.js';
-import { safeUseId } from '../../utils/react.js';
 import { useModal } from './hooks/useModal.js';
 import { component } from '../../engines/common.js';
 import { popupConfig } from '../Popup/Popup.js';
@@ -66,7 +65,7 @@ var modalRoot = function modalRoot(Root) {
       }),
       modalInfo = _useModal.modalInfo;
     var transparent = useMemo(function () {
-      return getIdLastModal(Array.from(popupController.items.values())) !== innerId;
+      return getIdLastModal(popupController.items) !== innerId;
     }, [innerId, popupController.items]);
     var onModalOverlayKeyDown = useCallback(function (event) {
       if (onOverlayClick) {

package/es/components/Modal/Modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\nimport { safeUseId } from 'src/utils';\nimport { RootProps, component } from 'src/engines';\nimport { useFocusTrap } from 'src/hooks';\n\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { IconClose } from '../_Icon/Icons/IconClose';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\nimport { CloseButton, ModalBody, ModalContent } from './Modal.styles';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n    forwardRef<HTMLDivElement, ModalProps>(\n        (\n            {\n                id,\n                withAnimation,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                withBlur,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.modalOverlayWithBlurColor})`\n                : `var(${tokens.modalOverlayColor})`;\n\n            const { modalInfo } = useModal({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(Array.from(popupController.items.values())) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onModalOverlayKeyDown = useCallback(\n                (event: React.MouseEvent<HTMLDivElement>) => {\n                    if (onOverlayClick) {\n                        onOverlayClick(event);\n                        return;\n                    }\n\n                    if (onClose) {\n                        onClose();\n                    }\n                },\n                [closeOnOverlayClick, onOverlayClick, onClose],\n            );\n\n            const overlayNode = (\n                <Overlay\n                    className={classes.overlay}\n                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                    backgroundColorProperty={overlayBackgroundToken}\n                    withBlur={withBlur}\n                    transparent={transparent}\n                    isClickable={closeOnOverlayClick}\n                    onOverlayClick={onModalOverlayKeyDown}\n                />\n            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\n                </Popup>\n            );\n        },\n    );\n\nexport const modalConfig = {\n    name: 'Modal',\n    tag: 'div',\n    layout: modalRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n    },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","opened","isOpen","hasBody","hasClose","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","Array","from","items","values","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","_IconClose","IconClose","size","color","Fragment","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}
+{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { useFocusTrap } from '../../hooks';\nimport { IconClose } from '../_Icon/Icons/IconClose';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\nimport { CloseButton, ModalBody, ModalContent } from './Modal.styles';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n    forwardRef<HTMLDivElement, ModalProps>(\n        (\n            {\n                id,\n                withAnimation,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                withBlur,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.modalOverlayWithBlurColor})`\n                : `var(${tokens.modalOverlayColor})`;\n\n            const { modalInfo } = useModal({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onModalOverlayKeyDown = useCallback(\n                (event: React.MouseEvent<HTMLDivElement>) => {\n                    if (onOverlayClick) {\n                        onOverlayClick(event);\n                        return;\n                    }\n\n                    if (onClose) {\n                        onClose();\n                    }\n                },\n                [closeOnOverlayClick, onOverlayClick, onClose],\n            );\n\n            const overlayNode = (\n                <Overlay\n                    className={classes.overlay}\n                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                    backgroundColorProperty={overlayBackgroundToken}\n                    withBlur={withBlur}\n                    transparent={transparent}\n                    isClickable={closeOnOverlayClick}\n                    onOverlayClick={onModalOverlayKeyDown}\n                />\n            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\n                </Popup>\n            );\n        },\n    );\n\nexport const modalConfig = {\n    name: 'Modal',\n    tag: 'div',\n    layout: modalRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n    },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","opened","isOpen","hasBody","hasClose","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","_IconClose","IconClose","size","color","Fragment","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}

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

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