@alfalab/core-components-base-modal 4.1.1 → 4.1.4

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.4](https://github.com/core-ds/core-components/compare/@alfalab/core-components-base-modal@4.1.3...@alfalab/core-components-base-modal@4.1.4) (2022-07-14)
+
+
+### Bug Fixes
+
+* **base-modal:** fix overflow hidden bug ([#128](https://github.com/core-ds/core-components/issues/128)) ([eb953b9](https://github.com/core-ds/core-components/commit/eb953b9866dae8c28bf8265d6884cdf1544ae63c))
+
+
+
+
+
+## [4.1.3](https://github.com/core-ds/core-components/compare/@alfalab/core-components-base-modal@4.1.2...@alfalab/core-components-base-modal@4.1.3) (2022-07-11)
+
+
+### Bug Fixes
+
+* **base-modal:** fix using resize observer ([#136](https://github.com/core-ds/core-components/issues/136)) ([cb8f03c](https://github.com/core-ds/core-components/commit/cb8f03ca55394316189d1d4529ee3fdb691538d9))
+* fixed 'window is not defined' error ([#126](https://github.com/core-ds/core-components/issues/126)) ([f4e9ca5](https://github.com/core-ds/core-components/commit/f4e9ca54ed52fb328d21c85b7efa8176a90dcb6e))
+
+
+
+
+
+## [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)
 
 

package/{dist/Component.js → 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_15icx","wrapper":"base-modal__wrapper_15icx","content":"base-modal__content_15icx","hidden":"base-modal__hidden_15icx","backdrop":"base-modal__backdrop_15icx","appear":"base-modal__appear_15icx","enter":"base-modal__enter_15icx","appearActive":"base-modal__appearActive_15icx","enterActive":"base-modal__enterActive_15icx","exit":"base-modal__exit_15icx","exitActive":"base-modal__exitActive_15icx","exitDone":"base-modal__exitDone_15icx"};
+var styles = {"component":"base-modal__component_1bawz","wrapper":"base-modal__wrapper_1bawz","content":"base-modal__content_1bawz","hidden":"base-modal__hidden_1bawz","backdrop":"base-modal__backdrop_1bawz","appear":"base-modal__appear_1bawz","enter":"base-modal__enter_1bawz","appearActive":"base-modal__appearActive_1bawz","enterActive":"base-modal__enterActive_1bawz","exit":"base-modal__exit_1bawz","exitActive":"base-modal__exitActive_1bawz","exitDone":"base-modal__exitDone_1bawz"};
 require('./index.css')
 
 var BaseModalContext = React__default['default'].createContext({
@@ -66,7 +66,7 @@ var BaseModalContext = React__default['default'].createContext({
 });
 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 _o = React.useState(null), 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];
@@ -79,6 +79,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
     var contentNodeRef = React.useRef(null);
     var restoreContainerStylesRef = React.useRef(null);
     var mouseDownTarget = React.useRef();
+    var resizeObserverRef = React.useRef();
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = utils.hasScrollbar(scrollableNodeRef.current);
@@ -86,27 +87,31 @@ 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]);
-    var resizeObserver$1 = React.useMemo(function () { return new resizeObserver.ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = React.useCallback(function () {
-        if (scrollableNodeRef.current)
-            resizeObserver$1.observe(scrollableNodeRef.current);
-        if (contentNodeRef.current)
-            resizeObserver$1.observe(contentNodeRef.current);
-    }, [resizeObserver$1]);
-    var removeResizeHandle = React.useCallback(function () {
-        resizeObserver$1.disconnect();
-    }, [resizeObserver$1]);
+        if (!resizeObserverRef.current)
+            return;
+        if (scrollableNodeRef.current) {
+            resizeObserverRef.current.observe(scrollableNodeRef.current);
+        }
+        if (contentNodeRef.current) {
+            resizeObserverRef.current.observe(contentNodeRef.current);
+        }
+    }, []);
+    var removeResizeHandle = React.useCallback(function () { var _a; return (_a = resizeObserverRef.current) === null || _a === void 0 ? void 0 : _a.disconnect(); }, []);
     var contentRef = React.useCallback(function (node) {
         if (node !== null) {
             contentNodeRef.current = node;
-            resizeObserver$1.observe(node);
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.observe(node);
+            }
             checkToHasScrollBar();
         }
-    }, [resizeObserver$1]);
+    }, []);
     var handleScroll = React.useCallback(function () {
         if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
@@ -195,25 +200,28 @@ 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());
-            };
+            if (isExited) {
+                var el_1 = getContainer();
+                utils.handleContainer(el_1);
+                restoreContainerStylesRef.current = function () {
+                    restoreContainerStylesRef.current = null;
+                    utils.restoreContainerStyles(el_1);
+                };
+                setExited(false);
+            }
         }
-    }, [getContainer, open]);
-    React.useEffect(function () {
-        if (open)
-            setExited(false);
-    }, [open]);
+    }, [getContainer, open, isExited]);
     React.useEffect(function () {
+        var ResizeObserver = window.ResizeObserver || resizeObserver.ResizeObserver;
+        resizeObserverRef.current = new ResizeObserver(checkToHasScrollBar);
         return function () {
             if (restoreContainerStylesRef.current) {
                 restoreContainerStylesRef.current();
             }
-            resizeObserver$1.disconnect();
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.disconnect();
+            }
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     var contextValue = React.useMemo(function () { return ({
         hasHeader: hasHeader,
@@ -249,7 +257,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/{dist/cssm → 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');
@@ -65,7 +65,7 @@ var BaseModalContext = React__default['default'].createContext({
 });
 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 _o = React.useState(null), 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];
@@ -78,6 +78,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
     var contentNodeRef = React.useRef(null);
     var restoreContainerStylesRef = React.useRef(null);
     var mouseDownTarget = React.useRef();
+    var resizeObserverRef = React.useRef();
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = utils.hasScrollbar(scrollableNodeRef.current);
@@ -85,27 +86,31 @@ 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]);
-    var resizeObserver$1 = React.useMemo(function () { return new resizeObserver.ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = React.useCallback(function () {
-        if (scrollableNodeRef.current)
-            resizeObserver$1.observe(scrollableNodeRef.current);
-        if (contentNodeRef.current)
-            resizeObserver$1.observe(contentNodeRef.current);
-    }, [resizeObserver$1]);
-    var removeResizeHandle = React.useCallback(function () {
-        resizeObserver$1.disconnect();
-    }, [resizeObserver$1]);
+        if (!resizeObserverRef.current)
+            return;
+        if (scrollableNodeRef.current) {
+            resizeObserverRef.current.observe(scrollableNodeRef.current);
+        }
+        if (contentNodeRef.current) {
+            resizeObserverRef.current.observe(contentNodeRef.current);
+        }
+    }, []);
+    var removeResizeHandle = React.useCallback(function () { var _a; return (_a = resizeObserverRef.current) === null || _a === void 0 ? void 0 : _a.disconnect(); }, []);
     var contentRef = React.useCallback(function (node) {
         if (node !== null) {
             contentNodeRef.current = node;
-            resizeObserver$1.observe(node);
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.observe(node);
+            }
             checkToHasScrollBar();
         }
-    }, [resizeObserver$1]);
+    }, []);
     var handleScroll = React.useCallback(function () {
         if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
@@ -194,25 +199,28 @@ 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());
-            };
+            if (isExited) {
+                var el_1 = getContainer();
+                utils.handleContainer(el_1);
+                restoreContainerStylesRef.current = function () {
+                    restoreContainerStylesRef.current = null;
+                    utils.restoreContainerStyles(el_1);
+                };
+                setExited(false);
+            }
         }
