@alfalab/core-components 41.4.0-beta.0 → 41.4.0-beta.1

package/base-modal/Component.d.ts

@@ -83,11 +83,6 @@ type BaseModalProps = {
      * Пропсы для анимации (CSSTransition)
      */
     transitionProps?: Partial<TransitionProps>;
-    /**
-     * Рендерить ли в контейнер через портал.
-     * @default true
-     */
-    usePortal?: boolean;
     /**
      * Обработчик события нажатия на бэкдроп
      */

package/base-modal/Component.js

@@ -41,14 +41,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.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, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p;
-    var _q = React.useState(null), exited = _q[0], setExited = _q[1];
-    var _r = React.useState(false), hasScroll = _r[0], setHasScroll = _r[1];
-    var _s = React.useState(false), hasHeader = _s[0], setHasHeader = _s[1];
-    var _t = React.useState(false), hasFooter = _t[0], setHasFooter = _t[1];
-    var _u = React.useState(false), headerHighlighted = _u[0], setHeaderHighlighted = _u[1];
-    var _v = React.useState(false), footerHighlighted = _v[0], setFooterHighlighted = _v[1];
-    var _w = React.useState(0), headerOffset = _w[0], setHeaderOffset = _w[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);
@@ -231,27 +231,27 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         setHeaderOffset,
         handleClose,
     ]);
-    var renderContent = function () { return (React__default.default.createElement(coreComponentsStack.Stack, { value: zIndex }, function (computedZIndex) {
-        var _a;
-        return (React__default.default.createElement(BaseModalContext.Provider, { value: contextValue },
-            React__default.default.createElement(FocusLock__default.default, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
-                Backdrop && (React__default.default.createElement(Backdrop, tslib.__assign({}, backdropProps, { className: cn__default.default(backdropProps.className, styles.backdrop), open: open, style: {
-                        zIndex: computedZIndex,
-                    } }))),
-                React__default.default.createElement("div", { role: 'dialog', className: cn__default.default(styles.wrapper, wrapperClassName, (_a = {},
-                        _a[styles.hidden] = !open && isExited,
-                        _a)), ref: mergeRefs__default.default([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
-                    // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
-                    tabIndex: 0, "data-test-id": dataTestId, style: {
-                        zIndex: computedZIndex,
-                    } },
-                    React__default.default.createElement(reactTransitionGroup.CSSTransition, tslib.__assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                        React__default.default.createElement("div", { className: cn__default.default(styles.component, className), ref: mergeRefs__default.default([componentRef, componentNodeRef]) },
-                            React__default.default.createElement("div", { className: cn__default.default(styles.content, contentClassName) }, children)))))));
-    })); };
     if (!shouldRender)
         return null;
-    return usePortal ? (React__default.default.createElement(coreComponentsPortal.Portal, { getPortalContainer: container, immediateMount: true }, renderContent())) : (renderContent());
+    return (React__default.default.createElement(coreComponentsStack.Stack, { value: zIndex }, function (computedZIndex) {
+        var _a;
+        return (React__default.default.createElement(coreComponentsPortal.Portal, { getPortalContainer: container, immediateMount: true },
+            React__default.default.createElement(BaseModalContext.Provider, { value: contextValue },
+                React__default.default.createElement(FocusLock__default.default, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                    Backdrop && (React__default.default.createElement(Backdrop, tslib.__assign({}, backdropProps, { className: cn__default.default(backdropProps.className, styles.backdrop), open: open, style: {
+                            zIndex: computedZIndex,
+                        } }))),
+                    React__default.default.createElement("div", { role: 'dialog', className: cn__default.default(styles.wrapper, wrapperClassName, (_a = {},
+                            _a[styles.hidden] = !open && isExited,
+                            _a)), ref: mergeRefs__default.default([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
+                        // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+                        tabIndex: 0, "data-test-id": dataTestId, style: {
+                            zIndex: computedZIndex,
+                        } },
+                        React__default.default.createElement(reactTransitionGroup.CSSTransition, tslib.__assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
+                            React__default.default.createElement("div", { className: cn__default.default(styles.component, className), ref: mergeRefs__default.default([componentRef, componentNodeRef]) },
+                                React__default.default.createElement("div", { className: cn__default.default(styles.content, contentClassName) }, children))))))));
+    }));
 });
 
 exports.BaseModal = BaseModal;

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

@@ -83,11 +83,6 @@ type BaseModalProps = {
      * Пропсы для анимации (CSSTransition)
      */
     transitionProps?: Partial<TransitionProps>;
-    /**
-     * Рендерить ли в контейнер через портал.
-     * @default true
-     */
-    usePortal?: boolean;
     /**
      * Обработчик события нажатия на бэкдроп
      */

package/base-modal/cssm/Component.js

@@ -40,14 +40,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.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, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p;
-    var _q = React.useState(null), exited = _q[0], setExited = _q[1];
-    var _r = React.useState(false), hasScroll = _r[0], setHasScroll = _r[1];
-    var _s = React.useState(false), hasHeader = _s[0], setHasHeader = _s[1];
-    var _t = React.useState(false), hasFooter = _t[0], setHasFooter = _t[1];
-    var _u = React.useState(false), headerHighlighted = _u[0], setHeaderHighlighted = _u[1];
-    var _v = React.useState(false), footerHighlighted = _v[0], setFooterHighlighted = _v[1];
-    var _w = React.useState(0), headerOffset = _w[0], setHeaderOffset = _w[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);
@@ -230,27 +230,27 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         setHeaderOffset,
         handleClose,
     ]);
