@alfalab/core-components-bottom-sheet 5.2.2 → 5.3.1

package/{component-a31768c8.d.ts → component-7f6ec6ba.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="react-transition-group" />
 /// <reference types="react" />
 import React from "react";
-import { FC, ReactNode, HTMLAttributes } from "react";
+import { FC, ReactNode, HTMLAttributes, RefObject } from "react";
 import { BottomSheetTitleAlign } from "./index";
 import { TransitionProps } from 'react-transition-group/Transition';
 import { BaseModalProps } from "@alfalab/core-components-base-modal";
@@ -220,6 +220,10 @@ type BottomSheetProps = {
      * Свойства для Бэкдропа
      */
     backdropProps?: BaseModalProps['backdropProps'];
+    /**
+     * Реф на контейнер, в котором происходит скролл
+     */
+    scrollableContainerRef?: RefObject<HTMLElement>;
     /**
      * Обработчик закрытия
      */

package/{component-a31768c8.js → component-7f6ec6ba.js}

@@ -1,8 +1,9 @@
 'use strict';
 
-var tslib_es6 = require('./tslib.es6-f62bcae9.js');
+var tslib = require('tslib');
 var React = require('react');
 var reactDiv100vh = require('react-div-100vh');
+var mergeRefs = require('react-merge-refs');
 var reactSwipeable = require('react-swipeable');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('@alfalab/core-components-base-modal');
@@ -15,6 +16,7 @@ var components_closer_Component = require('./components/closer/Component.js');
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
 var getDataTestId = function (dataTestId, element) {
@@ -22,7 +24,7 @@ var getDataTestId = function (dataTestId, element) {
     return dataTestId ? "".concat(dataTestId).concat(elementPart) : undefined;
 };
 
-var styles$1 = {"headerWrapper":"bottom-sheet__headerWrapper_1uguw","header":"bottom-sheet__header_1uguw","sticky":"bottom-sheet__sticky_1uguw","highlighted":"bottom-sheet__highlighted_1uguw","justifyEnd":"bottom-sheet__justifyEnd_1uguw","addon":"bottom-sheet__addon_1uguw","addonFixed":"bottom-sheet__addonFixed_1uguw","addonLeft":"bottom-sheet__addonLeft_1uguw","addonRight":"bottom-sheet__addonRight_1uguw","title":"bottom-sheet__title_1uguw","titleCenter":"bottom-sheet__titleCenter_1uguw","titleLeft":"bottom-sheet__titleLeft_1uguw","trimTitle":"bottom-sheet__trimTitle_1uguw","titleBigIndentHorizontal":"bottom-sheet__titleBigIndentHorizontal_1uguw","titleIndentRight":"bottom-sheet__titleIndentRight_1uguw","titleIndentLeft":"bottom-sheet__titleIndentLeft_1uguw"};
+var styles$1 = {"headerWrapper":"bottom-sheet__headerWrapper_1veed","header":"bottom-sheet__header_1veed","sticky":"bottom-sheet__sticky_1veed","highlighted":"bottom-sheet__highlighted_1veed","justifyEnd":"bottom-sheet__justifyEnd_1veed","addon":"bottom-sheet__addon_1veed","addonFixed":"bottom-sheet__addonFixed_1veed","addonLeft":"bottom-sheet__addonLeft_1veed","addonRight":"bottom-sheet__addonRight_1veed","title":"bottom-sheet__title_1veed","titleCenter":"bottom-sheet__titleCenter_1veed","titleLeft":"bottom-sheet__titleLeft_1veed","trimTitle":"bottom-sheet__trimTitle_1veed","titleBigIndentHorizontal":"bottom-sheet__titleBigIndentHorizontal_1veed","titleIndentRight":"bottom-sheet__titleIndentRight_1veed","titleIndentLeft":"bottom-sheet__titleIndentLeft_1veed"};
 require('./components/header/index.css')
 
 var Header = function (_a) {
@@ -72,7 +74,7 @@ var Header = function (_a) {
         bottomAddons));
 };
 
-var styles = {"modal":"bottom-sheet__modal_ug9q1","component":"bottom-sheet__component_ug9q1","withTransition":"bottom-sheet__withTransition_ug9q1","scrollableContainer":"bottom-sheet__scrollableContainer_ug9q1","marker":"bottom-sheet__marker_ug9q1","content":"bottom-sheet__content_ug9q1","noHeader":"bottom-sheet__noHeader_ug9q1","noFooter":"bottom-sheet__noFooter_ug9q1","scrollLocked":"bottom-sheet__scrollLocked_ug9q1","appear":"bottom-sheet__appear_ug9q1","enter":"bottom-sheet__enter_ug9q1","appearActive":"bottom-sheet__appearActive_ug9q1","enterActive":"bottom-sheet__enterActive_ug9q1","enterDone":"bottom-sheet__enterDone_ug9q1","appearDone":"bottom-sheet__appearDone_ug9q1","exit":"bottom-sheet__exit_ug9q1","exitActive":"bottom-sheet__exitActive_ug9q1"};
+var styles = {"modal":"bottom-sheet__modal_h361e","component":"bottom-sheet__component_h361e","withTransition":"bottom-sheet__withTransition_h361e","scrollableContainer":"bottom-sheet__scrollableContainer_h361e","marker":"bottom-sheet__marker_h361e","content":"bottom-sheet__content_h361e","noHeader":"bottom-sheet__noHeader_h361e","noFooter":"bottom-sheet__noFooter_h361e","scrollLocked":"bottom-sheet__scrollLocked_h361e","appear":"bottom-sheet__appear_h361e","enter":"bottom-sheet__enter_h361e","appearActive":"bottom-sheet__appearActive_h361e","enterActive":"bottom-sheet__enterActive_h361e","enterDone":"bottom-sheet__enterDone_h361e","appearDone":"bottom-sheet__appearDone_h361e","exit":"bottom-sheet__exit_h361e","exitActive":"bottom-sheet__exitActive_h361e"};
 require('./index.css')
 
 var TIMEOUT = 300;
@@ -85,10 +87,10 @@ var HEADER_OFFSET = 24;
 var CLOSE_OFFSET = 0.2;
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var open = _a.open, title = _a.title, container = _a.container, 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, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _f = _a.stickyFooter, stickyFooter = _f === void 0 ? true : _f, _g = _a.initialHeight, initialHeight = _g === void 0 ? 'default' : _g, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _h = _a.transitionProps, transitionProps = _h === void 0 ? {} : _h, dataTestId = _a.dataTestId, _j = _a.swipeable, swipeable = _j === void 0 ? true : _j, backdropProps = _a.backdropProps, onClose = _a.onClose, onBack = _a.onBack;
-    var _k = React.useState(0), sheetOffset = _k[0], setSheetOffset = _k[1];
-    var _l = React.useState(1), backdropOpacity = _l[0], setBackdropOpacity = _l[1];
-    var _m = React.useState(false), scrollLocked = _m[0], setScrollLocked = _m[1];
+    var open = _a.open, title = _a.title, container = _a.container, 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, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _f = _a.stickyFooter, stickyFooter = _f === void 0 ? true : _f, _g = _a.initialHeight, initialHeight = _g === void 0 ? 'default' : _g, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _h = _a.transitionProps, transitionProps = _h === void 0 ? {} : _h, dataTestId = _a.dataTestId, _j = _a.swipeable, swipeable = _j === void 0 ? true : _j, backdropProps = _a.backdropProps, _k = _a.scrollableContainerRef, scrollableContainerRef = _k === void 0 ? function () { return null; } : _k, onClose = _a.onClose, onBack = _a.onBack;
+    var _l = React.useState(0), sheetOffset = _l[0], setSheetOffset = _l[1];
+    var _m = React.useState(1), backdropOpacity = _m[0], setBackdropOpacity = _m[1];
+    var _o = React.useState(false), scrollLocked = _o[0], setScrollLocked = _o[1];
     var sheetHeight = React.useRef(0);
     var scrollableContainer = React.useRef(null);
     var scrollableContainerScrollValue = React.useRef(0);
@@ -222,16 +224,16 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         height: initialHeight === 'full' ? targetHeight : 'unset',
         maxHeight: targetHeight,
     }); };
