@alfalab/core-components-base-modal 4.0.2 → 4.1.2

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.2](https://github.com/core-ds/core-components/compare/@alfalab/core-components-base-modal@4.1.1...@alfalab/core-components-base-modal@4.1.2) (2022-07-01)
+
+
+### Performance Improvements
+
+* refuse to use a resize-observer polyfill if it is not needed ([#120](https://github.com/core-ds/core-components/issues/120)) ([f2abcb2](https://github.com/core-ds/core-components/commit/f2abcb2888dd5906b345f5fc64b1624eef56ac13))
+
+
+
+
+
+## [4.1.1](https://github.com/core-ds/core-components/compare/@alfalab/core-components-base-modal@4.1.0...@alfalab/core-components-base-modal@4.1.1) (2022-06-30)
+
+
+### Bug Fixes
+
+* **base-modal:** fixed outside modal click ([#115](https://github.com/core-ds/core-components/issues/115)) ([6a08f72](https://github.com/core-ds/core-components/commit/6a08f726521dcd9a310b0e06345950429eac246a))
+
+
+
+
+
+# [4.1.0](https://github.com/core-ds/core-components/compare/@alfalab/core-components-base-modal@4.0.2...@alfalab/core-components-base-modal@4.1.0) (2022-06-28)
+
+
+### Features
+
+* circumflexus retrieval ([#57](https://github.com/core-ds/core-components/issues/57)) ([3820da8](https://github.com/core-ds/core-components/commit/3820da818bcdcbee6904c648b3e29c3c828fe202))
+
+
+
+
+
 # [4.0.0](https://github.com/core-ds/core-components/compare/@alfalab/core-components-base-modal@3.2.0...@alfalab/core-components-base-modal@4.0.0) (2022-03-24)
 
 

package/dist/Component.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var cn = require('classnames');
 var mergeRefs = require('react-merge-refs');
-var resizeObserver = require('resize-observer');
+var resizeObserver = require('@juggle/resize-observer');
 var reactTransitionGroup = require('react-transition-group');
 var FocusLock = require('react-focus-lock');
 var coreComponentsPortal = require('@alfalab/core-components-portal');
@@ -48,7 +48,7 @@ var __assign = function () {
     return __assign.apply(this, arguments);
 };
 
-var styles = {"component":"base-modal__component_1o875","wrapper":"base-modal__wrapper_1o875","content":"base-modal__content_1o875","hidden":"base-modal__hidden_1o875","backdrop":"base-modal__backdrop_1o875","appear":"base-modal__appear_1o875","enter":"base-modal__enter_1o875","appearActive":"base-modal__appearActive_1o875","enterActive":"base-modal__enterActive_1o875","exit":"base-modal__exit_1o875","exitActive":"base-modal__exitActive_1o875","exitDone":"base-modal__exitDone_1o875"};
+var styles = {"component":"base-modal__component_8t6ig","wrapper":"base-modal__wrapper_8t6ig","content":"base-modal__content_8t6ig","hidden":"base-modal__hidden_8t6ig","backdrop":"base-modal__backdrop_8t6ig","appear":"base-modal__appear_8t6ig","enter":"base-modal__enter_8t6ig","appearActive":"base-modal__appearActive_8t6ig","enterActive":"base-modal__enterActive_8t6ig","exit":"base-modal__exit_8t6ig","exitActive":"base-modal__exitActive_8t6ig","exitDone":"base-modal__exitDone_8t6ig"};
 require('./index.css')
 
 var BaseModalContext = React__default['default'].createContext({
@@ -64,6 +64,7 @@ var BaseModalContext = React__default['default'].createContext({
     setHasFooter: function () { return null; },
     onClose: function () { return null; },
 });
+var ResizeObserver = window.ResizeObserver || resizeObserver.ResizeObserver;
 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];
@@ -78,6 +79,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
     var scrollableNodeRef = React.useRef(null);
     var contentNodeRef = React.useRef(null);
     var restoreContainerStylesRef = React.useRef(null);
+    var mouseDownTarget = React.useRef();
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = utils.hasScrollbar(scrollableNodeRef.current);
@@ -89,23 +91,23 @@ var BaseModal = React.forwardRef(function (_a, ref) {
     var getContainer = React.useCallback(function () {
         return (container ? container() : document.body);
     }, [container]);
-    var resizeObserver$1 = React.useMemo(function () { return new resizeObserver.ResizeObserver(checkToHasScrollBar); }, []);
+    var resizeObserver = React.useMemo(function () { return new ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = React.useCallback(function () {
         if (scrollableNodeRef.current)
-            resizeObserver$1.observe(scrollableNodeRef.current);
+            resizeObserver.observe(scrollableNodeRef.current);
         if (contentNodeRef.current)
-            resizeObserver$1.observe(contentNodeRef.current);
-    }, [resizeObserver$1]);
+            resizeObserver.observe(contentNodeRef.current);
+    }, [resizeObserver]);
     var removeResizeHandle = React.useCallback(function () {
-        resizeObserver$1.disconnect();
-    }, [resizeObserver$1]);
+        resizeObserver.disconnect();
+    }, [resizeObserver]);
     var contentRef = React.useCallback(function (node) {
         if (node !== null) {
             contentNodeRef.current = node;
-            resizeObserver$1.observe(node);
+            resizeObserver.observe(node);
             checkToHasScrollBar();
         }
-    }, [resizeObserver$1]);
+    }, [resizeObserver]);
     var handleScroll = React.useCallback(function () {
         if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
@@ -131,8 +133,15 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
-    var handleBackdropClick = function (event) {
-        if (!disableBackdropClick && event.target === wrapperRef.current) {
+    var handleBackdropMouseDown = function (event) {
+        if (!disableBackdropClick) {
+            mouseDownTarget.current = event.target;
+        }
+    };
+    var handleBackdropMouseUp = function (event) {
+        if (!disableBackdropClick &&
+            event.target === wrapperRef.current &&
+            mouseDownTarget.current === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -203,7 +212,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
             if (restoreContainerStylesRef.current) {
                 restoreContainerStylesRef.current();
             }
-            resizeObserver$1.disconnect();
+            resizeObserver.disconnect();
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -242,7 +251,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
                         } }))),
                     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, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
+                            _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },
                         React__default['default'].createElement(reactTransitionGroup.CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),

package/dist/cssm/Component.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var cn = require('classnames');
 var mergeRefs = require('react-merge-refs');
-var resizeObserver = require('resize-observer');
+var resizeObserver = require('@juggle/resize-observer');
 var reactTransitionGroup = require('react-transition-group');
 var FocusLock = require('react-focus-lock');
 var coreComponentsPortal = require('@alfalab/core-components-portal/dist/cssm');
@@ -63,6 +63,7 @@ var BaseModalContext = React__default['default'].createContext({
     setHasFooter: function () { return null; },
     onClose: function () { return null; },
 });
+var ResizeObserver = window.ResizeObserver || resizeObserver.ResizeObserver;
 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];
@@ -77,6 +78,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
     var scrollableNodeRef = React.useRef(null);
     var contentNodeRef = React.useRef(null);
     var restoreContainerStylesRef = React.useRef(null);
+    var mouseDownTarget = React.useRef();
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = utils.hasScrollbar(scrollableNodeRef.current);
@@ -88,23 +90,23 @@ var BaseModal = React.forwardRef(function (_a, ref) {
     var getContainer = React.useCallback(function () {
         return (container ? container() : document.body);
     }, [container]);
-    var resizeObserver$1 = React.useMemo(function () { return new resizeObserver.ResizeObserver(checkToHasScrollBar); }, []);
+    var resizeObserver = React.useMemo(function () { return new ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = React.useCallback(function () {
         if (scrollableNodeRef.current)
-            resizeObserver$1.observe(scrollableNodeRef.current);
+            resizeObserver.observe(scrollableNodeRef.current);
         if (contentNodeRef.current)
-            resizeObserver$1.observe(contentNodeRef.current);
-    }, [resizeObserver$1]);
+            resizeObserver.observe(contentNodeRef.current);
+    }, [resizeObserver]);
     var removeResizeHandle = React.useCallback(function () {
-        resizeObserver$1.disconnect();
-    }, [resizeObserver$1]);
+        resizeObserver.disconnect();
+    }, [resizeObserver]);
     var contentRef = React.useCallback(function (node) {
         if (node !== null) {
             contentNodeRef.current = node;
-            resizeObserver$1.observe(node);
+            resizeObserver.observe(node);
             checkToHasScrollBar();
         }
-    }, [resizeObserver$1]);
+    }, [resizeObserver]);
     var handleScroll = React.useCallback(function () {
         if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
@@ -130,8 +132,15 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
-    var handleBackdropClick = function (event) {
-        if (!disableBackdropClick && event.target === wrapperRef.current) {
+    var handleBackdropMouseDown = function (event) {
+        if (!disableBackdropClick) {
+            mouseDownTarget.current = event.target;
+        }
+    };
+    var handleBackdropMouseUp = function (event) {
+        if (!disableBackdropClick &&
+            event.target === wrapperRef.current &&
+            mouseDownTarget.current === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -202,7 +211,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
             if (restoreContainerStylesRef.current) {
                 restoreContainerStylesRef.current();
             }
-            resizeObserver$1.disconnect();
+            resizeObserver.disconnect();
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -241,7 +250,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
                         } }))),
                     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, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
+                            _a)), ref: mergeRefs__default['default']([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },
                         React__default['default'].createElement(reactTransitionGroup.CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles__default['default'] }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),

package/dist/cssm/index.js

@@ -6,7 +6,7 @@ var Component = require('./Component.js');
 require('react');
 require('classnames');
 require('react-merge-refs');
-require('resize-observer');
+require('@juggle/resize-observer');
 require('react-transition-group');
 require('react-focus-lock');
 require('@alfalab/core-components-portal/dist/cssm');

package/dist/esm/Component.js

@@ -1,7 +1,7 @@
 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';
+import { ResizeObserver as ResizeObserver$1 } from '@juggle/resize-observer';
 import { CSSTransition } from 'react-transition-group';
 import FocusLock from 'react-focus-lock';
 import { Portal } from '@alfalab/core-components-portal/dist/esm';
@@ -37,7 +37,7 @@ var __assign = function () {
     return __assign.apply(this, arguments);
 };
 
-var styles = {"component":"base-modal__component_1o875","wrapper":"base-modal__wrapper_1o875","content":"base-modal__content_1o875","hidden":"base-modal__hidden_1o875","backdrop":"base-modal__backdrop_1o875","appear":"base-modal__appear_1o875","enter":"base-modal__enter_1o875","appearActive":"base-modal__appearActive_1o875","enterActive":"base-modal__enterActive_1o875","exit":"base-modal__exit_1o875","exitActive":"base-modal__exitActive_1o875","exitDone":"base-modal__exitDone_1o875"};
+var styles = {"component":"base-modal__component_8t6ig","wrapper":"base-modal__wrapper_8t6ig","content":"base-modal__content_8t6ig","hidden":"base-modal__hidden_8t6ig","backdrop":"base-modal__backdrop_8t6ig","appear":"base-modal__appear_8t6ig","enter":"base-modal__enter_8t6ig","appearActive":"base-modal__appearActive_8t6ig","enterActive":"base-modal__enterActive_8t6ig","exit":"base-modal__exit_8t6ig","exitActive":"base-modal__exitActive_8t6ig","exitDone":"base-modal__exitDone_8t6ig"};
 require('./index.css')
 
 var BaseModalContext = React.createContext({
@@ -53,6 +53,7 @@ var BaseModalContext = React.createContext({
     setHasFooter: function () { return null; },
     onClose: function () { return null; },
 });
+var ResizeObserver = window.ResizeObserver || ResizeObserver$1;
 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];
@@ -67,6 +68,7 @@ var BaseModal = forwardRef(function (_a, ref) {
     var scrollableNodeRef = useRef(null);
     var contentNodeRef = useRef(null);
     var restoreContainerStylesRef = useRef(null);
+    var mouseDownTarget = useRef();
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = hasScrollbar(scrollableNodeRef.current);
@@ -120,8 +122,15 @@ var BaseModal = forwardRef(function (_a, ref) {
         }
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
-    var handleBackdropClick = function (event) {
-        if (!disableBackdropClick && event.target === wrapperRef.current) {
+    var handleBackdropMouseDown = function (event) {
+        if (!disableBackdropClick) {
+            mouseDownTarget.current = event.target;
+        }
+    };
+    var handleBackdropMouseUp = function (event) {
+        if (!disableBackdropClick &&
+            event.target === wrapperRef.current &&
+            mouseDownTarget.current === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -231,7 +240,7 @@ var BaseModal = forwardRef(function (_a, ref) {
                         } }))),
                     React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, (_a = {},
                             _a[styles.hidden] = !open && exited,
-                            _a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
+                            _a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                             zIndex: computedZIndex,
                         } },
                         React.createElement(CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),

package/dist/esm/index.css

@@ -1,4 +1,4 @@
-/* hash: 1jd4u */
+/* hash: a8jqp */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_1o875 {
+.base-modal__component_8t6ig {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_1o875 {
+.base-modal__wrapper_8t6ig {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_1o875 {
+.base-modal__content_8t6ig {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_1o875 {
+.base-modal__hidden_8t6ig {
     display: none;
 }
-.base-modal__backdrop_1o875 {
+.base-modal__backdrop_8t6ig {
     z-index: 0;
 }
-.base-modal__appear_1o875,
-.base-modal__enter_1o875 {
+.base-modal__appear_8t6ig,
+.base-modal__enter_8t6ig {
     opacity: 0;
 }
-.base-modal__appearActive_1o875,
-.base-modal__enterActive_1o875 {
+.base-modal__appearActive_8t6ig,
+.base-modal__enterActive_8t6ig {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_1o875 {
+.base-modal__exit_8t6ig {
     opacity: 1;
 }
-.base-modal__exitActive_1o875,
-.base-modal__exitDone_1o875 {
+.base-modal__exitActive_8t6ig,
+.base-modal__exitDone_8t6ig {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/esm/index.js

@@ -2,7 +2,7 @@ export { BaseModal, BaseModalContext } from './Component.js';
 import 'react';
 import 'classnames';
 import 'react-merge-refs';
-import 'resize-observer';
+import '@juggle/resize-observer';
 import 'react-transition-group';
 import 'react-focus-lock';
 import '@alfalab/core-components-portal/dist/esm';

package/dist/index.css

@@ -1,4 +1,4 @@
-/* hash: 1jd4u */
+/* hash: a8jqp */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_1o875 {
+.base-modal__component_8t6ig {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_1o875 {
+.base-modal__wrapper_8t6ig {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_1o875 {
+.base-modal__content_8t6ig {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_1o875 {
+.base-modal__hidden_8t6ig {
     display: none;
 }
-.base-modal__backdrop_1o875 {
+.base-modal__backdrop_8t6ig {
     z-index: 0;
 }
-.base-modal__appear_1o875,
-.base-modal__enter_1o875 {
+.base-modal__appear_8t6ig,
+.base-modal__enter_8t6ig {
     opacity: 0;
 }
-.base-modal__appearActive_1o875,
-.base-modal__enterActive_1o875 {
+.base-modal__appearActive_8t6ig,
+.base-modal__enterActive_8t6ig {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_1o875 {
+.base-modal__exit_8t6ig {
     opacity: 1;
 }
-.base-modal__exitActive_1o875,
-.base-modal__exitDone_1o875 {
+.base-modal__exitActive_8t6ig,
+.base-modal__exitDone_8t6ig {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/index.js

@@ -6,7 +6,7 @@ var Component = require('./Component.js');
 require('react');
 require('classnames');
 require('react-merge-refs');
-require('resize-observer');
+require('@juggle/resize-observer');
 require('react-transition-group');
 require('react-focus-lock');
 require('@alfalab/core-components-portal');

package/dist/modern/Component.js

@@ -1,7 +1,7 @@
 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';
+import { ResizeObserver as ResizeObserver$1 } from '@juggle/resize-observer';
 import { CSSTransition } from 'react-transition-group';
 import FocusLock from 'react-focus-lock';
 import { Portal } from '@alfalab/core-components-portal/dist/modern';
@@ -10,7 +10,7 @@ import { stackingOrder, Stack } from '@alfalab/core-components-stack/dist/modern
 import '@alfalab/core-components-global-store/dist/modern';
 import { isScrolledToTop, isScrolledToBottom, handleContainer, restoreContainerStyles, hasScrollbar } from './utils.js';
 
-var styles = {"component":"base-modal__component_1o875","wrapper":"base-modal__wrapper_1o875","content":"base-modal__content_1o875","hidden":"base-modal__hidden_1o875","backdrop":"base-modal__backdrop_1o875","appear":"base-modal__appear_1o875","enter":"base-modal__enter_1o875","appearActive":"base-modal__appearActive_1o875","enterActive":"base-modal__enterActive_1o875","exit":"base-modal__exit_1o875","exitActive":"base-modal__exitActive_1o875","exitDone":"base-modal__exitDone_1o875"};
+var styles = {"component":"base-modal__component_8t6ig","wrapper":"base-modal__wrapper_8t6ig","content":"base-modal__content_8t6ig","hidden":"base-modal__hidden_8t6ig","backdrop":"base-modal__backdrop_8t6ig","appear":"base-modal__appear_8t6ig","enter":"base-modal__enter_8t6ig","appearActive":"base-modal__appearActive_8t6ig","enterActive":"base-modal__enterActive_8t6ig","exit":"base-modal__exit_8t6ig","exitActive":"base-modal__exitActive_8t6ig","exitDone":"base-modal__exitDone_8t6ig"};
 require('./index.css')
 
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
@@ -27,6 +27,7 @@ const BaseModalContext = React.createContext({
     setHasFooter: () => null,
     onClose: () => null,
 });
+const ResizeObserver = window.ResizeObserver || ResizeObserver$1;
 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);
@@ -40,6 +41,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
     const scrollableNodeRef = useRef(null);
     const contentNodeRef = useRef(null);
     const restoreContainerStylesRef = useRef(null);
+    const mouseDownTarget = useRef();
     const checkToHasScrollBar = () => {
         if (scrollableNodeRef.current) {
             const scrollExists = hasScrollbar(scrollableNodeRef.current);
@@ -93,8 +95,15 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         }
         return null;
     }, [onBackdropClick, onClose, onEscapeKeyDown]);
-    const handleBackdropClick = (event) => {
-        if (!disableBackdropClick && event.target === wrapperRef.current) {
+    const handleBackdropMouseDown = (event) => {
+        if (!disableBackdropClick) {
+            mouseDownTarget.current = event.target;
+        }
+    };
+    const handleBackdropMouseUp = (event) => {
+        if (!disableBackdropClick &&
+            event.target === wrapperRef.current &&
+            mouseDownTarget.current === wrapperRef.current) {
             handleClose(event, 'backdropClick');
         }
     };
@@ -202,7 +211,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
                     } }))),
                 React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, {
                         [styles.hidden]: !open && exited,
-                    }), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onClick: handleBackdropClick, tabIndex: -1, "data-test-id": dataTestId, style: {
+                    }), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                         zIndex: computedZIndex,
                     } },
                     React.createElement(CSSTransition, Object.assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),

package/dist/modern/index.css

@@ -1,4 +1,4 @@
-/* hash: 1jd4u */
+/* hash: a8jqp */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_1o875 {
+.base-modal__component_8t6ig {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_1o875 {
+.base-modal__wrapper_8t6ig {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_1o875 {
+.base-modal__content_8t6ig {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_1o875 {
+.base-modal__hidden_8t6ig {
     display: none;
 }
-.base-modal__backdrop_1o875 {
+.base-modal__backdrop_8t6ig {
     z-index: 0;
 }
-.base-modal__appear_1o875,
-.base-modal__enter_1o875 {
+.base-modal__appear_8t6ig,
+.base-modal__enter_8t6ig {
     opacity: 0;
 }
-.base-modal__appearActive_1o875,
-.base-modal__enterActive_1o875 {
+.base-modal__appearActive_8t6ig,
+.base-modal__enterActive_8t6ig {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_1o875 {
+.base-modal__exit_8t6ig {
     opacity: 1;
 }
-.base-modal__exitActive_1o875,
-.base-modal__exitDone_1o875 {
+.base-modal__exitActive_8t6ig,
+.base-modal__exitDone_8t6ig {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/modern/index.js

@@ -1,7 +1,7 @@
 import 'react';
 import 'classnames';
 import 'react-merge-refs';
-import 'resize-observer';
+import '@juggle/resize-observer';
 import 'react-transition-group';
 import 'react-focus-lock';
 import '@alfalab/core-components-portal/dist/modern';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-base-modal",
-    "version": "4.0.2",
+    "version": "4.1.2",
     "description": "BaseModal component",
     "keywords": [],
     "license": "MIT",
@@ -15,15 +15,15 @@
         "access": "public"
     },
     "dependencies": {
-        "@alfalab/core-components-backdrop": "^2.0.3",
+        "@alfalab/core-components-backdrop": "^2.1.0",
         "@alfalab/core-components-global-store": "^1.1.1",
-        "@alfalab/core-components-portal": "^2.0.2",
-        "@alfalab/core-components-stack": "^3.0.2",
-        "classnames": "2.2.6",
-        "react-focus-lock": "2.5.0",
-        "react-merge-refs": "1.1.0",
-        "react-transition-group": "4.4.1",
-        "resize-observer": "1.0.0"
+        "@alfalab/core-components-portal": "^2.0.3",
+        "@alfalab/core-components-stack": "^3.0.3",
+        "@juggle/resize-observer": "^3.3.1",
+        "classnames": "^2.2.6",
+        "react-focus-lock": "^2.5.0",
+        "react-merge-refs": "^1.1.0",
+        "react-transition-group": "^4.4.1"
     },
     "devDependencies": {
         "@types/react-transition-group": "^4.2.4"
@@ -31,5 +31,5 @@
     "peerDependencies": {
         "react": "^16.9.0 || ^17.0.1"
     },
-    "gitHead": "8d998af881e79e8b524179aa50cdb117c1380c74"
+    "gitHead": "a1e54f5b2894447f4a6c80347706c27f855d5710"
 }