-    var renderContent = function () { return (React__default.default.createElement(coreComponentsStack.Stack, { value: zIndex }, function (computedZIndex) {
-        var _a;
-        return (React__default.default.createElement(BaseModalContext.Provider, { value: contextValue },
-            React__default.default.createElement(FocusLock__default.default, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
-                Backdrop && (React__default.default.createElement(Backdrop, tslib.__assign({}, backdropProps, { className: cn__default.default(backdropProps.className, styles__default.default.backdrop), open: open, style: {
-                        zIndex: computedZIndex,
-                    } }))),
-                React__default.default.createElement("div", { role: 'dialog', className: cn__default.default(styles__default.default.wrapper, wrapperClassName, (_a = {},
-                        _a[styles__default.default.hidden] = !open && isExited,
-                        _a)), ref: mergeRefs__default.default([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
-                    // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
-                    tabIndex: 0, "data-test-id": dataTestId, style: {
-                        zIndex: computedZIndex,
-                    } },
-                    React__default.default.createElement(reactTransitionGroup.CSSTransition, tslib.__assign({ appear: true, timeout: 200, classNames: styles__default.default }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                        React__default.default.createElement("div", { className: cn__default.default(styles__default.default.component, className), ref: mergeRefs__default.default([componentRef, componentNodeRef]) },
-                            React__default.default.createElement("div", { className: cn__default.default(styles__default.default.content, contentClassName) }, children)))))));
-    })); };
     if (!shouldRender)
         return null;
-    return usePortal ? (React__default.default.createElement(coreComponentsPortal.Portal, { getPortalContainer: container, immediateMount: true }, renderContent())) : (renderContent());
+    return (React__default.default.createElement(coreComponentsStack.Stack, { value: zIndex }, function (computedZIndex) {
+        var _a;
+        return (React__default.default.createElement(coreComponentsPortal.Portal, { getPortalContainer: container, immediateMount: true },
+            React__default.default.createElement(BaseModalContext.Provider, { value: contextValue },
+                React__default.default.createElement(FocusLock__default.default, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                    Backdrop && (React__default.default.createElement(Backdrop, tslib.__assign({}, backdropProps, { className: cn__default.default(backdropProps.className, styles__default.default.backdrop), open: open, style: {
+                            zIndex: computedZIndex,
+                        } }))),
+                    React__default.default.createElement("div", { role: 'dialog', className: cn__default.default(styles__default.default.wrapper, wrapperClassName, (_a = {},
+                            _a[styles__default.default.hidden] = !open && isExited,
+                            _a)), ref: mergeRefs__default.default([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
+                        // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+                        tabIndex: 0, "data-test-id": dataTestId, style: {
+                            zIndex: computedZIndex,
+                        } },
+                        React__default.default.createElement(reactTransitionGroup.CSSTransition, tslib.__assign({ appear: true, timeout: 200, classNames: styles__default.default }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
+                            React__default.default.createElement("div", { className: cn__default.default(styles__default.default.component, className), ref: mergeRefs__default.default([componentRef, componentNodeRef]) },
+                                React__default.default.createElement("div", { className: cn__default.default(styles__default.default.content, contentClassName) }, children))))))));
+    }));
 });
 
 exports.BaseModal = BaseModal;

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

@@ -83,11 +83,6 @@ type BaseModalProps = {
      * Пропсы для анимации (CSSTransition)
      */
     transitionProps?: Partial<TransitionProps>;
-    /**
-     * Рендерить ли в контейнер через портал.
-     * @default true
-     */
-    usePortal?: boolean;
     /**
      * Обработчик события нажатия на бэкдроп
      */

package/base-modal/esm/Component.js

@@ -32,14 +32,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.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, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p;
-    var _q = useState(null), exited = _q[0], setExited = _q[1];
-    var _r = useState(false), hasScroll = _r[0], setHasScroll = _r[1];
-    var _s = useState(false), hasHeader = _s[0], setHasHeader = _s[1];
-    var _t = useState(false), hasFooter = _t[0], setHasFooter = _t[1];
-    var _u = useState(false), headerHighlighted = _u[0], setHeaderHighlighted = _u[1];
-    var _v = useState(false), footerHighlighted = _v[0], setFooterHighlighted = _v[1];
-    var _w = useState(0), headerOffset = _w[0], setHeaderOffset = _w[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);
@@ -222,27 +222,27 @@ var BaseModal = forwardRef(function (_a, ref) {
         setHeaderOffset,
         handleClose,
     ]);
-    var renderContent = function () { return (React.createElement(Stack, { value: zIndex }, function (computedZIndex) {
-        var _a;
-        return (React.createElement(BaseModalContext.Provider, { value: contextValue },
-            React.createElement(FocusLock, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
-                Backdrop$1 && (React.createElement(Backdrop$1, __assign({}, backdropProps, { className: cn(backdropProps.className, styles.backdrop), open: open, style: {
-                        zIndex: computedZIndex,
-                    } }))),
-                React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, (_a = {},
-                        _a[styles.hidden] = !open && isExited,
-                        _a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
-                    // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
-                    tabIndex: 0, "data-test-id": dataTestId, style: {
-                        zIndex: computedZIndex,
-                    } },
-                    React.createElement(CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                        React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
-                            React.createElement("div", { className: cn(styles.content, contentClassName) }, children)))))));
-    })); };
     if (!shouldRender)
         return null;
-    return usePortal ? (React.createElement(Portal, { getPortalContainer: container, immediateMount: true }, renderContent())) : (renderContent());
+    return (React.createElement(Stack, { value: zIndex }, function (computedZIndex) {
+        var _a;
+        return (React.createElement(Portal, { getPortalContainer: container, immediateMount: true },
+            React.createElement(BaseModalContext.Provider, { value: contextValue },
+                React.createElement(FocusLock, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                    Backdrop$1 && (React.createElement(Backdrop$1, __assign({}, backdropProps, { className: cn(backdropProps.className, styles.backdrop), open: open, style: {
+                            zIndex: computedZIndex,
+                        } }))),
+                    React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, (_a = {},
+                            _a[styles.hidden] = !open && isExited,
+                            _a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
+                        // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+                        tabIndex: 0, "data-test-id": dataTestId, style: {
+                            zIndex: computedZIndex,
+                        } },
+                        React.createElement(CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
+                            React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
+                                React.createElement("div", { className: cn(styles.content, contentClassName) }, children))))))));
+    }));
 });
 
 export { BaseModal, BaseModalContext };

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