-    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_es6.__assign(tslib_es6.__assign({}, backdropProps), { opacity: backdropOpacity, handlers: swipeable ? backdropSwipeablehandlers : false, opacityTimeout: TIMEOUT, invisible: initialHeight === 'full' ? false : hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles.modal, modalClassName), wrapperClassName: modalWrapperClassName, disableBlockingScroll: disableBlockingScroll, transitionProps: tslib_es6.__assign(tslib_es6.__assign({ appear: true, timeout: TIMEOUT, classNames: styles }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
-        React__default.default.createElement("div", { style: tslib_es6.__assign({}, getHeightStyles()) },
-            React__default.default.createElement("div", tslib_es6.__assign({ className: cn__default.default(styles.component, className, (_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), { opacity: backdropOpacity, handlers: swipeable ? backdropSwipeablehandlers : false, opacityTimeout: TIMEOUT, invisible: initialHeight === 'full' ? false : hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles.modal, modalClassName), wrapperClassName: modalWrapperClassName, disableBlockingScroll: disableBlockingScroll, transitionProps: tslib.__assign(tslib.__assign({ appear: true, timeout: TIMEOUT, classNames: styles }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
+        React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()) },
+            React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles.component, className, (_b = {},
                     _b[styles.withTransition] = !sheetOffset,
-                    _b)), style: tslib_es6.__assign(tslib_es6.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeablehandlers),
-                React__default.default.createElement("div", tslib_es6.__assign({}, containerProps, { className: cn__default.default(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_c = {},
+                    _b)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeablehandlers),
+                React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_c = {},
                         _c[styles.scrollLocked] = scrollLocked,
-                        _c)), ref: scrollableContainer }),
+                        _c)), ref: mergeRefs__default.default([scrollableContainer, scrollableContainerRef]) }),
                     swipeable && React__default.default.createElement("div", { className: cn__default.default(styles.marker) }),
-                    !hideHeader && !emptyHeader && React__default.default.createElement(Header, tslib_es6.__assign({}, headerProps)),
+                    !hideHeader && !emptyHeader && React__default.default.createElement(Header, tslib.__assign({}, headerProps)),
                     React__default.default.createElement("div", { className: cn__default.default(styles.content, contentClassName, (_d = {},
                             _d[styles.noHeader] = hideHeader || emptyHeader,
                             _d[styles.noFooter] = !actionButton,

package/component.js

@@ -1,12 +1,13 @@
 'use strict';
 
-require('./tslib.es6-f62bcae9.js');
+require('tslib');
 require('react');
 require('react-div-100vh');
+require('react-merge-refs');
 require('react-swipeable');
 require('classnames');
 require('@alfalab/core-components-base-modal');
-var components_header_Component = require('./component-a31768c8.js');
+var components_header_Component = require('./component-7f6ec6ba.js');
 require('./components/footer/Component.js');
 require('./components/swipeable-backdrop/Component.js');
 require('@alfalab/core-components-typography');

package/components/backer/Component.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tslib_es6 = require('../../tslib.es6-f62bcae9.js');
+var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsIconButton = require('@alfalab/core-components-icon-button');
@@ -11,13 +11,13 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"backer":"bottom-sheet__backer_57ab6","button":"bottom-sheet__button_57ab6"};
+var styles = {"backer":"bottom-sheet__backer_i62n2","button":"bottom-sheet__button_i62n2"};
 require('./index.css')
 
 var Backer = function (_a) {
-    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? ArrowBackMIcon.ArrowBackMIcon : _c, dataTestId = _a.dataTestId, onClick = _a.onClick, restProps = tslib_es6.__rest(_a, ["className", "size", "icon", "dataTestId", "onClick"]);
+    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? ArrowBackMIcon.ArrowBackMIcon : _c, dataTestId = _a.dataTestId, onClick = _a.onClick, restProps = tslib.__rest(_a, ["className", "size", "icon", "dataTestId", "onClick"]);
     return (React__default.default.createElement("div", { className: cn__default.default(styles.backer, className) },
-        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib_es6.__assign({ size: size, className: styles.button, "aria-label": '\u043D\u0430\u0437\u0430\u0434', onClick: onClick, icon: icon, dataTestId: dataTestId }, restProps))));
+        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib.__assign({ size: size, className: styles.button, "aria-label": '\u043D\u0430\u0437\u0430\u0434', onClick: onClick, icon: icon, dataTestId: dataTestId }, restProps))));
 };
 
 exports.Backer = Backer;

