@alfalab/core-components 42.6.0 → 42.8.0

package/bottom-sheet/component.js

@@ -21,13 +21,13 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"modal":"bottom-sheet__modal_5eb4s","wrapper":"bottom-sheet__wrapper_5eb4s","fullscreen":"bottom-sheet__fullscreen_5eb4s","component":"bottom-sheet__component_5eb4s","withTransition":"bottom-sheet__withTransition_5eb4s","scrollableContainer":"bottom-sheet__scrollableContainer_5eb4s","marker":"bottom-sheet__marker_5eb4s","defaultMarker":"bottom-sheet__defaultMarker_5eb4s","content":"bottom-sheet__content_5eb4s","noHeader":"bottom-sheet__noHeader_5eb4s","noFooter":"bottom-sheet__noFooter_5eb4s","scrollLocked":"bottom-sheet__scrollLocked_5eb4s","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_5eb4s","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_5eb4s","appear":"bottom-sheet__appear_5eb4s","enter":"bottom-sheet__enter_5eb4s","appearActive":"bottom-sheet__appearActive_5eb4s","enterActive":"bottom-sheet__enterActive_5eb4s","enterDone":"bottom-sheet__enterDone_5eb4s","appearDone":"bottom-sheet__appearDone_5eb4s","exit":"bottom-sheet__exit_5eb4s","exitActive":"bottom-sheet__exitActive_5eb4s","background-accent":"bottom-sheet__background-accent_5eb4s","background-info":"bottom-sheet__background-info_5eb4s","background-attention-muted":"bottom-sheet__background-attention-muted_5eb4s","background-positive-muted":"bottom-sheet__background-positive-muted_5eb4s","background-negative-muted":"bottom-sheet__background-negative-muted_5eb4s","background-primary":"bottom-sheet__background-primary_5eb4s","background-primary-inverted":"bottom-sheet__background-primary-inverted_5eb4s","background-secondary":"bottom-sheet__background-secondary_5eb4s","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_5eb4s","background-tertiary":"bottom-sheet__background-tertiary_5eb4s","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_5eb4s","background-quaternary":"bottom-sheet__background-quaternary_5eb4s","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_5eb4s","background-specialbg-component":"bottom-sheet__background-specialbg-component_5eb4s","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_5eb4s","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_5eb4s","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_5eb4s","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_5eb4s","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_5eb4s","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_5eb4s","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_5eb4s","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_5eb4s"};
+var styles = {"modal":"bottom-sheet__modal_1fnli","wrapper":"bottom-sheet__wrapper_1fnli","fullscreen":"bottom-sheet__fullscreen_1fnli","component":"bottom-sheet__component_1fnli","withTransition":"bottom-sheet__withTransition_1fnli","scrollableContainer":"bottom-sheet__scrollableContainer_1fnli","marker":"bottom-sheet__marker_1fnli","defaultMarker":"bottom-sheet__defaultMarker_1fnli","content":"bottom-sheet__content_1fnli","noHeader":"bottom-sheet__noHeader_1fnli","noFooter":"bottom-sheet__noFooter_1fnli","scrollLocked":"bottom-sheet__scrollLocked_1fnli","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_1fnli","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_1fnli","appear":"bottom-sheet__appear_1fnli","enter":"bottom-sheet__enter_1fnli","appearActive":"bottom-sheet__appearActive_1fnli","enterActive":"bottom-sheet__enterActive_1fnli","enterDone":"bottom-sheet__enterDone_1fnli","appearDone":"bottom-sheet__appearDone_1fnli","exit":"bottom-sheet__exit_1fnli","exitActive":"bottom-sheet__exitActive_1fnli","background-accent":"bottom-sheet__background-accent_1fnli","background-info":"bottom-sheet__background-info_1fnli","background-attention-muted":"bottom-sheet__background-attention-muted_1fnli","background-positive-muted":"bottom-sheet__background-positive-muted_1fnli","background-negative-muted":"bottom-sheet__background-negative-muted_1fnli","background-primary":"bottom-sheet__background-primary_1fnli","background-primary-inverted":"bottom-sheet__background-primary-inverted_1fnli","background-secondary":"bottom-sheet__background-secondary_1fnli","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1fnli","background-tertiary":"bottom-sheet__background-tertiary_1fnli","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1fnli","background-quaternary":"bottom-sheet__background-quaternary_1fnli","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1fnli","background-specialbg-component":"bottom-sheet__background-specialbg-component_1fnli","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1fnli","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1fnli","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1fnli","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1fnli","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1fnli","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1fnli","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1fnli","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1fnli"};
 require('./index.css');
 
