@alfalab/core-components 41.17.0-beta.1 → 41.17.0-beta.11

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

@@ -5,7 +5,6 @@ var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('../../../../base-modal/cssm');
 var coreComponentsNavigationBar = require('../../../../navigation-bar/cssm');
-var utils = require('../../utils.js');
 var styles = require('./index.module.css');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -16,11 +15,11 @@ var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
 
 var Header = function (_a) {
     var _b;
-    var className = _a.className, sticky = _a.sticky, headerRef = _a.headerRef, title = _a.title, children = _a.children, restProps = tslib.__rest(_a, ["className", "sticky", "headerRef", "title", "children"]);
+    var className = _a.className, sticky = _a.sticky, headerRef = _a.headerRef, headerOffset = _a.headerOffset, title = _a.title, children = _a.children, restProps = tslib.__rest(_a, ["className", "sticky", "headerRef", "headerOffset", "title", "children"]);
     var _c = React.useContext(coreComponentsBaseModal.BaseModalContext), setHeaderOffset = _c.setHeaderOffset, setHasHeader = _c.setHasHeader, headerHighlighted = _c.headerHighlighted, onClose = _c.onClose;
     React.useEffect(function () {
-        setHeaderOffset(utils.HEADER_OFFSET);
-    }, [setHeaderOffset]);
+        setHeaderOffset(headerOffset);
+    }, [headerOffset, setHeaderOffset]);
     React.useEffect(function () {
         setHasHeader(true);
     }, [setHasHeader]);

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

@@ -57,6 +57,9 @@
     pointer-events: none;
     border-top-right-radius: var(--border-radius-xl);
     border-top-left-radius: var(--border-radius-xl);