package/components/backer/index.css

@@ -1,4 +1,4 @@
-/* hash: 1xbzm */
+/* hash: fo1vj */
 :root {
 } /* deprecated */ :root {
     --color-light-graphic-primary: #0b1f35;
@@ -18,7 +18,7 @@
 } :root {
 } :root {
     --bottom-sheet-backer-bg-color: var(--color-light-bg-primary-inverted-alpha-3);
-} .bottom-sheet__backer_57ab6 {
+} .bottom-sheet__backer_i62n2 {
     width: 32px;
     height: 32px;
     display: flex;
@@ -26,7 +26,7 @@
     align-items: center;
     cursor: pointer;
     color: var(--color-light-graphic-primary);
-} .bottom-sheet__button_57ab6 {
+} .bottom-sheet__button_i62n2 {
     background: var(--bottom-sheet-backer-bg-color);
     -webkit-backdrop-filter: blur(10px);
             backdrop-filter: blur(10px);

package/components/closer/Component.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tslib_es6 = require('../../tslib.es6-f62bcae9.js');
+var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('@alfalab/core-components-base-modal');
@@ -12,17 +12,17 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"closer":"bottom-sheet__closer_1fi8d","button":"bottom-sheet__button_1fi8d"};
+var styles = {"closer":"bottom-sheet__closer_1254o","button":"bottom-sheet__button_1254o"};
 require('./index.css')
 
 var Closer = function (_a) {
-    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? CrossMIcon.CrossMIcon : _c, dataTestId = _a.dataTestId, restProps = tslib_es6.__rest(_a, ["className", "size", "icon", "dataTestId"]);
+    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? CrossMIcon.CrossMIcon : _c, dataTestId = _a.dataTestId, restProps = tslib.__rest(_a, ["className", "size", "icon", "dataTestId"]);
     var onClose = React.useContext(coreComponentsBaseModal.BaseModalContext).onClose;
     var handleClick = React.useCallback(function (event) {
         onClose(event, 'closerClick');
     }, [onClose]);
     return (React__default.default.createElement("div", { className: cn__default.default(styles.closer, className) },
-        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib_es6.__assign({ size: size, className: styles.button, "aria-label": '\u0437\u0430\u043A\u0440\u044B\u0442\u044C', onClick: handleClick, icon: icon, dataTestId: dataTestId }, restProps))));
+        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib.__assign({ size: size, className: styles.button, "aria-label": '\u0437\u0430\u043A\u0440\u044B\u0442\u044C', onClick: handleClick, icon: icon, dataTestId: dataTestId }, restProps))));
 };
 
 exports.Closer = Closer;