+var isNil = coreComponentsShared.fnUtils.isNil;
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d, _e, _f;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _g = _a.titleSize, titleSize = _g === void 0 ? 'default' : _g, 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, _h = _a.titleAlign, titleAlign = _h === void 0 ? 'left' : _h, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _j = _a.stickyFooter, stickyFooter = _j === void 0 ? true : _j, _k = _a.initialHeight, initialHeight = _k === void 0 ? 'default' : _k, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, disableFocusLock = _a.disableFocusLock, children = _a.children, zIndex = _a.zIndex, _l = _a.transitionProps, transitionProps = _l === void 0 ? {} : _l, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _m = _a.swipeable, swipeable = _m === void 0 ? true : _m, _o = _a.swipeableContent, swipeableContent = _o === void 0 ? true : _o, _p = _a.swipeThreshold, swipeThreshold = _p === void 0 ? 5 : _p, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _q = _a.scrollableContainerRef, scrollableContainerRef = _q === void 0 ? function () { return null; } : _q, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _r = _a.sheetContainerRef, sheetContainerRef = _r === void 0 ? function () { return null; } : _r, _s = _a.headerOffset, headerOffset = _s === void 0 ? 24 : _s, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize, disableRestoreFocus = _a.disableRestoreFocus, disableAutoFocus = _a.disableAutoFocus, disableEscapeKeyDown = _a.disableEscapeKeyDown, keepMounted = _a.keepMounted, onMagnetizeEnd = _a.onMagnetizeEnd, onOffsetChange = _a.onOffsetChange, swipeableMarker = _a.swipeableMarker, swipeableMarkerClassName = _a.swipeableMarkerClassName;
-    var hasInitialIdx = initialActiveAreaIndex !== undefined;
+    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _g = _a.titleSize, titleSize = _g === void 0 ? 'default' : _g, 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, _h = _a.titleAlign, titleAlign = _h === void 0 ? 'left' : _h, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _j = _a.stickyFooter, stickyFooter = _j === void 0 ? true : _j, _k = _a.initialHeight, initialHeight = _k === void 0 ? 'default' : _k, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, disableFocusLock = _a.disableFocusLock, children = _a.children, zIndex = _a.zIndex, _l = _a.transitionProps, transitionProps = _l === void 0 ? {} : _l, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _m = _a.swipeable, swipeable = _m === void 0 ? true : _m, _o = _a.swipeableContent, swipeableContent = _o === void 0 ? true : _o, _p = _a.swipeThreshold, swipeThreshold = _p === void 0 ? 5 : _p, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _q = _a.scrollableContainerRef, scrollableContainerRef = _q === void 0 ? function () { return null; } : _q, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _r = _a.sheetContainerRef, sheetContainerRef = _r === void 0 ? function () { return null; } : _r, _s = _a.headerOffset, headerOffset = _s === void 0 ? 24 : _s, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize, onSwipeStart = _a.onSwipeStart, onSwipeEnd = _a.onSwipeEnd, disableRestoreFocus = _a.disableRestoreFocus, disableAutoFocus = _a.disableAutoFocus, disableEscapeKeyDown = _a.disableEscapeKeyDown, keepMounted = _a.keepMounted, onMagnetizeEnd = _a.onMagnetizeEnd, onOffsetChange = _a.onOffsetChange, swipeableMarker = _a.swipeableMarker, swipeableMarkerClassName = _a.swipeableMarkerClassName;
     var fullHeight = reactDiv100vh.use100vh() || 0;
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
@@ -55,6 +55,21 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var headerProps = tslib.__assign(tslib.__assign({}, (titleIsReactElement
         ? { children: title }
         : { title: title ? title === null || title === void 0 ? void 0 : title.toString() : undefined })), { scrollableParentRef: scrollableContainer, headerRef: headerRef, headerOffset: headerOffset, className: headerClassName, addonClassName: addonClassName, closerClassName: closerClassName, backButtonClassName: backerClassName, leftAddons: leftAddons, rightAddons: rightAddons, bottomAddons: bottomAddons, hasCloser: hasCloser, hasBackButton: hasBacker, align: titleAlign, trim: trimTitle, sticky: stickyHeader, dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'header'), onBack: onBack, titleSize: titleSize, subtitle: subtitle, onClose: onClose });