-    }, [getContainer, open]);
-    React.useEffect(function () {
-        if (open)
-            setExited(false);
-    }, [open]);
+    }, [getContainer, open, isExited]);
     React.useEffect(function () {
+        var ResizeObserver = window.ResizeObserver || resizeObserver.ResizeObserver;
+        resizeObserverRef.current = new ResizeObserver(checkToHasScrollBar);
         return function () {
             if (restoreContainerStylesRef.current) {
                 restoreContainerStylesRef.current();
             }
-            resizeObserver$1.disconnect();
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.disconnect();
+            }
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     var contextValue = React.useMemo(function () { return ({
         hasHeader: hasHeader,
@@ -248,7 +256,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/{dist/cssm → 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 → esm}/Component.js

@@ -1,7 +1,7 @@
-import React, { forwardRef, useState, useRef, useCallback, useMemo, useEffect } from 'react';
+import React, { forwardRef, useState, useRef, useCallback, useEffect, useMemo } from 'react';
 import cn from 'classnames';
 import mergeRefs from 'react-merge-refs';
-import { ResizeObserver } from 'resize-observer';
+import { ResizeObserver } 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_15icx","wrapper":"base-modal__wrapper_15icx","content":"base-modal__content_15icx","hidden":"base-modal__hidden_15icx","backdrop":"base-modal__backdrop_15icx","appear":"base-modal__appear_15icx","enter":"base-modal__enter_15icx","appearActive":"base-modal__appearActive_15icx","enterActive":"base-modal__enterActive_15icx","exit":"base-modal__exit_15icx","exitActive":"base-modal__exitActive_15icx","exitDone":"base-modal__exitDone_15icx"};
+var styles = {"component":"base-modal__component_1bawz","wrapper":"base-modal__wrapper_1bawz","content":"base-modal__content_1bawz","hidden":"base-modal__hidden_1bawz","backdrop":"base-modal__backdrop_1bawz","appear":"base-modal__appear_1bawz","enter":"base-modal__enter_1bawz","appearActive":"base-modal__appearActive_1bawz","enterActive":"base-modal__enterActive_1bawz","exit":"base-modal__exit_1bawz","exitActive":"base-modal__exitActive_1bawz","exitDone":"base-modal__exitDone_1bawz"};
 require('./index.css')
 
 var BaseModalContext = React.createContext({
@@ -55,7 +55,7 @@ var BaseModalContext = React.createContext({
 });
 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 _o = useState(null), 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];
@@ -68,6 +68,7 @@ var BaseModal = forwardRef(function (_a, ref) {
     var contentNodeRef = useRef(null);
     var restoreContainerStylesRef = useRef(null);
     var mouseDownTarget = useRef();
+    var resizeObserverRef = useRef();
     var checkToHasScrollBar = function () {
         if (scrollableNodeRef.current) {
             var scrollExists = hasScrollbar(scrollableNodeRef.current);
@@ -75,27 +76,31 @@ 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]);
-    var resizeObserver = useMemo(function () { return new ResizeObserver(checkToHasScrollBar); }, []);
     var addResizeHandle = useCallback(function () {
-        if (scrollableNodeRef.current)
-            resizeObserver.observe(scrollableNodeRef.current);
-        if (contentNodeRef.current)
-            resizeObserver.observe(contentNodeRef.current);
-    }, [resizeObserver]);
-    var removeResizeHandle = useCallback(function () {
-        resizeObserver.disconnect();
-    }, [resizeObserver]);
+        if (!resizeObserverRef.current)
+            return;
+        if (scrollableNodeRef.current) {
+            resizeObserverRef.current.observe(scrollableNodeRef.current);
+        }
+        if (contentNodeRef.current) {
+            resizeObserverRef.current.observe(contentNodeRef.current);
+        }
+    }, []);
+    var removeResizeHandle = useCallback(function () { var _a; return (_a = resizeObserverRef.current) === null || _a === void 0 ? void 0 : _a.disconnect(); }, []);
     var contentRef = useCallback(function (node) {
         if (node !== null) {
             contentNodeRef.current = node;
-            resizeObserver.observe(node);
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.observe(node);
+            }
             checkToHasScrollBar();
         }
-    }, [resizeObserver]);
+    }, []);
     var handleScroll = useCallback(function () {
         if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
@@ -184,25 +189,28 @@ var BaseModal = forwardRef(function (_a, ref) {
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     useEffect(function () {
         if (open) {
-            handleContainer(getContainer());
-            restoreContainerStylesRef.current = function () {
-                restoreContainerStylesRef.current = null;
-                restoreContainerStyles(getContainer());
-            };
+            if (isExited) {
+                var el_1 = getContainer();
+                handleContainer(el_1);
+                restoreContainerStylesRef.current = function () {
+                    restoreContainerStylesRef.current = null;
+                    restoreContainerStyles(el_1);
+                };
+                setExited(false);
+            }
         }
-    }, [getContainer, open]);
-    useEffect(function () {
-        if (open)
-            setExited(false);
-    }, [open]);
+    }, [getContainer, open, isExited]);
     useEffect(function () {
+        var ResizeObserver$1 = window.ResizeObserver || ResizeObserver;
+        resizeObserverRef.current = new ResizeObserver$1(checkToHasScrollBar);
         return function () {
             if (restoreContainerStylesRef.current) {
                 restoreContainerStylesRef.current();
             }
-            resizeObserver.disconnect();
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.disconnect();
+            }
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     var contextValue = useMemo(function () { return ({
         hasHeader: hasHeader,
@@ -238,7 +246,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/{dist/modern → esm}/index.css

@@ -1,4 +1,4 @@
-/* hash: 5o7wx */
+/* hash: 1i6t2 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_15icx {
+.base-modal__component_1bawz {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_15icx {
+.base-modal__wrapper_1bawz {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_15icx {
+.base-modal__content_1bawz {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_15icx {
+.base-modal__hidden_1bawz {
     display: none;
 }
-.base-modal__backdrop_15icx {
+.base-modal__backdrop_1bawz {
     z-index: 0;
 }
-.base-modal__appear_15icx,
-.base-modal__enter_15icx {
+.base-modal__appear_1bawz,
+.base-modal__enter_1bawz {
     opacity: 0;
 }
-.base-modal__appearActive_15icx,
-.base-modal__enterActive_15icx {
+.base-modal__appearActive_1bawz,
+.base-modal__enterActive_1bawz {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_15icx {
+.base-modal__exit_1bawz {
     opacity: 1;
 }
-.base-modal__exitActive_15icx,
-.base-modal__exitDone_15icx {
+.base-modal__exitActive_1bawz,
+.base-modal__exitDone_1bawz {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/{dist/esm → 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/esm/index.css → index.css}

@@ -1,4 +1,4 @@
-/* hash: 5o7wx */
+/* hash: 1i6t2 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_15icx {
+.base-modal__component_1bawz {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_15icx {
+.base-modal__wrapper_1bawz {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_15icx {
+.base-modal__content_1bawz {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_15icx {
+.base-modal__hidden_1bawz {
     display: none;
 }
-.base-modal__backdrop_15icx {
+.base-modal__backdrop_1bawz {
     z-index: 0;
 }
-.base-modal__appear_15icx,
-.base-modal__enter_15icx {
+.base-modal__appear_1bawz,
+.base-modal__enter_1bawz {
     opacity: 0;
 }
-.base-modal__appearActive_15icx,
-.base-modal__enterActive_15icx {
+.base-modal__appearActive_1bawz,
+.base-modal__enterActive_1bawz {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_15icx {
+.base-modal__exit_1bawz {
     opacity: 1;
 }
-.base-modal__exitActive_15icx,
-.base-modal__exitDone_15icx {
+.base-modal__exitActive_1bawz,
+.base-modal__exitDone_1bawz {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/{dist/index.js → 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 → modern}/Component.js

@@ -1,7 +1,7 @@
-import React, { forwardRef, useState, useRef, useCallback, useMemo, useEffect } from 'react';
+import React, { forwardRef, useState, useRef, useCallback, useEffect, useMemo } from 'react';
 import cn from 'classnames';
 import mergeRefs from 'react-merge-refs';
-import { ResizeObserver } from 'resize-observer';
+import { ResizeObserver } 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_15icx","wrapper":"base-modal__wrapper_15icx","content":"base-modal__content_15icx","hidden":"base-modal__hidden_15icx","backdrop":"base-modal__backdrop_15icx","appear":"base-modal__appear_15icx","enter":"base-modal__enter_15icx","appearActive":"base-modal__appearActive_15icx","enterActive":"base-modal__enterActive_15icx","exit":"base-modal__exit_15icx","exitActive":"base-modal__exitActive_15icx","exitDone":"base-modal__exitDone_15icx"};
+var styles = {"component":"base-modal__component_1bawz","wrapper":"base-modal__wrapper_1bawz","content":"base-modal__content_1bawz","hidden":"base-modal__hidden_1bawz","backdrop":"base-modal__backdrop_1bawz","appear":"base-modal__appear_1bawz","enter":"base-modal__enter_1bawz","appearActive":"base-modal__appearActive_1bawz","enterActive":"base-modal__enterActive_1bawz","exit":"base-modal__exit_1bawz","exitActive":"base-modal__exitActive_1bawz","exitDone":"base-modal__exitDone_1bawz"};
 require('./index.css')
 
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
@@ -28,7 +28,7 @@ const BaseModalContext = React.createContext({
     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, componentRef = null, }, ref) => {
-    const [exited, setExited] = useState(!open);
+    const [exited, setExited] = useState(null);
     const [hasScroll, setHasScroll] = useState(false);
     const [hasHeader, setHasHeader] = useState(false);
     const [hasFooter, setHasFooter] = useState(false);
@@ -41,6 +41,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
     const contentNodeRef = useRef(null);
     const restoreContainerStylesRef = useRef(null);
     const mouseDownTarget = useRef();
+    const resizeObserverRef = useRef();
     const checkToHasScrollBar = () => {
         if (scrollableNodeRef.current) {
             const scrollExists = hasScrollbar(scrollableNodeRef.current);
@@ -48,27 +49,31 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
             setHasScroll(scrollExists);
         }
     };
-    const shouldRender = keepMounted || open || !exited;
+    const isExited = exited || exited === null;
+    const shouldRender = keepMounted || open || !isExited;
     const getContainer = useCallback(() => {
         return (container ? container() : document.body);
     }, [container]);
-    const resizeObserver = useMemo(() => new ResizeObserver(checkToHasScrollBar), []);
     const addResizeHandle = useCallback(() => {
-        if (scrollableNodeRef.current)
-            resizeObserver.observe(scrollableNodeRef.current);
-        if (contentNodeRef.current)
-            resizeObserver.observe(contentNodeRef.current);
-    }, [resizeObserver]);
-    const removeResizeHandle = useCallback(() => {
-        resizeObserver.disconnect();
-    }, [resizeObserver]);
+        if (!resizeObserverRef.current)
+            return;
+        if (scrollableNodeRef.current) {
+            resizeObserverRef.current.observe(scrollableNodeRef.current);
+        }
+        if (contentNodeRef.current) {
+            resizeObserverRef.current.observe(contentNodeRef.current);
+        }
+    }, []);
+    const removeResizeHandle = useCallback(() => resizeObserverRef.current?.disconnect(), []);
     const contentRef = useCallback((node) => {
         if (node !== null) {
             contentNodeRef.current = node;
-            resizeObserver.observe(node);
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.observe(node);
+            }
             checkToHasScrollBar();
         }
-    }, [resizeObserver]);
+    }, []);
     const handleScroll = useCallback(() => {
         if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
@@ -157,25 +162,28 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
     }, [handleScroll, onUnmount, removeResizeHandle, transitionProps]);
     useEffect(() => {
         if (open) {
-            handleContainer(getContainer());
-            restoreContainerStylesRef.current = () => {
-                restoreContainerStylesRef.current = null;
-                restoreContainerStyles(getContainer());
-            };
+            if (isExited) {
+                const el = getContainer();
+                handleContainer(el);
+                restoreContainerStylesRef.current = () => {
+                    restoreContainerStylesRef.current = null;
+                    restoreContainerStyles(el);
+                };
+                setExited(false);
+            }
         }
-    }, [getContainer, open]);
-    useEffect(() => {
-        if (open)
-            setExited(false);
-    }, [open]);
+    }, [getContainer, open, isExited]);
     useEffect(() => {
+        const ResizeObserver$1 = window.ResizeObserver || ResizeObserver;
+        resizeObserverRef.current = new ResizeObserver$1(checkToHasScrollBar);
         return () => {
             if (restoreContainerStylesRef.current) {
                 restoreContainerStylesRef.current();
             }
-            resizeObserver.disconnect();
+            if (resizeObserverRef.current) {
+                resizeObserverRef.current.disconnect();
+            }
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     const contextValue = useMemo(() => ({
         hasHeader,
@@ -209,7 +217,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
                         zIndex: computedZIndex,
                     } }))),
                 React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, {
-                        [styles.hidden]: !open && exited,
+                        [styles.hidden]: !open && isExited,
                     }), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, tabIndex: -1, "data-test-id": dataTestId, style: {
                         zIndex: computedZIndex,
                     } },

package/{dist → modern}/index.css

@@ -1,4 +1,4 @@
-/* hash: 5o7wx */
+/* hash: 1i6t2 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_15icx {
+.base-modal__component_1bawz {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_15icx {
+.base-modal__wrapper_1bawz {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_15icx {
+.base-modal__content_1bawz {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_15icx {
+.base-modal__hidden_1bawz {
     display: none;
 }
-.base-modal__backdrop_15icx {
+.base-modal__backdrop_1bawz {
     z-index: 0;
 }
-.base-modal__appear_15icx,
-.base-modal__enter_15icx {
+.base-modal__appear_1bawz,
+.base-modal__enter_1bawz {
     opacity: 0;
 }
-.base-modal__appearActive_15icx,
-.base-modal__enterActive_15icx {
+.base-modal__appearActive_1bawz,
+.base-modal__enterActive_1bawz {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_15icx {
+.base-modal__exit_1bawz {
     opacity: 1;
 }
-.base-modal__exitActive_15icx,
-.base-modal__exitDone_15icx {
+.base-modal__exitActive_1bawz,
+.base-modal__exitDone_1bawz {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/{dist/modern → 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,35 +1,32 @@
 {
     "name": "@alfalab/core-components-base-modal",
-    "version": "4.1.1",
+    "version": "4.1.4",
     "description": "BaseModal component",
     "keywords": [],
     "license": "MIT",
-    "main": "dist/index.js",
-    "files": [
-        "dist"
-    ],
+    "main": "index.js",
     "scripts": {
-        "postinstall": "node ./dist/send-stats.js > /dev/null 2>&1 || exit 0"
+        "postinstall": "node ./send-stats.js > /dev/null 2>&1 || exit 0"
     },
     "publishConfig": {
-        "access": "public"
+        "access": "public",
+        "directory": "dist"
     },
     "dependencies": {
-        "@alfalab/core-components-backdrop": "^2.1.0",
-        "@alfalab/core-components-global-store": "^1.1.1",
-        "@alfalab/core-components-portal": "^2.0.3",
-        "@alfalab/core-components-stack": "^3.0.3",
+        "@alfalab/core-components-backdrop": "^2.1.1",
+        "@alfalab/core-components-global-store": "^1.1.2",
+        "@alfalab/core-components-portal": "^2.0.4",
+        "@alfalab/core-components-stack": "^3.0.4",
+        "@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",
-        "resize-observer": "^1.0.0"
+        "react-transition-group": "^4.4.1"
     },
     "devDependencies": {
         "@types/react-transition-group": "^4.2.4"
     },
     "peerDependencies": {
         "react": "^16.9.0 || ^17.0.1"
-    },
-    "gitHead": "7faa1479f68e818fde406010fe07b8ee126deffb"
+    }
 }