package/components/closer/index.css

@@ -1,4 +1,4 @@
-/* hash: 13z6q */
+/* hash: 1cmjx */
 :root {
 } /* deprecated */ :root {
     --color-light-graphic-primary: #0b1f35;
@@ -18,7 +18,7 @@
 } :root {
 } :root {
     --bottom-sheet-closer-bg-color: var(--color-light-bg-primary-inverted-alpha-3);
-} .bottom-sheet__closer_1fi8d {
+} .bottom-sheet__closer_1254o {
     width: 32px;
     height: 32px;
     display: flex;
@@ -26,7 +26,7 @@
     align-items: center;
     cursor: pointer;
     color: var(--color-light-graphic-primary);
-} .bottom-sheet__button_1fi8d {
+} .bottom-sheet__button_1254o {
     background: var(--bottom-sheet-closer-bg-color);
     -webkit-backdrop-filter: blur(10px);
             backdrop-filter: blur(10px);

package/components/footer/Component.js

@@ -9,7 +9,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"footer":"bottom-sheet__footer_1mm05","sticky":"bottom-sheet__sticky_1mm05","highlighted":"bottom-sheet__highlighted_1mm05"};
+var styles = {"footer":"bottom-sheet__footer_i273y","sticky":"bottom-sheet__sticky_i273y","highlighted":"bottom-sheet__highlighted_i273y"};
 require('./index.css')
 
 var Footer = function (_a) {

package/components/footer/index.css

@@ -1,4 +1,4 @@
-/* hash: twuoo */
+/* hash: cjoe0 */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-primary: #fff;
@@ -20,13 +20,13 @@
 } :root {
     --bottom-sheet-footer-border-top: 1px solid var(--color-light-border-primary);
     --bottom-sheet-footer-background-color: var(--color-light-bg-primary);
-} .bottom-sheet__footer_1mm05 {
+} .bottom-sheet__footer_i273y {
     padding: var(--gap-m) var(--gap-m);
     background-color: var(--color-light-bg-primary);
-} .bottom-sheet__sticky_1mm05 {
+} .bottom-sheet__sticky_i273y {
     position: sticky;
     bottom: 0;
-} .bottom-sheet__highlighted_1mm05 {
+} .bottom-sheet__highlighted_i273y {
     border-top: var(--bottom-sheet-footer-border-top);
     background-color: var(--bottom-sheet-footer-background-color);
 }

package/components/header/Component.js

@@ -4,11 +4,12 @@ require('react');
 require('classnames');
 require('@alfalab/core-components-base-modal');
 require('@alfalab/core-components-typography');
-var components_header_Component = require('../../component-a31768c8.js');
+var components_header_Component = require('../../component-7f6ec6ba.js');
 require('../backer/Component.js');
 require('../closer/Component.js');
-require('../../tslib.es6-f62bcae9.js');
+require('tslib');
 require('react-div-100vh');
+require('react-merge-refs');
 require('react-swipeable');
 require('../footer/Component.js');
 require('../swipeable-backdrop/Component.js');

package/components/header/index.css