@@ -83,11 +83,6 @@ type BaseModalProps = {
      * Пропсы для анимации (CSSTransition)
      */
     transitionProps?: Partial<TransitionProps>;
-    /**
-     * Рендерить ли в контейнер через портал.
-     * @default true
-     */
-    usePortal?: boolean;
     /**
      * Обработчик события нажатия на бэкдроп
      */

package/base-modal/modern/Component.js

@@ -6,7 +6,7 @@ import { ResizeObserver } from '@juggle/resize-observer';
 import cn from 'classnames';
 import { Backdrop } from '../../backdrop/modern';
 import { Portal } from '../../portal/modern';
-import { stackingOrder, Stack } from '../../stack/modern';
+import { Stack, stackingOrder } from '../../stack/modern';
 import { isScrolledToTop, isScrolledToBottom, handleContainer, restoreContainerStyles, hasScrollbar, getScrollbarSize } from './utils.js';
 import './matches-polyfill.js';
 import '../../global-store/modern';
@@ -31,7 +31,7 @@ const BaseModalContext = React.createContext({
     setHasFooter: () => null,
     onClose: () => null,
 });
-const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, disableBlockingScroll = false, keepMounted = false, className, contentClassName, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, componentRef = null, usePortal = true, }, ref) => {
+const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, disableBlockingScroll = false, keepMounted = false, className, contentClassName, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, componentRef = null, }, ref) => {
     const [exited, setExited] = useState(null);
     const [hasScroll, setHasScroll] = useState(false);
     const [hasHeader, setHasHeader] = useState(false);
@@ -220,24 +220,24 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         setHeaderOffset,
         handleClose,
     ]);
