@alfalab/core-components-base-modal 3.0.1 → 3.2.0

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.2.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-base-modal@3.1.0...@alfalab/core-components-base-modal@3.2.0) (2022-03-01)
+
+
+### Features
+
+* **base-modal:** add component ref for base modal ([#1008](https://github.com/alfa-laboratory/core-components/issues/1008)) ([fb13dbd](https://github.com/alfa-laboratory/core-components/commit/fb13dbdf6352b10b80a74fa87edfcb1f54b76d5a))
+* Исправить импорты в сторях. ([#998](https://github.com/alfa-laboratory/core-components/issues/998)) ([e6a654a](https://github.com/alfa-laboratory/core-components/commit/e6a654a0599451c7d149484cb61d8067eed083b7))
+
+
+
+
+
+# [3.1.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-base-modal@3.0.2...@alfalab/core-components-base-modal@3.1.0) (2022-01-17)
+
+
+### Features
+
+* **base-modal:** extract modal store to global ([#943](https://github.com/alfa-laboratory/core-components/issues/943)) ([9587f17](https://github.com/alfa-laboratory/core-components/commit/9587f1773bb690ac6696077509d4a519aa109198))
+
+
+
+
+
+## [3.0.2](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-base-modal@3.0.1...@alfalab/core-components-base-modal@3.0.2) (2021-09-14)
+
+
+### Bug Fixes
+
+* **base-modal:** modal scroll ([#820](https://github.com/alfa-laboratory/core-components/issues/820)) ([1b2d94a](https://github.com/alfa-laboratory/core-components/commit/1b2d94ad45e04145bf1292d749ae2028702dc622))
+
+
+
+
+
 ## [3.0.1](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-base-modal@3.0.0...@alfalab/core-components-base-modal@3.0.1) (2021-07-09)
 
 **Note:** Version bump only for package @alfalab/core-components-base-modal

package/dist/Component.d.ts

@@ -108,6 +108,10 @@ type BaseModalProps = {
      * z-index компонента
      */
     zIndex?: number;
+    /**
+     * Реф, который должен быть установлен компонентной области
+     */
+    componentRef?: MutableRefObject<HTMLDivElement | null>;
 };
 type BaseModalContext = {
     hasFooter?: boolean;

package/dist/Component.js

@@ -11,6 +11,7 @@ var FocusLock = require('react-focus-lock');
 var coreComponentsPortal = require('@alfalab/core-components-portal');
 var coreComponentsBackdrop = require('@alfalab/core-components-backdrop');
 var coreComponentsStack = require('@alfalab/core-components-stack');
+require('@alfalab/core-components-global-store');
 var utils = require('./utils.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -47,7 +48,7 @@ var __assign = function () {
     return __assign.apply(this, arguments);
 };
 
-var styles = {"component":"base-modal__component_1rshh","wrapper":"base-modal__wrapper_1rshh","content":"base-modal__content_1rshh","hidden":"base-modal__hidden_1rshh","backdrop":"base-modal__backdrop_1rshh","appear":"base-modal__appear_1rshh","enter":"base-modal__enter_1rshh","appearActive":"base-modal__appearActive_1rshh","enterActive":"base-modal__enterActive_1rshh","exit":"base-modal__exit_1rshh","exitActive":"base-modal__exitActive_1rshh","exitDone":"base-modal__exitDone_1rshh"};
+var styles = {"component":"base-modal__component_pvkw5","wrapper":"base-modal__wrapper_pvkw5","content":"base-modal__content_pvkw5","hidden":"base-modal__hidden_pvkw5","backdrop":"base-modal__backdrop_pvkw5","appear":"base-modal__appear_pvkw5","enter":"base-modal__enter_pvkw5","appearActive":"base-modal__appearActive_pvkw5","enterActive":"base-modal__enterActive_pvkw5","exit":"base-modal__exit_pvkw5","exitActive":"base-modal__exitActive_pvkw5","exitDone":"base-modal__exitDone_pvkw5"};
 require('./index.css')
 
 var BaseModalContext = React__default['default'].createContext({
@@ -62,18 +63,18 @@ var BaseModalContext = React__default['default'].createContext({
     onClose: function () { return null; },
 });
 var BaseModal = React.forwardRef(function (_a, ref) {
-    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l;
-    var _m = React.useState(!open), exited = _m[0], setExited = _m[1];
-    var _o = React.useState(false), hasScroll = _o[0], setHasScroll = _o[1];
-    var _p = React.useState(false), hasHeader = _p[0], setHasHeader = _p[1];
-    var _q = React.useState(false), hasFooter = _q[0], setHasFooter = _q[1];
-    var _r = React.useState(false), headerHighlighted = _r[0], setHeaderHighlighted = _r[1];
-    var _s = React.useState(false), footerHighlighted = _s[0], setFooterHighlighted = _s[1];
-    var componentRef = React.useRef(null);
+    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l, _m = _a.componentRef, componentRef = _m === void 0 ? null : _m;
+    var _o = React.useState(!open), exited = _o[0], setExited = _o[1];
+    var _p = React.useState(false), hasScroll = _p[0], setHasScroll = _p[1];
+    var _q = React.useState(false), hasHeader = _q[0], setHasHeader = _q[1];
+    var _r = React.useState(false), hasFooter = _r[0], setHasFooter = _r[1];
+    var _s = React.useState(false), headerHighlighted = _s[0], setHeaderHighlighted = _s[1];
+    var _t = React.useState(false), footerHighlighted = _t[0], setFooterHighlighted = _t[1];
+    var componentNodeRef = React.useRef(null);
     var wrapperRef = React.useRef(null);
     var scrollableNodeRef = React.useRef(null);
     var contentNodeRef = React.useRef(null);
-    var restoreContainerStyles = React.useRef(null);
+    var restoreContainerStylesRef = React.useRef(null);
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = utils.hasScrollbar(scrollableNodeRef.current);
@@ -82,6 +83,9 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     };
     var shouldRender = keepMounted || open || !exited;
+    var getContainer = React.useCallback(function () {
+        return (container ? container() : document.body);
+    }, [container]);
     var resizeObserver$1 = React.useMemo(function () { return new resizeObserver.ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = React.useCallback(function () {
         if (scrollableNodeRef.current)
@@ -100,15 +104,16 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     }, [resizeObserver$1]);
     var handleScroll = React.useCallback(function () {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!utils.isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!utils.isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
     }, [hasFooter, hasHeader]);
     var handleClose = React.useCallback(function (event, reason) {
@@ -124,7 +129,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
     var handleBackdropClick = function (event) {
-        if (!disableBackdropClick) {
+        if (!disableBackdropClick && event.target === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -146,7 +151,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         if (scrollHandler === 'wrapper')
             return wrapperRef.current;
         if (scrollHandler === 'content')
-            return componentRef.current;
+            return componentNodeRef.current;
         return scrollHandler.current || wrapperRef.current;
     }, [scrollHandler]);
     var handleEntered = React.useCallback(function (node, isAppearing) {
@@ -173,27 +178,29 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
         if (onUnmount)
             onUnmount();
-        if (restoreContainerStyles.current) {
-            restoreContainerStyles.current();
-            restoreContainerStyles.current = null;
+        if (restoreContainerStylesRef.current) {
+            restoreContainerStylesRef.current();
         }
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     React.useEffect(function () {
         if (open) {
-            restoreContainerStyles.current = utils.handleContainer((container ? container() : document.body));
+            utils.handleContainer(getContainer());
+            restoreContainerStylesRef.current = function () {
+                restoreContainerStylesRef.current = null;
+                utils.restoreContainerStyles(getContainer());
+            };
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [open]);
+    }, [getContainer, open]);
     React.useEffect(function () {
         if (open)
             setExited(false);
     }, [open]);
     React.useEffect(function () {
         return function () {
-            resizeObserver$1.disconnect();
-            if (restoreContainerStyles.current) {
-                restoreContainerStyles.current();
+            if (restoreContainerStylesRef.current) {
+                restoreContainerStylesRef.current();
             }
+            resizeObserver$1.disconnect();
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -223,14 +230,16 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         return (React__default['default'].createElement(coreComponentsPortal.Portal, { getPortalContainer: container },
             React__default['default'].createElement(BaseModalContext.Provider, { value: contextValue },
                 React__default['default'].createElement(FocusLock__default['default'], { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                    Backdrop && (React__default['default'].createElement(Backdrop, __assign({}, backdropProps, { className: cn__default['default'](backdropProps.className, styles.backdrop), open: open, style: {
+                            zIndex: computedZIndex,
+                        } }))),
                     React__default['default'].createElement("div", { role: 'dialog', className: cn__default['default'](styles.wrapper, wrapperClassName, (_a = {},
                             _a[styles.hidden] = !open && exited,
-                            _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, tabIndex: -1, "data-test-id": dataTestId, style: {
+                            _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },
-                        Backdrop && (React__default['default'].createElement(Backdrop, __assign({}, backdropProps, { className: cn__default['default'](backdropProps.className, styles.backdrop), open: open, onClick: handleBackdropClick }))),
                         React__default['default'].createElement(reactTransitionGroup.CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                            React__default['default'].createElement("div", { className: cn__default['default'](styles.component, className), ref: componentRef },
+                            React__default['default'].createElement("div", { className: cn__default['default'](styles.component, className), ref: mergeRefs__default['default']([componentRef, componentNodeRef]) },
                                 React__default['default'].createElement("div", { className: cn__default['default'](styles.content, contentClassName) }, children))))))));
     }));
 });

package/dist/cssm/Component.d.ts

@@ -108,6 +108,10 @@ type BaseModalProps = {
      * z-index компонента
      */
     zIndex?: number;
+    /**
+     * Реф, который должен быть установлен компонентной области
+     */
+    componentRef?: MutableRefObject<HTMLDivElement | null>;
 };
 type BaseModalContext = {
     hasFooter?: boolean;

package/dist/cssm/Component.js

@@ -11,6 +11,7 @@ var FocusLock = require('react-focus-lock');
 var coreComponentsPortal = require('@alfalab/core-components-portal/dist/cssm');
 var coreComponentsBackdrop = require('@alfalab/core-components-backdrop/dist/cssm');
 var coreComponentsStack = require('@alfalab/core-components-stack/dist/cssm');
+require('@alfalab/core-components-global-store/dist/cssm');
 var utils = require('./utils.js');
 var styles = require('./index.module.css');
 
@@ -61,18 +62,18 @@ var BaseModalContext = React__default['default'].createContext({
     onClose: function () { return null; },
 });
 var BaseModal = React.forwardRef(function (_a, ref) {
-    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l;
-    var _m = React.useState(!open), exited = _m[0], setExited = _m[1];
-    var _o = React.useState(false), hasScroll = _o[0], setHasScroll = _o[1];
-    var _p = React.useState(false), hasHeader = _p[0], setHasHeader = _p[1];
-    var _q = React.useState(false), hasFooter = _q[0], setHasFooter = _q[1];
-    var _r = React.useState(false), headerHighlighted = _r[0], setHeaderHighlighted = _r[1];
-    var _s = React.useState(false), footerHighlighted = _s[0], setFooterHighlighted = _s[1];
-    var componentRef = React.useRef(null);
+    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l, _m = _a.componentRef, componentRef = _m === void 0 ? null : _m;
+    var _o = React.useState(!open), exited = _o[0], setExited = _o[1];
+    var _p = React.useState(false), hasScroll = _p[0], setHasScroll = _p[1];
+    var _q = React.useState(false), hasHeader = _q[0], setHasHeader = _q[1];
+    var _r = React.useState(false), hasFooter = _r[0], setHasFooter = _r[1];
+    var _s = React.useState(false), headerHighlighted = _s[0], setHeaderHighlighted = _s[1];
+    var _t = React.useState(false), footerHighlighted = _t[0], setFooterHighlighted = _t[1];
+    var componentNodeRef = React.useRef(null);
     var wrapperRef = React.useRef(null);
     var scrollableNodeRef = React.useRef(null);
     var contentNodeRef = React.useRef(null);
-    var restoreContainerStyles = React.useRef(null);
+    var restoreContainerStylesRef = React.useRef(null);
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = utils.hasScrollbar(scrollableNodeRef.current);
@@ -81,6 +82,9 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     };
     var shouldRender = keepMounted || open || !exited;
+    var getContainer = React.useCallback(function () {
+        return (container ? container() : document.body);
+    }, [container]);
     var resizeObserver$1 = React.useMemo(function () { return new resizeObserver.ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = React.useCallback(function () {
         if (scrollableNodeRef.current)
@@ -99,15 +103,16 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     }, [resizeObserver$1]);
     var handleScroll = React.useCallback(function () {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!utils.isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!utils.isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
     }, [hasFooter, hasHeader]);
     var handleClose = React.useCallback(function (event, reason) {
@@ -123,7 +128,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
     var handleBackdropClick = function (event) {
-        if (!disableBackdropClick) {
+        if (!disableBackdropClick && event.target === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -145,7 +150,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         if (scrollHandler === 'wrapper')
             return wrapperRef.current;
         if (scrollHandler === 'content')
-            return componentRef.current;
+            return componentNodeRef.current;
         return scrollHandler.current || wrapperRef.current;
     }, [scrollHandler]);
     var handleEntered = React.useCallback(function (node, isAppearing) {
@@ -172,27 +177,29 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
         if (onUnmount)
             onUnmount();
-        if (restoreContainerStyles.current) {
-            restoreContainerStyles.current();
-            restoreContainerStyles.current = null;
+        if (restoreContainerStylesRef.current) {
+            restoreContainerStylesRef.current();
         }
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     React.useEffect(function () {
         if (open) {
-            restoreContainerStyles.current = utils.handleContainer((container ? container() : document.body));
+            utils.handleContainer(getContainer());
+            restoreContainerStylesRef.current = function () {
+                restoreContainerStylesRef.current = null;
+                utils.restoreContainerStyles(getContainer());
+            };
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [open]);
+    }, [getContainer, open]);
     React.useEffect(function () {
         if (open)
             setExited(false);
     }, [open]);
     React.useEffect(function () {
         return function () {
-            resizeObserver$1.disconnect();
-            if (restoreContainerStyles.current) {
-                restoreContainerStyles.current();
+            if (restoreContainerStylesRef.current) {
+                restoreContainerStylesRef.current();
             }
+            resizeObserver$1.disconnect();
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -222,14 +229,16 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         return (React__default['default'].createElement(coreComponentsPortal.Portal, { getPortalContainer: container },
             React__default['default'].createElement(BaseModalContext.Provider, { value: contextValue },
                 React__default['default'].createElement(FocusLock__default['default'], { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                    Backdrop && (React__default['default'].createElement(Backdrop, __assign({}, backdropProps, { className: cn__default['default'](backdropProps.className, styles__default['default'].backdrop), open: open, style: {
+                            zIndex: computedZIndex,
+                        } }))),
                     React__default['default'].createElement("div", { role: 'dialog', className: cn__default['default'](styles__default['default'].wrapper, wrapperClassName, (_a = {},
                             _a[styles__default['default'].hidden] = !open && exited,
-                            _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, tabIndex: -1, "data-test-id": dataTestId, style: {
+                            _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },
-                        Backdrop && (React__default['default'].createElement(Backdrop, __assign({}, backdropProps, { className: cn__default['default'](backdropProps.className, styles__default['default'].backdrop), open: open, onClick: handleBackdropClick }))),
                         React__default['default'].createElement(reactTransitionGroup.CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles__default['default'] }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                            React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].component, className), ref: componentRef },
+                            React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].component, className), ref: mergeRefs__default['default']([componentRef, componentNodeRef]) },
                                 React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].content, contentClassName) }, children))))))));
     }));
 });

package/dist/cssm/index.js

@@ -12,6 +12,7 @@ require('react-focus-lock');
 require('@alfalab/core-components-portal/dist/cssm');
 require('@alfalab/core-components-backdrop/dist/cssm');
 require('@alfalab/core-components-stack/dist/cssm');
+require('@alfalab/core-components-global-store/dist/cssm');
 var utils = require('./utils.js');
 require('./index.module.css');
 
@@ -23,3 +24,4 @@ exports.handleContainer = utils.handleContainer;
 exports.hasScrollbar = utils.hasScrollbar;
 exports.isScrolledToBottom = utils.isScrolledToBottom;
 exports.isScrolledToTop = utils.isScrolledToTop;
+exports.restoreContainerStyles = utils.restoreContainerStyles;

package/dist/cssm/index.module.css

@@ -40,7 +40,7 @@
     display: none;
 }
 .backdrop {
-    z-index: -1;
+    z-index: 0;
 }
 .appear,
 .enter {

package/dist/cssm/utils.d.ts

@@ -1,5 +1,6 @@
 declare function isScrolledToTop(target: HTMLElement): boolean;
 declare function isScrolledToBottom(target: HTMLElement): boolean;
 declare function hasScrollbar(target: HTMLElement): boolean;
-declare const handleContainer: (container: HTMLElement) => () => void;
-export { isScrolledToTop, isScrolledToBottom, hasScrollbar, handleContainer };
+declare const restoreContainerStyles: (container: HTMLElement) => void;
+declare const handleContainer: (container?: HTMLElement | undefined) => void;
+export { isScrolledToTop, isScrolledToBottom, hasScrollbar, restoreContainerStyles, handleContainer };

package/dist/cssm/utils.js

@@ -2,6 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var coreComponentsGlobalStore = require('@alfalab/core-components-global-store/dist/cssm');
+
 function isScrolledToTop(target) {
     return target.scrollTop <= 0;
 }
@@ -32,12 +34,40 @@ var isOverflowing = function (container) {
 var getPaddingRight = function (node) {
     return parseInt(window.getComputedStyle(node).paddingRight, 10) || 0;
 };
+var restoreContainerStyles = function (container) {
+    var modalRestoreStyles = coreComponentsGlobalStore.getModalStore().getRestoreStyles();
+    var index = modalRestoreStyles.findIndex(function (s) { return s.container === container; });
+    var existingStyles = modalRestoreStyles[index];
+    if (!existingStyles)
+        return;
+    existingStyles.modals -= 1;
+    if (existingStyles.modals <= 0) {
+        modalRestoreStyles.splice(index, 1);
+        existingStyles.styles.forEach(function (_a) {
+            var value = _a.value, el = _a.el, key = _a.key;
+            if (value) {
+                el.style.setProperty(key, value);
+            }
+            else {
+                el.style.removeProperty(key);
+            }
+        });
+    }
+};
 var handleContainer = function (container) {
-    var restoreStyle = [];
+    if (!container)
+        return;
+    var modalRestoreStyles = coreComponentsGlobalStore.getModalStore().getRestoreStyles();
+    var existingStyles = modalRestoreStyles.find(function (s) { return s.container === container; });
+    if (existingStyles) {
+        existingStyles.modals += 1;
+        return;
+    }
+    var containerStyles = [];
     if (isOverflowing(container)) {
         // Вычисляет размер до применения `overflow hidden` для избежания скачков
         var scrollbarSize = getScrollbarSize();
-        restoreStyle.push({
+        containerStyles.push({
             value: container.style.paddingRight,
             key: 'padding-right',
             el: container,
@@ -56,27 +86,22 @@ var handleContainer = function (container) {
         : container;
     // Блокируем скролл даже если отсутствует скроллбар
     if (scrollContainer.style.overflow !== 'hidden') {
-        restoreStyle.push({
+        containerStyles.push({
             value: scrollContainer.style.overflow,
             key: 'overflow',
             el: scrollContainer,
         });
     }
     scrollContainer.style.overflow = 'hidden';
-    return function () {
-        restoreStyle.forEach(function (_a) {
-            var value = _a.value, el = _a.el, key = _a.key;
-            if (value) {
-                el.style.setProperty(key, value);
-            }
-            else {
-                el.style.removeProperty(key);
-            }
-        });
-    };
+    modalRestoreStyles.push({
+        container: container,
+        modals: 1,
+        styles: containerStyles,
+    });
 };
 
 exports.handleContainer = handleContainer;
 exports.hasScrollbar = hasScrollbar;
 exports.isScrolledToBottom = isScrolledToBottom;
 exports.isScrolledToTop = isScrolledToTop;
+exports.restoreContainerStyles = restoreContainerStyles;

package/dist/esm/Component.d.ts

@@ -108,6 +108,10 @@ type BaseModalProps = {
      * z-index компонента
      */
     zIndex?: number;
+    /**
+     * Реф, который должен быть установлен компонентной области
+     */
+    componentRef?: MutableRefObject<HTMLDivElement | null>;
 };
 type BaseModalContext = {
     hasFooter?: boolean;