@@ -1,4 +1,4 @@
-/* hash: 1a5po */
+/* hash: ssjdh */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-primary: #fff;
@@ -28,37 +28,37 @@
     --bottom-sheet-title-line-height: 24px;
     --bottom-sheet-title-font-family: var(--font-family-system);
     --bottom-sheet-title-margin-vertical: var(--gap-2xs);
-} .bottom-sheet__headerWrapper_1uguw {
+} .bottom-sheet__headerWrapper_1veed {
     padding: var(--gap-xs);
     padding-bottom: 0;
     background-color: var(--color-light-bg-primary);
     border-top-right-radius: var(--border-radius-xl);
     border-top-left-radius: var(--border-radius-xl);
     z-index: 1;
-} .bottom-sheet__header_1uguw {
+} .bottom-sheet__header_1veed {
     display: flex;
-} .bottom-sheet__sticky_1uguw {
+} .bottom-sheet__sticky_1veed {
     position: sticky;
     top: 0;
-} .bottom-sheet__highlighted_1uguw {
+} .bottom-sheet__highlighted_1veed {
     border-bottom: var(--bottom-sheet-header-border-bottom);
-} .bottom-sheet__justifyEnd_1uguw {
+} .bottom-sheet__justifyEnd_1veed {
     justify-content: flex-end;
-} .bottom-sheet__addon_1uguw {
+} .bottom-sheet__addon_1veed {
     display: flex;
     justify-content: center;
     align-items: center;
     min-width: 48px;
     height: 48px;
-} .bottom-sheet__addonFixed_1uguw {
+} .bottom-sheet__addonFixed_1veed {
     position: fixed;
-} .bottom-sheet__addonLeft_1uguw {
+} .bottom-sheet__addonLeft_1veed {
     left: 0;
     margin-left: var(--gap-xs);
-} .bottom-sheet__addonRight_1uguw {
+} .bottom-sheet__addonRight_1veed {
     right: 0;
     margin-right: var(--gap-xs);
-} .bottom-sheet__title_1uguw {
+} .bottom-sheet__title_1veed {
     padding: var(--gap-xs) var(--gap-xs);
     margin: var(--bottom-sheet-title-margin-vertical) 0;
     width: 100%;
@@ -66,18 +66,18 @@
     font-weight: var(--bottom-sheet-title-font-weight);
     line-height: var(--bottom-sheet-title-line-height);
     font-family: var(--bottom-sheet-title-font-family);
-} .bottom-sheet__titleCenter_1uguw {
+} .bottom-sheet__titleCenter_1veed {
     text-align: center;
-} .bottom-sheet__titleLeft_1uguw {
+} .bottom-sheet__titleLeft_1veed {
     text-align: left;
-} .bottom-sheet__trimTitle_1uguw {
+} .bottom-sheet__trimTitle_1veed {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-} .bottom-sheet__titleBigIndentHorizontal_1uguw {
+} .bottom-sheet__titleBigIndentHorizontal_1veed {
     margin: var(--bottom-sheet-title-margin-vertical) var(--gap-4xl);
-} .bottom-sheet__titleIndentRight_1uguw {
+} .bottom-sheet__titleIndentRight_1veed {
     margin-right: var(--gap-4xl);
-} .bottom-sheet__titleIndentLeft_1uguw {
+} .bottom-sheet__titleIndentLeft_1veed {
     margin-left: var(--gap-4xl);
 }

package/components/swipeable-backdrop/Component.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tslib_es6 = require('../../tslib.es6-f62bcae9.js');
+var tslib = require('tslib');
 var React = require('react');
 var coreComponentsBackdrop = require('@alfalab/core-components-backdrop');
 
@@ -9,9 +9,9 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var SwipeableBackdrop = function (_a) {
-    var opacity = _a.opacity, handlers = _a.handlers, opacityTimeout = _a.opacityTimeout, style = _a.style, backdropProps = tslib_es6.__rest(_a, ["opacity", "handlers", "opacityTimeout", "style"]);
-    return (React__default.default.createElement("div", tslib_es6.__assign({}, handlers, { style: tslib_es6.__assign({ opacity: opacity, transition: opacity === 1 ? "opacity ".concat(opacityTimeout, "ms ease-in-out") : '', position: 'relative' }, style) }),
-        React__default.default.createElement(coreComponentsBackdrop.Backdrop, tslib_es6.__assign({}, backdropProps))));
+    var opacity = _a.opacity, handlers = _a.handlers, opacityTimeout = _a.opacityTimeout, style = _a.style, backdropProps = tslib.__rest(_a, ["opacity", "handlers", "opacityTimeout", "style"]);
+    return (React__default.default.createElement("div", tslib.__assign({}, handlers, { style: tslib.__assign({ opacity: opacity, transition: opacity === 1 ? "opacity ".concat(opacityTimeout, "ms ease-in-out") : '', position: 'relative' }, style) }),
+        React__default.default.createElement(coreComponentsBackdrop.Backdrop, tslib.__assign({}, backdropProps))));
 };
 
 exports.SwipeableBackdrop = SwipeableBackdrop;