-    const renderContent = () => (React.createElement(Stack, { value: zIndex }, (computedZIndex) => (React.createElement(BaseModalContext.Provider, { value: contextValue },
-        React.createElement(FocusLock, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
-            Backdrop$1 && (React.createElement(Backdrop$1, { ...backdropProps, className: cn(backdropProps.className, styles.backdrop), open: open, style: {
-                    zIndex: computedZIndex,
-                } })),
-            React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, {
-                    [styles.hidden]: !open && isExited,
-                }), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
-                // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
-                tabIndex: 0, "data-test-id": dataTestId, style: {
-                    zIndex: computedZIndex,
-                } },
-                React.createElement(CSSTransition, { appear: true, timeout: 200, classNames: styles, ...transitionProps, in: open, onEntered: handleEntered, onExited: handleExited },
-                    React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
-                        React.createElement("div", { className: cn(styles.content, contentClassName) }, children)))))))));
     if (!shouldRender)
         return null;
-    return usePortal ? (React.createElement(Portal, { getPortalContainer: container, immediateMount: true }, renderContent())) : (renderContent());
+    return (React.createElement(Stack, { value: zIndex }, (computedZIndex) => (React.createElement(Portal, { getPortalContainer: container, immediateMount: true },
+        React.createElement(BaseModalContext.Provider, { value: contextValue },
+            React.createElement(FocusLock, { autoFocus: !disableAutoFocus, disabled: disableFocusLock || !open, returnFocus: !disableRestoreFocus },
+                Backdrop$1 && (React.createElement(Backdrop$1, { ...backdropProps, className: cn(backdropProps.className, styles.backdrop), open: open, style: {
+                        zIndex: computedZIndex,
+                    } })),
+                React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, {
+                        [styles.hidden]: !open && isExited,
+                    }), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, 
+                    // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+                    tabIndex: 0, "data-test-id": dataTestId, style: {
+                        zIndex: computedZIndex,
+                    } },
+                    React.createElement(CSSTransition, { appear: true, timeout: 200, classNames: styles, ...transitionProps, in: open, onEntered: handleEntered, onExited: handleExited },
+                        React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
+                            React.createElement("div", { className: cn(styles.content, contentClassName) }, children))))))))));
 });
 
 export { BaseModal, BaseModalContext };

package/bottom-sheet/component.js

@@ -25,16 +25,16 @@ var getDataTestId = function (dataTestId, element) {
     return dataTestId ? "".concat(dataTestId).concat(elementPart) : undefined;
 };
 
