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

package/dist/esm/Component.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useState, useRef, useMemo, useCallback, useEffect } from 'react';
+import React, { forwardRef, useState, useRef, useCallback, useMemo, useEffect } from 'react';
 import cn from 'classnames';
 import mergeRefs from 'react-merge-refs';
 import { ResizeObserver } from 'resize-observer';
@@ -7,7 +7,8 @@ import FocusLock from 'react-focus-lock';
 import { Portal } from '@alfalab/core-components-portal/dist/esm';
 import { Backdrop } from '@alfalab/core-components-backdrop/dist/esm';
 import { stackingOrder, Stack } from '@alfalab/core-components-stack/dist/esm';
-import { isScrolledToTop, isScrolledToBottom, handleContainer, hasScrollbar } from './utils.js';
+import '@alfalab/core-components-global-store/dist/esm';
+import { isScrolledToTop, isScrolledToBottom, handleContainer, restoreContainerStyles, hasScrollbar } from './utils.js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -36,7 +37,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.createContext({
@@ -51,18 +52,18 @@ var BaseModalContext = React.createContext({
     onClose: function () { return null; },
 });
 var BaseModal = 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$1 = _c === void 0 ? 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 ? stackingOrder.MODAL : _l;
-    var _m = useState(!open), exited = _m[0], setExited = _m[1];
-    var _o = useState(false), hasScroll = _o[0], setHasScroll = _o[1];
-    var _p = useState(false), hasHeader = _p[0], setHasHeader = _p[1];
-    var _q = useState(false), hasFooter = _q[0], setHasFooter = _q[1];
-    var _r = useState(false), headerHighlighted = _r[0], setHeaderHighlighted = _r[1];
-    var _s = useState(false), footerHighlighted = _s[0], setFooterHighlighted = _s[1];
-    var componentRef = 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$1 = _c === void 0 ? 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 ? stackingOrder.MODAL : _l, _m = _a.componentRef, componentRef = _m === void 0 ? null : _m;
+    var _o = useState(!open), exited = _o[0], setExited = _o[1];
+    var _p = useState(false), hasScroll = _p[0], setHasScroll = _p[1];
+    var _q = useState(false), hasHeader = _q[0], setHasHeader = _q[1];
+    var _r = useState(false), hasFooter = _r[0], setHasFooter = _r[1];
+    var _s = useState(false), headerHighlighted = _s[0], setHeaderHighlighted = _s[1];
+    var _t = useState(false), footerHighlighted = _t[0], setFooterHighlighted = _t[1];
+    var componentNodeRef = useRef(null);
     var wrapperRef = useRef(null);
     var scrollableNodeRef = useRef(null);
     var contentNodeRef = useRef(null);
-    var restoreContainerStyles = useRef(null);
+    var restoreContainerStylesRef = useRef(null);
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = hasScrollbar(scrollableNodeRef.current);
@@ -71,6 +72,9 @@ var BaseModal = forwardRef(function (_a, ref) {
         }
     };
     var shouldRender = keepMounted || open || !exited;