package/{esm/component-13675fe5.d.ts → cssm/component-8a02e7db.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="react-transition-group" />
 /// <reference types="react" />
 import React from "react";
-import { FC, ReactNode, HTMLAttributes } from "react";
+import { FC, ReactNode, HTMLAttributes, RefObject } from "react";
 import { BottomSheetTitleAlign } from "./index";
 import { TransitionProps } from 'react-transition-group/Transition';
 import { BaseModalProps } from "@alfalab/core-components-base-modal";
@@ -220,6 +220,10 @@ type BottomSheetProps = {
      * Свойства для Бэкдропа
      */
     backdropProps?: BaseModalProps['backdropProps'];
+    /**
+     * Реф на контейнер, в котором происходит скролл
+     */
+    scrollableContainerRef?: RefObject<HTMLElement>;
     /**
      * Обработчик закрытия
      */

package/cssm/{component-082df5fd.js → component-8a02e7db.js}

@@ -1,8 +1,9 @@
 'use strict';
 
-var tslib_es6 = require('./tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
 var reactDiv100vh = require('react-div-100vh');
+var mergeRefs = require('react-merge-refs');
 var reactSwipeable = require('react-swipeable');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('@alfalab/core-components-base-modal/cssm');
@@ -17,6 +18,7 @@ var styles = require('./components/header/index.module.css');
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 var styles__default$1 = /*#__PURE__*/_interopDefaultCompat(styles$1);
 var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
@@ -83,10 +85,10 @@ var HEADER_OFFSET = 24;
 var CLOSE_OFFSET = 0.2;
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var open = _a.open, title = _a.title, container = _a.container, 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, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _f = _a.stickyFooter, stickyFooter = _f === void 0 ? true : _f, _g = _a.initialHeight, initialHeight = _g === void 0 ? 'default' : _g, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _h = _a.transitionProps, transitionProps = _h === void 0 ? {} : _h, dataTestId = _a.dataTestId, _j = _a.swipeable, swipeable = _j === void 0 ? true : _j, backdropProps = _a.backdropProps, onClose = _a.onClose, onBack = _a.onBack;
-    var _k = React.useState(0), sheetOffset = _k[0], setSheetOffset = _k[1];
-    var _l = React.useState(1), backdropOpacity = _l[0], setBackdropOpacity = _l[1];
-    var _m = React.useState(false), scrollLocked = _m[0], setScrollLocked = _m[1];
+    var open = _a.open, title = _a.title, container = _a.container, 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, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _f = _a.stickyFooter, stickyFooter = _f === void 0 ? true : _f, _g = _a.initialHeight, initialHeight = _g === void 0 ? 'default' : _g, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, children = _a.children, zIndex = _a.zIndex, _h = _a.transitionProps, transitionProps = _h === void 0 ? {} : _h, dataTestId = _a.dataTestId, _j = _a.swipeable, swipeable = _j === void 0 ? true : _j, backdropProps = _a.backdropProps, _k = _a.scrollableContainerRef, scrollableContainerRef = _k === void 0 ? function () { return null; } : _k, onClose = _a.onClose, onBack = _a.onBack;
+    var _l = React.useState(0), sheetOffset = _l[0], setSheetOffset = _l[1];
+    var _m = React.useState(1), backdropOpacity = _m[0], setBackdropOpacity = _m[1];
+    var _o = React.useState(false), scrollLocked = _o[0], setScrollLocked = _o[1];
     var sheetHeight = React.useRef(0);
     var scrollableContainer = React.useRef(null);
     var scrollableContainerScrollValue = React.useRef(0);
@@ -220,16 +222,16 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         height: initialHeight === 'full' ? targetHeight : 'unset',
         maxHeight: targetHeight,
     }); };