+    var startSwiping = function (event) {
+        setSwipingInProgress(function (p) {
+            if (!p)
+                onSwipeStart === null || onSwipeStart === void 0 ? void 0 : onSwipeStart(event);
+            return true;
+        });
+    };
+    var stopSwiping = function (event) {
+        setSwipingInProgress(function (p) {
+            if (p)
+                onSwipeEnd === null || onSwipeEnd === void 0 ? void 0 : onSwipeEnd(event);
+            return false;
+        });
+        scrollOccurred.current = false;
+    };
     var getBackdropOpacity = function (offset) {
         var canClose = magneticAreas[0] === 0;
         var secondArea = magneticAreas[1];
@@ -86,7 +101,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         }
     };
     var scrollToArea = function (idx) {
-        setSwipingInProgress(false);
+        stopSwiping(null);
         var nextArea = magneticAreas[idx];
         if (nextArea === 0) {
             onClose();
@@ -206,11 +221,11 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         if (shouldSkipSwiping(deltaY, initial[1], event)) {
             return;
         }
-        setSwipingInProgress(true);
+        startSwiping(event);
     };
-    var handleTouchEnd = function () {
-        setSwipingInProgress(false);
-        scrollOccurred.current = false;
+    var handleTouchEnd = function (_a) {
+        var event = _a.event;
+        return stopSwiping(event);
     };
     var handleSheetSwiping = function (_a) {
         var initial = _a.initial, deltaY = _a.deltaY, event = _a.event;
@@ -218,7 +233,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
             return;
         }
         if (!swipingInProgress) {
-            setSwipingInProgress(true);
+            startSwiping(event);
         }
         var offset = getSheetOffset(deltaY);
         var opacity = getBackdropOpacity(offset);
@@ -235,9 +250,9 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
-        var nextArea = hasInitialIdx ? magneticAreas[idx] : lastMagneticArea;
+        var nextArea = isNil(idx) ? lastMagneticArea : magneticAreas[idx];
         setBackdropOpacity(1);
-        setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[idx] : magneticAreas[0]);
+        setSheetOffset(isNil(idx) ? magneticAreas[0] : lastMagneticArea - magneticAreas[idx]);
         setActiveArea(nextArea);
         onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd();
         if (transitionProps.onExited) {
@@ -267,13 +282,13 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         }
     };
     React.useEffect(function () {
-        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта.
+        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта
         if (!isFirstRender) {
-            setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[initialActiveAreaIndex] : 0);
-            setActiveArea(hasInitialIdx ? magneticAreas[initialActiveAreaIndex] : lastMagneticArea);
+            var idx = initialActiveAreaIndex;
+            setSheetOffset(isNil(idx) ? 0 : lastMagneticArea - magneticAreas[idx]);
+            setActiveArea(isNil(idx) ? lastMagneticArea : magneticAreas[idx]);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isFirstRender]);
+    }, [initialActiveAreaIndex, isFirstRender, lastMagneticArea, magneticAreas]);
     React.useEffect(function () {
         if (!sheetRef.current)
             return;

package/bottom-sheet/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_114h0","sticky":"bottom-sheet__sticky_114h0","highlighted":"bottom-sheet__highlighted_114h0","background-accent":"bottom-sheet__background-accent_114h0","background-info":"bottom-sheet__background-info_114h0","background-attention-muted":"bottom-sheet__background-attention-muted_114h0","background-positive-muted":"bottom-sheet__background-positive-muted_114h0","background-negative-muted":"bottom-sheet__background-negative-muted_114h0","background-primary":"bottom-sheet__background-primary_114h0","background-primary-inverted":"bottom-sheet__background-primary-inverted_114h0","background-secondary":"bottom-sheet__background-secondary_114h0","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_114h0","background-tertiary":"bottom-sheet__background-tertiary_114h0","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_114h0","background-quaternary":"bottom-sheet__background-quaternary_114h0","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_114h0","background-specialbg-component":"bottom-sheet__background-specialbg-component_114h0","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_114h0","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_114h0","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_114h0","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_114h0","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_114h0","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_114h0","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_114h0","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_114h0"};
+var styles = {"footer":"bottom-sheet__footer_u9y6k","sticky":"bottom-sheet__sticky_u9y6k","highlighted":"bottom-sheet__highlighted_u9y6k","background-accent":"bottom-sheet__background-accent_u9y6k","background-info":"bottom-sheet__background-info_u9y6k","background-attention-muted":"bottom-sheet__background-attention-muted_u9y6k","background-positive-muted":"bottom-sheet__background-positive-muted_u9y6k","background-negative-muted":"bottom-sheet__background-negative-muted_u9y6k","background-primary":"bottom-sheet__background-primary_u9y6k","background-primary-inverted":"bottom-sheet__background-primary-inverted_u9y6k","background-secondary":"bottom-sheet__background-secondary_u9y6k","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_u9y6k","background-tertiary":"bottom-sheet__background-tertiary_u9y6k","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_u9y6k","background-quaternary":"bottom-sheet__background-quaternary_u9y6k","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_u9y6k","background-specialbg-component":"bottom-sheet__background-specialbg-component_u9y6k","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_u9y6k","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_u9y6k","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_u9y6k","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_u9y6k","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_u9y6k","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_u9y6k","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_u9y6k","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_u9y6k"};
 require('./index.css');
 
 var Footer = function (_a) {

package/bottom-sheet/components/footer/index.css

@@ -1,4 +1,4 @@
-/* hash: v9a86 */
+/* hash: 85c0a */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-accent: #ef3124;
@@ -41,58 +41,58 @@
 } :root {
     --bottom-sheet-footer-border-top: 1px solid var(--color-light-border-secondary);
     --bottom-sheet-footer-background-color: var(--color-light-bg-primary);
-} .bottom-sheet__footer_114h0 {
+} .bottom-sheet__footer_u9y6k {
     padding: var(--gap-m) var(--gap-m);
     background-color: var(--color-light-bg-primary);
-} .bottom-sheet__sticky_114h0 {
+} .bottom-sheet__sticky_u9y6k {
     position: sticky;
     bottom: 0;
     z-index: 1;
-} .bottom-sheet__highlighted_114h0 {
+} .bottom-sheet__highlighted_u9y6k {
     border-top: var(--bottom-sheet-footer-border-top);
     background-color: var(--bottom-sheet-footer-background-color);
-} .bottom-sheet__background-accent_114h0 {
+} .bottom-sheet__background-accent_u9y6k {
             background-color: var(--color-light-bg-accent);
-        } .bottom-sheet__background-info_114h0 {
+        } .bottom-sheet__background-info_u9y6k {
             background-color: var(--color-light-bg-info);
-        } .bottom-sheet__background-attention-muted_114h0 {
+        } .bottom-sheet__background-attention-muted_u9y6k {
             background-color: var(--color-light-bg-attention-muted);
-        } .bottom-sheet__background-positive-muted_114h0 {
+        } .bottom-sheet__background-positive-muted_u9y6k {
             background-color: var(--color-light-bg-positive-muted);
-        } .bottom-sheet__background-negative-muted_114h0 {
+        } .bottom-sheet__background-negative-muted_u9y6k {
             background-color: var(--color-light-bg-negative-muted);
-        } .bottom-sheet__background-primary_114h0 {
+        } .bottom-sheet__background-primary_u9y6k {
             background-color: var(--color-light-bg-primary);
-        } .bottom-sheet__background-primary-inverted_114h0 {
+        } .bottom-sheet__background-primary-inverted_u9y6k {
             background-color: var(--color-light-bg-primary-inverted);
-        } .bottom-sheet__background-secondary_114h0 {
+        } .bottom-sheet__background-secondary_u9y6k {
             background-color: var(--color-light-bg-secondary);
-        } .bottom-sheet__background-secondary-inverted_114h0 {
+        } .bottom-sheet__background-secondary-inverted_u9y6k {
             background-color: var(--color-light-bg-secondary-inverted);
-        } .bottom-sheet__background-tertiary_114h0 {
+        } .bottom-sheet__background-tertiary_u9y6k {
             background-color: var(--color-light-bg-tertiary);
-        } .bottom-sheet__background-tertiary-inverted_114h0 {
+        } .bottom-sheet__background-tertiary-inverted_u9y6k {
             background-color: var(--color-light-bg-tertiary-inverted);
-        } .bottom-sheet__background-quaternary_114h0 {
+        } .bottom-sheet__background-quaternary_u9y6k {
             background-color: var(--color-light-bg-quaternary);
-        } .bottom-sheet__background-quaternary-inverted_114h0 {
+        } .bottom-sheet__background-quaternary-inverted_u9y6k {
             background-color: var(--color-light-bg-quaternary-inverted);
-        } .bottom-sheet__background-specialbg-component_114h0 {
+        } .bottom-sheet__background-specialbg-component_u9y6k {
             background-color: var(--color-light-specialbg-component);
-        } .bottom-sheet__background-specialbg-component-inverted_114h0 {
+        } .bottom-sheet__background-specialbg-component-inverted_u9y6k {
             background-color: var(--color-light-specialbg-component-inverted);
-        } .bottom-sheet__background-specialbg-primary-grouped_114h0 {
+        } .bottom-sheet__background-specialbg-primary-grouped_u9y6k {
             background-color: var(--color-light-specialbg-primary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-grouped_114h0 {
+        } .bottom-sheet__background-specialbg-secondary-grouped_u9y6k {
             background-color: var(--color-light-specialbg-secondary-grouped);
-        } .bottom-sheet__background-specialbg-tertiary-grouped_114h0 {
+        } .bottom-sheet__background-specialbg-tertiary-grouped_u9y6k {
             background-color: var(--color-light-specialbg-tertiary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-transparent_114h0 {
+        } .bottom-sheet__background-specialbg-secondary-transparent_u9y6k {
             background-color: var(--color-light-specialbg-secondary-transparent);
-        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_114h0 {
+        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_u9y6k {
             background-color: var(--color-light-specialbg-secondary-transparent-inverted);
-        } .bottom-sheet__background-specialbg-tertiary-transparent_114h0 {
+        } .bottom-sheet__background-specialbg-tertiary-transparent_u9y6k {
             background-color: var(--color-light-specialbg-tertiary-transparent);
-        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_114h0 {
+        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_u9y6k {
             background-color: var(--color-light-specialbg-tertiary-transparent-inverted);
         }

package/bottom-sheet/components/header/Component.js

@@ -11,7 +11,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"headerWrapper":"bottom-sheet__headerWrapper_1l1go","hasContent":"bottom-sheet__hasContent_1l1go","header":"bottom-sheet__header_1l1go","sticky":"bottom-sheet__sticky_1l1go","highlighted":"bottom-sheet__highlighted_1l1go","justifyEnd":"bottom-sheet__justifyEnd_1l1go","addon":"bottom-sheet__addon_1l1go","addonFixed":"bottom-sheet__addonFixed_1l1go","title":"bottom-sheet__title_1l1go","titleCenter":"bottom-sheet__titleCenter_1l1go","titleLeft":"bottom-sheet__titleLeft_1l1go","trimTitle":"bottom-sheet__trimTitle_1l1go"};
+var styles = {"headerWrapper":"bottom-sheet__headerWrapper_109hy","hasContent":"bottom-sheet__hasContent_109hy","header":"bottom-sheet__header_109hy","sticky":"bottom-sheet__sticky_109hy","highlighted":"bottom-sheet__highlighted_109hy","justifyEnd":"bottom-sheet__justifyEnd_109hy","addon":"bottom-sheet__addon_109hy","addonFixed":"bottom-sheet__addonFixed_109hy","title":"bottom-sheet__title_109hy","titleCenter":"bottom-sheet__titleCenter_109hy","titleLeft":"bottom-sheet__titleLeft_109hy","trimTitle":"bottom-sheet__trimTitle_109hy"};
 require('./index.css');
 
 var Header = function (_a) {

package/bottom-sheet/components/header/index.css

@@ -1,4 +1,4 @@
-/* hash: 1x5qy */
+/* hash: 12fxk */
 :root {
 } /* deprecated */ :root {
     --color-light-border-secondary: #e9e9eb; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
@@ -27,42 +27,42 @@
     --bottom-sheet-title-font-weight: 700;
     --bottom-sheet-title-line-height: 24px;
     --bottom-sheet-title-font-family: var(--font-family-system);
-} .bottom-sheet__headerWrapper_1l1go {
+} .bottom-sheet__headerWrapper_109hy {
     padding: var(--gap-s) var(--gap-xs) var(--gap-2xs);
     border-top-right-radius: var(--border-radius-xl);
     border-top-left-radius: var(--border-radius-xl);
     z-index: 1;
-} .bottom-sheet__hasContent_1l1go {
+} .bottom-sheet__hasContent_109hy {
     background-color: inherit;
-} .bottom-sheet__header_1l1go {
+} .bottom-sheet__header_109hy {
     display: flex;
-} .bottom-sheet__sticky_1l1go {
+} .bottom-sheet__sticky_109hy {
     position: sticky;
     top: 0;
-} .bottom-sheet__highlighted_1l1go {
+} .bottom-sheet__highlighted_109hy {
     border-bottom: var(--bottom-sheet-header-border-bottom);
-} .bottom-sheet__justifyEnd_1l1go {
+} .bottom-sheet__justifyEnd_109hy {
     justify-content: flex-end;
-} .bottom-sheet__addon_1l1go {
+} .bottom-sheet__addon_109hy {
     display: flex;
     justify-content: center;
     align-items: center;
     min-width: 48px;
     height: 48px;
-} .bottom-sheet__addonFixed_1l1go {
+} .bottom-sheet__addonFixed_109hy {
     position: fixed;
-} .bottom-sheet__title_1l1go {
+} .bottom-sheet__title_109hy {
     padding: var(--gap-s) var(--gap-xs);
     width: 100%;
     font-size: var(--bottom-sheet-title-font-size);
     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_1l1go {
+} .bottom-sheet__titleCenter_109hy {
     text-align: center;
-} .bottom-sheet__titleLeft_1l1go {
+} .bottom-sheet__titleLeft_109hy {
     text-align: left;
-} .bottom-sheet__trimTitle_1l1go {
+} .bottom-sheet__trimTitle_109hy {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;

package/bottom-sheet/cssm/component.js

@@ -25,10 +25,10 @@ var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
 
+var isNil = coreComponentsShared.fnUtils.isNil;
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d, _e, _f;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _g = _a.titleSize, titleSize = _g === void 0 ? 'default' : _g, 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, _h = _a.titleAlign, titleAlign = _h === void 0 ? 'left' : _h, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _j = _a.stickyFooter, stickyFooter = _j === void 0 ? true : _j, _k = _a.initialHeight, initialHeight = _k === void 0 ? 'default' : _k, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, disableFocusLock = _a.disableFocusLock, children = _a.children, zIndex = _a.zIndex, _l = _a.transitionProps, transitionProps = _l === void 0 ? {} : _l, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _m = _a.swipeable, swipeable = _m === void 0 ? true : _m, _o = _a.swipeableContent, swipeableContent = _o === void 0 ? true : _o, _p = _a.swipeThreshold, swipeThreshold = _p === void 0 ? 5 : _p, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _q = _a.scrollableContainerRef, scrollableContainerRef = _q === void 0 ? function () { return null; } : _q, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _r = _a.sheetContainerRef, sheetContainerRef = _r === void 0 ? function () { return null; } : _r, _s = _a.headerOffset, headerOffset = _s === void 0 ? 24 : _s, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize, disableRestoreFocus = _a.disableRestoreFocus, disableAutoFocus = _a.disableAutoFocus, disableEscapeKeyDown = _a.disableEscapeKeyDown, keepMounted = _a.keepMounted, onMagnetizeEnd = _a.onMagnetizeEnd, onOffsetChange = _a.onOffsetChange, swipeableMarker = _a.swipeableMarker, swipeableMarkerClassName = _a.swipeableMarkerClassName;
-    var hasInitialIdx = initialActiveAreaIndex !== undefined;
+    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _g = _a.titleSize, titleSize = _g === void 0 ? 'default' : _g, 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, _h = _a.titleAlign, titleAlign = _h === void 0 ? 'left' : _h, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _j = _a.stickyFooter, stickyFooter = _j === void 0 ? true : _j, _k = _a.initialHeight, initialHeight = _k === void 0 ? 'default' : _k, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, disableFocusLock = _a.disableFocusLock, children = _a.children, zIndex = _a.zIndex, _l = _a.transitionProps, transitionProps = _l === void 0 ? {} : _l, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _m = _a.swipeable, swipeable = _m === void 0 ? true : _m, _o = _a.swipeableContent, swipeableContent = _o === void 0 ? true : _o, _p = _a.swipeThreshold, swipeThreshold = _p === void 0 ? 5 : _p, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _q = _a.scrollableContainerRef, scrollableContainerRef = _q === void 0 ? function () { return null; } : _q, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _r = _a.sheetContainerRef, sheetContainerRef = _r === void 0 ? function () { return null; } : _r, _s = _a.headerOffset, headerOffset = _s === void 0 ? 24 : _s, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize, onSwipeStart = _a.onSwipeStart, onSwipeEnd = _a.onSwipeEnd, disableRestoreFocus = _a.disableRestoreFocus, disableAutoFocus = _a.disableAutoFocus, disableEscapeKeyDown = _a.disableEscapeKeyDown, keepMounted = _a.keepMounted, onMagnetizeEnd = _a.onMagnetizeEnd, onOffsetChange = _a.onOffsetChange, swipeableMarker = _a.swipeableMarker, swipeableMarkerClassName = _a.swipeableMarkerClassName;
     var fullHeight = reactDiv100vh.use100vh() || 0;
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
@@ -56,6 +56,21 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var headerProps = tslib.__assign(tslib.__assign({}, (titleIsReactElement
         ? { children: title }
         : { title: title ? title === null || title === void 0 ? void 0 : title.toString() : undefined })), { scrollableParentRef: scrollableContainer, headerRef: headerRef, headerOffset: headerOffset, className: headerClassName, addonClassName: addonClassName, closerClassName: closerClassName, backButtonClassName: backerClassName, leftAddons: leftAddons, rightAddons: rightAddons, bottomAddons: bottomAddons, hasCloser: hasCloser, hasBackButton: hasBacker, align: titleAlign, trim: trimTitle, sticky: stickyHeader, dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'header'), onBack: onBack, titleSize: titleSize, subtitle: subtitle, onClose: onClose });
+    var startSwiping = function (event) {
+        setSwipingInProgress(function (p) {
+            if (!p)
+                onSwipeStart === null || onSwipeStart === void 0 ? void 0 : onSwipeStart(event);
+            return true;
+        });
+    };
+    var stopSwiping = function (event) {
+        setSwipingInProgress(function (p) {
+            if (p)
+                onSwipeEnd === null || onSwipeEnd === void 0 ? void 0 : onSwipeEnd(event);
+            return false;
+        });
+        scrollOccurred.current = false;
+    };
     var getBackdropOpacity = function (offset) {
         var canClose = magneticAreas[0] === 0;
         var secondArea = magneticAreas[1];
@@ -87,7 +102,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         }
     };
     var scrollToArea = function (idx) {
-        setSwipingInProgress(false);
+        stopSwiping(null);
         var nextArea = magneticAreas[idx];
         if (nextArea === 0) {
             onClose();
@@ -207,11 +222,11 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         if (shouldSkipSwiping(deltaY, initial[1], event)) {
             return;
         }
-        setSwipingInProgress(true);
+        startSwiping(event);
     };
-    var handleTouchEnd = function () {
-        setSwipingInProgress(false);
-        scrollOccurred.current = false;
+    var handleTouchEnd = function (_a) {
+        var event = _a.event;
+        return stopSwiping(event);
     };
     var handleSheetSwiping = function (_a) {
         var initial = _a.initial, deltaY = _a.deltaY, event = _a.event;
@@ -219,7 +234,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
             return;
         }
         if (!swipingInProgress) {
-            setSwipingInProgress(true);
+            startSwiping(event);
         }
         var offset = getSheetOffset(deltaY);
         var opacity = getBackdropOpacity(offset);
@@ -236,9 +251,9 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
-        var nextArea = hasInitialIdx ? magneticAreas[idx] : lastMagneticArea;
+        var nextArea = isNil(idx) ? lastMagneticArea : magneticAreas[idx];
         setBackdropOpacity(1);
-        setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[idx] : magneticAreas[0]);
+        setSheetOffset(isNil(idx) ? magneticAreas[0] : lastMagneticArea - magneticAreas[idx]);
         setActiveArea(nextArea);
         onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd();
         if (transitionProps.onExited) {
@@ -268,13 +283,13 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         }
     };
     React.useEffect(function () {
-        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта.
+        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта
         if (!isFirstRender) {
-            setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[initialActiveAreaIndex] : 0);
-            setActiveArea(hasInitialIdx ? magneticAreas[initialActiveAreaIndex] : lastMagneticArea);
+            var idx = initialActiveAreaIndex;
+            setSheetOffset(isNil(idx) ? 0 : lastMagneticArea - magneticAreas[idx]);
+            setActiveArea(isNil(idx) ? lastMagneticArea : magneticAreas[idx]);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isFirstRender]);
+    }, [initialActiveAreaIndex, isFirstRender, lastMagneticArea, magneticAreas]);
     React.useEffect(function () {
         if (!sheetRef.current)
             return;

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

@@ -1,5 +1,6 @@
 /// <reference types="react-transition-group" />
 import { HTMLAttributes, ReactElement, ReactNode, RefObject } from 'react';
+import { HandledEvents } from 'react-swipeable/es/types';
 import { TransitionProps } from 'react-transition-group/Transition';
 import { BaseModalProps } from "../../base-modal";
 import { NavigationBarProps } from "../../navigation-bar";
@@ -263,5 +264,13 @@ type BottomSheetProps = {
      * Вызывается при изменении положения шторки
      */
     onOffsetChange?: (offset: number, percent: number) => void;
+    /**
+     * Вызывается в начале свайпа
+     */
+    onSwipeStart?: (event: HandledEvents) => void;
+    /**
+     * Вызывается после окончания свайпа
+     */
+    onSwipeEnd?: (event: HandledEvents | null) => void;
 };
 export { BottomSheetTitleAlign, BottomSheetProps };

package/bottom-sheet/esm/component.js

@@ -5,7 +5,7 @@ import mergeRefs from 'react-merge-refs';
 import { useSwipeable } from 'react-swipeable';
 import cn from 'classnames';
 import { BaseModal } from '../../base-modal/esm';
-import { getDataTestId } from '../../shared/esm';
+import { fnUtils, getDataTestId } from '../../shared/esm';
 import { Footer } from './components/footer/Component.js';
 import { Header } from './components/header/Component.js';
 import { SwipeableBackdrop } from './components/swipeable-backdrop/Component.js';
@@ -13,13 +13,13 @@ import { convertPercentToNumber, TIMEOUT, MARKER_HEIGHT, SCROLL_OFFSET, SWIPE_VE
 import '../../navigation-bar/esm';
 import '../../backdrop/esm';
 
-var styles = {"modal":"bottom-sheet__modal_5eb4s","wrapper":"bottom-sheet__wrapper_5eb4s","fullscreen":"bottom-sheet__fullscreen_5eb4s","component":"bottom-sheet__component_5eb4s","withTransition":"bottom-sheet__withTransition_5eb4s","scrollableContainer":"bottom-sheet__scrollableContainer_5eb4s","marker":"bottom-sheet__marker_5eb4s","defaultMarker":"bottom-sheet__defaultMarker_5eb4s","content":"bottom-sheet__content_5eb4s","noHeader":"bottom-sheet__noHeader_5eb4s","noFooter":"bottom-sheet__noFooter_5eb4s","scrollLocked":"bottom-sheet__scrollLocked_5eb4s","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_5eb4s","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_5eb4s","appear":"bottom-sheet__appear_5eb4s","enter":"bottom-sheet__enter_5eb4s","appearActive":"bottom-sheet__appearActive_5eb4s","enterActive":"bottom-sheet__enterActive_5eb4s","enterDone":"bottom-sheet__enterDone_5eb4s","appearDone":"bottom-sheet__appearDone_5eb4s","exit":"bottom-sheet__exit_5eb4s","exitActive":"bottom-sheet__exitActive_5eb4s","background-accent":"bottom-sheet__background-accent_5eb4s","background-info":"bottom-sheet__background-info_5eb4s","background-attention-muted":"bottom-sheet__background-attention-muted_5eb4s","background-positive-muted":"bottom-sheet__background-positive-muted_5eb4s","background-negative-muted":"bottom-sheet__background-negative-muted_5eb4s","background-primary":"bottom-sheet__background-primary_5eb4s","background-primary-inverted":"bottom-sheet__background-primary-inverted_5eb4s","background-secondary":"bottom-sheet__background-secondary_5eb4s","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_5eb4s","background-tertiary":"bottom-sheet__background-tertiary_5eb4s","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_5eb4s","background-quaternary":"bottom-sheet__background-quaternary_5eb4s","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_5eb4s","background-specialbg-component":"bottom-sheet__background-specialbg-component_5eb4s","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_5eb4s","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_5eb4s","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_5eb4s","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_5eb4s","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_5eb4s","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_5eb4s","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_5eb4s","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_5eb4s"};
+var styles = {"modal":"bottom-sheet__modal_1fnli","wrapper":"bottom-sheet__wrapper_1fnli","fullscreen":"bottom-sheet__fullscreen_1fnli","component":"bottom-sheet__component_1fnli","withTransition":"bottom-sheet__withTransition_1fnli","scrollableContainer":"bottom-sheet__scrollableContainer_1fnli","marker":"bottom-sheet__marker_1fnli","defaultMarker":"bottom-sheet__defaultMarker_1fnli","content":"bottom-sheet__content_1fnli","noHeader":"bottom-sheet__noHeader_1fnli","noFooter":"bottom-sheet__noFooter_1fnli","scrollLocked":"bottom-sheet__scrollLocked_1fnli","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_1fnli","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_1fnli","appear":"bottom-sheet__appear_1fnli","enter":"bottom-sheet__enter_1fnli","appearActive":"bottom-sheet__appearActive_1fnli","enterActive":"bottom-sheet__enterActive_1fnli","enterDone":"bottom-sheet__enterDone_1fnli","appearDone":"bottom-sheet__appearDone_1fnli","exit":"bottom-sheet__exit_1fnli","exitActive":"bottom-sheet__exitActive_1fnli","background-accent":"bottom-sheet__background-accent_1fnli","background-info":"bottom-sheet__background-info_1fnli","background-attention-muted":"bottom-sheet__background-attention-muted_1fnli","background-positive-muted":"bottom-sheet__background-positive-muted_1fnli","background-negative-muted":"bottom-sheet__background-negative-muted_1fnli","background-primary":"bottom-sheet__background-primary_1fnli","background-primary-inverted":"bottom-sheet__background-primary-inverted_1fnli","background-secondary":"bottom-sheet__background-secondary_1fnli","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1fnli","background-tertiary":"bottom-sheet__background-tertiary_1fnli","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1fnli","background-quaternary":"bottom-sheet__background-quaternary_1fnli","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1fnli","background-specialbg-component":"bottom-sheet__background-specialbg-component_1fnli","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1fnli","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1fnli","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1fnli","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1fnli","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1fnli","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1fnli","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1fnli","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1fnli"};
 require('./index.css');
 
+var isNil = fnUtils.isNil;
 var BottomSheet = forwardRef(function (_a, ref) {
     var _b, _c, _d, _e, _f;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _g = _a.titleSize, titleSize = _g === void 0 ? 'default' : _g, 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, _h = _a.titleAlign, titleAlign = _h === void 0 ? 'left' : _h, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _j = _a.stickyFooter, stickyFooter = _j === void 0 ? true : _j, _k = _a.initialHeight, initialHeight = _k === void 0 ? 'default' : _k, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, disableFocusLock = _a.disableFocusLock, children = _a.children, zIndex = _a.zIndex, _l = _a.transitionProps, transitionProps = _l === void 0 ? {} : _l, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _m = _a.swipeable, swipeable = _m === void 0 ? true : _m, _o = _a.swipeableContent, swipeableContent = _o === void 0 ? true : _o, _p = _a.swipeThreshold, swipeThreshold = _p === void 0 ? 5 : _p, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _q = _a.scrollableContainerRef, scrollableContainerRef = _q === void 0 ? function () { return null; } : _q, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _r = _a.sheetContainerRef, sheetContainerRef = _r === void 0 ? function () { return null; } : _r, _s = _a.headerOffset, headerOffset = _s === void 0 ? 24 : _s, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize, disableRestoreFocus = _a.disableRestoreFocus, disableAutoFocus = _a.disableAutoFocus, disableEscapeKeyDown = _a.disableEscapeKeyDown, keepMounted = _a.keepMounted, onMagnetizeEnd = _a.onMagnetizeEnd, onOffsetChange = _a.onOffsetChange, swipeableMarker = _a.swipeableMarker, swipeableMarkerClassName = _a.swipeableMarkerClassName;
-    var hasInitialIdx = initialActiveAreaIndex !== undefined;
+    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _g = _a.titleSize, titleSize = _g === void 0 ? 'default' : _g, 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, _h = _a.titleAlign, titleAlign = _h === void 0 ? 'left' : _h, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _j = _a.stickyFooter, stickyFooter = _j === void 0 ? true : _j, _k = _a.initialHeight, initialHeight = _k === void 0 ? 'default' : _k, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, disableFocusLock = _a.disableFocusLock, children = _a.children, zIndex = _a.zIndex, _l = _a.transitionProps, transitionProps = _l === void 0 ? {} : _l, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _m = _a.swipeable, swipeable = _m === void 0 ? true : _m, _o = _a.swipeableContent, swipeableContent = _o === void 0 ? true : _o, _p = _a.swipeThreshold, swipeThreshold = _p === void 0 ? 5 : _p, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _q = _a.scrollableContainerRef, scrollableContainerRef = _q === void 0 ? function () { return null; } : _q, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _r = _a.sheetContainerRef, sheetContainerRef = _r === void 0 ? function () { return null; } : _r, _s = _a.headerOffset, headerOffset = _s === void 0 ? 24 : _s, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize, onSwipeStart = _a.onSwipeStart, onSwipeEnd = _a.onSwipeEnd, disableRestoreFocus = _a.disableRestoreFocus, disableAutoFocus = _a.disableAutoFocus, disableEscapeKeyDown = _a.disableEscapeKeyDown, keepMounted = _a.keepMounted, onMagnetizeEnd = _a.onMagnetizeEnd, onOffsetChange = _a.onOffsetChange, swipeableMarker = _a.swipeableMarker, swipeableMarkerClassName = _a.swipeableMarkerClassName;
     var fullHeight = use100vh() || 0;
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
@@ -47,6 +47,21 @@ var BottomSheet = forwardRef(function (_a, ref) {
     var headerProps = __assign(__assign({}, (titleIsReactElement
         ? { children: title }
         : { title: title ? title === null || title === void 0 ? void 0 : title.toString() : undefined })), { scrollableParentRef: scrollableContainer, headerRef: headerRef, headerOffset: headerOffset, className: headerClassName, addonClassName: addonClassName, closerClassName: closerClassName, backButtonClassName: backerClassName, leftAddons: leftAddons, rightAddons: rightAddons, bottomAddons: bottomAddons, hasCloser: hasCloser, hasBackButton: hasBacker, align: titleAlign, trim: trimTitle, sticky: stickyHeader, dataTestId: getDataTestId(dataTestId, 'header'), onBack: onBack, titleSize: titleSize, subtitle: subtitle, onClose: onClose });
+    var startSwiping = function (event) {
+        setSwipingInProgress(function (p) {
+            if (!p)
+                onSwipeStart === null || onSwipeStart === void 0 ? void 0 : onSwipeStart(event);
+            return true;
+        });
+    };
+    var stopSwiping = function (event) {
+        setSwipingInProgress(function (p) {
+            if (p)
+                onSwipeEnd === null || onSwipeEnd === void 0 ? void 0 : onSwipeEnd(event);
+            return false;
+        });
+        scrollOccurred.current = false;
+    };
     var getBackdropOpacity = function (offset) {
         var canClose = magneticAreas[0] === 0;
         var secondArea = magneticAreas[1];
@@ -78,7 +93,7 @@ var BottomSheet = forwardRef(function (_a, ref) {
         }
     };
     var scrollToArea = function (idx) {
-        setSwipingInProgress(false);
+        stopSwiping(null);
         var nextArea = magneticAreas[idx];
         if (nextArea === 0) {
             onClose();
@@ -198,11 +213,11 @@ var BottomSheet = forwardRef(function (_a, ref) {
         if (shouldSkipSwiping(deltaY, initial[1], event)) {
             return;
         }
-        setSwipingInProgress(true);
+        startSwiping(event);
     };
-    var handleTouchEnd = function () {
-        setSwipingInProgress(false);
-        scrollOccurred.current = false;
+    var handleTouchEnd = function (_a) {
+        var event = _a.event;
+        return stopSwiping(event);
     };
     var handleSheetSwiping = function (_a) {
         var initial = _a.initial, deltaY = _a.deltaY, event = _a.event;
@@ -210,7 +225,7 @@ var BottomSheet = forwardRef(function (_a, ref) {
             return;
         }
         if (!swipingInProgress) {
-            setSwipingInProgress(true);
+            startSwiping(event);
         }
         var offset = getSheetOffset(deltaY);
         var opacity = getBackdropOpacity(offset);
@@ -227,9 +242,9 @@ var BottomSheet = forwardRef(function (_a, ref) {
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
-        var nextArea = hasInitialIdx ? magneticAreas[idx] : lastMagneticArea;
+        var nextArea = isNil(idx) ? lastMagneticArea : magneticAreas[idx];
         setBackdropOpacity(1);
-        setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[idx] : magneticAreas[0]);
+        setSheetOffset(isNil(idx) ? magneticAreas[0] : lastMagneticArea - magneticAreas[idx]);
         setActiveArea(nextArea);
         onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd();
         if (transitionProps.onExited) {
@@ -259,13 +274,13 @@ var BottomSheet = forwardRef(function (_a, ref) {
         }
     };
     useEffect(function () {
-        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта.
+        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта
         if (!isFirstRender) {
-            setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[initialActiveAreaIndex] : 0);
-            setActiveArea(hasInitialIdx ? magneticAreas[initialActiveAreaIndex] : lastMagneticArea);
+            var idx = initialActiveAreaIndex;
+            setSheetOffset(isNil(idx) ? 0 : lastMagneticArea - magneticAreas[idx]);
+            setActiveArea(isNil(idx) ? lastMagneticArea : magneticAreas[idx]);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isFirstRender]);
+    }, [initialActiveAreaIndex, isFirstRender, lastMagneticArea, magneticAreas]);
     useEffect(function () {
         if (!sheetRef.current)
             return;

package/bottom-sheet/esm/components/footer/Component.js

@@ -2,7 +2,7 @@ import React, { useContext, useEffect } from 'react';
 import cn from 'classnames';
 import { BaseModalContext } from '../../../../base-modal/esm';
 
-var styles = {"footer":"bottom-sheet__footer_114h0","sticky":"bottom-sheet__sticky_114h0","highlighted":"bottom-sheet__highlighted_114h0","background-accent":"bottom-sheet__background-accent_114h0","background-info":"bottom-sheet__background-info_114h0","background-attention-muted":"bottom-sheet__background-attention-muted_114h0","background-positive-muted":"bottom-sheet__background-positive-muted_114h0","background-negative-muted":"bottom-sheet__background-negative-muted_114h0","background-primary":"bottom-sheet__background-primary_114h0","background-primary-inverted":"bottom-sheet__background-primary-inverted_114h0","background-secondary":"bottom-sheet__background-secondary_114h0","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_114h0","background-tertiary":"bottom-sheet__background-tertiary_114h0","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_114h0","background-quaternary":"bottom-sheet__background-quaternary_114h0","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_114h0","background-specialbg-component":"bottom-sheet__background-specialbg-component_114h0","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_114h0","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_114h0","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_114h0","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_114h0","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_114h0","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_114h0","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_114h0","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_114h0"};
+var styles = {"footer":"bottom-sheet__footer_u9y6k","sticky":"bottom-sheet__sticky_u9y6k","highlighted":"bottom-sheet__highlighted_u9y6k","background-accent":"bottom-sheet__background-accent_u9y6k","background-info":"bottom-sheet__background-info_u9y6k","background-attention-muted":"bottom-sheet__background-attention-muted_u9y6k","background-positive-muted":"bottom-sheet__background-positive-muted_u9y6k","background-negative-muted":"bottom-sheet__background-negative-muted_u9y6k","background-primary":"bottom-sheet__background-primary_u9y6k","background-primary-inverted":"bottom-sheet__background-primary-inverted_u9y6k","background-secondary":"bottom-sheet__background-secondary_u9y6k","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_u9y6k","background-tertiary":"bottom-sheet__background-tertiary_u9y6k","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_u9y6k","background-quaternary":"bottom-sheet__background-quaternary_u9y6k","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_u9y6k","background-specialbg-component":"bottom-sheet__background-specialbg-component_u9y6k","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_u9y6k","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_u9y6k","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_u9y6k","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_u9y6k","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_u9y6k","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_u9y6k","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_u9y6k","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_u9y6k"};
 require('./index.css');
 
 var Footer = function (_a) {