+    var getContainer = useCallback(function () {
+        return (container ? container() : document.body);
+    }, [container]);
     var resizeObserver = useMemo(function () { return new ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = useCallback(function () {
         if (scrollableNodeRef.current)
@@ -89,15 +93,16 @@ var BaseModal = forwardRef(function (_a, ref) {
         }
     }, [resizeObserver]);
     var handleScroll = useCallback(function () {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
     }, [hasFooter, hasHeader]);
     var handleClose = useCallback(function (event, reason) {
@@ -113,7 +118,7 @@ var BaseModal = forwardRef(function (_a, ref) {
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
     var handleBackdropClick = function (event) {
-        if (!disableBackdropClick) {
+        if (!disableBackdropClick && event.target === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -135,7 +140,7 @@ var BaseModal = 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 = useCallback(function (node, isAppearing) {
@@ -162,27 +167,29 @@ var BaseModal = forwardRef(function (_a, ref) {
         }
         if (onUnmount)
             onUnmount();
-        if (restoreContainerStyles.current) {
-            restoreContainerStyles.current();
-            restoreContainerStyles.current = null;
+        if (restoreContainerStylesRef.current) {
+            restoreContainerStylesRef.current();
         }
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     useEffect(function () {
         if (open) {
-            restoreContainerStyles.current = handleContainer((container ? container() : document.body));
+            handleContainer(getContainer());
+            restoreContainerStylesRef.current = function () {
+                restoreContainerStylesRef.current = null;
+                restoreContainerStyles(getContainer());
+            };
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [open]);
+    }, [getContainer, open]);
     useEffect(function () {
         if (open)
             setExited(false);
     }, [open]);
     useEffect(function () {
         return function () {
-            resizeObserver.disconnect();
-            if (restoreContainerStyles.current) {
-                restoreContainerStyles.current();
+            if (restoreContainerStylesRef.current) {
+                restoreContainerStylesRef.current();
             }
+            resizeObserver.disconnect();
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -212,14 +219,16 @@ var BaseModal = forwardRef(function (_a, ref) {
         return (React.createElement(Portal, { getPortalContainer: container },
             React.createElement(BaseModalContext.Provider, { value: contextValue },
                 React.createElement(FocusLock, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                    Backdrop$1 && (React.createElement(Backdrop$1, __assign({}, backdropProps, { className: cn(backdropProps.className, styles.backdrop), open: open, style: {
+                            zIndex: computedZIndex,
+                        } }))),
                     React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, (_a = {},
                             _a[styles.hidden] = !open && exited,
-                            _a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, tabIndex: -1, "data-test-id": dataTestId, style: {
+                            _a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },
-                        Backdrop$1 && (React.createElement(Backdrop$1, __assign({}, backdropProps, { className: cn(backdropProps.className, styles.backdrop), open: open, onClick: handleBackdropClick }))),
                         React.createElement(CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                            React.createElement("div", { className: cn(styles.component, className), ref: componentRef },
+                            React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
                                 React.createElement("div", { className: cn(styles.content, contentClassName) }, children))))))));
     }));
 });

package/dist/esm/index.css

@@ -1,4 +1,4 @@
-/* hash: 1rshh */
+/* hash: zuxb3 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_1rshh {
+.base-modal__component_pvkw5 {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_1rshh {
+.base-modal__wrapper_pvkw5 {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_1rshh {
+.base-modal__content_pvkw5 {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_1rshh {
+.base-modal__hidden_pvkw5 {
     display: none;
 }
-.base-modal__backdrop_1rshh {
-    z-index: -1;
+.base-modal__backdrop_pvkw5 {
+    z-index: 0;
 }
-.base-modal__appear_1rshh,
-.base-modal__enter_1rshh {
+.base-modal__appear_pvkw5,
+.base-modal__enter_pvkw5 {
     opacity: 0;
 }
-.base-modal__appearActive_1rshh,
-.base-modal__enterActive_1rshh {
+.base-modal__appearActive_pvkw5,
+.base-modal__enterActive_pvkw5 {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_1rshh {
+.base-modal__exit_pvkw5 {
     opacity: 1;
 }
-.base-modal__exitActive_1rshh,
-.base-modal__exitDone_1rshh {
+.base-modal__exitActive_pvkw5,
+.base-modal__exitDone_pvkw5 {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/esm/index.js

@@ -8,4 +8,5 @@ import 'react-focus-lock';
 import '@alfalab/core-components-portal/dist/esm';
 import '@alfalab/core-components-backdrop/dist/esm';
 import '@alfalab/core-components-stack/dist/esm';
-export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop } from './utils.js';
+import '@alfalab/core-components-global-store/dist/esm';
+export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles } from './utils.js';

package/dist/esm/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/esm/utils.js

@@ -1,3 +1,5 @@
+import { getModalStore } from '@alfalab/core-components-global-store/dist/esm';
+
 function isScrolledToTop(target) {
     return target.scrollTop <= 0;
 }
@@ -28,12 +30,40 @@ var isOverflowing = function (container) {
 var getPaddingRight = function (node) {
     return parseInt(window.getComputedStyle(node).paddingRight, 10) || 0;
 };
+var restoreContainerStyles = function (container) {
+    var modalRestoreStyles = 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 = 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,
@@ -52,24 +82,18 @@ 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,
+    });
 };
 
-export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop };
+export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles };

package/dist/index.css

@@ -1,4 +1,4 @@
-/* hash: 1rshh */
+/* hash: zuxb3 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_1rshh {
+.base-modal__component_pvkw5 {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_1rshh {
+.base-modal__wrapper_pvkw5 {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_1rshh {
+.base-modal__content_pvkw5 {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_1rshh {
+.base-modal__hidden_pvkw5 {
     display: none;
 }
-.base-modal__backdrop_1rshh {
-    z-index: -1;
+.base-modal__backdrop_pvkw5 {
+    z-index: 0;
 }
-.base-modal__appear_1rshh,
-.base-modal__enter_1rshh {
+.base-modal__appear_pvkw5,
+.base-modal__enter_pvkw5 {
     opacity: 0;
 }
-.base-modal__appearActive_1rshh,
-.base-modal__enterActive_1rshh {
+.base-modal__appearActive_pvkw5,
+.base-modal__enterActive_pvkw5 {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_1rshh {
+.base-modal__exit_pvkw5 {
     opacity: 1;
 }
-.base-modal__exitActive_1rshh,
-.base-modal__exitDone_1rshh {
+.base-modal__exitActive_pvkw5,
+.base-modal__exitDone_pvkw5 {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/index.js

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

package/dist/modern/Component.d.ts

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

package/dist/modern/Component.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useState, useRef, useMemo, useCallback, useEffect } from 'react';
+import React, { forwardRef, useState, useRef, useCallback, useMemo, useEffect } from 'react';
 import cn from 'classnames';
 import mergeRefs from 'react-merge-refs';
 import { ResizeObserver } from 'resize-observer';
@@ -7,9 +7,10 @@ import FocusLock from 'react-focus-lock';
 import { Portal } from '@alfalab/core-components-portal/dist/modern';
 import { Backdrop } from '@alfalab/core-components-backdrop/dist/modern';
 import { stackingOrder, Stack } from '@alfalab/core-components-stack/dist/modern';
-import { isScrolledToTop, isScrolledToBottom, handleContainer, hasScrollbar } from './utils.js';
+import '@alfalab/core-components-global-store/dist/modern';
+import { isScrolledToTop, isScrolledToBottom, handleContainer, restoreContainerStyles, hasScrollbar } from './utils.js';
 
-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')
 
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
@@ -24,18 +25,18 @@ const BaseModalContext = React.createContext({
     setHasFooter: () => null,
     onClose: () => null,
 });
-const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, keepMounted = false, className, contentClassName, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, }, ref) => {
+const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, keepMounted = false, className, contentClassName, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, componentRef = null, }, ref) => {
     const [exited, setExited] = useState(!open);
     const [hasScroll, setHasScroll] = useState(false);
     const [hasHeader, setHasHeader] = useState(false);
     const [hasFooter, setHasFooter] = useState(false);
     const [headerHighlighted, setHeaderHighlighted] = useState(false);
     const [footerHighlighted, setFooterHighlighted] = useState(false);
-    const componentRef = useRef(null);
+    const componentNodeRef = useRef(null);
     const wrapperRef = useRef(null);
     const scrollableNodeRef = useRef(null);
     const contentNodeRef = useRef(null);
-    const restoreContainerStyles = useRef(null);
+    const restoreContainerStylesRef = useRef(null);
     const checkToHasScrollBar = () => {
         if (scrollableNodeRef.current) {
             const scrollExists = hasScrollbar(scrollableNodeRef.current);
@@ -44,6 +45,9 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         }
     };
     const shouldRender = keepMounted || open || !exited;
+    const getContainer = useCallback(() => {
+        return (container ? container() : document.body);
+    }, [container]);
     const resizeObserver = useMemo(() => new ResizeObserver(checkToHasScrollBar), []);
     const addResizeHandle = useCallback(() => {
         if (scrollableNodeRef.current)
@@ -62,15 +66,16 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         }
     }, [resizeObserver]);
     const handleScroll = useCallback(() => {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
     }, [hasFooter, hasHeader]);
     const handleClose = useCallback((event, reason) => {
@@ -86,7 +91,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
     const handleBackdropClick = (event) => {
-        if (!disableBackdropClick) {
+        if (!disableBackdropClick && event.target === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -108,7 +113,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         if (scrollHandler === 'wrapper')
             return wrapperRef.current;
         if (scrollHandler === 'content')
-            return componentRef.current;
+            return componentNodeRef.current;
         return scrollHandler.current || wrapperRef.current;
     }, [scrollHandler]);
     const handleEntered = useCallback((node, isAppearing) => {
@@ -135,27 +140,29 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         }
         if (onUnmount)
             onUnmount();
-        if (restoreContainerStyles.current) {
-            restoreContainerStyles.current();
-            restoreContainerStyles.current = null;
+        if (restoreContainerStylesRef.current) {
+            restoreContainerStylesRef.current();
         }
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     useEffect(() => {
         if (open) {
-            restoreContainerStyles.current = handleContainer((container ? container() : document.body));
+            handleContainer(getContainer());
+            restoreContainerStylesRef.current = () => {
+                restoreContainerStylesRef.current = null;
+                restoreContainerStyles(getContainer());
+            };
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [open]);
+    }, [getContainer, open]);
     useEffect(() => {
         if (open)
             setExited(false);
     }, [open]);
     useEffect(() => {
         return () => {
-            resizeObserver.disconnect();
-            if (restoreContainerStyles.current) {
-                restoreContainerStyles.current();
+            if (restoreContainerStylesRef.current) {
+                restoreContainerStylesRef.current();
             }
+            resizeObserver.disconnect();
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -183,14 +190,16 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
     return (React.createElement(Stack, { value: zIndex }, computedZIndex => (React.createElement(Portal, { getPortalContainer: container },
         React.createElement(BaseModalContext.Provider, { value: contextValue },
             React.createElement(FocusLock, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                Backdrop$1 && (React.createElement(Backdrop$1, Object.assign({}, backdropProps, { className: cn(backdropProps.className, styles.backdrop), open: open, style: {
+                        zIndex: computedZIndex,
+                    } }))),
                 React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, {
                         [styles.hidden]: !open && exited,
-                    }), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, tabIndex: -1, "data-test-id": dataTestId, style: {
+                    }), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
                         zIndex: computedZIndex,
                     } },
-                    Backdrop$1 && (React.createElement(Backdrop$1, Object.assign({}, backdropProps, { className: cn(backdropProps.className, styles.backdrop), open: open, onClick: handleBackdropClick }))),
                     React.createElement(CSSTransition, Object.assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                        React.createElement("div", { className: cn(styles.component, className), ref: componentRef },
+                        React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
                             React.createElement("div", { className: cn(styles.content, contentClassName) }, children))))))))));
 });
 

package/dist/modern/index.css

@@ -1,4 +1,4 @@
-/* hash: 1rshh */
+/* hash: zuxb3 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_1rshh {
+.base-modal__component_pvkw5 {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_1rshh {
+.base-modal__wrapper_pvkw5 {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_1rshh {
+.base-modal__content_pvkw5 {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_1rshh {
+.base-modal__hidden_pvkw5 {
     display: none;
 }
-.base-modal__backdrop_1rshh {
-    z-index: -1;
+.base-modal__backdrop_pvkw5 {
+    z-index: 0;
 }
-.base-modal__appear_1rshh,
-.base-modal__enter_1rshh {
+.base-modal__appear_pvkw5,
+.base-modal__enter_pvkw5 {
     opacity: 0;
 }
-.base-modal__appearActive_1rshh,
-.base-modal__enterActive_1rshh {
+.base-modal__appearActive_pvkw5,
+.base-modal__enterActive_pvkw5 {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_1rshh {
+.base-modal__exit_pvkw5 {
     opacity: 1;
 }
-.base-modal__exitActive_1rshh,
-.base-modal__exitDone_1rshh {
+.base-modal__exitActive_pvkw5,
+.base-modal__exitDone_pvkw5 {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/modern/index.js

@@ -7,5 +7,6 @@ import 'react-focus-lock';
 import '@alfalab/core-components-portal/dist/modern';
 import '@alfalab/core-components-backdrop/dist/modern';
 import '@alfalab/core-components-stack/dist/modern';
-export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop } from './utils.js';
+import '@alfalab/core-components-global-store/dist/modern';
+export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles } from './utils.js';
 export { BaseModal, BaseModalContext } from './Component.js';