+    transition: border-radius 0.3s ease;
+} .fullscreen {
+    border-radius: 0;
 } .component {
     overflow: hidden;
     position: relative;

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

@@ -105,6 +105,14 @@ type BottomSheetProps = {
      * @default true
      */
     swipeable?: boolean;
+    /**
+     * Будет ли свайпаться контент
+     */
+    swipeableContent?: boolean;
+    /**
+     * Порог свайпа
+     */
+    swipeThreshold?: number;
     /**
      * Слот слева
      */
@@ -207,6 +215,10 @@ type BottomSheetProps = {
      * Скрыть скроллбар внутри шторки
      */
     hideScrollbar?: boolean;
+    /**
+     * Верхний отступ шторки, если она открыта на максимальную высоту
+     */
+    headerOffset?: number;
     /**
      * Обработчик закрытия
      */
@@ -219,5 +231,9 @@ type BottomSheetProps = {
      * Вызывается после притягивания к одной из `magneticAreas`
      */
     onMagnetize?: (index: number) => void;
+    /**
+     * Вызывается при изменении положения шторки
+     */
+    onOffsetChange?: (offset: number, percent: number) => void;
 };
 export { BottomSheetTitleAlign, BottomSheetProps };

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

@@ -1,8 +1,8 @@
 declare const TIMEOUT = 500;
 declare const SWIPE_VELOCITY = 0.4;
 declare const MARKER_HEIGHT = 24;
-declare const HEADER_OFFSET = 24;
 declare const CLOSE_OFFSET = 0.2;
 declare const SCROLL_OFFSET = 1;
-declare const convertPercentToNumber: (value: string | number, fullHeight: number) => number;
-export { TIMEOUT, SWIPE_VELOCITY, MARKER_HEIGHT, HEADER_OFFSET, CLOSE_OFFSET, SCROLL_OFFSET, convertPercentToNumber };
+declare const HEADER_OFFSET = 24;
+declare const convertPercentToNumber: (value: string | number, fullHeight: number, headerOffset?: number) => number;
+export { TIMEOUT, SWIPE_VELOCITY, MARKER_HEIGHT, CLOSE_OFFSET, SCROLL_OFFSET, HEADER_OFFSET, convertPercentToNumber };

package/bottom-sheet/cssm/utils.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var TIMEOUT = 500;
 var SWIPE_VELOCITY = 0.4;
 var MARKER_HEIGHT = 24;
-/* Верхний отступ шторки, если она открыта на максимальную высоту */
-var HEADER_OFFSET = 24;
 var CLOSE_OFFSET = 0.2;
 var SCROLL_OFFSET = 1;
-var convertPercentToNumber = function (value, fullHeight) {
-    var maxHeight = fullHeight - HEADER_OFFSET;
+var HEADER_OFFSET = 24;
+var convertPercentToNumber = function (value, fullHeight, headerOffset) {
+    if (headerOffset === void 0) { headerOffset = HEADER_OFFSET; }
+    var maxHeight = fullHeight - headerOffset;
     if (typeof value === 'string') {
         var percent = parseFloat(value) / 100;
         if (percent < 0) {

package/bottom-sheet/esm/component.js

@@ -8,7 +8,7 @@ import { BaseModal } from '../../base-modal/esm';
 import { Footer } from './components/footer/Component.js';
 import { Header } from './components/header/Component.js';
 import { SwipeableBackdrop } from './components/swipeable-backdrop/Component.js';
-import { convertPercentToNumber, HEADER_OFFSET, TIMEOUT, MARKER_HEIGHT, SCROLL_OFFSET, SWIPE_VELOCITY, CLOSE_OFFSET } from './utils.js';
+import { convertPercentToNumber, TIMEOUT, MARKER_HEIGHT, SCROLL_OFFSET, SWIPE_VELOCITY, CLOSE_OFFSET } from './utils.js';
 import '../../navigation-bar/esm';
 import '../../backdrop/esm';
 
@@ -17,28 +17,32 @@ var getDataTestId = function (dataTestId, element) {
     return dataTestId ? "".concat(dataTestId).concat(elementPart) : undefined;
 };
 
-var styles = {"modal":"bottom-sheet__modal_1yfxn","wrapper":"bottom-sheet__wrapper_1yfxn","component":"bottom-sheet__component_1yfxn","withTransition":"bottom-sheet__withTransition_1yfxn","scrollableContainer":"bottom-sheet__scrollableContainer_1yfxn","marker":"bottom-sheet__marker_1yfxn","content":"bottom-sheet__content_1yfxn","noHeader":"bottom-sheet__noHeader_1yfxn","noFooter":"bottom-sheet__noFooter_1yfxn","scrollLocked":"bottom-sheet__scrollLocked_1yfxn","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_1yfxn","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_1yfxn","appear":"bottom-sheet__appear_1yfxn","enter":"bottom-sheet__enter_1yfxn","appearActive":"bottom-sheet__appearActive_1yfxn","enterActive":"bottom-sheet__enterActive_1yfxn","enterDone":"bottom-sheet__enterDone_1yfxn","appearDone":"bottom-sheet__appearDone_1yfxn","exit":"bottom-sheet__exit_1yfxn","exitActive":"bottom-sheet__exitActive_1yfxn","background-accent":"bottom-sheet__background-accent_1yfxn","background-info":"bottom-sheet__background-info_1yfxn","background-attention-muted":"bottom-sheet__background-attention-muted_1yfxn","background-positive-muted":"bottom-sheet__background-positive-muted_1yfxn","background-negative-muted":"bottom-sheet__background-negative-muted_1yfxn","background-primary":"bottom-sheet__background-primary_1yfxn","background-primary-inverted":"bottom-sheet__background-primary-inverted_1yfxn","background-secondary":"bottom-sheet__background-secondary_1yfxn","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1yfxn","background-tertiary":"bottom-sheet__background-tertiary_1yfxn","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1yfxn","background-quaternary":"bottom-sheet__background-quaternary_1yfxn","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1yfxn","background-specialbg-component":"bottom-sheet__background-specialbg-component_1yfxn","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1yfxn","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1yfxn","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1yfxn","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1yfxn","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1yfxn","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1yfxn","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1yfxn","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1yfxn"};
+var styles = {"modal":"bottom-sheet__modal_1yfxn","wrapper":"bottom-sheet__wrapper_1yfxn","fullscreen":"bottom-sheet__fullscreen_1yfxn","component":"bottom-sheet__component_1yfxn","withTransition":"bottom-sheet__withTransition_1yfxn","scrollableContainer":"bottom-sheet__scrollableContainer_1yfxn","marker":"bottom-sheet__marker_1yfxn","content":"bottom-sheet__content_1yfxn","noHeader":"bottom-sheet__noHeader_1yfxn","noFooter":"bottom-sheet__noFooter_1yfxn","scrollLocked":"bottom-sheet__scrollLocked_1yfxn","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_1yfxn","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_1yfxn","appear":"bottom-sheet__appear_1yfxn","enter":"bottom-sheet__enter_1yfxn","appearActive":"bottom-sheet__appearActive_1yfxn","enterActive":"bottom-sheet__enterActive_1yfxn","enterDone":"bottom-sheet__enterDone_1yfxn","appearDone":"bottom-sheet__appearDone_1yfxn","exit":"bottom-sheet__exit_1yfxn","exitActive":"bottom-sheet__exitActive_1yfxn","background-accent":"bottom-sheet__background-accent_1yfxn","background-info":"bottom-sheet__background-info_1yfxn","background-attention-muted":"bottom-sheet__background-attention-muted_1yfxn","background-positive-muted":"bottom-sheet__background-positive-muted_1yfxn","background-negative-muted":"bottom-sheet__background-negative-muted_1yfxn","background-primary":"bottom-sheet__background-primary_1yfxn","background-primary-inverted":"bottom-sheet__background-primary-inverted_1yfxn","background-secondary":"bottom-sheet__background-secondary_1yfxn","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1yfxn","background-tertiary":"bottom-sheet__background-tertiary_1yfxn","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1yfxn","background-quaternary":"bottom-sheet__background-quaternary_1yfxn","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1yfxn","background-specialbg-component":"bottom-sheet__background-specialbg-component_1yfxn","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1yfxn","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1yfxn","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1yfxn","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1yfxn","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1yfxn","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1yfxn","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1yfxn","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1yfxn"};
 require('./index.css');
 
 var BottomSheet = forwardRef(function (_a, ref) {
-    var _b, _c, _d, _e;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _f = _a.titleSize, titleSize = _f === void 0 ? 'default' : _f, subtitle = _a.subtitle, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, containerProps = _a.containerProps, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, modalClassName = _a.modalClassName, modalWrapperClassName = _a.modalWrapperClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, bottomAddons = _a.bottomAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _g = _a.titleAlign, titleAlign = _g === void 0 ? 'left' : _g, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _h = _a.stickyFooter, stickyFooter = _h === void 0 ? true : _h, _j = _a.initialHeight, initialHeight = _j === void 0 ? 'default' : _j, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, disableFocusLock = _a.disableFocusLock, children = _a.children, zIndex = _a.zIndex, _k = _a.transitionProps, transitionProps = _k === void 0 ? {} : _k, magneticAreasProp = _a.magneticAreas, initialActiveAreaIndex = _a.initialActiveAreaIndex, dataTestId = _a.dataTestId, _l = _a.swipeable, swipeable = _l === void 0 ? true : _l, scrollLockedProp = _a.scrollLocked, backdropProps = _a.backdropProps, _m = _a.scrollableContainerRef, scrollableContainerRef = _m === void 0 ? function () { return null; } : _m, bottomSheetInstanceRef = _a.bottomSheetInstanceRef, _o = _a.sheetContainerRef, sheetContainerRef = _o === void 0 ? function () { return null; } : _o, onClose = _a.onClose, onBack = _a.onBack, onMagnetize = _a.onMagnetize;
+    var _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, onOffsetChange = _a.onOffsetChange;
     var hasInitialIdx = initialActiveAreaIndex !== undefined;
     var fullHeight = use100vh() || 0;
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
     var magneticAreas = useMemo(function () {
         if (magneticAreasProp) {
-            return magneticAreasProp.map(function (area) { return convertPercentToNumber(area, fullHeight); });
+            return magneticAreasProp.map(function (area) {
+                return convertPercentToNumber(area, fullHeight, headerOffset);
+            });
         }
-        return [0, fullHeight - HEADER_OFFSET];
-    }, [fullHeight, magneticAreasProp]);
+        return [0, fullHeight - headerOffset];
+    }, [fullHeight, headerOffset, magneticAreasProp]);
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
-    var _p = useState(0), sheetOffset = _p[0], setSheetOffset = _p[1];
-    var _q = useState(1), backdropOpacity = _q[0], setBackdropOpacity = _q[1];
-    var _r = useState(0), activeArea = _r[0], setActiveArea = _r[1];
-    var swipingInProgress = useRef(null);
+    var _t = useState(0), sheetOffset = _t[0], setSheetOffset = _t[1];
+    var _u = useState(1), backdropOpacity = _u[0], setBackdropOpacity = _u[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);
+    var contentRef = useRef(null);
     var sheetHeight = useRef(0);
     var sheetRef = useRef(null);
     var scrollableContainer = useRef(null);
@@ -46,7 +50,7 @@ var BottomSheet = forwardRef(function (_a, ref) {
     var titleIsReactElement = React.isValidElement(title);
     var headerProps = __assign(__assign({}, (titleIsReactElement
         ? { children: title }
-        : { title: title ? title === null || title === void 0 ? void 0 : title.toString() : undefined })), { scrollableParentRef: scrollableContainer, headerRef: headerRef, 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 });
+        : { 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 getBackdropOpacity = function (offset) {
         var canClose = magneticAreas[0] === 0;
         var secondArea = magneticAreas[1];
@@ -72,15 +76,17 @@ var BottomSheet = forwardRef(function (_a, ref) {
         }
     };
     var scrollToArea = function (idx) {
-        swipingInProgress.current = false;
+        setSwipingInProgress(false);
         var nextArea = magneticAreas[idx];
         if (nextArea === 0) {
             onClose();
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(0);
             return;
         }
         if (nextArea) {
             setActiveArea(nextArea);
             setSheetOffset(lastMagneticArea - nextArea);
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(getActiveAreaIndex(nextArea));
         }
     };
     var magnetize = function (dir, velocity, deltaY) {
@@ -93,6 +99,7 @@ var BottomSheet = forwardRef(function (_a, ref) {
                 .find(function (area) { return area < activeArea; });
             if (nextArea_1 === 0) {
                 onClose();
+                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(0);
                 return;
             }
             var offset_1 = nextArea_1
@@ -100,6 +107,9 @@ var BottomSheet = forwardRef(function (_a, ref) {
                 : lastMagneticArea - activeArea;
             setSheetOffset(offset_1);
             setActiveArea(function (prevState) { return nextArea_1 !== null && nextArea_1 !== void 0 ? nextArea_1 : prevState; });
+            if (nextArea_1) {
+                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(getActiveAreaIndex(nextArea_1));
+            }
             return;
         }
         if (shouldMagnetizeUpByVelocity) {
@@ -107,6 +117,9 @@ var BottomSheet = forwardRef(function (_a, ref) {
             var offset_2 = nextArea_2 ? lastMagneticArea - nextArea_2 : 0;
             setSheetOffset(offset_2);
             setActiveArea(function (prevState) { return nextArea_2 !== null && nextArea_2 !== void 0 ? nextArea_2 : prevState; });
+            if (nextArea_2) {
+                onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(getActiveAreaIndex(nextArea_2));
+            }
             return;
         }
         var offset = getSheetOffset(deltaY);
@@ -117,6 +130,7 @@ var BottomSheet = forwardRef(function (_a, ref) {
         var shouldCloseByOffset = isSecondArea && canClose && 1 - currentSheetHeight / activeArea > CLOSE_OFFSET;
         if (shouldCloseByOffset) {
             onClose();
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(0);
             return;
         }
         var nearestArea = magneticAreas.reduceRight(function (res, area) {
@@ -131,21 +145,27 @@ var BottomSheet = forwardRef(function (_a, ref) {
         }).nearestArea;
         if (nearestArea === 0) {
             onClose();
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(0);
         }
         else {
             setSheetOffset(lastMagneticArea - nearestArea);
             setActiveArea(nearestArea);
             setBackdropOpacity(1);
+            onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(getActiveAreaIndex(nearestArea));
         }
     };
     /**
      * Если контент внутри шторки скроллится - то шторка не должна свайпаться
      * Если шапка внутри шторки зафиксирована - то шторка должна свайпаться только в области шапки
      */
-    var shouldSkipSwiping = function (dir, startY) {
+    var shouldSkipSwiping = function (dir, startY, event) {
+        var _a;
         if (!swipeable)
             return true;
-        if (scrollLockedProp || swipingInProgress.current)
+        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 координата)
@@ -157,33 +177,38 @@ var BottomSheet = forwardRef(function (_a, ref) {
                 Math.abs(bottomSheetTopY - startY) <= headerRef.current.clientHeight)) {
             return false;
         }
-        return dir === 'Down'
+        var shouldScroll = dir === 'Down'
             ? scrollableNode.scrollTop > 0
             : scrollableNode.scrollHeight -
                 scrollableNode.scrollTop -
                 scrollableNode.clientHeight >
                 SCROLL_OFFSET;
+        if (!scrollOccurred.current && shouldScroll) {
+            scrollOccurred.current = true;
+        }
+        return shouldScroll;
     };
     var handleSheetSwipe = function (_a) {
-        var dir = _a.dir, initial = _a.initial, velocity = _a.velocity, deltaY = _a.deltaY;
-        if (shouldSkipSwiping(dir, initial[1])) {
+        var dir = _a.dir, initial = _a.initial, velocity = _a.velocity, deltaY = _a.deltaY, event = _a.event;
+        if (scrollOccurred.current || shouldSkipSwiping(dir, initial[1], event)) {
             return;
         }
         magnetize(dir, velocity, deltaY);
     };
     var handleSheetSwipeStart = function (_a) {
-        var dir = _a.dir, initial = _a.initial;
-        if (shouldSkipSwiping(dir, initial[1])) {
+        var dir = _a.dir, initial = _a.initial, event = _a.event;
+        if (shouldSkipSwiping(dir, initial[1], event)) {
             return;
         }
-        swipingInProgress.current = true;
+        setSwipingInProgress(true);
     };
-    var handleSheetSwiped = function () {
-        swipingInProgress.current = false;
+    var handleTouchEnd = function () {
+        setSwipingInProgress(false);
+        scrollOccurred.current = false;
     };
     var handleSheetSwiping = function (_a) {
-        var initial = _a.initial, deltaY = _a.deltaY, dir = _a.dir;
-        if (shouldSkipSwiping(dir, initial[1])) {
+        var initial = _a.initial, deltaY = _a.deltaY, dir = _a.dir, event = _a.event;
+        if (scrollOccurred.current || shouldSkipSwiping(dir, initial[1], event)) {
             return;
         }
         var offset = getSheetOffset(deltaY);
@@ -196,24 +221,31 @@ var BottomSheet = forwardRef(function (_a, ref) {
         onSwiping: handleSheetSwiping,
         onSwipedDown: handleSheetSwipe,
         onSwipedUp: handleSheetSwipe,
-        onSwiped: handleSheetSwiped,
+        onTouchEndOrOnMouseUp: handleTouchEnd,
         trackMouse: swipeable,
-        delta: 5,
+        delta: swipeThreshold,
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
+        var nextArea = hasInitialIdx ? magneticAreas[idx] : lastMagneticArea;
         setBackdropOpacity(1);
         setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[idx] : magneticAreas[0]);
-        setActiveArea(hasInitialIdx ? magneticAreas[idx] : lastMagneticArea);
+        setActiveArea(nextArea);
         if (transitionProps.onExited) {
             transitionProps.onExited(node);
         }
     };
+    var handleEnter = function (node, isAppearing) {
+        onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(getActiveAreaIndex(activeArea));
+        if (transitionProps.onEnter) {
+            transitionProps.onEnter(node, isAppearing);
+        }
+    };
     var handleEntered = function (node, isAppearing) {
         setBackdropOpacity(1);
         setSheetHeight();
         // Ready for swiping
-        swipingInProgress.current = false;
+        setSwipingInProgress(false);
         if (transitionProps.onEntered) {
             transitionProps.onEntered(node, isAppearing);
         }
@@ -227,9 +259,13 @@ var BottomSheet = forwardRef(function (_a, ref) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isFirstRender]);
     useEffect(function () {
-        onMagnetize === null || onMagnetize === void 0 ? void 0 : onMagnetize(open ? getActiveAreaIndex(activeArea) : 0);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [activeArea, open]);
+        if (!sheetRef.current)
+            return;
+        var maxOffset = fullHeight - headerOffset;
+        var offset = open ? sheetOffset : maxOffset;
+        var percent = (offset / maxOffset) * 100;
+        onOffsetChange === null || onOffsetChange === void 0 ? void 0 : onOffsetChange(offset, percent);
+    }, [fullHeight, headerOffset, onOffsetChange, open, sheetOffset]);
     useImperativeHandle(bottomSheetInstanceRef, function () { return ({
         scrollToArea: scrollToArea,
     }); });
@@ -243,21 +279,23 @@ var BottomSheet = forwardRef(function (_a, ref) {
     var bgClassName = backgroundColor && styles["background-".concat(backgroundColor)];
     return (React.createElement(BaseModal, { open: open, ref: ref, container: container, dataTestId: dataTestId, zIndex: zIndex, onClose: onClose, usePortal: usePortal, scrollHandler: scrollableContainer, Backdrop: SwipeableBackdrop, backdropProps: __assign(__assign({}, backdropProps), { className: styles.disabledPointerEvents, opacity: backdropOpacity, opacityTimeout: TIMEOUT, invisible: hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn(styles.modal, modalClassName), wrapperClassName: cn(modalWrapperClassName, (_b = {},
             _b[styles.disabledPointerEvents] = hideOverlay,
-            _b)), disableBlockingScroll: disableBlockingScroll, disableFocusLock: disableFocusLock, transitionProps: __assign(__assign({ appear: true, timeout: TIMEOUT, classNames: styles }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
-        React.createElement("div", { style: __assign({}, getHeightStyles()), className: styles.wrapper, onTransitionEnd: setSheetHeight },
-            React.createElement("div", __assign({ className: cn(styles.component, bgClassName, className, (_c = {},
-                    _c[styles.withTransition] = swipingInProgress.current === false,
-                    _c)), style: __assign(__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
-                React.createElement("div", __assign({}, containerProps, { className: cn(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_d = {},
-                        _d[styles.scrollLocked] = scrollLockedProp || swipingInProgress.current,
-                        _d[styles.hiddenScrollbar] = hideScrollbar,
-                        _d)), ref: mergeRefs([scrollableContainer, scrollableContainerRef]) }),
+            _b)), disableBlockingScroll: disableBlockingScroll, disableFocusLock: disableFocusLock, transitionProps: __assign(__assign({ appear: true, timeout: TIMEOUT, classNames: styles }, transitionProps), { onExited: handleExited, onEntered: handleEntered, onEnter: handleEnter }) },
+        React.createElement("div", { style: __assign({}, getHeightStyles()), className: cn(styles.wrapper, (_c = {},
+                _c[styles.fullscreen] = headerOffset === 0 && sheetOffset === 0,
+                _c)), onTransitionEnd: setSheetHeight },
+            React.createElement("div", __assign({ className: cn(styles.component, bgClassName, className, (_d = {},
+                    _d[styles.withTransition] = swipingInProgress === false,
+                    _d)), style: __assign(__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
+                React.createElement("div", __assign({}, containerProps, { className: cn(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_e = {},
+                        _e[styles.scrollLocked] = scrollLockedProp || swipingInProgress,
+                        _e[styles.hiddenScrollbar] = hideScrollbar,
+                        _e)), ref: mergeRefs([scrollableContainer, scrollableContainerRef]) }),
                     swipeable && React.createElement("div", { className: cn(styles.marker) }),
                     !hideHeader && !emptyHeader && React.createElement(Header, __assign({}, headerProps)),
-                    React.createElement("div", { className: cn(styles.content, contentClassName, (_e = {},
-                            _e[styles.noHeader] = hideHeader || emptyHeader,
-                            _e[styles.noFooter] = !actionButton,
-                            _e)) }, children),
+                    React.createElement("div", { ref: contentRef, className: cn(styles.content, contentClassName, (_f = {},
+                            _f[styles.noHeader] = hideHeader || emptyHeader,
+                            _f[styles.noFooter] = !actionButton,
+                            _f)) }, children),
                     actionButton && (React.createElement(Footer, { sticky: stickyFooter, className: cn(bgClassName, footerClassName) }, actionButton)))))));
 });
 

package/bottom-sheet/esm/components/header/Component.d.ts

@@ -2,6 +2,7 @@ import { FC, RefObject } from 'react';
 import { NavigationBarProps } from "../../../../navigation-bar";
 type HeaderProps = Omit<NavigationBarProps, 'view' | 'size'> & {
     headerRef: RefObject<HTMLDivElement>;
+    headerOffset: number;
 };
 declare const Header: FC<HeaderProps>;
 export { HeaderProps, Header };

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

@@ -3,18 +3,17 @@ import React, { useContext, useEffect } from 'react';
 import cn from 'classnames';
 import { BaseModalContext } from '../../../../base-modal/esm';
 import { NavigationBar } from '../../../../navigation-bar/esm';
-import { HEADER_OFFSET } from '../../utils.js';
 
 var styles = {"headerWrapper":"bottom-sheet__headerWrapper_4ccwl","hasContent":"bottom-sheet__hasContent_4ccwl","header":"bottom-sheet__header_4ccwl","sticky":"bottom-sheet__sticky_4ccwl","highlighted":"bottom-sheet__highlighted_4ccwl","justifyEnd":"bottom-sheet__justifyEnd_4ccwl","addon":"bottom-sheet__addon_4ccwl","addonFixed":"bottom-sheet__addonFixed_4ccwl","title":"bottom-sheet__title_4ccwl","titleCenter":"bottom-sheet__titleCenter_4ccwl","titleLeft":"bottom-sheet__titleLeft_4ccwl","trimTitle":"bottom-sheet__trimTitle_4ccwl"};
 require('./index.css');
 
 var Header = function (_a) {
     var _b;
-    var className = _a.className, sticky = _a.sticky, headerRef = _a.headerRef, title = _a.title, children = _a.children, restProps = __rest(_a, ["className", "sticky", "headerRef", "title", "children"]);
+    var className = _a.className, sticky = _a.sticky, headerRef = _a.headerRef, headerOffset = _a.headerOffset, title = _a.title, children = _a.children, restProps = __rest(_a, ["className", "sticky", "headerRef", "headerOffset", "title", "children"]);
     var _c = useContext(BaseModalContext), setHeaderOffset = _c.setHeaderOffset, setHasHeader = _c.setHasHeader, headerHighlighted = _c.headerHighlighted, onClose = _c.onClose;
     useEffect(function () {
-        setHeaderOffset(HEADER_OFFSET);
-    }, [setHeaderOffset]);
+        setHeaderOffset(headerOffset);
+    }, [headerOffset, setHeaderOffset]);
     useEffect(function () {
         setHasHeader(true);
     }, [setHasHeader]);

package/bottom-sheet/esm/index.css

@@ -58,6 +58,9 @@
     pointer-events: none;
     border-top-right-radius: var(--border-radius-xl);
     border-top-left-radius: var(--border-radius-xl);
+    transition: border-radius 0.3s ease;
+} .bottom-sheet__fullscreen_1yfxn {
+    border-radius: 0;
 } .bottom-sheet__component_1yfxn {
     overflow: hidden;
     position: relative;

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

@@ -105,6 +105,14 @@ type BottomSheetProps = {
      * @default true
      */
     swipeable?: boolean;
+    /**
+     * Будет ли свайпаться контент
+     */
+    swipeableContent?: boolean;
+    /**
+     * Порог свайпа
+     */
+    swipeThreshold?: number;
     /**
      * Слот слева
      */
@@ -207,6 +215,10 @@ type BottomSheetProps = {
      * Скрыть скроллбар внутри шторки
      */
     hideScrollbar?: boolean;
+    /**
+     * Верхний отступ шторки, если она открыта на максимальную высоту
+     */
+    headerOffset?: number;
     /**
      * Обработчик закрытия
      */
@@ -219,5 +231,9 @@ type BottomSheetProps = {
      * Вызывается после притягивания к одной из `magneticAreas`
      */
     onMagnetize?: (index: number) => void;
+    /**
+     * Вызывается при изменении положения шторки
+     */
+    onOffsetChange?: (offset: number, percent: number) => void;
 };
 export { BottomSheetTitleAlign, BottomSheetProps };

package/bottom-sheet/esm/utils.d.ts

@@ -1,8 +1,8 @@
 declare const TIMEOUT = 500;
 declare const SWIPE_VELOCITY = 0.4;
 declare const MARKER_HEIGHT = 24;
-declare const HEADER_OFFSET = 24;
 declare const CLOSE_OFFSET = 0.2;
 declare const SCROLL_OFFSET = 1;
-declare const convertPercentToNumber: (value: string | number, fullHeight: number) => number;
-export { TIMEOUT, SWIPE_VELOCITY, MARKER_HEIGHT, HEADER_OFFSET, CLOSE_OFFSET, SCROLL_OFFSET, convertPercentToNumber };
+declare const HEADER_OFFSET = 24;
+declare const convertPercentToNumber: (value: string | number, fullHeight: number, headerOffset?: number) => number;
+export { TIMEOUT, SWIPE_VELOCITY, MARKER_HEIGHT, CLOSE_OFFSET, SCROLL_OFFSET, HEADER_OFFSET, convertPercentToNumber };

package/bottom-sheet/esm/utils.js

@@ -1,12 +1,12 @@
 var TIMEOUT = 500;
 var SWIPE_VELOCITY = 0.4;
 var MARKER_HEIGHT = 24;
-/* Верхний отступ шторки, если она открыта на максимальную высоту */
-var HEADER_OFFSET = 24;
 var CLOSE_OFFSET = 0.2;
 var SCROLL_OFFSET = 1;
-var convertPercentToNumber = function (value, fullHeight) {
-    var maxHeight = fullHeight - HEADER_OFFSET;
+var HEADER_OFFSET = 24;
+var convertPercentToNumber = function (value, fullHeight, headerOffset) {
+    if (headerOffset === void 0) { headerOffset = HEADER_OFFSET; }
+    var maxHeight = fullHeight - headerOffset;
     if (typeof value === 'string') {
         var percent = parseFloat(value) / 100;
         if (percent < 0) {

package/bottom-sheet/index.css

@@ -58,6 +58,9 @@
     pointer-events: none;
     border-top-right-radius: var(--border-radius-xl);
     border-top-left-radius: var(--border-radius-xl);
+    transition: border-radius 0.3s ease;
+} .bottom-sheet__fullscreen_1yfxn {
+    border-radius: 0;
 } .bottom-sheet__component_1yfxn {
     overflow: hidden;
     position: relative;