+var isClient = function () { return typeof window !== 'undefined'; };
+
 var styles = {"modal":"bottom-sheet__modal_1gfwj","wrapper":"bottom-sheet__wrapper_1gfwj","component":"bottom-sheet__component_1gfwj","withTransition":"bottom-sheet__withTransition_1gfwj","scrollableContainer":"bottom-sheet__scrollableContainer_1gfwj","marker":"bottom-sheet__marker_1gfwj","content":"bottom-sheet__content_1gfwj","noHeader":"bottom-sheet__noHeader_1gfwj","noFooter":"bottom-sheet__noFooter_1gfwj","scrollLocked":"bottom-sheet__scrollLocked_1gfwj","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_1gfwj","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_1gfwj","appear":"bottom-sheet__appear_1gfwj","enter":"bottom-sheet__enter_1gfwj","appearActive":"bottom-sheet__appearActive_1gfwj","enterActive":"bottom-sheet__enterActive_1gfwj","enterDone":"bottom-sheet__enterDone_1gfwj","appearDone":"bottom-sheet__appearDone_1gfwj","exit":"bottom-sheet__exit_1gfwj","exitActive":"bottom-sheet__exitActive_1gfwj","background-accent":"bottom-sheet__background-accent_1gfwj","background-info":"bottom-sheet__background-info_1gfwj","background-attention-muted":"bottom-sheet__background-attention-muted_1gfwj","background-positive-muted":"bottom-sheet__background-positive-muted_1gfwj","background-negative-muted":"bottom-sheet__background-negative-muted_1gfwj","background-primary":"bottom-sheet__background-primary_1gfwj","background-primary-inverted":"bottom-sheet__background-primary-inverted_1gfwj","background-secondary":"bottom-sheet__background-secondary_1gfwj","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1gfwj","background-tertiary":"bottom-sheet__background-tertiary_1gfwj","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1gfwj","background-quaternary":"bottom-sheet__background-quaternary_1gfwj","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1gfwj","background-specialbg-component":"bottom-sheet__background-specialbg-component_1gfwj","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1gfwj","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1gfwj","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1gfwj","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1gfwj","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1gfwj","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1gfwj","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1gfwj","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1gfwj"};
 require('./index.css');
 
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d, _e;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _f = _a.titleSize, titleSize = _f === void 0 ? 'default' : _f, subtitle = _a.subtitle, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, containerProps = _a.containerProps, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, modalClassName = _a.modalClassName, modalWrapperClassName = _a.modalWrapperClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, bottomAddons = _a.bottomAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _g = _a.titleAlign, titleAlign = _g === void 0 ? 'left' : _g, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _h = _a.stickyFooter, stickyFooter = _h === void 0 ? true : _h, _j = _a.initialHeight, initialHeight = _j === void 0 ? 'default' : _j, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _k = _a.transitionProps, transitionProps = _k === void 0 ? {} : _k, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _l = _a.swipeable, swipeable = _l === void 0 ? true : _l, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _m = _a.scrollableContainerRef, scrollableContainerRef = _m === void 0 ? function () { return null; } : _m, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _o = _a.sheetContainerRef, sheetContainerRef = _o === void 0 ? function () { return null; } : _o, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize;
+    var open = _a.open, title = _a.title, container = _a.container, backgroundColor = _a.backgroundColor, _f = _a.titleSize, titleSize = _f === void 0 ? 'default' : _f, subtitle = _a.subtitle, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, containerProps = _a.containerProps, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, modalClassName = _a.modalClassName, modalWrapperClassName = _a.modalWrapperClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, bottomAddons = _a.bottomAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _g = _a.titleAlign, titleAlign = _g === void 0 ? 'left' : _g, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _h = _a.stickyFooter, stickyFooter = _h === void 0 ? true : _h, _j = _a.initialHeight, initialHeight = _j === void 0 ? 'default' : _j, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _k = _a.transitionProps, transitionProps = _k === void 0 ? {} : _k, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _l = _a.swipeable, swipeable = _l === void 0 ? true : _l, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _m = _a.scrollableContainerRef, scrollableContainerRef = _m === void 0 ? function () { return null; } : _m, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _o = _a.sheetContainerRef, sheetContainerRef = _o === void 0 ? function () { return null; } : _o, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize;
     var hasInitialIdx = initialActiveAreaIndex !== undefined;