-    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_es6.__assign(tslib_es6.__assign({}, backdropProps), { opacity: backdropOpacity, handlers: swipeable ? backdropSwipeablehandlers : false, opacityTimeout: TIMEOUT, invisible: initialHeight === 'full' ? false : hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles__default$1.default.modal, modalClassName), wrapperClassName: modalWrapperClassName, disableBlockingScroll: disableBlockingScroll, transitionProps: tslib_es6.__assign(tslib_es6.__assign({ appear: true, timeout: TIMEOUT, classNames: styles__default$1.default }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
-        React__default.default.createElement("div", { style: tslib_es6.__assign({}, getHeightStyles()) },
-            React__default.default.createElement("div", tslib_es6.__assign({ className: cn__default.default(styles__default$1.default.component, className, (_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), { opacity: backdropOpacity, handlers: swipeable ? backdropSwipeablehandlers : false, opacityTimeout: TIMEOUT, invisible: initialHeight === 'full' ? false : hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles__default$1.default.modal, modalClassName), wrapperClassName: modalWrapperClassName, disableBlockingScroll: disableBlockingScroll, transitionProps: tslib.__assign(tslib.__assign({ appear: true, timeout: TIMEOUT, classNames: styles__default$1.default }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
+        React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()) },
+            React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles__default$1.default.component, className, (_b = {},
                     _b[styles__default$1.default.withTransition] = !sheetOffset,
-                    _b)), style: tslib_es6.__assign(tslib_es6.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeablehandlers),
-                React__default.default.createElement("div", tslib_es6.__assign({}, containerProps, { className: cn__default.default(styles__default$1.default.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_c = {},
+                    _b)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeablehandlers),
+                React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles__default$1.default.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_c = {},
                         _c[styles__default$1.default.scrollLocked] = scrollLocked,
-                        _c)), ref: scrollableContainer }),
+                        _c)), ref: mergeRefs__default.default([scrollableContainer, scrollableContainerRef]) }),
                     swipeable && React__default.default.createElement("div", { className: cn__default.default(styles__default$1.default.marker) }),
-                    !hideHeader && !emptyHeader && React__default.default.createElement(Header, tslib_es6.__assign({}, headerProps)),
+                    !hideHeader && !emptyHeader && React__default.default.createElement(Header, tslib.__assign({}, headerProps)),
                     React__default.default.createElement("div", { className: cn__default.default(styles__default$1.default.content, contentClassName, (_d = {},
                             _d[styles__default$1.default.noHeader] = hideHeader || emptyHeader,
                             _d[styles__default$1.default.noFooter] = !actionButton,

package/cssm/component.js

@@ -1,12 +1,13 @@
 'use strict';
 
-require('./tslib.es6-bbd6cd2a.js');
+require('tslib');
 require('react');
 require('react-div-100vh');
+require('react-merge-refs');
 require('react-swipeable');
 require('classnames');
 require('@alfalab/core-components-base-modal/cssm');
-var components_header_Component = require('./component-082df5fd.js');
+var components_header_Component = require('./component-8a02e7db.js');
 require('./components/footer/Component.js');
 require('./components/swipeable-backdrop/Component.js');
 require('./index.module.css');

package/cssm/components/backer/Component.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tslib_es6 = require('../../tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsIconButton = require('@alfalab/core-components-icon-button/cssm');
@@ -14,9 +14,9 @@ var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
 
 var Backer = function (_a) {
-    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? ArrowBackMIcon.ArrowBackMIcon : _c, dataTestId = _a.dataTestId, onClick = _a.onClick, restProps = tslib_es6.__rest(_a, ["className", "size", "icon", "dataTestId", "onClick"]);
+    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? ArrowBackMIcon.ArrowBackMIcon : _c, dataTestId = _a.dataTestId, onClick = _a.onClick, restProps = tslib.__rest(_a, ["className", "size", "icon", "dataTestId", "onClick"]);
     return (React__default.default.createElement("div", { className: cn__default.default(styles__default.default.backer, className) },
-        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib_es6.__assign({ size: size, className: styles__default.default.button, "aria-label": '\u043D\u0430\u0437\u0430\u0434', onClick: onClick, icon: icon, dataTestId: dataTestId }, restProps))));
+        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib.__assign({ size: size, className: styles__default.default.button, "aria-label": '\u043D\u0430\u0437\u0430\u0434', onClick: onClick, icon: icon, dataTestId: dataTestId }, restProps))));
 };
 
 exports.Backer = Backer;

package/cssm/components/closer/Component.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tslib_es6 = require('../../tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('@alfalab/core-components-base-modal/cssm');
@@ -15,13 +15,13 @@ var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
 
 var Closer = function (_a) {
-    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? CrossMIcon.CrossMIcon : _c, dataTestId = _a.dataTestId, restProps = tslib_es6.__rest(_a, ["className", "size", "icon", "dataTestId"]);
+    var className = _a.className, _b = _a.size, size = _b === void 0 ? 'xs' : _b, _c = _a.icon, icon = _c === void 0 ? CrossMIcon.CrossMIcon : _c, dataTestId = _a.dataTestId, restProps = tslib.__rest(_a, ["className", "size", "icon", "dataTestId"]);
     var onClose = React.useContext(coreComponentsBaseModal.BaseModalContext).onClose;
     var handleClick = React.useCallback(function (event) {
         onClose(event, 'closerClick');
     }, [onClose]);
     return (React__default.default.createElement("div", { className: cn__default.default(styles__default.default.closer, className) },
-        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib_es6.__assign({ size: size, className: styles__default.default.button, "aria-label": '\u0437\u0430\u043A\u0440\u044B\u0442\u044C', onClick: handleClick, icon: icon, dataTestId: dataTestId }, restProps))));
+        React__default.default.createElement(coreComponentsIconButton.IconButton, tslib.__assign({ size: size, className: styles__default.default.button, "aria-label": '\u0437\u0430\u043A\u0440\u044B\u0442\u044C', onClick: handleClick, icon: icon, dataTestId: dataTestId }, restProps))));
 };
 
 exports.Closer = Closer;

