@salutejs/plasma-new-hope 0.327.0-canary.2031.15756758840.0 → 0.327.0-canary.2031.15774276345.0

package/cjs/components/Drawer/Drawer.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var plasmaCore = require('@salutejs/plasma-core');
-var index$1 = require('../Popup/utils/index.js');
 var index = require('../../utils/index.js');
+var index$1 = require('../Popup/utils/index.js');
 var Drawer_tokens = require('./Drawer.tokens.js');
 var base = require('./variations/_view/base.js');
 var base$1 = require('./variations/_size/base.js');
@@ -15,6 +15,7 @@ var Drawer_styles = require('./Drawer.styles.js');
 var DrawerContext = require('./DrawerContext.js');
 var useFocusTrap = require('../../hooks/useFocusTrap.js');
 var PopupContext = require('../Popup/PopupContext.js');
+var react = require('../../utils/react.js');
 var useDrawer = require('./hooks/useDrawer.js');
 var Overlay = require('../Overlay/Overlay.js');
 var getSizeValueFromProp = require('../../utils/getSizeValueFromProp.js');
@@ -65,7 +66,7 @@ var drawerRoot = function drawerRoot(Root) {
     var trapRef = useFocusTrap.useFocusTrap(true, initialFocusRef, focusAfterRef);
     var popupController = PopupContext.usePopupContext();
     var innerRef = plasmaCore.useForkRef(trapRef, outerRef);
-    var uniqId = plasmaCore.safeUseId();
+    var uniqId = react.safeUseId();
     var innerId = id || uniqId;
     var overlayBackgroundToken = withBlur ? "var(".concat(Drawer_tokens.tokens.drawerOverlayWithBlurColor, ")") : "var(".concat(Drawer_tokens.tokens.drawerOverlayColor, ")");
     var innerWidth = width ? getSizeValueFromProp.getSizeValueFromProp(width) : '100%';
@@ -82,7 +83,7 @@ var drawerRoot = function drawerRoot(Root) {
       }),
       drawerInfo = _useDrawer.drawerInfo;
     var transparent = React.useMemo(function () {
-      return DrawerContext.getIdLastDrawer(popupController.items) !== innerId;
+      return DrawerContext.getIdLastDrawer(Array.from(popupController.items.values())) !== innerId;
     }, [innerId, popupController.items]);
     var onDrawerOverlayKeyDown = function onDrawerOverlayKeyDown(event) {
       if (onOverlayClick) {

package/cjs/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, 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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"}
+{"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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"}

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

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

package/cjs/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 (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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"}
+{"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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"}

package/cjs/components/Modal/Modal.js

@@ -13,6 +13,7 @@ var ModalContext = require('./ModalContext.js');
 var Modal_styles = require('./Modal.styles.js');
 var useFocusTrap = require('../../hooks/useFocusTrap.js');
 var PopupContext = require('../Popup/PopupContext.js');
+var react = require('../../utils/react.js');
 var useModal = require('./hooks/useModal.js');
 var common = require('../../engines/common.js');
 var Popup$1 = require('../Popup/Popup.js');
@@ -60,7 +61,7 @@ var modalRoot = function modalRoot(Root) {
     var trapRef = useFocusTrap.useFocusTrap(true, initialFocusRef, focusAfterRef, true);
     var popupController = PopupContext.usePopupContext();
     var innerRef = plasmaCore.useForkRef(trapRef, outerRootRef);
-    var uniqId = plasmaCore.safeUseId();
+    var uniqId = react.safeUseId();
     var innerId = id || uniqId;
     var overlayBackgroundToken = withBlur ? "var(".concat(Modal_tokens.tokens.modalOverlayWithBlurColor, ")") : "var(".concat(Modal_tokens.tokens.modalOverlayColor, ")");
     var _useModal = useModal.useModal({
@@ -73,7 +74,7 @@ var modalRoot = function modalRoot(Root) {
       }),
       modalInfo = _useModal.modalInfo;
     var transparent = React.useMemo(function () {
-      return ModalContext.getIdLastModal(popupController.items) !== innerId;
+      return ModalContext.getIdLastModal(Array.from(popupController.items.values())) !== innerId;
     }, [innerId, popupController.items]);
     var onModalOverlayKeyDown = React.useCallback(function (event) {
       if (onOverlayClick) {

package/cjs/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, 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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"}
+{"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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"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"useModal.js","sources":["../../../../src/components/Modal/hooks/useModal.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { ModalInfo, getIdLastModal } from '../ModalContext';\nimport { ModalHookArgs } from '../Modal.types';\nimport { usePopupContext } from '../../Popup';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useModal = ({ id, popupInfo, onEscKeyDown, onClose, closeOnEsc = true }: ModalHookArgs) => {\n    const popupController = usePopupContext();\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(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    }, [onClose, onEscKeyDown, popupController.items, closeOnEsc]);\n\n    const modalInfo: ModalInfo = {\n        id,\n        info: {\n            isModal: true,\n        },\n        ...popupInfo,\n    };\n\n    return { modalInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useModal","_ref","id","popupInfo","onEscKeyDown","onClose","_ref$closeOnEsc","closeOnEsc","popupController","usePopupContext","onKeyDown","useCallback","event","keyCode","getIdLastModal","items","useEffect","window","addEventListener","removeEventListener","modalInfo","_objectSpread","info","isModal"],"mappings":";;;;;;;;;AAMA,IAAMA,cAAc,GAAG,EAAE,CAAA;IAEZC,QAAQ,GAAG,SAAXA,QAAQA,CAAAC,IAAA,EAAmF;AAAA,EAAA,IAA7EC,EAAE,GAAAD,IAAA,CAAFC,EAAE;IAAEC,SAAS,GAAAF,IAAA,CAATE,SAAS;IAAEC,YAAY,GAAAH,IAAA,CAAZG,YAAY;IAAEC,OAAO,GAAAJ,IAAA,CAAPI,OAAO;IAAAC,eAAA,GAAAL,IAAA,CAAEM,UAAU;AAAVA,IAAAA,UAAU,GAAAD,eAAA,KAAG,KAAA,CAAA,GAAA,IAAI,GAAAA,eAAA,CAAA;AAC9E,EAAA,IAAME,eAAe,GAAGC,4BAAe,EAAE,CAAA;;AAEzC;AACA,EAAA,IAAMC,SAAS,GAAGC,iBAAW,CACzB,UAACC,KAAoB,EAAK;IACtB,IAAI,CAACL,UAAU,EAAE;AACb,MAAA,OAAA;AACJ,KAAA;AACA,IAAA,IAAIK,KAAK,CAACC,OAAO,KAAKd,cAAc,IAAIe,2BAAc,CAACN,eAAe,CAACO,KAAK,CAAC,KAAKb,EAAE,EAAE;AAClF,MAAA,IAAIE,YAAY,EAAE;QACdA,YAAY,CAACQ,KAAK,CAAC,CAAA;AACnB,QAAA,OAAA;AACJ,OAAA;AAEA,MAAA,IAAIP,OAAO,EAAE;AACTA,QAAAA,OAAO,EAAE,CAAA;AACb,OAAA;AACJ,KAAA;AACJ,GAAC,EACD,CAACA,OAAO,EAAED,YAAY,EAAEI,eAAe,CAACO,KAAK,EAAER,UAAU,CAC7D,CAAC,CAAA;AAEDS,EAAAA,eAAS,CAAC,YAAM;AACZC,IAAAA,MAAM,CAACC,gBAAgB,CAAC,SAAS,EAAER,SAAS,CAAC,CAAA;AAC7C,IAAA,OAAO,YAAM;AACTO,MAAAA,MAAM,CAACE,mBAAmB,CAAC,SAAS,EAAET,SAAS,CAAC,CAAA;KACnD,CAAA;AACL,GAAC,EAAE,CAACL,OAAO,EAAED,YAAY,EAAEI,eAAe,CAACO,KAAK,EAAER,UAAU,CAAC,CAAC,CAAA;EAE9D,IAAMa,SAAoB,GAAAC,uCAAA,CAAA;AACtBnB,IAAAA,EAAE,EAAFA,EAAE;AACFoB,IAAAA,IAAI,EAAE;AACFC,MAAAA,OAAO,EAAE,IAAA;AACb,KAAA;AAAC,GAAA,EACEpB,SAAS,CACf,CAAA;EAED,OAAO;AAAEiB,IAAAA,SAAS,EAATA,SAAAA;GAAW,CAAA;AACxB;;;;"}
+{"version":3,"file":"useModal.js","sources":["../../../../src/components/Modal/hooks/useModal.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { ModalInfo, getIdLastModal } from '../ModalContext';\nimport { ModalHookArgs } from '../Modal.types';\nimport { usePopupContext } from '../../Popup';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useModal = ({ id, popupInfo, onEscKeyDown, onClose, closeOnEsc = true }: ModalHookArgs) => {\n    const popupController = usePopupContext();\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(Array.from(popupController.items.values())) === 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    }, [onClose, onEscKeyDown, popupController.items, closeOnEsc]);\n\n    const modalInfo: ModalInfo = {\n        id,\n        info: {\n            isModal: true,\n        },\n        ...popupInfo,\n    };\n\n    return { modalInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useModal","_ref","id","popupInfo","onEscKeyDown","onClose","_ref$closeOnEsc","closeOnEsc","popupController","usePopupContext","onKeyDown","useCallback","event","keyCode","getIdLastModal","Array","from","items","values","useEffect","window","addEventListener","removeEventListener","modalInfo","_objectSpread","info","isModal"],"mappings":";;;;;;;;;AAMA,IAAMA,cAAc,GAAG,EAAE,CAAA;IAEZC,QAAQ,GAAG,SAAXA,QAAQA,CAAAC,IAAA,EAAmF;AAAA,EAAA,IAA7EC,EAAE,GAAAD,IAAA,CAAFC,EAAE;IAAEC,SAAS,GAAAF,IAAA,CAATE,SAAS;IAAEC,YAAY,GAAAH,IAAA,CAAZG,YAAY;IAAEC,OAAO,GAAAJ,IAAA,CAAPI,OAAO;IAAAC,eAAA,GAAAL,IAAA,CAAEM,UAAU;AAAVA,IAAAA,UAAU,GAAAD,eAAA,KAAG,KAAA,CAAA,GAAA,IAAI,GAAAA,eAAA,CAAA;AAC9E,EAAA,IAAME,eAAe,GAAGC,4BAAe,EAAE,CAAA;;AAEzC;AACA,EAAA,IAAMC,SAAS,GAAGC,iBAAW,CACzB,UAACC,KAAoB,EAAK;IACtB,IAAI,CAACL,UAAU,EAAE;AACb,MAAA,OAAA;AACJ,KAAA;IACA,IAAIK,KAAK,CAACC,OAAO,KAAKd,cAAc,IAAIe,2BAAc,CAACC,KAAK,CAACC,IAAI,CAACR,eAAe,CAACS,KAAK,CAACC,MAAM,EAAE,CAAC,CAAC,KAAKhB,EAAE,EAAE;AACvG,MAAA,IAAIE,YAAY,EAAE;QACdA,YAAY,CAACQ,KAAK,CAAC,CAAA;AACnB,QAAA,OAAA;AACJ,OAAA;AAEA,MAAA,IAAIP,OAAO,EAAE;AACTA,QAAAA,OAAO,EAAE,CAAA;AACb,OAAA;AACJ,KAAA;AACJ,GAAC,EACD,CAACA,OAAO,EAAED,YAAY,EAAEI,eAAe,CAACS,KAAK,EAAEV,UAAU,CAC7D,CAAC,CAAA;AAEDY,EAAAA,eAAS,CAAC,YAAM;AACZC,IAAAA,MAAM,CAACC,gBAAgB,CAAC,SAAS,EAAEX,SAAS,CAAC,CAAA;AAC7C,IAAA,OAAO,YAAM;AACTU,MAAAA,MAAM,CAACE,mBAAmB,CAAC,SAAS,EAAEZ,SAAS,CAAC,CAAA;KACnD,CAAA;AACL,GAAC,EAAE,CAACL,OAAO,EAAED,YAAY,EAAEI,eAAe,CAACS,KAAK,EAAEV,UAAU,CAAC,CAAC,CAAA;EAE9D,IAAMgB,SAAoB,GAAAC,uCAAA,CAAA;AACtBtB,IAAAA,EAAE,EAAFA,EAAE;AACFuB,IAAAA,IAAI,EAAE;AACFC,MAAAA,OAAO,EAAE,IAAA;AACb,KAAA;AAAC,GAAA,EACEvB,SAAS,CACf,CAAA;EAED,OAAO;AAAEoB,IAAAA,SAAS,EAATA,SAAAA;GAAW,CAAA;AACxB;;;;"}

package/cjs/components/Popup/Popup.js

@@ -9,6 +9,7 @@ var index = require('../../utils/index.js');
 var PopupRoot = require('./PopupRoot.js');
 var Popup_tokens = require('./Popup.tokens.js');
 var Popup_styles = require('./Popup.styles.js');
+var react = require('../../utils/react.js');
 var usePopup = require('./hooks/usePopup.js');
 var canUseDOM = require('../../utils/canUseDOM.js');
 var Portal = require('../Portal/Portal.js');
@@ -99,7 +100,7 @@ var popupRoot = function popupRoot(Root) {
       className = _ref.className,
       rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
     var innerIsOpen = isOpen || opened;
-    var uniqId = plasmaCore.safeUseId();
+    var uniqId = react.safeUseId();
     var innerId = id || uniqId;
     var _usePopup = usePopup.usePopup({
         isOpen: innerIsOpen,

package/cjs/components/Popup/Popup.js.map

@@ -1 +1 @@
-{"version":3,"file":"Popup.js","sources":["../../../src/components/Popup/Popup.tsx"],"sourcesContent":["import React, { forwardRef, useRef } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps } from '../../engines/types';\nimport { canUseDOM, cx } from '../../utils';\nimport { Portal } from '../Portal';\n\nimport type { PopupPlacementBasic, PopupPlacement, PopupPositionType, PopupProps } from './Popup.types';\nimport { PopupRoot } from './PopupRoot';\nimport { usePopup } from './hooks';\nimport { classes } from './Popup.tokens';\nimport { StyledPortalContainer } from './Popup.styles';\n\nexport const handlePosition = (\n    placement: PopupPlacement,\n    offset: [number, number] | [string, string],\n): PopupPositionType => {\n    let x = '0rem';\n    let y = '0rem';\n\n    if (offset) {\n        const [_x, _y] = offset;\n        x = typeof _x === 'number' ? `${_x}rem` : _x;\n        y = typeof _y === 'number' ? `${_y}rem` : _y;\n    }\n\n    if (!placement || placement === 'center') {\n        return {\n            left: `calc(50% + ${x})`,\n            top: `calc(50% - ${y})`,\n            transform: 'translate(-50%, -50%)',\n        };\n    }\n\n    let left;\n    let right;\n    let top;\n    let bottom;\n    let transform;\n    const placements = placement.split('-') as PopupPlacementBasic[];\n\n    placements.forEach((placementValue: PopupPlacementBasic) => {\n        switch (placementValue) {\n            case 'left':\n                left = x;\n                break;\n            case 'right':\n                right = x;\n                break;\n            case 'top':\n                top = y;\n                break;\n            case 'bottom':\n                bottom = y;\n                break;\n            default:\n                break;\n        }\n    });\n\n    const isCenteredX = left === undefined && right === undefined;\n    const isCenteredY = top === undefined && bottom === undefined;\n\n    if (isCenteredX) {\n        transform = 'translateX(-50%)';\n    }\n\n    if (isCenteredY) {\n        transform = 'translateY(-50%)';\n    }\n\n    return {\n        left: isCenteredX ? `calc(50% + ${x})` : left,\n        right,\n        top: isCenteredY ? `calc(50% - ${y})` : top,\n        bottom,\n        transform,\n    };\n};\n\n/**\n * Базовый компонент Popup.\n */\nexport const popupRoot = (Root: RootProps<HTMLDivElement, PopupProps>) =>\n    forwardRef<HTMLDivElement, PopupProps>(\n        (\n            {\n                id,\n                isOpen = false,\n                opened = false,\n                placement = 'center',\n                offset = [0, 0],\n                frame = 'document',\n                children,\n                overlay,\n                // eslint-disable-next-line @typescript-eslint/no-unused-vars\n                role,\n                zIndex,\n                popupInfo,\n                withAnimation = false,\n                className,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = isOpen || opened;\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n\n            const { isVisible, animationInfo, setVisible, rootId } = usePopup({\n                isOpen: innerIsOpen,\n                id: innerId,\n                popupInfo,\n                withAnimation,\n            });\n\n            const portalRef = useRef<HTMLDivElement | null>(null);\n            const contentRef = useRef<HTMLDivElement | null>(null);\n\n            const innerRef = useForkRef<HTMLDivElement>(contentRef, outerRootRef);\n\n            if (!isVisible && !innerIsOpen) {\n                return null;\n            }\n\n            const cls = cx(\n                className,\n                animationInfo?.endAnimation ? classes.endAnimation : '',\n                animationInfo?.endTransition ? classes.endTransition : '',\n            );\n\n            const rootNode = (\n                <Root className={cls}>\n                    {overlay}\n                    <PopupRoot\n                        id={innerId}\n                        ref={innerRef}\n                        position={handlePosition(placement, offset)}\n                        zIndex={zIndex}\n                        frame={frame}\n                        animationInfo={animationInfo}\n                        setVisible={setVisible}\n                        {...rest}\n                    >\n                        {children}\n                    </PopupRoot>\n                </Root>\n            );\n\n            if (typeof frame !== 'string' && frame && frame.current && canUseDOM) {\n                return <Portal container={frame.current}>{rootNode}</Portal>;\n            }\n\n            const withFrameId = typeof frame === 'string' && frame !== 'document';\n            const containerElement = withFrameId && canUseDOM && document.getElementById(frame as string);\n\n            if (containerElement) {\n                return (\n                    <Portal container={containerElement}>\n                        <StyledPortalContainer ref={portalRef}>\n                            {portalRef.current && <Portal container={portalRef.current}>{rootNode}</Portal>}\n                        </StyledPortalContainer>{' '}\n                    </Portal>\n                );\n            }\n\n            const globalPortal = canUseDOM && document.getElementById(rootId);\n\n            return <>{globalPortal && <Portal container={globalPortal}>{rootNode}</Portal>}</>;\n        },\n    );\n\nexport const popupConfig = {\n    name: 'Popup',\n    tag: 'div',\n    layout: popupRoot,\n    base: '',\n    variations: {},\n    defaults: {},\n};\n"],"names":["handlePosition","placement","offset","x","y","_offset","_slicedToArray","_x","_y","concat","left","top","transform","right","bottom","placements","split","forEach","placementValue","isCenteredX","undefined","isCenteredY","popupRoot","Root","forwardRef","_ref","outerRootRef","id","_ref$isOpen","isOpen","_ref$opened","opened","_ref$placement","_ref$offset","_ref$frame","frame","children","overlay","zIndex","popupInfo","_ref$withAnimation","withAnimation","className","rest","_objectWithoutProperties","_excluded","innerIsOpen","uniqId","safeUseId","innerId","_usePopup","usePopup","isVisible","animationInfo","setVisible","rootId","portalRef","useRef","contentRef","innerRef","useForkRef","cls","cx","endAnimation","classes","endTransition","rootNode","React","createElement","PopupRoot","_extends","ref","position","current","canUseDOM","Portal","container","withFrameId","containerElement","document","getElementById","StyledPortalContainer","globalPortal","Fragment","popupConfig","name","tag","layout","base","variations","defaults"],"mappings":"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"}
+{"version":3,"file":"Popup.js","sources":["../../../src/components/Popup/Popup.tsx"],"sourcesContent":["import React, { forwardRef, useRef } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\nimport { canUseDOM, cx, safeUseId } from 'src/utils';\nimport { RootProps } from 'src/engines/types';\n\nimport { Portal } from '../Portal';\n\nimport type { PopupPlacementBasic, PopupPlacement, PopupPositionType, PopupProps } from './Popup.types';\nimport { PopupRoot } from './PopupRoot';\nimport { usePopup } from './hooks';\nimport { classes } from './Popup.tokens';\nimport { StyledPortalContainer } from './Popup.styles';\n\nexport const handlePosition = (\n    placement: PopupPlacement,\n    offset: [number, number] | [string, string],\n): PopupPositionType => {\n    let x = '0rem';\n    let y = '0rem';\n\n    if (offset) {\n        const [_x, _y] = offset;\n        x = typeof _x === 'number' ? `${_x}rem` : _x;\n        y = typeof _y === 'number' ? `${_y}rem` : _y;\n    }\n\n    if (!placement || placement === 'center') {\n        return {\n            left: `calc(50% + ${x})`,\n            top: `calc(50% - ${y})`,\n            transform: 'translate(-50%, -50%)',\n        };\n    }\n\n    let left;\n    let right;\n    let top;\n    let bottom;\n    let transform;\n    const placements = placement.split('-') as PopupPlacementBasic[];\n\n    placements.forEach((placementValue: PopupPlacementBasic) => {\n        switch (placementValue) {\n            case 'left':\n                left = x;\n                break;\n            case 'right':\n                right = x;\n                break;\n            case 'top':\n                top = y;\n                break;\n            case 'bottom':\n                bottom = y;\n                break;\n            default:\n                break;\n        }\n    });\n\n    const isCenteredX = left === undefined && right === undefined;\n    const isCenteredY = top === undefined && bottom === undefined;\n\n    if (isCenteredX) {\n        transform = 'translateX(-50%)';\n    }\n\n    if (isCenteredY) {\n        transform = 'translateY(-50%)';\n    }\n\n    return {\n        left: isCenteredX ? `calc(50% + ${x})` : left,\n        right,\n        top: isCenteredY ? `calc(50% - ${y})` : top,\n        bottom,\n        transform,\n    };\n};\n\n/**\n * Базовый компонент Popup.\n */\nexport const popupRoot = (Root: RootProps<HTMLDivElement, PopupProps>) =>\n    forwardRef<HTMLDivElement, PopupProps>(\n        (\n            {\n                id,\n                isOpen = false,\n                opened = false,\n                placement = 'center',\n                offset = [0, 0],\n                frame = 'document',\n                children,\n                overlay,\n                // eslint-disable-next-line @typescript-eslint/no-unused-vars\n                role,\n                zIndex,\n                popupInfo,\n                withAnimation = false,\n                className,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = isOpen || opened;\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n\n            const { isVisible, animationInfo, setVisible, rootId } = usePopup({\n                isOpen: innerIsOpen,\n                id: innerId,\n                popupInfo,\n                withAnimation,\n            });\n\n            const portalRef = useRef<HTMLDivElement | null>(null);\n            const contentRef = useRef<HTMLDivElement | null>(null);\n\n            const innerRef = useForkRef<HTMLDivElement>(contentRef, outerRootRef);\n\n            if (!isVisible && !innerIsOpen) {\n                return null;\n            }\n\n            const cls = cx(\n                className,\n                animationInfo?.endAnimation ? classes.endAnimation : '',\n                animationInfo?.endTransition ? classes.endTransition : '',\n            );\n\n            const rootNode = (\n                <Root className={cls}>\n                    {overlay}\n                    <PopupRoot\n                        id={innerId}\n                        ref={innerRef}\n                        position={handlePosition(placement, offset)}\n                        zIndex={zIndex}\n                        frame={frame}\n                        animationInfo={animationInfo}\n                        setVisible={setVisible}\n                        {...rest}\n                    >\n                        {children}\n                    </PopupRoot>\n                </Root>\n            );\n\n            if (typeof frame !== 'string' && frame && frame.current && canUseDOM) {\n                return <Portal container={frame.current}>{rootNode}</Portal>;\n            }\n\n            const withFrameId = typeof frame === 'string' && frame !== 'document';\n            const containerElement = withFrameId && canUseDOM && document.getElementById(frame as string);\n\n            if (containerElement) {\n                return (\n                    <Portal container={containerElement}>\n                        <StyledPortalContainer ref={portalRef}>\n                            {portalRef.current && <Portal container={portalRef.current}>{rootNode}</Portal>}\n                        </StyledPortalContainer>{' '}\n                    </Portal>\n                );\n            }\n\n            const globalPortal = canUseDOM && document.getElementById(rootId);\n\n            return <>{globalPortal && <Portal container={globalPortal}>{rootNode}</Portal>}</>;\n        },\n    );\n\nexport const popupConfig = {\n    name: 'Popup',\n    tag: 'div',\n    layout: popupRoot,\n    base: '',\n    variations: {},\n    defaults: {},\n};\n"],"names":["handlePosition","placement","offset","x","y","_offset","_slicedToArray","_x","_y","concat","left","top","transform","right","bottom","placements","split","forEach","placementValue","isCenteredX","undefined","isCenteredY","popupRoot","Root","forwardRef","_ref","outerRootRef","id","_ref$isOpen","isOpen","_ref$opened","opened","_ref$placement","_ref$offset","_ref$frame","frame","children","overlay","zIndex","popupInfo","_ref$withAnimation","withAnimation","className","rest","_objectWithoutProperties","_excluded","innerIsOpen","uniqId","safeUseId","innerId","_usePopup","usePopup","isVisible","animationInfo","setVisible","rootId","portalRef","useRef","contentRef","innerRef","useForkRef","cls","cx","endAnimation","classes","endTransition","rootNode","React","createElement","PopupRoot","_extends","ref","position","current","canUseDOM","Portal","container","withFrameId","containerElement","document","getElementById","StyledPortalContainer","globalPortal","Fragment","popupConfig","name","tag","layout","base","variations","defaults"],"mappings":"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"}

package/cjs/components/Popup/PopupContext.js

@@ -16,9 +16,9 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var React__default = /*#__PURE__*/_interopDefault(React);
 
 var POPUP_PORTAL_ID = 'plasma-popup-root';
-var items = [];
+var initialItems = /*#__PURE__*/new Map();
 var PopupContext = /*#__PURE__*/React.createContext({
-  items: items,
+  items: initialItems,
   rootId: POPUP_PORTAL_ID,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   register: function register(_info) {
@@ -38,7 +38,7 @@ var PopupProvider = function PopupProvider(_ref) {
   var children = _ref.children,
     UNSAFE_SSR_ENABLED = _ref.UNSAFE_SSR_ENABLED;
   var prevBodyOverflowY = React.useRef(canUseDOM.canUseDOM ? document.body.style.overflowY : '');
-  var _useState = React.useState([]),
+  var _useState = React.useState(initialItems),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     items = _useState2[0],
     setItems = _useState2[1];
@@ -50,11 +50,13 @@ var PopupProvider = function PopupProvider(_ref) {
     }
     setItems(function (prevItems) {
       var _info$info;
-      if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !ModalContext.hasModals(prevItems)) {
+      var newItems = new Map(prevItems);
+      if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !ModalContext.hasModals(Array.from(prevItems.values()))) {
         prevBodyOverflowY.current = document.body.style.overflowY;
         document.body.style.overflowY = 'hidden';
       }
-      return [].concat(_rollupPluginBabelHelpers.toConsumableArray(prevItems), [info]);
+      newItems.set(info.id, info);
+      return newItems;
     });
   };
   var unregister = function unregister(id) {
@@ -62,20 +64,16 @@ var PopupProvider = function PopupProvider(_ref) {
       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 = ModalContext.hasModals(prevItems);
-      prevItems.splice(index, 1);
-      if (prevHasModals && !ModalContext.hasModals(prevItems)) {
+      var newItems = new Map(prevItems);
+      var prevHasModals = ModalContext.hasModals(Array.from(newItems.values()));
+      newItems["delete"](id);
+      if (prevHasModals && !ModalContext.hasModals(Array.from(newItems.values()))) {
         document.body.style.overflowY = prevBodyOverflowY.current;
       }
-
-      // при return prevItems не обновится контекст
-      return _rollupPluginBabelHelpers.toConsumableArray(prevItems);
+      return newItems;
     });
   };
   var context = {

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

@@ -1 +1 @@
-{"version":3,"file":"PopupContext.js","sources":["../../../src/components/Popup/PopupContext.tsx"],"sourcesContent":["import React, { createContext, useState, useContext, FC, PropsWithChildren, useRef } from 'react';\n\nimport { Portal } from '../Portal';\nimport { hasModals } from '../Modal/ModalContext';\nimport { canUseDOM, safeUseId } from '../../utils';\n\nimport { ClientOnlyPortal } from './ClientOnlyPortal';\nimport type { PopupContextType, PopupInfo } from './Popup.types';\nimport { StyledPortal } from './Popup.styles';\n\nexport const POPUP_PORTAL_ID = 'plasma-popup-root';\n\nconst items: PopupInfo[] = [];\n\nconst PopupContext = createContext<PopupContextType>({\n    items,\n    rootId: POPUP_PORTAL_ID,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    register(_info: PopupInfo): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    unregister(_id: string): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n});\n\nexport const usePopupContext = () => useContext(PopupContext);\n\n// TODO: #1599\nexport const PopupProvider: FC<\n    PropsWithChildren & {\n        /**\n         * @description Только для применения в рамках SSR.\n         */\n        UNSAFE_SSR_ENABLED?: boolean;\n    }\n> = ({ children, UNSAFE_SSR_ENABLED }) => {\n    const prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');\n    const [items, setItems] = useState<PopupInfo[]>([]);\n\n    const uuid = safeUseId();\n    const rootId = `${POPUP_PORTAL_ID}-${uuid}`;\n\n    const register = (info: PopupInfo) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            if (info.info?.isModal && !hasModals(prevItems)) {\n                prevBodyOverflowY.current = document.body.style.overflowY;\n                document.body.style.overflowY = 'hidden';\n            }\n\n            return [...prevItems, info];\n        });\n    };\n\n    const unregister = (id: string) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            const index = prevItems.findIndex((item: PopupInfo) => id === item.id);\n\n            if (index === -1) {\n                return prevItems;\n            }\n\n            const prevHasModals = hasModals(prevItems);\n            prevItems.splice(index, 1);\n\n            if (prevHasModals && !hasModals(prevItems)) {\n                document.body.style.overflowY = prevBodyOverflowY.current;\n            }\n\n            // при return prevItems не обновится контекст\n            return [...prevItems];\n        });\n    };\n\n    const context = {\n        items,\n        rootId,\n        register,\n        unregister,\n    };\n\n    return (\n        <PopupContext.Provider value={context}>\n            {children}\n\n            {UNSAFE_SSR_ENABLED ? (\n                <ClientOnlyPortal>\n                    <StyledPortal id={rootId} />\n                </ClientOnlyPortal>\n            ) : (\n                <Portal container={document.body}>\n                    <StyledPortal id={rootId} />\n                </Portal>\n            )}\n        </PopupContext.Provider>\n    );\n};\n"],"names":["POPUP_PORTAL_ID","items","PopupContext","createContext","rootId","register","_info","Error","unregister","_id","usePopupContext","useContext","PopupProvider","_ref","children","UNSAFE_SSR_ENABLED","prevBodyOverflowY","useRef","canUseDOM","document","body","style","overflowY","_useState","useState","_useState2","_slicedToArray","setItems","uuid","safeUseId","concat","info","prevItems","_info$info","isModal","hasModals","current","_toConsumableArray","id","index","findIndex","item","prevHasModals","splice","context","React","createElement","Provider","value","ClientOnlyPortal","StyledPortal","Portal","container"],"mappings":"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"}
+{"version":3,"file":"PopupContext.js","sources":["../../../src/components/Popup/PopupContext.tsx"],"sourcesContent":["import React, { createContext, useState, useContext, FC, PropsWithChildren, useRef } from 'react';\nimport { canUseDOM, safeUseId } from 'src/utils';\n\nimport { Portal } from '../Portal';\nimport { hasModals } from '../Modal/ModalContext';\n\nimport { ClientOnlyPortal } from './ClientOnlyPortal';\nimport type { PopupContextType, PopupInfo } from './Popup.types';\nimport { StyledPortal } from './Popup.styles';\n\nexport const POPUP_PORTAL_ID = 'plasma-popup-root';\n\nconst initialItems = new Map<string, PopupInfo>();\n\nconst PopupContext = createContext<PopupContextType>({\n    items: initialItems,\n    rootId: POPUP_PORTAL_ID,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    register(_info: PopupInfo): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    unregister(_id: string): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n});\n\nexport const usePopupContext = () => useContext(PopupContext);\n\n// TODO: #1599\nexport const PopupProvider: FC<\n    PropsWithChildren & {\n        /**\n         * @description Только для применения в рамках SSR.\n         */\n        UNSAFE_SSR_ENABLED?: boolean;\n    }\n> = ({ children, UNSAFE_SSR_ENABLED }) => {\n    const prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');\n    const [items, setItems] = useState(initialItems);\n\n    const uuid = safeUseId();\n    const rootId = `${POPUP_PORTAL_ID}-${uuid}`;\n\n    const register = (info: PopupInfo) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            const newItems = new Map(prevItems);\n\n            if (info.info?.isModal && !hasModals(Array.from(prevItems.values()))) {\n                prevBodyOverflowY.current = document.body.style.overflowY;\n                document.body.style.overflowY = 'hidden';\n            }\n\n            newItems.set(info.id, info);\n            return newItems;\n        });\n    };\n\n    const unregister = (id: string) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            if (!prevItems.has(id)) {\n                return prevItems;\n            }\n\n            const newItems = new Map(prevItems);\n            const prevHasModals = hasModals(Array.from(newItems.values()));\n\n            newItems.delete(id);\n\n            if (prevHasModals && !hasModals(Array.from(newItems.values()))) {\n                document.body.style.overflowY = prevBodyOverflowY.current;\n            }\n\n            return newItems;\n        });\n    };\n\n    const context = {\n        items,\n        rootId,\n        register,\n        unregister,\n    };\n\n    return (\n        <PopupContext.Provider value={context}>\n            {children}\n\n            {UNSAFE_SSR_ENABLED ? (\n                <ClientOnlyPortal>\n                    <StyledPortal id={rootId} />\n                </ClientOnlyPortal>\n            ) : (\n                <Portal container={document.body}>\n                    <StyledPortal id={rootId} />\n                </Portal>\n            )}\n        </PopupContext.Provider>\n    );\n};\n"],"names":["POPUP_PORTAL_ID","initialItems","Map","PopupContext","createContext","items","rootId","register","_info","Error","unregister","_id","usePopupContext","useContext","PopupProvider","_ref","children","UNSAFE_SSR_ENABLED","prevBodyOverflowY","useRef","canUseDOM","document","body","style","overflowY","_useState","useState","_useState2","_slicedToArray","setItems","uuid","safeUseId","concat","info","prevItems","_info$info","newItems","isModal","hasModals","Array","from","values","current","set","id","has","prevHasModals","context","React","createElement","Provider","value","ClientOnlyPortal","StyledPortal","Portal","container"],"mappings":"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"}

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

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.drawerRoot = exports.drawerConfig = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("react"));
 var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
+var _utils = /*#__PURE__*/require("../../utils");
 var _Popup = /*#__PURE__*/require("../Popup");
 var _Overlay = /*#__PURE__*/require("../Overlay");
-var _utils = /*#__PURE__*/require("../Popup/utils");
-var _utils2 = /*#__PURE__*/require("../../utils");
+var _utils2 = /*#__PURE__*/require("../Popup/utils");
 var _hooks = /*#__PURE__*/require("../../hooks");
 var _Drawer = /*#__PURE__*/require("./Drawer.tokens");
 var _base = /*#__PURE__*/require("./variations/_view/base");
@@ -65,11 +65,11 @@ var drawerRoot = exports.drawerRoot = function drawerRoot(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(_Drawer.tokens.drawerOverlayWithBlurColor, ")") : "var(".concat(_Drawer.tokens.drawerOverlayColor, ")");
-    var innerWidth = width ? (0, _utils2.getSizeValueFromProp)(width) : '100%';
-    var innerHeight = height ? (0, _utils2.getSizeValueFromProp)(height) : '100%';
+    var innerWidth = width ? (0, _utils.getSizeValueFromProp)(width) : '100%';
+    var innerHeight = height ? (0, _utils.getSizeValueFromProp)(height) : '100%';
     var placementClass = placement ? _Drawer.classes["".concat(placement, "Placement")] : undefined;
     var _useDrawer = (0, _hooks2.useDrawer)({
         id: innerId,
@@ -82,7 +82,7 @@ var drawerRoot = exports.drawerRoot = function drawerRoot(Root) {
       }),
       drawerInfo = _useDrawer.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]);
     var onDrawerOverlayKeyDown = function onDrawerOverlayKeyDown(event) {
       if (onOverlayClick) {
@@ -96,7 +96,7 @@ var drawerRoot = exports.drawerRoot = function drawerRoot(Root) {
     return /*#__PURE__*/_react["default"].createElement(_Drawer2.StyledPopup, _extends({
       id: innerId,
       ref: asModal ? innerRef : outerRef,
-      className: (0, _utils2.cx)(placementClass),
+      className: (0, _utils.cx)(placementClass),
       opened: innerIsOpen,
       zIndex: zIndex,
       placement: placement,
@@ -110,7 +110,7 @@ var drawerRoot = exports.drawerRoot = function drawerRoot(Root) {
         view: view
       }, /*#__PURE__*/_react["default"].createElement(_Overlay.Overlay, {
         className: _Drawer.classes.overlay,
-        zIndex: zIndex || _utils.DEFAULT_Z_INDEX,
+        zIndex: zIndex || _utils2.DEFAULT_Z_INDEX,
         backgroundColorProperty: overlayBackgroundToken,
         withBlur: withBlur,
         transparent: transparent,

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

@@ -33,7 +33,7 @@ var useDrawer = exports.useDrawer = function useDrawer(_ref) {
     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;
@@ -64,7 +64,7 @@ var useDrawer = exports.useDrawer = function useDrawer(_ref) {
     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;
     }
   }, [isOpen, popupController.items]);

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

@@ -7,11 +7,12 @@ 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 _utils = /*#__PURE__*/require("../Popup/utils");
-var _hooks = /*#__PURE__*/require("../../hooks");
+var _utils2 = /*#__PURE__*/require("../Popup/utils");
 var _IconClose2 = /*#__PURE__*/require("../_Icon/Icons/IconClose");
 var _Modal = /*#__PURE__*/require("./Modal.tokens");
 var _hooks2 = /*#__PURE__*/require("./hooks");
@@ -60,7 +61,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, _plasmaCore.safeUseId)();
+    var uniqId = (0, _utils.safeUseId)();
     var innerId = id || uniqId;
     var overlayBackgroundToken = withBlur ? "var(".concat(_Modal.tokens.modalOverlayWithBlurColor, ")") : "var(".concat(_Modal.tokens.modalOverlayColor, ")");
     var _useModal = (0, _hooks2.useModal)({
@@ -73,7 +74,7 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
       }),
       modalInfo = _useModal.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]);
     var onModalOverlayKeyDown = (0, _react.useCallback)(function (event) {
       if (onOverlayClick) {
@@ -86,7 +87,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 || _utils.DEFAULT_Z_INDEX,
+      zIndex: zIndex || _utils2.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)(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

@@ -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, _plasmaCore.safeUseId)();
+    var uniqId = (0, _utils.safeUseId)();
     var innerId = id || uniqId;
     var _usePopup = (0, _hooks.usePopup)({
         isOpen: innerIsOpen,