-    var fullHeight = reactDiv100vh.use100vh() || 0;
-    // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
-    var isFirstRender = fullHeight === 0;
+    var fullHeight = reactDiv100vh.use100vh() || isClient() ? window.innerHeight : 0;
     var magneticAreas = React.useMemo(function () {
         if (magneticAreasProp) {
             return magneticAreasProp.map(function (area) { return utils.convertPercentToNumber(area, fullHeight); });
@@ -42,10 +42,12 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         return [0, fullHeight - utils.HEADER_OFFSET];
     }, [fullHeight, magneticAreasProp]);
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
-    var _p = React.useState(0), sheetOffset = _p[0], setSheetOffset = _p[1];
+    var _p = React.useState(hasInitialIdx
+        ? lastMagneticArea - magneticAreas[initialActiveAreaIndex]
+        : magneticAreas[0]), sheetOffset = _p[0], setSheetOffset = _p[1];
     var _q = React.useState(1), backdropOpacity = _q[0], setBackdropOpacity = _q[1];
-    var _r = React.useState(0), activeArea = _r[0], setActiveArea = _r[1];
-    var swipingInProgress = React.useRef(null);
+    var _r = React.useState(hasInitialIdx ? magneticAreas[initialActiveAreaIndex] : lastMagneticArea), activeArea = _r[0], setActiveArea = _r[1];
+    var swipingInProgress = React.useRef(false);
     var headerRef = React.useRef(null);
     var sheetHeight = React.useRef(0);
     var sheetRef = React.useRef(null);
@@ -219,20 +221,10 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var handleEntered = function (node, isAppearing) {
         setBackdropOpacity(1);
         setSheetHeight();
-        // Ready for swiping
-        swipingInProgress.current = false;
         if (transitionProps.onEntered) {
             transitionProps.onEntered(node, isAppearing);
         }
     };
-    React.useEffect(function () {
-        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта.
-        if (!isFirstRender) {
-            setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[initialActiveAreaIndex] : 0);
-            setActiveArea(hasInitialIdx ? magneticAreas[initialActiveAreaIndex] : lastMagneticArea);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isFirstRender]);
     React.useEffect(function () {
         onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(open ? getActiveAreaIndex(activeArea) : 0);
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -240,20 +232,20 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     React.useImperativeHandle(bottomSheetInstanceRef, function () { return ({
         scrollToArea: scrollToArea,
     }); });
-    var getSwipeStyles = function () {
-        return sheetOffset ? { transform: "translateY(".concat(sheetOffset, "px)") } : {};
-    };
+    var getSwipeStyles = function () { return ({
+        transform: sheetOffset ? "translateY(".concat(sheetOffset, "px)") : '',
+    }); };
     var getHeightStyles = function () { return ({
-        height: !isFirstRender && initialHeight === 'full' ? "".concat(lastMagneticArea, "px") : 'unset',
-        maxHeight: isFirstRender ? 0 : "".concat(lastMagneticArea, "px"),
+        height: initialHeight === 'full' ? "".concat(lastMagneticArea, "px") : 'unset',
+        maxHeight: "".concat(lastMagneticArea, "px"),
     }); };
     var bgClassName = backgroundColor && styles["background-".concat(backgroundColor)];
-    return (React__default.default.createElement(coreComponentsBaseModal.BaseModal, { open: open, ref: ref, container: container, dataTestId: dataTestId, zIndex: zIndex, onClose: onClose, usePortal: usePortal, scrollHandler: scrollableContainer, Backdrop: components_swipeableBackdrop_Component.SwipeableBackdrop, backdropProps: tslib.__assign(tslib.__assign({}, backdropProps), { className: styles.disabledPointerEvents, opacity: backdropOpacity, opacityTimeout: utils.TIMEOUT, invisible: hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles.modal, modalClassName), wrapperClassName: cn__default.default(modalWrapperClassName, (_b = {},
+    return (React__default.default.createElement(coreComponentsBaseModal.BaseModal, { open: open, ref: ref, container: container, dataTestId: dataTestId, zIndex: zIndex, onClose: onClose, scrollHandler: scrollableContainer, Backdrop: components_swipeableBackdrop_Component.SwipeableBackdrop, backdropProps: tslib.__assign(tslib.__assign({}, backdropProps), { className: styles.disabledPointerEvents, opacity: backdropOpacity, opacityTimeout: utils.TIMEOUT, invisible: hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles.modal, modalClassName), wrapperClassName: cn__default.default(modalWrapperClassName, (_b = {},
             _b[styles.disabledPointerEvents] = hideOverlay,
             _b)), disableBlockingScroll: disableBlockingScroll, transitionProps: tslib.__assign(tslib.__assign({ appear: true, timeout: utils.TIMEOUT, classNames: styles }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
         React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()), className: styles.wrapper, onTransitionEnd: setSheetHeight },
             React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles.component, bgClassName, className, (_c = {},
-                    _c[styles.withTransition] = swipingInProgress.current === false,
+                    _c[styles.withTransition] = !swipingInProgress.current,
                     _c)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs__default.default([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
                 React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_d = {},
                         _d[styles.scrollLocked] = scrollLockedProp || swipingInProgress.current,

package/bottom-sheet/cssm/component.js

@@ -29,13 +29,13 @@ var getDataTestId = function (dataTestId, element) {
     return dataTestId ? "".concat(dataTestId).concat(elementPart) : undefined;
 };
 
+var isClient = function () { return typeof window !== 'undefined'; };
+
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d, _e;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _f = _a.titleSize, titleSize = _f === void 0 ? 'default' : _f, subtitle = _a.subtitle, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, containerProps = _a.containerProps, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, modalClassName = _a.modalClassName, modalWrapperClassName = _a.modalWrapperClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, bottomAddons = _a.bottomAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _g = _a.titleAlign, titleAlign = _g === void 0 ? 'left' : _g, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _h = _a.stickyFooter, stickyFooter = _h === void 0 ? true : _h, _j = _a.initialHeight, initialHeight = _j === void 0 ? 'default' : _j, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _k = _a.transitionProps, transitionProps = _k === void 0 ? {} : _k, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _l = _a.swipeable, swipeable = _l === void 0 ? true : _l, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _m = _a.scrollableContainerRef, scrollableContainerRef = _m === void 0 ? function () { return null; } : _m, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _o = _a.sheetContainerRef, sheetContainerRef = _o === void 0 ? function () { return null; } : _o, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize;
+    var open = _a.open, title = _a.title, container = _a.container, backgroundColor = _a.backgroundColor, _f = _a.titleSize, titleSize = _f === void 0 ? 'default' : _f, subtitle = _a.subtitle, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, containerProps = _a.containerProps, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, modalClassName = _a.modalClassName, modalWrapperClassName = _a.modalWrapperClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, bottomAddons = _a.bottomAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _g = _a.titleAlign, titleAlign = _g === void 0 ? 'left' : _g, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _h = _a.stickyFooter, stickyFooter = _h === void 0 ? true : _h, _j = _a.initialHeight, initialHeight = _j === void 0 ? 'default' : _j, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _k = _a.transitionProps, transitionProps = _k === void 0 ? {} : _k, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _l = _a.swipeable, swipeable = _l === void 0 ? true : _l, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _m = _a.scrollableContainerRef, scrollableContainerRef = _m === void 0 ? function () { return null; } : _m, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _o = _a.sheetContainerRef, sheetContainerRef = _o === void 0 ? function () { return null; } : _o, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize;
     var hasInitialIdx = initialActiveAreaIndex !== undefined;
-    var fullHeight = reactDiv100vh.use100vh() || 0;
-    // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
-    var isFirstRender = fullHeight === 0;
+    var fullHeight = reactDiv100vh.use100vh() || isClient() ? window.innerHeight : 0;
     var magneticAreas = React.useMemo(function () {
         if (magneticAreasProp) {
             return magneticAreasProp.map(function (area) { return utils.convertPercentToNumber(area, fullHeight); });
@@ -43,10 +43,12 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         return [0, fullHeight - utils.HEADER_OFFSET];
     }, [fullHeight, magneticAreasProp]);
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
-    var _p = React.useState(0), sheetOffset = _p[0], setSheetOffset = _p[1];
+    var _p = React.useState(hasInitialIdx
+        ? lastMagneticArea - magneticAreas[initialActiveAreaIndex]
+        : magneticAreas[0]), sheetOffset = _p[0], setSheetOffset = _p[1];
     var _q = React.useState(1), backdropOpacity = _q[0], setBackdropOpacity = _q[1];
-    var _r = React.useState(0), activeArea = _r[0], setActiveArea = _r[1];
-    var swipingInProgress = React.useRef(null);
+    var _r = React.useState(hasInitialIdx ? magneticAreas[initialActiveAreaIndex] : lastMagneticArea), activeArea = _r[0], setActiveArea = _r[1];
+    var swipingInProgress = React.useRef(false);
     var headerRef = React.useRef(null);
     var sheetHeight = React.useRef(0);
     var sheetRef = React.useRef(null);
@@ -220,20 +222,10 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var handleEntered = function (node, isAppearing) {
         setBackdropOpacity(1);
         setSheetHeight();
-        // Ready for swiping
-        swipingInProgress.current = false;
         if (transitionProps.onEntered) {
             transitionProps.onEntered(node, isAppearing);
         }
     };
-    React.useEffect(function () {
-        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта.
-        if (!isFirstRender) {
-            setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[initialActiveAreaIndex] : 0);
-            setActiveArea(hasInitialIdx ? magneticAreas[initialActiveAreaIndex] : lastMagneticArea);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isFirstRender]);
     React.useEffect(function () {
         onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(open ? getActiveAreaIndex(activeArea) : 0);
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -241,20 +233,20 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     React.useImperativeHandle(bottomSheetInstanceRef, function () { return ({
         scrollToArea: scrollToArea,
     }); });
-    var getSwipeStyles = function () {
-        return sheetOffset ? { transform: "translateY(".concat(sheetOffset, "px)") } : {};
-    };
+    var getSwipeStyles = function () { return ({
+        transform: sheetOffset ? "translateY(".concat(sheetOffset, "px)") : '',
+    }); };
     var getHeightStyles = function () { return ({
-        height: !isFirstRender && initialHeight === 'full' ? "".concat(lastMagneticArea, "px") : 'unset',
-        maxHeight: isFirstRender ? 0 : "".concat(lastMagneticArea, "px"),
+        height: initialHeight === 'full' ? "".concat(lastMagneticArea, "px") : 'unset',
+        maxHeight: "".concat(lastMagneticArea, "px"),
     }); };
     var bgClassName = backgroundColor && styles__default.default["background-".concat(backgroundColor)];
-    return (React__default.default.createElement(coreComponentsBaseModal.BaseModal, { open: open, ref: ref, container: container, dataTestId: dataTestId, zIndex: zIndex, onClose: onClose, usePortal: usePortal, scrollHandler: scrollableContainer, Backdrop: components_swipeableBackdrop_Component.SwipeableBackdrop, backdropProps: tslib.__assign(tslib.__assign({}, backdropProps), { className: styles__default.default.disabledPointerEvents, opacity: backdropOpacity, opacityTimeout: utils.TIMEOUT, invisible: hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles__default.default.modal, modalClassName), wrapperClassName: cn__default.default(modalWrapperClassName, (_b = {},
+    return (React__default.default.createElement(coreComponentsBaseModal.BaseModal, { open: open, ref: ref, container: container, dataTestId: dataTestId, zIndex: zIndex, onClose: onClose, scrollHandler: scrollableContainer, Backdrop: components_swipeableBackdrop_Component.SwipeableBackdrop, backdropProps: tslib.__assign(tslib.__assign({}, backdropProps), { className: styles__default.default.disabledPointerEvents, opacity: backdropOpacity, opacityTimeout: utils.TIMEOUT, invisible: hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles__default.default.modal, modalClassName), wrapperClassName: cn__default.default(modalWrapperClassName, (_b = {},
             _b[styles__default.default.disabledPointerEvents] = hideOverlay,
             _b)), disableBlockingScroll: disableBlockingScroll, transitionProps: tslib.__assign(tslib.__assign({ appear: true, timeout: utils.TIMEOUT, classNames: styles__default.default }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
         React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()), className: styles__default.default.wrapper, onTransitionEnd: setSheetHeight },
             React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles__default.default.component, bgClassName, className, (_c = {},
-                    _c[styles__default.default.withTransition] = swipingInProgress.current === false,
+                    _c[styles__default.default.withTransition] = !swipingInProgress.current,
                     _c)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs__default.default([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
                 React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles__default.default.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_d = {},
                         _d[styles__default.default.scrollLocked] = scrollLockedProp || swipingInProgress.current,

package/bottom-sheet/cssm/types.d.ts

@@ -36,10 +36,6 @@ type BottomSheetProps = {
      * Контейнер к которому будут добавляться порталы
      */
     container?: BaseModalProps['container'];
-    /**
-     * Рендерить ли в контейнер через портал.
-     */
-    usePortal?: BaseModalProps['usePortal'];
     /**
      * Дополнительный класс
      */