package/cssm/components/header/Component.js

@@ -4,12 +4,13 @@ require('react');
 require('classnames');
 require('@alfalab/core-components-base-modal/cssm');
 require('@alfalab/core-components-typography/cssm');
-var components_header_Component = require('../../component-082df5fd.js');
+var components_header_Component = require('../../component-8a02e7db.js');
 require('../backer/Component.js');
 require('../closer/Component.js');
 require('./index.module.css');
-require('../../tslib.es6-bbd6cd2a.js');
+require('tslib');
 require('react-div-100vh');
+require('react-merge-refs');
 require('react-swipeable');
 require('../footer/Component.js');
 require('../footer/index.module.css');

package/cssm/components/swipeable-backdrop/Component.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tslib_es6 = require('../../tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
 var coreComponentsBackdrop = require('@alfalab/core-components-backdrop/cssm');
 
@@ -9,9 +9,9 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var SwipeableBackdrop = function (_a) {
-    var opacity = _a.opacity, handlers = _a.handlers, opacityTimeout = _a.opacityTimeout, style = _a.style, backdropProps = tslib_es6.__rest(_a, ["opacity", "handlers", "opacityTimeout", "style"]);
-    return (React__default.default.createElement("div", tslib_es6.__assign({}, handlers, { style: tslib_es6.__assign({ opacity: opacity, transition: opacity === 1 ? "opacity ".concat(opacityTimeout, "ms ease-in-out") : '', position: 'relative' }, style) }),
-        React__default.default.createElement(coreComponentsBackdrop.Backdrop, tslib_es6.__assign({}, backdropProps))));
+    var opacity = _a.opacity, handlers = _a.handlers, opacityTimeout = _a.opacityTimeout, style = _a.style, backdropProps = tslib.__rest(_a, ["opacity", "handlers", "opacityTimeout", "style"]);
+    return (React__default.default.createElement("div", tslib.__assign({}, handlers, { style: tslib.__assign({ opacity: opacity, transition: opacity === 1 ? "opacity ".concat(opacityTimeout, "ms ease-in-out") : '', position: 'relative' }, style) }),
+        React__default.default.createElement(coreComponentsBackdrop.Backdrop, tslib.__assign({}, backdropProps))));
 };
 
 exports.SwipeableBackdrop = SwipeableBackdrop;

package/cssm/index.d.ts

@@ -1 +1 @@
-export * from "./component-082df5fd";
+export * from "./component-8a02e7db";

package/cssm/index.js

@@ -1,9 +1,10 @@
 'use strict';
 
-var components_header_Component = require('./component-082df5fd.js');
-require('./tslib.es6-bbd6cd2a.js');
+var components_header_Component = require('./component-8a02e7db.js');
+require('tslib');
 require('react');
 require('react-div-100vh');
+require('react-merge-refs');
 require('react-swipeable');
 require('classnames');
 require('@alfalab/core-components-base-modal/cssm');

package/{cssm/component-082df5fd.d.ts → esm/component-9a8081cd.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="react-transition-group" />
 /// <reference types="react" />
 import React from "react";
-import { FC, ReactNode, HTMLAttributes } from "react";
+import { FC, ReactNode, HTMLAttributes, RefObject } from "react";
 import { BottomSheetTitleAlign } from "./index";
 import { TransitionProps } from 'react-transition-group/Transition';
 import { BaseModalProps } from "@alfalab/core-components-base-modal";
@@ -220,6 +220,10 @@ type BottomSheetProps = {
      * Свойства для Бэкдропа
      */
     backdropProps?: BaseModalProps['backdropProps'];
+    /**
+     * Реф на контейнер, в котором происходит скролл
+     */
+    scrollableContainerRef?: RefObject<HTMLElement>;
     /**
      * Обработчик закрытия
      */