@alfalab/core-components 28.5.0-beta.0 → 28.7.0

package/base-modal/Component.js

@@ -46,7 +46,7 @@ var __assign = function () {
     return __assign.apply(this, arguments);
 };
 
-var styles = {"component":"base-modal__component_12z52","wrapper":"base-modal__wrapper_12z52","content":"base-modal__content_12z52","hidden":"base-modal__hidden_12z52","backdrop":"base-modal__backdrop_12z52","appear":"base-modal__appear_12z52","enter":"base-modal__enter_12z52","appearActive":"base-modal__appearActive_12z52","enterActive":"base-modal__enterActive_12z52","exit":"base-modal__exit_12z52","exitActive":"base-modal__exitActive_12z52","exitDone":"base-modal__exitDone_12z52"};
+var styles = {"component":"base-modal__component_1xxjn","wrapper":"base-modal__wrapper_1xxjn","content":"base-modal__content_1xxjn","hidden":"base-modal__hidden_1xxjn","backdrop":"base-modal__backdrop_1xxjn","appear":"base-modal__appear_1xxjn","enter":"base-modal__enter_1xxjn","appearActive":"base-modal__appearActive_1xxjn","enterActive":"base-modal__enterActive_1xxjn","exit":"base-modal__exit_1xxjn","exitActive":"base-modal__exitActive_1xxjn","exitDone":"base-modal__exitDone_1xxjn"};
 require('./index.css');
 
 var BaseModalContext = React__default['default'].createContext({
@@ -63,14 +63,14 @@ 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, _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 _u = React.useState(0), headerOffset = _u[0], setHeaderOffset = _u[1];
+    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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, 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, _m = _a.zIndex, zIndex = _m === void 0 ? coreComponentsStack.stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o;
+    var _p = React.useState(null), exited = _p[0], setExited = _p[1];
+    var _q = React.useState(false), hasScroll = _q[0], setHasScroll = _q[1];
+    var _r = React.useState(false), hasHeader = _r[0], setHasHeader = _r[1];
+    var _s = React.useState(false), hasFooter = _s[0], setHasFooter = _s[1];
+    var _t = React.useState(false), headerHighlighted = _t[0], setHeaderHighlighted = _t[1];
+    var _u = React.useState(false), footerHighlighted = _u[0], setFooterHighlighted = _u[1];
+    var _v = React.useState(0), headerOffset = _v[0], setHeaderOffset = _v[1];
     var componentNodeRef = React.useRef(null);
     var wrapperRef = React.useRef(null);
     var scrollableNodeRef = React.useRef(null);
@@ -85,7 +85,8 @@ var BaseModal = React.forwardRef(function (_a, ref) {
             setHasScroll(scrollExists);
         }
     };
-    var shouldRender = keepMounted || open || !exited;
+    var isExited = exited || exited === null;
+    var shouldRender = keepMounted || open || !isExited;
     var getContainer = React.useCallback(function () {
         return (container ? container() : document.body);
     }, [container]);
@@ -135,7 +136,15 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
     var handleBackdropMouseDown = function (event) {
-        if (!disableBackdropClick) {
+        var _a;
+        var clickedOnScrollbar = false;
+        var clientWidth = (_a = event.target) === null || _a === void 0 ? void 0 : _a.clientWidth;
+        if (event.clientX && clientWidth) {
+            // Устанавливаем смещение для абсолютно спозиционированного скроллбара в OSX в 17px.
+            var offset = utils.getScrollbarSize() === 0 ? 17 : 0;
+            clickedOnScrollbar = event.clientX + offset > clientWidth;
+        }
+        if (!disableBackdropClick && !clickedOnScrollbar) {
             mouseDownTarget.current = event.target;
         }
     };
@@ -145,6 +154,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
             mouseDownTarget.current === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
+        mouseDownTarget.current = undefined;
     };
     var handleKeyDown = React.useCallback(function (event) {
         /*
@@ -196,18 +206,18 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     React.useEffect(function () {
-        if (open) {
-            utils.handleContainer(getContainer());
-            restoreContainerStylesRef.current = function () {
-                restoreContainerStylesRef.current = null;
-                utils.restoreContainerStyles(getContainer());
-            };
-        }
-    }, [getContainer, open]);
-    React.useEffect(function () {
-        if (open)
+        if (open && isExited) {
+            if (!disableBlockingScroll) {
+                var el_1 = getContainer();
+                utils.handleContainer(el_1);
+                restoreContainerStylesRef.current = function () {
+                    restoreContainerStylesRef.current = null;
+                    utils.restoreContainerStyles(el_1);
+                };
+            }
             setExited(false);
-    }, [open]);
+        }
+    }, [getContainer, open, disableBlockingScroll, isExited]);
     React.useEffect(function () {
         var ResizeObserver = window.ResizeObserver || resizeObserver.ResizeObserver;
         resizeObserverRef.current = new ResizeObserver(checkToHasScrollBar);
@@ -254,7 +264,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
                             zIndex: computedZIndex,
                         } }))),
                     React__default['default'].createElement("div", { role: 'dialog', className: cn__default['default'](styles.wrapper, wrapperClassName, (_a = {},
-                            _a[styles.hidden] = !open && exited,
+                            _a[styles.hidden] = !open && isExited,
                             _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },

package/base-modal/cssm/Component.d.ts

@@ -49,6 +49,11 @@ type BaseModalProps = {
      * @default false
      */
     disableBackdropClick?: boolean;
+    /**
+     * Отключает блокировку скролла при открытии модального окна
+     * @default false
+     */
+    disableBlockingScroll?: boolean;
     /**
      * Содержимое модалки всегда в DOM
      * @default false

package/base-modal/cssm/Component.js

@@ -62,14 +62,14 @@ 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, _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 _u = React.useState(0), headerOffset = _u[0], setHeaderOffset = _u[1];
+    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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, 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, _m = _a.zIndex, zIndex = _m === void 0 ? coreComponentsStack.stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o;
+    var _p = React.useState(null), exited = _p[0], setExited = _p[1];
+    var _q = React.useState(false), hasScroll = _q[0], setHasScroll = _q[1];
+    var _r = React.useState(false), hasHeader = _r[0], setHasHeader = _r[1];
+    var _s = React.useState(false), hasFooter = _s[0], setHasFooter = _s[1];
+    var _t = React.useState(false), headerHighlighted = _t[0], setHeaderHighlighted = _t[1];
+    var _u = React.useState(false), footerHighlighted = _u[0], setFooterHighlighted = _u[1];
+    var _v = React.useState(0), headerOffset = _v[0], setHeaderOffset = _v[1];
     var componentNodeRef = React.useRef(null);
     var wrapperRef = React.useRef(null);
     var scrollableNodeRef = React.useRef(null);
@@ -84,7 +84,8 @@ var BaseModal = React.forwardRef(function (_a, ref) {
             setHasScroll(scrollExists);
         }
     };
-    var shouldRender = keepMounted || open || !exited;
+    var isExited = exited || exited === null;
+    var shouldRender = keepMounted || open || !isExited;
     var getContainer = React.useCallback(function () {
         return (container ? container() : document.body);
     }, [container]);
@@ -134,7 +135,15 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
     var handleBackdropMouseDown = function (event) {
-        if (!disableBackdropClick) {
+        var _a;
+        var clickedOnScrollbar = false;
+        var clientWidth = (_a = event.target) === null || _a === void 0 ? void 0 : _a.clientWidth;
+        if (event.clientX && clientWidth) {
+            // Устанавливаем смещение для абсолютно спозиционированного скроллбара в OSX в 17px.
+            var offset = utils.getScrollbarSize() === 0 ? 17 : 0;
+            clickedOnScrollbar = event.clientX + offset > clientWidth;
+        }
+        if (!disableBackdropClick && !clickedOnScrollbar) {
             mouseDownTarget.current = event.target;
         }
     };
@@ -144,6 +153,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
             mouseDownTarget.current === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
+        mouseDownTarget.current = undefined;
     };
     var handleKeyDown = React.useCallback(function (event) {
         /*
@@ -195,18 +205,18 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     React.useEffect(function () {
-        if (open) {
-            utils.handleContainer(getContainer());
-            restoreContainerStylesRef.current = function () {
-                restoreContainerStylesRef.current = null;
-                utils.restoreContainerStyles(getContainer());
-            };
-        }
-    }, [getContainer, open]);
-    React.useEffect(function () {
-        if (open)
+        if (open && isExited) {
+            if (!disableBlockingScroll) {
+                var el_1 = getContainer();
+                utils.handleContainer(el_1);
+                restoreContainerStylesRef.current = function () {
+                    restoreContainerStylesRef.current = null;
+                    utils.restoreContainerStyles(el_1);
+                };
+            }
             setExited(false);
-    }, [open]);
+        }
+    }, [getContainer, open, disableBlockingScroll, isExited]);
     React.useEffect(function () {
         var ResizeObserver = window.ResizeObserver || resizeObserver.ResizeObserver;
         resizeObserverRef.current = new ResizeObserver(checkToHasScrollBar);
@@ -253,7 +263,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
                             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[styles__default['default'].hidden] = !open && isExited,
                             _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },

package/base-modal/cssm/index.js

@@ -18,6 +18,7 @@ require('./index.module.css');
 
 exports.BaseModal = Component.BaseModal;
 exports.BaseModalContext = Component.BaseModalContext;
+exports.getScrollbarSize = utils.getScrollbarSize;
 exports.handleContainer = utils.handleContainer;
 exports.hasScrollbar = utils.hasScrollbar;
 exports.isScrolledToBottom = utils.isScrolledToBottom;

package/base-modal/cssm/utils.d.ts

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

package/base-modal/cssm/utils.js

@@ -11,18 +11,24 @@ function isScrolledToBottom(target) {
 function hasScrollbar(target) {
     return target.scrollHeight > target.clientHeight;
 }
-var getScrollbarSize = function () {
-    var scrollDiv = document.createElement('div');
-    scrollDiv.style.width = '99px';
-    scrollDiv.style.height = '99px';
-    scrollDiv.style.position = 'absolute';
-    scrollDiv.style.top = '-9999px';
-    scrollDiv.style.overflow = 'scroll';
-    document.body.appendChild(scrollDiv);
-    var scrollbarSize = scrollDiv.offsetWidth - scrollDiv.clientWidth;
-    document.body.removeChild(scrollDiv);
-    return scrollbarSize;
-};
+var getScrollbarSize = (function () {
+    var cachedSize;
+    return function () {
+        if (cachedSize !== undefined)
+            return cachedSize;
+        var scrollDiv = document.createElement('div');
+        scrollDiv.style.width = '99px';
+        scrollDiv.style.height = '99px';
+        scrollDiv.style.position = 'absolute';
+        scrollDiv.style.top = '-9999px';
+        scrollDiv.style.overflow = 'scroll';
+        document.body.appendChild(scrollDiv);
+        var scrollbarSize = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+        document.body.removeChild(scrollDiv);
+        cachedSize = scrollbarSize;
+        return scrollbarSize;
+    };
+})();
 var isOverflowing = function (container) {
     if (document.body === container) {
         return window.innerWidth > document.documentElement.clientWidth;
@@ -98,6 +104,7 @@ var handleContainer = function (container) {
     });
 };
 
+exports.getScrollbarSize = getScrollbarSize;
 exports.handleContainer = handleContainer;
 exports.hasScrollbar = hasScrollbar;
 exports.isScrolledToBottom = isScrolledToBottom;

package/base-modal/esm/Component.d.ts

@@ -49,6 +49,11 @@ type BaseModalProps = {
      * @default false
      */
     disableBackdropClick?: boolean;
+    /**
+     * Отключает блокировку скролла при открытии модального окна
+     * @default false
+     */
+    disableBlockingScroll?: boolean;
     /**
      * Содержимое модалки всегда в DOM
      * @default false

package/base-modal/esm/Component.js

@@ -8,7 +8,7 @@ import { Portal } from '../../portal/esm';
 import { Backdrop } from '../../backdrop/esm';
 import { stackingOrder, Stack } from '../../stack/esm';
 import '../../global-store/esm';
-import { isScrolledToTop, isScrolledToBottom, handleContainer, restoreContainerStyles, hasScrollbar } from './utils.js';
+import { isScrolledToTop, isScrolledToBottom, handleContainer, restoreContainerStyles, hasScrollbar, getScrollbarSize } from './utils.js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -37,7 +37,7 @@ var __assign = function () {
     return __assign.apply(this, arguments);
 };
 
-var styles = {"component":"base-modal__component_12z52","wrapper":"base-modal__wrapper_12z52","content":"base-modal__content_12z52","hidden":"base-modal__hidden_12z52","backdrop":"base-modal__backdrop_12z52","appear":"base-modal__appear_12z52","enter":"base-modal__enter_12z52","appearActive":"base-modal__appearActive_12z52","enterActive":"base-modal__enterActive_12z52","exit":"base-modal__exit_12z52","exitActive":"base-modal__exitActive_12z52","exitDone":"base-modal__exitDone_12z52"};
+var styles = {"component":"base-modal__component_1xxjn","wrapper":"base-modal__wrapper_1xxjn","content":"base-modal__content_1xxjn","hidden":"base-modal__hidden_1xxjn","backdrop":"base-modal__backdrop_1xxjn","appear":"base-modal__appear_1xxjn","enter":"base-modal__enter_1xxjn","appearActive":"base-modal__appearActive_1xxjn","enterActive":"base-modal__enterActive_1xxjn","exit":"base-modal__exit_1xxjn","exitActive":"base-modal__exitActive_1xxjn","exitDone":"base-modal__exitDone_1xxjn"};
 require('./index.css');
 
 var BaseModalContext = React.createContext({
@@ -54,14 +54,14 @@ 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, _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 _u = useState(0), headerOffset = _u[0], setHeaderOffset = _u[1];
+    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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, 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, _m = _a.zIndex, zIndex = _m === void 0 ? stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o;
+    var _p = useState(null), exited = _p[0], setExited = _p[1];
+    var _q = useState(false), hasScroll = _q[0], setHasScroll = _q[1];
+    var _r = useState(false), hasHeader = _r[0], setHasHeader = _r[1];
+    var _s = useState(false), hasFooter = _s[0], setHasFooter = _s[1];
+    var _t = useState(false), headerHighlighted = _t[0], setHeaderHighlighted = _t[1];
+    var _u = useState(false), footerHighlighted = _u[0], setFooterHighlighted = _u[1];
+    var _v = useState(0), headerOffset = _v[0], setHeaderOffset = _v[1];
     var componentNodeRef = useRef(null);
     var wrapperRef = useRef(null);
     var scrollableNodeRef = useRef(null);
@@ -76,7 +76,8 @@ var BaseModal = forwardRef(function (_a, ref) {
             setHasScroll(scrollExists);
         }
     };
-    var shouldRender = keepMounted || open || !exited;
+    var isExited = exited || exited === null;
+    var shouldRender = keepMounted || open || !isExited;
     var getContainer = useCallback(function () {
         return (container ? container() : document.body);
     }, [container]);
@@ -126,7 +127,15 @@ var BaseModal = forwardRef(function (_a, ref) {
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
     var handleBackdropMouseDown = function (event) {
-        if (!disableBackdropClick) {
+        var _a;
+        var clickedOnScrollbar = false;
+        var clientWidth = (_a = event.target) === null || _a === void 0 ? void 0 : _a.clientWidth;
+        if (event.clientX && clientWidth) {
+            // Устанавливаем смещение для абсолютно спозиционированного скроллбара в OSX в 17px.
+            var offset = getScrollbarSize() === 0 ? 17 : 0;
+            clickedOnScrollbar = event.clientX + offset > clientWidth;
+        }
+        if (!disableBackdropClick && !clickedOnScrollbar) {
             mouseDownTarget.current = event.target;
         }
     };
@@ -136,6 +145,7 @@ var BaseModal = forwardRef(function (_a, ref) {
             mouseDownTarget.current === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
+        mouseDownTarget.current = undefined;
     };
     var handleKeyDown = useCallback(function (event) {
         /*
@@ -187,18 +197,18 @@ var BaseModal = forwardRef(function (_a, ref) {
         }
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     useEffect(function () {
-        if (open) {
-            handleContainer(getContainer());
-            restoreContainerStylesRef.current = function () {
-                restoreContainerStylesRef.current = null;
-                restoreContainerStyles(getContainer());
-            };
-        }
-    }, [getContainer, open]);
-    useEffect(function () {
-        if (open)
+        if (open && isExited) {
+            if (!disableBlockingScroll) {
+                var el_1 = getContainer();
+                handleContainer(el_1);
+                restoreContainerStylesRef.current = function () {
+                    restoreContainerStylesRef.current = null;
+                    restoreContainerStyles(el_1);
+                };
+            }
             setExited(false);
-    }, [open]);
+        }
+    }, [getContainer, open, disableBlockingScroll, isExited]);
     useEffect(function () {
         var ResizeObserver$1 = window.ResizeObserver || ResizeObserver;
         resizeObserverRef.current = new ResizeObserver$1(checkToHasScrollBar);
@@ -245,7 +255,7 @@ var BaseModal = forwardRef(function (_a, ref) {
                             zIndex: computedZIndex,
                         } }))),
                     React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, (_a = {},
-                            _a[styles.hidden] = !open && exited,
+                            _a[styles.hidden] = !open && isExited,
                             _a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },

package/base-modal/esm/index.css

@@ -1,4 +1,4 @@
-/* hash: 175qx */
+/* hash: 1z9ex */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_12z52 {
+.base-modal__component_1xxjn {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_12z52 {
+.base-modal__wrapper_1xxjn {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_12z52 {
+.base-modal__content_1xxjn {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_12z52 {
+.base-modal__hidden_1xxjn {
     display: none;
 }
-.base-modal__backdrop_12z52 {
+.base-modal__backdrop_1xxjn {
     z-index: 0;
 }
-.base-modal__appear_12z52,
-.base-modal__enter_12z52 {
+.base-modal__appear_1xxjn,
+.base-modal__enter_1xxjn {
     opacity: 0;
 }
-.base-modal__appearActive_12z52,
-.base-modal__enterActive_12z52 {
+.base-modal__appearActive_1xxjn,
+.base-modal__enterActive_1xxjn {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_12z52 {
+.base-modal__exit_1xxjn {
     opacity: 1;
 }
-.base-modal__exitActive_12z52,
-.base-modal__exitDone_12z52 {
+.base-modal__exitActive_1xxjn,
+.base-modal__exitDone_1xxjn {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/base-modal/esm/index.js

@@ -8,5 +8,5 @@ import '../../portal/esm';
 import '../../backdrop/esm';
 import '../../stack/esm';
 import '../../global-store/esm';
-export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles } from './utils.js';
+export { getScrollbarSize, handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles } from './utils.js';
 export { BaseModal, BaseModalContext } from './Component.js';

package/base-modal/esm/utils.d.ts

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

package/base-modal/esm/utils.js

@@ -9,18 +9,24 @@ function isScrolledToBottom(target) {
 function hasScrollbar(target) {
     return target.scrollHeight > target.clientHeight;
 }
-var getScrollbarSize = function () {
-    var scrollDiv = document.createElement('div');
-    scrollDiv.style.width = '99px';
-    scrollDiv.style.height = '99px';
-    scrollDiv.style.position = 'absolute';
-    scrollDiv.style.top = '-9999px';
-    scrollDiv.style.overflow = 'scroll';
-    document.body.appendChild(scrollDiv);
-    var scrollbarSize = scrollDiv.offsetWidth - scrollDiv.clientWidth;
-    document.body.removeChild(scrollDiv);
-    return scrollbarSize;
-};
+var getScrollbarSize = (function () {
+    var cachedSize;
+    return function () {
+        if (cachedSize !== undefined)
+            return cachedSize;
+        var scrollDiv = document.createElement('div');
+        scrollDiv.style.width = '99px';
+        scrollDiv.style.height = '99px';
+        scrollDiv.style.position = 'absolute';
+        scrollDiv.style.top = '-9999px';
+        scrollDiv.style.overflow = 'scroll';
+        document.body.appendChild(scrollDiv);
+        var scrollbarSize = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+        document.body.removeChild(scrollDiv);
+        cachedSize = scrollbarSize;
+        return scrollbarSize;
+    };
+})();
 var isOverflowing = function (container) {
     if (document.body === container) {
         return window.innerWidth > document.documentElement.clientWidth;
@@ -96,4 +102,4 @@ var handleContainer = function (container) {
     });
 };
 
-export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles };
+export { getScrollbarSize, handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles };

package/base-modal/index.css

@@ -1,4 +1,4 @@
-/* hash: 175qx */
+/* hash: 1z9ex */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_12z52 {
+.base-modal__component_1xxjn {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_12z52 {
+.base-modal__wrapper_1xxjn {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_12z52 {
+.base-modal__content_1xxjn {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_12z52 {
+.base-modal__hidden_1xxjn {
     display: none;
 }
-.base-modal__backdrop_12z52 {
+.base-modal__backdrop_1xxjn {
     z-index: 0;
 }
-.base-modal__appear_12z52,
-.base-modal__enter_12z52 {
+.base-modal__appear_1xxjn,
+.base-modal__enter_1xxjn {
     opacity: 0;
 }
-.base-modal__appearActive_12z52,
-.base-modal__enterActive_12z52 {
+.base-modal__appearActive_1xxjn,
+.base-modal__enterActive_1xxjn {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_12z52 {
+.base-modal__exit_1xxjn {
     opacity: 1;
 }
-.base-modal__exitActive_12z52,
-.base-modal__exitDone_12z52 {
+.base-modal__exitActive_1xxjn,
+.base-modal__exitDone_1xxjn {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/base-modal/index.js

@@ -17,6 +17,7 @@ var utils = require('./utils.js');
 
 exports.BaseModal = Component.BaseModal;
 exports.BaseModalContext = Component.BaseModalContext;
+exports.getScrollbarSize = utils.getScrollbarSize;
 exports.handleContainer = utils.handleContainer;
 exports.hasScrollbar = utils.hasScrollbar;
 exports.isScrolledToBottom = utils.isScrolledToBottom;

package/base-modal/modern/Component.d.ts

@@ -49,6 +49,11 @@ type BaseModalProps = {
      * @default false
      */
     disableBackdropClick?: boolean;
+    /**
+     * Отключает блокировку скролла при открытии модального окна
+     * @default false
+     */
+    disableBlockingScroll?: boolean;
     /**
      * Содержимое модалки всегда в DOM
      * @default false