@alfalab/core-components 42.13.0-beta.0 → 42.13.0

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

@@ -1,4 +1,4 @@
-/* hash: 7594c */
+/* hash: icpfj */
 :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 */
@@ -30,42 +30,42 @@
     --bottom-sheet-title-font-family: var(--font-family-system);
 
     /* footer */
-} .bottom-sheet__headerWrapper_68phn {
+} .bottom-sheet__headerWrapper_1yo8w {
     padding: var(--gap-s) var(--gap-xs) var(--gap-2xs);
     border-top-left-radius: inherit;
     border-top-right-radius: inherit;
     z-index: 1;
-} .bottom-sheet__hasContent_68phn {
+} .bottom-sheet__hasContent_1yo8w {
     background-color: inherit;
-} .bottom-sheet__header_68phn {
+} .bottom-sheet__header_1yo8w {
     display: flex;
-} .bottom-sheet__sticky_68phn {
+} .bottom-sheet__sticky_1yo8w {
     position: sticky;
     top: 0;
-} .bottom-sheet__highlighted_68phn {
+} .bottom-sheet__highlighted_1yo8w {
     border-bottom: var(--bottom-sheet-header-border-bottom);
-} .bottom-sheet__justifyEnd_68phn {
+} .bottom-sheet__justifyEnd_1yo8w {
     justify-content: flex-end;
-} .bottom-sheet__addon_68phn {
+} .bottom-sheet__addon_1yo8w {
     display: flex;
     justify-content: center;
     align-items: center;
     min-width: 48px;
     height: 48px;
-} .bottom-sheet__addonFixed_68phn {
+} .bottom-sheet__addonFixed_1yo8w {
     position: fixed;
-} .bottom-sheet__title_68phn {
+} .bottom-sheet__title_1yo8w {
     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_68phn {
+} .bottom-sheet__titleCenter_1yo8w {
     text-align: center;
-} .bottom-sheet__titleLeft_68phn {
+} .bottom-sheet__titleLeft_1yo8w {
     text-align: left;
-} .bottom-sheet__trimTitle_68phn {
+} .bottom-sheet__trimTitle_1yo8w {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;

package/bottom-sheet/cssm/component.js

@@ -43,7 +43,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
     var _t = React.useState(0), sheetOffset = _t[0], setSheetOffset = _t[1];
     var _u = React.useState(1), backdropOpacity = _u[0], setBackdropOpacity = _u[1];
-    var _v = React.useState(-1), activeAreaIdx = _v[0], setActiveAreaIdx = _v[1];
+    var _v = React.useState(0), activeArea = _v[0], setActiveArea = _v[1];
     var _w = React.useState(null), swipingInProgress = _w[0], setSwipingInProgress = _w[1];
     var scrollOccurred = React.useRef(false);
     var headerRef = React.useRef(null);
@@ -51,7 +51,6 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var sheetHeight = React.useRef(0);
     var sheetRef = React.useRef(null);
     var scrollableContainer = React.useRef(null);
-    var activeArea = magneticAreas[activeAreaIdx];
     var emptyHeader = !hasCloser && !leftAddons && !title && !hasBacker && !rightAddons;
     var titleIsReactElement = React__default.default.isValidElement(title);
     var headerProps = tslib.__assign(tslib.__assign({}, (titleIsReactElement
@@ -105,53 +104,56 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var scrollToArea = function (idx) {
         stopSwiping(null);
         var nextArea = magneticAreas[idx];
-        var nextAreaIdx = getActiveAreaIndex(nextArea);
         if (nextArea === 0) {
             onClose();
             return;
         }
-        if (nextAreaIdx !== -1) {
-            setActiveAreaIdx(nextAreaIdx);
+        if (nextArea) {
+            setActiveArea(nextArea);
             setSheetOffset(lastMagneticArea - nextArea);
-            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(getActiveAreaIndex(nextArea));
         }
     };
     var magnetize = function (velocity, deltaY) {
         var shouldMagnetizeDownByVelocity = deltaY >= 0 && velocity >= utils.SWIPE_VELOCITY;
         var shouldMagnetizeUpByVelocity = deltaY < 0 && velocity >= utils.SWIPE_VELOCITY;
-        var updatePosition = function (nextOffset, nextAreaIdx) {
-            setSheetOffset(nextOffset);
-            setActiveAreaIdx(function (prevState) { return (nextAreaIdx === -1 ? prevState : nextAreaIdx); });
-            if (nextAreaIdx !== -1) {
-                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
-                // Если nextOffset == offset, то onTransitionEnd не отработает и onMagnetizeEnd не вызовется
-                if (sheetOffset === nextOffset) {
-                    onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
-                    setSheetHeight();
-                }
-            }
-        };
         if (shouldMagnetizeDownByVelocity) {
-            var nextArea = magneticAreas
+            var nextArea_1 = magneticAreas
                 .slice()
                 .reverse()
                 .find(function (area) { return area < activeArea; });
-            if (nextArea === 0) {
+            if (nextArea_1 === 0) {
                 onClose();
                 return;
             }
-            var nextOffset = nextArea
-                ? lastMagneticArea - nextArea
+            var nextOffset = nextArea_1
+                ? lastMagneticArea - nextArea_1
                 : lastMagneticArea - activeArea;
-            var nextAreaIdx = getActiveAreaIndex(nextArea);
-            updatePosition(nextOffset, nextAreaIdx);
+            setSheetOffset(nextOffset);
+            setActiveArea(function (prevState) { return nextArea_1 !== null && nextArea_1 !== void 0 ? nextArea_1 : prevState; });
+            if (nextArea_1) {
+                var nextAreaIdx = getActiveAreaIndex(nextArea_1);
+                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+                if (sheetOffset === nextOffset) {
+                    onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
+                    setSheetHeight();
+                }
+            }
             return;
         }
         if (shouldMagnetizeUpByVelocity) {
-            var nextArea = magneticAreas.find(function (area) { return area > activeArea; });
-            var nextAreaIdx = getActiveAreaIndex(nextArea);
-            var nextOffset = nextArea ? lastMagneticArea - nextArea : 0;
-            updatePosition(nextOffset, nextAreaIdx);
+            var nextArea_2 = magneticAreas.find(function (area) { return area > activeArea; });
+            var nextOffset = nextArea_2 ? lastMagneticArea - nextArea_2 : 0;
+            setSheetOffset(nextOffset);
+            setActiveArea(function (prevState) { return nextArea_2 !== null && nextArea_2 !== void 0 ? nextArea_2 : prevState; });
+            if (nextArea_2) {
+                var nextAreaIdx = getActiveAreaIndex(nextArea_2);
+                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+                if (sheetOffset === nextOffset) {
+                    onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
+                    setSheetHeight();
+                }
+            }
             return;
         }
         var offset = getSheetOffset(deltaY);
@@ -180,8 +182,15 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         else {
             var nextOffset = lastMagneticArea - nearestArea;
             var nextAreaIdx = getActiveAreaIndex(nearestArea);
+            setSheetOffset(nextOffset);
+            setActiveArea(nearestArea);
             setBackdropOpacity(1);
-            updatePosition(nextOffset, nextAreaIdx);
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+            // Если nextOffset == offset, то onTransitionEnd не отработает и onMagnetizeEnd не вызовется
+            if (sheetOffset === nextOffset) {
+                onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
+                setSheetHeight();
+            }
         }
     };
     /**
@@ -190,11 +199,13 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
      */
     var shouldSkipSwiping = function (deltaY, startY, event) {
         var _a;
-        if (scrollLockedProp || swipingInProgress)
-            return false;
+        if (!swipeable)
+            return true;
         if (!swipeableContent && ((_a = contentRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
             return true;
         }
+        if (scrollLockedProp || swipingInProgress)
+            return false;
         var scrollableNode = scrollableContainer.current;
         // Точка верхней границы (y координата)
         var bottomSheetTopY = fullHeight - sheetHeight.current;
@@ -253,21 +264,21 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         onSwiped: handleSheetSwipe,
         onTouchEndOrOnMouseUp: handleTouchEnd,
         trackMouse: swipeable,
-        trackTouch: swipeable,
         delta: swipeThreshold,
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
+        var nextArea = isNil(idx) ? lastMagneticArea : magneticAreas[idx];
         setBackdropOpacity(1);
         setSheetOffset(isNil(idx) ? magneticAreas[0] : lastMagneticArea - magneticAreas[idx]);
-        setActiveAreaIdx(isNil(idx) ? magneticAreas.length - 1 : idx);
+        setActiveArea(nextArea);
         onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(0);
         if (transitionProps.onExited) {
             transitionProps.onExited(node);
         }
     };
     var handleEnter = function (node, isAppearing) {
-        onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(initialActiveAreaIndex !== null && initialActiveAreaIndex !== void 0 ? initialActiveAreaIndex : magneticAreas.length - 1);
+        onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(initialActiveAreaIndex || magneticAreas.length - 1);
         if (transitionProps.onEnter) {
             transitionProps.onEnter(node, isAppearing);
         }
@@ -289,19 +300,13 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         }
     };
     React.useEffect(function () {
+        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта
         if (!isFirstRender) {
-            // Инициализируем стейт только после того, как была рассчитана высота вьюпорта
-            if (activeAreaIdx === -1) {
-                var idx = initialActiveAreaIndex;
-                setSheetOffset(isNil(idx) ? 0 : lastMagneticArea - magneticAreas[idx]);
-                setActiveAreaIdx(isNil(idx) ? magneticAreas.length - 1 : idx);
-            }
-            else {
-                setSheetOffset(activeArea ? lastMagneticArea - activeArea : 0);
-            }
+            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, magneticAreas, lastMagneticArea]);
+    }, [initialActiveAreaIndex, isFirstRender, lastMagneticArea, magneticAreas]);
     React.useEffect(function () {
         if (!sheetRef.current)
             return;

package/bottom-sheet/cssm/index.module.css

@@ -57,11 +57,9 @@
     width: 100%;
     max-width: 600px;
     pointer-events: none;
-    touch-action: none;
 } .wrapper {
     transform: translateY(100%);
     pointer-events: none;
-    touch-action: none;
     border-top-right-radius: var(--bottom-sheet-top-radius);
     border-top-left-radius: var(--bottom-sheet-top-radius);
     transition: border-radius 0.3s ease;
@@ -85,7 +83,6 @@
     height: 100%;
     background-color: inherit;
     border-radius: inherit;
-    overscroll-behavior: contain;
 } .marker {
     position: fixed;
     top: var(--gap-2xs);

package/bottom-sheet/esm/component.js

@@ -13,7 +13,7 @@ import { convertPercentToNumber, TIMEOUT, MARKER_HEIGHT, SCROLL_OFFSET, SWIPE_VE
 import '../../navigation-bar/esm';
 import '../../backdrop/esm';
 
-var styles = {"modal":"bottom-sheet__modal_s4kzq","wrapper":"bottom-sheet__wrapper_s4kzq","fullscreen":"bottom-sheet__fullscreen_s4kzq","component":"bottom-sheet__component_s4kzq","withTransition":"bottom-sheet__withTransition_s4kzq","scrollableContainer":"bottom-sheet__scrollableContainer_s4kzq","marker":"bottom-sheet__marker_s4kzq","defaultMarker":"bottom-sheet__defaultMarker_s4kzq","content":"bottom-sheet__content_s4kzq","noHeader":"bottom-sheet__noHeader_s4kzq","noFooter":"bottom-sheet__noFooter_s4kzq","scrollLocked":"bottom-sheet__scrollLocked_s4kzq","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_s4kzq","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_s4kzq","appear":"bottom-sheet__appear_s4kzq","enter":"bottom-sheet__enter_s4kzq","appearActive":"bottom-sheet__appearActive_s4kzq","enterActive":"bottom-sheet__enterActive_s4kzq","enterDone":"bottom-sheet__enterDone_s4kzq","appearDone":"bottom-sheet__appearDone_s4kzq","exit":"bottom-sheet__exit_s4kzq","exitActive":"bottom-sheet__exitActive_s4kzq","background-accent":"bottom-sheet__background-accent_s4kzq","background-info":"bottom-sheet__background-info_s4kzq","background-attention-muted":"bottom-sheet__background-attention-muted_s4kzq","background-positive-muted":"bottom-sheet__background-positive-muted_s4kzq","background-negative-muted":"bottom-sheet__background-negative-muted_s4kzq","background-primary":"bottom-sheet__background-primary_s4kzq","background-primary-inverted":"bottom-sheet__background-primary-inverted_s4kzq","background-secondary":"bottom-sheet__background-secondary_s4kzq","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_s4kzq","background-tertiary":"bottom-sheet__background-tertiary_s4kzq","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_s4kzq","background-quaternary":"bottom-sheet__background-quaternary_s4kzq","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_s4kzq","background-specialbg-component":"bottom-sheet__background-specialbg-component_s4kzq","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_s4kzq","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_s4kzq","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_s4kzq","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_s4kzq","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_s4kzq","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_s4kzq","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_s4kzq","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_s4kzq"};
+var styles = {"modal":"bottom-sheet__modal_cpaei","wrapper":"bottom-sheet__wrapper_cpaei","fullscreen":"bottom-sheet__fullscreen_cpaei","component":"bottom-sheet__component_cpaei","withTransition":"bottom-sheet__withTransition_cpaei","scrollableContainer":"bottom-sheet__scrollableContainer_cpaei","marker":"bottom-sheet__marker_cpaei","defaultMarker":"bottom-sheet__defaultMarker_cpaei","content":"bottom-sheet__content_cpaei","noHeader":"bottom-sheet__noHeader_cpaei","noFooter":"bottom-sheet__noFooter_cpaei","scrollLocked":"bottom-sheet__scrollLocked_cpaei","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_cpaei","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_cpaei","appear":"bottom-sheet__appear_cpaei","enter":"bottom-sheet__enter_cpaei","appearActive":"bottom-sheet__appearActive_cpaei","enterActive":"bottom-sheet__enterActive_cpaei","enterDone":"bottom-sheet__enterDone_cpaei","appearDone":"bottom-sheet__appearDone_cpaei","exit":"bottom-sheet__exit_cpaei","exitActive":"bottom-sheet__exitActive_cpaei","background-accent":"bottom-sheet__background-accent_cpaei","background-info":"bottom-sheet__background-info_cpaei","background-attention-muted":"bottom-sheet__background-attention-muted_cpaei","background-positive-muted":"bottom-sheet__background-positive-muted_cpaei","background-negative-muted":"bottom-sheet__background-negative-muted_cpaei","background-primary":"bottom-sheet__background-primary_cpaei","background-primary-inverted":"bottom-sheet__background-primary-inverted_cpaei","background-secondary":"bottom-sheet__background-secondary_cpaei","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_cpaei","background-tertiary":"bottom-sheet__background-tertiary_cpaei","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_cpaei","background-quaternary":"bottom-sheet__background-quaternary_cpaei","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_cpaei","background-specialbg-component":"bottom-sheet__background-specialbg-component_cpaei","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_cpaei","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_cpaei","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_cpaei","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_cpaei","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_cpaei","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_cpaei","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_cpaei","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_cpaei"};
 require('./index.css');
 
 var isNil = fnUtils.isNil;
@@ -34,7 +34,7 @@ var BottomSheet = forwardRef(function (_a, ref) {
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
     var _t = useState(0), sheetOffset = _t[0], setSheetOffset = _t[1];
     var _u = useState(1), backdropOpacity = _u[0], setBackdropOpacity = _u[1];
-    var _v = useState(-1), activeAreaIdx = _v[0], setActiveAreaIdx = _v[1];
+    var _v = useState(0), activeArea = _v[0], setActiveArea = _v[1];
     var _w = useState(null), swipingInProgress = _w[0], setSwipingInProgress = _w[1];
     var scrollOccurred = useRef(false);
     var headerRef = useRef(null);
@@ -42,7 +42,6 @@ var BottomSheet = forwardRef(function (_a, ref) {
     var sheetHeight = useRef(0);
     var sheetRef = useRef(null);
     var scrollableContainer = useRef(null);
-    var activeArea = magneticAreas[activeAreaIdx];
     var emptyHeader = !hasCloser && !leftAddons && !title && !hasBacker && !rightAddons;
     var titleIsReactElement = React.isValidElement(title);
     var headerProps = __assign(__assign({}, (titleIsReactElement
@@ -96,53 +95,56 @@ var BottomSheet = forwardRef(function (_a, ref) {
     var scrollToArea = function (idx) {
         stopSwiping(null);
         var nextArea = magneticAreas[idx];
-        var nextAreaIdx = getActiveAreaIndex(nextArea);
         if (nextArea === 0) {
             onClose();
             return;
         }
-        if (nextAreaIdx !== -1) {
-            setActiveAreaIdx(nextAreaIdx);
+        if (nextArea) {
+            setActiveArea(nextArea);
             setSheetOffset(lastMagneticArea - nextArea);
-            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(getActiveAreaIndex(nextArea));
         }
     };
     var magnetize = function (velocity, deltaY) {
         var shouldMagnetizeDownByVelocity = deltaY >= 0 && velocity >= SWIPE_VELOCITY;
         var shouldMagnetizeUpByVelocity = deltaY < 0 && velocity >= SWIPE_VELOCITY;
-        var updatePosition = function (nextOffset, nextAreaIdx) {
-            setSheetOffset(nextOffset);
-            setActiveAreaIdx(function (prevState) { return (nextAreaIdx === -1 ? prevState : nextAreaIdx); });
-            if (nextAreaIdx !== -1) {
-                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
-                // Если nextOffset == offset, то onTransitionEnd не отработает и onMagnetizeEnd не вызовется
-                if (sheetOffset === nextOffset) {
-                    onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
-                    setSheetHeight();
-                }
-            }
-        };
         if (shouldMagnetizeDownByVelocity) {
-            var nextArea = magneticAreas
+            var nextArea_1 = magneticAreas
                 .slice()
                 .reverse()
                 .find(function (area) { return area < activeArea; });
-            if (nextArea === 0) {
+            if (nextArea_1 === 0) {
                 onClose();
                 return;
             }
-            var nextOffset = nextArea
-                ? lastMagneticArea - nextArea
+            var nextOffset = nextArea_1
+                ? lastMagneticArea - nextArea_1
                 : lastMagneticArea - activeArea;
-            var nextAreaIdx = getActiveAreaIndex(nextArea);
-            updatePosition(nextOffset, nextAreaIdx);
+            setSheetOffset(nextOffset);
+            setActiveArea(function (prevState) { return nextArea_1 !== null && nextArea_1 !== void 0 ? nextArea_1 : prevState; });
+            if (nextArea_1) {
+                var nextAreaIdx = getActiveAreaIndex(nextArea_1);
+                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+                if (sheetOffset === nextOffset) {
+                    onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
+                    setSheetHeight();
+                }
+            }
             return;
         }
         if (shouldMagnetizeUpByVelocity) {
-            var nextArea = magneticAreas.find(function (area) { return area > activeArea; });
-            var nextAreaIdx = getActiveAreaIndex(nextArea);
-            var nextOffset = nextArea ? lastMagneticArea - nextArea : 0;
-            updatePosition(nextOffset, nextAreaIdx);
+            var nextArea_2 = magneticAreas.find(function (area) { return area > activeArea; });
+            var nextOffset = nextArea_2 ? lastMagneticArea - nextArea_2 : 0;
+            setSheetOffset(nextOffset);
+            setActiveArea(function (prevState) { return nextArea_2 !== null && nextArea_2 !== void 0 ? nextArea_2 : prevState; });
+            if (nextArea_2) {
+                var nextAreaIdx = getActiveAreaIndex(nextArea_2);
+                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+                if (sheetOffset === nextOffset) {
+                    onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
+                    setSheetHeight();
+                }
+            }
             return;
         }
         var offset = getSheetOffset(deltaY);
@@ -171,8 +173,15 @@ var BottomSheet = forwardRef(function (_a, ref) {
         else {
             var nextOffset = lastMagneticArea - nearestArea;
             var nextAreaIdx = getActiveAreaIndex(nearestArea);
+            setSheetOffset(nextOffset);
+            setActiveArea(nearestArea);
             setBackdropOpacity(1);
-            updatePosition(nextOffset, nextAreaIdx);
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(nextAreaIdx);
+            // Если nextOffset == offset, то onTransitionEnd не отработает и onMagnetizeEnd не вызовется
+            if (sheetOffset === nextOffset) {
+                onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(nextAreaIdx);
+                setSheetHeight();
+            }
         }
     };
     /**
@@ -181,11 +190,13 @@ var BottomSheet = forwardRef(function (_a, ref) {
      */
     var shouldSkipSwiping = function (deltaY, startY, event) {
         var _a;
-        if (scrollLockedProp || swipingInProgress)
-            return false;
+        if (!swipeable)
+            return true;
         if (!swipeableContent && ((_a = contentRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
             return true;
         }
+        if (scrollLockedProp || swipingInProgress)
+            return false;
         var scrollableNode = scrollableContainer.current;
         // Точка верхней границы (y координата)
         var bottomSheetTopY = fullHeight - sheetHeight.current;
@@ -244,21 +255,21 @@ var BottomSheet = forwardRef(function (_a, ref) {
         onSwiped: handleSheetSwipe,
         onTouchEndOrOnMouseUp: handleTouchEnd,
         trackMouse: swipeable,
-        trackTouch: swipeable,
         delta: swipeThreshold,
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
+        var nextArea = isNil(idx) ? lastMagneticArea : magneticAreas[idx];
         setBackdropOpacity(1);
         setSheetOffset(isNil(idx) ? magneticAreas[0] : lastMagneticArea - magneticAreas[idx]);
-        setActiveAreaIdx(isNil(idx) ? magneticAreas.length - 1 : idx);
+        setActiveArea(nextArea);
         onMagnetizeEnd === null || onMagnetizeEnd === void 0 ? void 0 : onMagnetizeEnd(0);
         if (transitionProps.onExited) {
             transitionProps.onExited(node);
         }
     };
     var handleEnter = function (node, isAppearing) {
-        onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(initialActiveAreaIndex !== null && initialActiveAreaIndex !== void 0 ? initialActiveAreaIndex : magneticAreas.length - 1);
+        onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(initialActiveAreaIndex || magneticAreas.length - 1);
         if (transitionProps.onEnter) {
             transitionProps.onEnter(node, isAppearing);
         }
@@ -280,19 +291,13 @@ var BottomSheet = forwardRef(function (_a, ref) {
         }
     };
     useEffect(function () {
+        // Инициализируем стейт только после того, как была рассчитана высота вьюпорта
         if (!isFirstRender) {
-            // Инициализируем стейт только после того, как была рассчитана высота вьюпорта
-            if (activeAreaIdx === -1) {
-                var idx = initialActiveAreaIndex;
-                setSheetOffset(isNil(idx) ? 0 : lastMagneticArea - magneticAreas[idx]);
-                setActiveAreaIdx(isNil(idx) ? magneticAreas.length - 1 : idx);
-            }
-            else {
-                setSheetOffset(activeArea ? lastMagneticArea - activeArea : 0);
-            }
+            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, magneticAreas, lastMagneticArea]);
+    }, [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_jxytq","sticky":"bottom-sheet__sticky_jxytq","highlighted":"bottom-sheet__highlighted_jxytq","background-accent":"bottom-sheet__background-accent_jxytq","background-info":"bottom-sheet__background-info_jxytq","background-attention-muted":"bottom-sheet__background-attention-muted_jxytq","background-positive-muted":"bottom-sheet__background-positive-muted_jxytq","background-negative-muted":"bottom-sheet__background-negative-muted_jxytq","background-primary":"bottom-sheet__background-primary_jxytq","background-primary-inverted":"bottom-sheet__background-primary-inverted_jxytq","background-secondary":"bottom-sheet__background-secondary_jxytq","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_jxytq","background-tertiary":"bottom-sheet__background-tertiary_jxytq","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_jxytq","background-quaternary":"bottom-sheet__background-quaternary_jxytq","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_jxytq","background-specialbg-component":"bottom-sheet__background-specialbg-component_jxytq","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_jxytq","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_jxytq","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_jxytq","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_jxytq","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_jxytq","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_jxytq","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_jxytq","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_jxytq"};
+var styles = {"footer":"bottom-sheet__footer_1ci9k","sticky":"bottom-sheet__sticky_1ci9k","highlighted":"bottom-sheet__highlighted_1ci9k","background-accent":"bottom-sheet__background-accent_1ci9k","background-info":"bottom-sheet__background-info_1ci9k","background-attention-muted":"bottom-sheet__background-attention-muted_1ci9k","background-positive-muted":"bottom-sheet__background-positive-muted_1ci9k","background-negative-muted":"bottom-sheet__background-negative-muted_1ci9k","background-primary":"bottom-sheet__background-primary_1ci9k","background-primary-inverted":"bottom-sheet__background-primary-inverted_1ci9k","background-secondary":"bottom-sheet__background-secondary_1ci9k","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1ci9k","background-tertiary":"bottom-sheet__background-tertiary_1ci9k","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1ci9k","background-quaternary":"bottom-sheet__background-quaternary_1ci9k","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1ci9k","background-specialbg-component":"bottom-sheet__background-specialbg-component_1ci9k","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1ci9k","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1ci9k","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1ci9k","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1ci9k","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1ci9k","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1ci9k","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1ci9k","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1ci9k"};
 require('./index.css');
 
 var Footer = function (_a) {

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

@@ -1,4 +1,4 @@
-/* hash: trkge */
+/* hash: 14z0r */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-accent: #ef3124;
@@ -45,58 +45,58 @@
     /* footer */
     --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_jxytq {
+} .bottom-sheet__footer_1ci9k {
     padding: var(--gap-m) var(--gap-m);
     background-color: var(--color-light-bg-primary);
-} .bottom-sheet__sticky_jxytq {
+} .bottom-sheet__sticky_1ci9k {
     position: sticky;
     bottom: 0;
     z-index: 1;
-} .bottom-sheet__highlighted_jxytq {
+} .bottom-sheet__highlighted_1ci9k {
     border-top: var(--bottom-sheet-footer-border-top);
     background-color: var(--bottom-sheet-footer-background-color);
-} .bottom-sheet__background-accent_jxytq {
+} .bottom-sheet__background-accent_1ci9k {
             background-color: var(--color-light-bg-accent);
-        } .bottom-sheet__background-info_jxytq {
+        } .bottom-sheet__background-info_1ci9k {
             background-color: var(--color-light-bg-info);
-        } .bottom-sheet__background-attention-muted_jxytq {
+        } .bottom-sheet__background-attention-muted_1ci9k {
             background-color: var(--color-light-bg-attention-muted);
-        } .bottom-sheet__background-positive-muted_jxytq {
+        } .bottom-sheet__background-positive-muted_1ci9k {
             background-color: var(--color-light-bg-positive-muted);
-        } .bottom-sheet__background-negative-muted_jxytq {
+        } .bottom-sheet__background-negative-muted_1ci9k {
             background-color: var(--color-light-bg-negative-muted);
-        } .bottom-sheet__background-primary_jxytq {
+        } .bottom-sheet__background-primary_1ci9k {
             background-color: var(--color-light-bg-primary);
-        } .bottom-sheet__background-primary-inverted_jxytq {
+        } .bottom-sheet__background-primary-inverted_1ci9k {
             background-color: var(--color-light-bg-primary-inverted);
-        } .bottom-sheet__background-secondary_jxytq {
+        } .bottom-sheet__background-secondary_1ci9k {
             background-color: var(--color-light-bg-secondary);
-        } .bottom-sheet__background-secondary-inverted_jxytq {
+        } .bottom-sheet__background-secondary-inverted_1ci9k {
             background-color: var(--color-light-bg-secondary-inverted);
-        } .bottom-sheet__background-tertiary_jxytq {
+        } .bottom-sheet__background-tertiary_1ci9k {
             background-color: var(--color-light-bg-tertiary);
-        } .bottom-sheet__background-tertiary-inverted_jxytq {
+        } .bottom-sheet__background-tertiary-inverted_1ci9k {
             background-color: var(--color-light-bg-tertiary-inverted);
-        } .bottom-sheet__background-quaternary_jxytq {
+        } .bottom-sheet__background-quaternary_1ci9k {
             background-color: var(--color-light-bg-quaternary);
-        } .bottom-sheet__background-quaternary-inverted_jxytq {
+        } .bottom-sheet__background-quaternary-inverted_1ci9k {
             background-color: var(--color-light-bg-quaternary-inverted);
-        } .bottom-sheet__background-specialbg-component_jxytq {
+        } .bottom-sheet__background-specialbg-component_1ci9k {
             background-color: var(--color-light-specialbg-component);
-        } .bottom-sheet__background-specialbg-component-inverted_jxytq {
+        } .bottom-sheet__background-specialbg-component-inverted_1ci9k {
             background-color: var(--color-light-specialbg-component-inverted);
-        } .bottom-sheet__background-specialbg-primary-grouped_jxytq {
+        } .bottom-sheet__background-specialbg-primary-grouped_1ci9k {
             background-color: var(--color-light-specialbg-primary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-grouped_jxytq {
+        } .bottom-sheet__background-specialbg-secondary-grouped_1ci9k {
             background-color: var(--color-light-specialbg-secondary-grouped);
-        } .bottom-sheet__background-specialbg-tertiary-grouped_jxytq {
+        } .bottom-sheet__background-specialbg-tertiary-grouped_1ci9k {
             background-color: var(--color-light-specialbg-tertiary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-transparent_jxytq {
+        } .bottom-sheet__background-specialbg-secondary-transparent_1ci9k {
             background-color: var(--color-light-specialbg-secondary-transparent);
-        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_jxytq {
+        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_1ci9k {
             background-color: var(--color-light-specialbg-secondary-transparent-inverted);
-        } .bottom-sheet__background-specialbg-tertiary-transparent_jxytq {
+        } .bottom-sheet__background-specialbg-tertiary-transparent_1ci9k {
             background-color: var(--color-light-specialbg-tertiary-transparent);
-        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_jxytq {
+        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_1ci9k {
             background-color: var(--color-light-specialbg-tertiary-transparent-inverted);
         }

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

@@ -4,7 +4,7 @@ import cn from 'classnames';
 import { BaseModalContext } from '../../../../base-modal/esm';
 import { NavigationBar } from '../../../../navigation-bar/esm';
 
-var styles = {"headerWrapper":"bottom-sheet__headerWrapper_68phn","hasContent":"bottom-sheet__hasContent_68phn","header":"bottom-sheet__header_68phn","sticky":"bottom-sheet__sticky_68phn","highlighted":"bottom-sheet__highlighted_68phn","justifyEnd":"bottom-sheet__justifyEnd_68phn","addon":"bottom-sheet__addon_68phn","addonFixed":"bottom-sheet__addonFixed_68phn","title":"bottom-sheet__title_68phn","titleCenter":"bottom-sheet__titleCenter_68phn","titleLeft":"bottom-sheet__titleLeft_68phn","trimTitle":"bottom-sheet__trimTitle_68phn"};
+var styles = {"headerWrapper":"bottom-sheet__headerWrapper_1yo8w","hasContent":"bottom-sheet__hasContent_1yo8w","header":"bottom-sheet__header_1yo8w","sticky":"bottom-sheet__sticky_1yo8w","highlighted":"bottom-sheet__highlighted_1yo8w","justifyEnd":"bottom-sheet__justifyEnd_1yo8w","addon":"bottom-sheet__addon_1yo8w","addonFixed":"bottom-sheet__addonFixed_1yo8w","title":"bottom-sheet__title_1yo8w","titleCenter":"bottom-sheet__titleCenter_1yo8w","titleLeft":"bottom-sheet__titleLeft_1yo8w","trimTitle":"bottom-sheet__trimTitle_1yo8w"};
 require('./index.css');
 
 var Header = function (_a) {