@alfalab/core-components 41.13.0-beta.1 → 41.13.0-beta.3

package/bottom-sheet/component.js

@@ -25,28 +25,31 @@ var getDataTestId = function (dataTestId, element) {
     return dataTestId ? "".concat(dataTestId).concat(elementPart) : undefined;
 };
 
-var styles = {"modal":"bottom-sheet__modal_epvla","wrapper":"bottom-sheet__wrapper_epvla","component":"bottom-sheet__component_epvla","withTransition":"bottom-sheet__withTransition_epvla","scrollableContainer":"bottom-sheet__scrollableContainer_epvla","marker":"bottom-sheet__marker_epvla","content":"bottom-sheet__content_epvla","noHeader":"bottom-sheet__noHeader_epvla","noFooter":"bottom-sheet__noFooter_epvla","scrollLocked":"bottom-sheet__scrollLocked_epvla","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_epvla","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_epvla","appear":"bottom-sheet__appear_epvla","enter":"bottom-sheet__enter_epvla","appearActive":"bottom-sheet__appearActive_epvla","enterActive":"bottom-sheet__enterActive_epvla","enterDone":"bottom-sheet__enterDone_epvla","appearDone":"bottom-sheet__appearDone_epvla","exit":"bottom-sheet__exit_epvla","exitActive":"bottom-sheet__exitActive_epvla","background-accent":"bottom-sheet__background-accent_epvla","background-info":"bottom-sheet__background-info_epvla","background-attention-muted":"bottom-sheet__background-attention-muted_epvla","background-positive-muted":"bottom-sheet__background-positive-muted_epvla","background-negative-muted":"bottom-sheet__background-negative-muted_epvla","background-primary":"bottom-sheet__background-primary_epvla","background-primary-inverted":"bottom-sheet__background-primary-inverted_epvla","background-secondary":"bottom-sheet__background-secondary_epvla","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_epvla","background-tertiary":"bottom-sheet__background-tertiary_epvla","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_epvla","background-quaternary":"bottom-sheet__background-quaternary_epvla","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_epvla","background-specialbg-component":"bottom-sheet__background-specialbg-component_epvla","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_epvla","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_epvla","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_epvla","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_epvla","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_epvla","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_epvla","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_epvla","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_epvla"};
+var styles = {"modal":"bottom-sheet__modal_epvla","wrapper":"bottom-sheet__wrapper_epvla","fullscreen":"bottom-sheet__fullscreen_epvla","component":"bottom-sheet__component_epvla","withTransition":"bottom-sheet__withTransition_epvla","scrollableContainer":"bottom-sheet__scrollableContainer_epvla","marker":"bottom-sheet__marker_epvla","content":"bottom-sheet__content_epvla","noHeader":"bottom-sheet__noHeader_epvla","noFooter":"bottom-sheet__noFooter_epvla","scrollLocked":"bottom-sheet__scrollLocked_epvla","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_epvla","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_epvla","appear":"bottom-sheet__appear_epvla","enter":"bottom-sheet__enter_epvla","appearActive":"bottom-sheet__appearActive_epvla","enterActive":"bottom-sheet__enterActive_epvla","enterDone":"bottom-sheet__enterDone_epvla","appearDone":"bottom-sheet__appearDone_epvla","exit":"bottom-sheet__exit_epvla","exitActive":"bottom-sheet__exitActive_epvla","background-accent":"bottom-sheet__background-accent_epvla","background-info":"bottom-sheet__background-info_epvla","background-attention-muted":"bottom-sheet__background-attention-muted_epvla","background-positive-muted":"bottom-sheet__background-positive-muted_epvla","background-negative-muted":"bottom-sheet__background-negative-muted_epvla","background-primary":"bottom-sheet__background-primary_epvla","background-primary-inverted":"bottom-sheet__background-primary-inverted_epvla","background-secondary":"bottom-sheet__background-secondary_epvla","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_epvla","background-tertiary":"bottom-sheet__background-tertiary_epvla","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_epvla","background-quaternary":"bottom-sheet__background-quaternary_epvla","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_epvla","background-specialbg-component":"bottom-sheet__background-specialbg-component_epvla","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_epvla","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_epvla","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_epvla","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_epvla","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_epvla","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_epvla","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_epvla","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_epvla"};
 require('./index.css');
 
 var BottomSheet = React.forwardRef(function (_a, ref) {
-    var _b, _c, _d, _e;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _f = _a.titleSize, titleSize = _f === void 0 ? 'default' : _f, subtitle = _a.subtitle, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, containerProps = _a.containerProps, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, modalClassName = _a.modalClassName, modalWrapperClassName = _a.modalWrapperClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, bottomAddons = _a.bottomAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _g = _a.titleAlign, titleAlign = _g === void 0 ? 'left' : _g, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _h = _a.stickyFooter, stickyFooter = _h === void 0 ? true : _h, _j = _a.initialHeight, initialHeight = _j === void 0 ? 'default' : _j, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, 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, onOffsetChange = _a.onOffsetChange;
+    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 = reactDiv100vh.use100vh() || 0;
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
     var magneticAreas = React.useMemo(function () {
         if (magneticAreasProp) {
-            return magneticAreasProp.map(function (area) { return utils.convertPercentToNumber(area, fullHeight); });
+            return magneticAreasProp.map(function (area) {
+                return utils.convertPercentToNumber(area, fullHeight, headerOffset);
+            });
         }
-        return [0, fullHeight - utils.HEADER_OFFSET];
-    }, [fullHeight, magneticAreasProp]);
+        return [0, fullHeight - headerOffset];
+    }, [fullHeight, headerOffset, magneticAreasProp]);
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
-    var _p = React.useState(0), sheetOffset = _p[0], setSheetOffset = _p[1];
-    var _q = React.useState(1), backdropOpacity = _q[0], setBackdropOpacity = _q[1];
-    var _r = React.useState(0), activeArea = _r[0], setActiveArea = _r[1];
+    var _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(0), activeArea = _v[0], setActiveArea = _v[1];
     var swipingInProgress = React.useRef(null);
     var headerRef = React.useRef(null);
+    var contentRef = React.useRef(null);
     var sheetHeight = React.useRef(0);
     var sheetRef = React.useRef(null);
     var scrollableContainer = React.useRef(null);
@@ -54,7 +57,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var titleIsReactElement = React__default.default.isValidElement(title);
     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, 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];
@@ -150,9 +153,13 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
      * Если контент внутри шторки скроллится - то шторка не должна свайпаться
      * Если шапка внутри шторки зафиксирована - то шторка должна свайпаться только в области шапки
      */
-    var shouldSkipSwiping = function (dir, startY) {
+    var shouldSkipSwiping = function (dir, startY, event) {
+        var _a;
         if (!swipeable)
             return true;
+        if (!swipeableContent && ((_a = contentRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
+            return true;
+        }
         if (scrollLockedProp || swipingInProgress.current)
             return false;
         var scrollableNode = scrollableContainer.current;
@@ -173,15 +180,15 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
                 utils.SCROLL_OFFSET;
     };
     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 (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;
@@ -190,8 +197,8 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         swipingInProgress.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 (shouldSkipSwiping(dir, initial[1], event)) {
             return;
         }
         var offset = getSheetOffset(deltaY);
@@ -206,7 +213,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         onSwipedUp: handleSheetSwipe,
         onSwiped: handleSheetSwiped,
         trackMouse: swipeable,
-        delta: 5,
+        delta: swipeThreshold,
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
@@ -241,11 +248,11 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     React.useEffect(function () {
         if (!sheetRef.current)
             return;
-        var maxOffset = fullHeight - utils.HEADER_OFFSET;
+        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, onOffsetChange, open, sheetOffset]);
+    }, [fullHeight, headerOffset, onOffsetChange, open, sheetOffset]);
     React.useImperativeHandle(bottomSheetInstanceRef, function () { return ({
         scrollToArea: scrollToArea,
     }); });
@@ -260,20 +267,22 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     return (React__default.default.createElement(coreComponentsBaseModal.BaseModal, { open: open, ref: ref, container: container, dataTestId: dataTestId, zIndex: zIndex, onClose: onClose, usePortal: usePortal, scrollHandler: scrollableContainer, Backdrop: components_swipeableBackdrop_Component.SwipeableBackdrop, backdropProps: tslib.__assign(tslib.__assign({}, backdropProps), { className: styles.disabledPointerEvents, opacity: backdropOpacity, opacityTimeout: utils.TIMEOUT, invisible: hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles.modal, modalClassName), wrapperClassName: cn__default.default(modalWrapperClassName, (_b = {},
             _b[styles.disabledPointerEvents] = hideOverlay,
             _b)), disableBlockingScroll: disableBlockingScroll, disableFocusLock: disableFocusLock, transitionProps: tslib.__assign(tslib.__assign({ appear: true, timeout: utils.TIMEOUT, classNames: styles }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
-        React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()), className: styles.wrapper, onTransitionEnd: setSheetHeight },
-            React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles.component, bgClassName, className, (_c = {},
-                    _c[styles.withTransition] = swipingInProgress.current === false,
-                    _c)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs__default.default([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
-                React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_d = {},
-                        _d[styles.scrollLocked] = scrollLockedProp || swipingInProgress.current,
-                        _d[styles.hiddenScrollbar] = hideScrollbar,
-                        _d)), ref: mergeRefs__default.default([scrollableContainer, scrollableContainerRef]) }),
+        React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()), className: cn__default.default(styles.wrapper, (_c = {},
+                _c[styles.fullscreen] = headerOffset === 0 && sheetOffset === 0,
+                _c)), onTransitionEnd: setSheetHeight },
+            React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles.component, bgClassName, className, (_d = {},
+                    _d[styles.withTransition] = swipingInProgress.current === false,
+                    _d)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs__default.default([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
+                React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_e = {},
+                        _e[styles.scrollLocked] = scrollLockedProp || swipingInProgress.current,
+                        _e[styles.hiddenScrollbar] = hideScrollbar,
+                        _e)), ref: mergeRefs__default.default([scrollableContainer, scrollableContainerRef]) }),
                     swipeable && React__default.default.createElement("div", { className: cn__default.default(styles.marker) }),
                     !hideHeader && !emptyHeader && React__default.default.createElement(components_header_Component.Header, tslib.__assign({}, headerProps)),
-                    React__default.default.createElement("div", { className: cn__default.default(styles.content, contentClassName, (_e = {},
-                            _e[styles.noHeader] = hideHeader || emptyHeader,
-                            _e[styles.noFooter] = !actionButton,
-                            _e)) }, children),
+                    React__default.default.createElement("div", { ref: contentRef, className: cn__default.default(styles.content, contentClassName, (_f = {},
+                            _f[styles.noHeader] = hideHeader || emptyHeader,
+                            _f[styles.noFooter] = !actionButton,
+                            _f)) }, children),
                     actionButton && (React__default.default.createElement(components_footer_Component.Footer, { sticky: stickyFooter, className: cn__default.default(bgClassName, footerClassName) }, actionButton)))))));
 });
 

package/bottom-sheet/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/components/header/Component.js

@@ -5,7 +5,6 @@ var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('../../../base-modal');
 var coreComponentsNavigationBar = require('../../../navigation-bar');
-var utils = require('../../utils.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -17,11 +16,11 @@ 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 = 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/component.js

@@ -30,24 +30,27 @@ var getDataTestId = function (dataTestId, element) {
 };
 
 var BottomSheet = React.forwardRef(function (_a, ref) {
-    var _b, _c, _d, _e;
-    var open = _a.open, title = _a.title, container = _a.container, usePortal = _a.usePortal, backgroundColor = _a.backgroundColor, _f = _a.titleSize, titleSize = _f === void 0 ? 'default' : _f, subtitle = _a.subtitle, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, containerProps = _a.containerProps, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, modalClassName = _a.modalClassName, modalWrapperClassName = _a.modalWrapperClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, bottomAddons = _a.bottomAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _g = _a.titleAlign, titleAlign = _g === void 0 ? 'left' : _g, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _h = _a.stickyFooter, stickyFooter = _h === void 0 ? true : _h, _j = _a.initialHeight, initialHeight = _j === void 0 ? 'default' : _j, hideOverlay = _a.hideOverlay, hideScrollbar = _a.hideScrollbar, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, disableBlockingScroll = _a.disableBlockingScroll, 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, onOffsetChange = _a.onOffsetChange;
+    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 = reactDiv100vh.use100vh() || 0;
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
     var magneticAreas = React.useMemo(function () {
         if (magneticAreasProp) {
-            return magneticAreasProp.map(function (area) { return utils.convertPercentToNumber(area, fullHeight); });
+            return magneticAreasProp.map(function (area) {
+                return utils.convertPercentToNumber(area, fullHeight, headerOffset);
+            });
         }
-        return [0, fullHeight - utils.HEADER_OFFSET];
-    }, [fullHeight, magneticAreasProp]);
+        return [0, fullHeight - headerOffset];
+    }, [fullHeight, headerOffset, magneticAreasProp]);
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
-    var _p = React.useState(0), sheetOffset = _p[0], setSheetOffset = _p[1];
-    var _q = React.useState(1), backdropOpacity = _q[0], setBackdropOpacity = _q[1];
-    var _r = React.useState(0), activeArea = _r[0], setActiveArea = _r[1];
+    var _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(0), activeArea = _v[0], setActiveArea = _v[1];
     var swipingInProgress = React.useRef(null);
     var headerRef = React.useRef(null);
+    var contentRef = React.useRef(null);
     var sheetHeight = React.useRef(0);
     var sheetRef = React.useRef(null);
     var scrollableContainer = React.useRef(null);
@@ -55,7 +58,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     var titleIsReactElement = React__default.default.isValidElement(title);
     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, 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];
@@ -151,9 +154,13 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
      * Если контент внутри шторки скроллится - то шторка не должна свайпаться
      * Если шапка внутри шторки зафиксирована - то шторка должна свайпаться только в области шапки
      */
-    var shouldSkipSwiping = function (dir, startY) {
+    var shouldSkipSwiping = function (dir, startY, event) {
+        var _a;
         if (!swipeable)
             return true;
+        if (!swipeableContent && ((_a = contentRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
+            return true;
+        }
         if (scrollLockedProp || swipingInProgress.current)
             return false;
         var scrollableNode = scrollableContainer.current;
@@ -174,15 +181,15 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
                 utils.SCROLL_OFFSET;
     };
     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 (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;
@@ -191,8 +198,8 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         swipingInProgress.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 (shouldSkipSwiping(dir, initial[1], event)) {
             return;
         }
         var offset = getSheetOffset(deltaY);
@@ -207,7 +214,7 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         onSwipedUp: handleSheetSwipe,
         onSwiped: handleSheetSwiped,
         trackMouse: swipeable,
-        delta: 5,
+        delta: swipeThreshold,
     });
     var handleExited = function (node) {
         var idx = initialActiveAreaIndex;
@@ -242,11 +249,11 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     React.useEffect(function () {
         if (!sheetRef.current)
             return;
-        var maxOffset = fullHeight - utils.HEADER_OFFSET;
+        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, onOffsetChange, open, sheetOffset]);
+    }, [fullHeight, headerOffset, onOffsetChange, open, sheetOffset]);
     React.useImperativeHandle(bottomSheetInstanceRef, function () { return ({
         scrollToArea: scrollToArea,
     }); });
@@ -261,20 +268,22 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     return (React__default.default.createElement(coreComponentsBaseModal.BaseModal, { open: open, ref: ref, container: container, dataTestId: dataTestId, zIndex: zIndex, onClose: onClose, usePortal: usePortal, scrollHandler: scrollableContainer, Backdrop: components_swipeableBackdrop_Component.SwipeableBackdrop, backdropProps: tslib.__assign(tslib.__assign({}, backdropProps), { className: styles__default.default.disabledPointerEvents, opacity: backdropOpacity, opacityTimeout: utils.TIMEOUT, invisible: hideOverlay }), disableBackdropClick: hideOverlay ? true : disableOverlayClick, className: cn__default.default(styles__default.default.modal, modalClassName), wrapperClassName: cn__default.default(modalWrapperClassName, (_b = {},
             _b[styles__default.default.disabledPointerEvents] = hideOverlay,
             _b)), disableBlockingScroll: disableBlockingScroll, disableFocusLock: disableFocusLock, transitionProps: tslib.__assign(tslib.__assign({ appear: true, timeout: utils.TIMEOUT, classNames: styles__default.default }, transitionProps), { onExited: handleExited, onEntered: handleEntered }) },
-        React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()), className: styles__default.default.wrapper, onTransitionEnd: setSheetHeight },
-            React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles__default.default.component, bgClassName, className, (_c = {},
-                    _c[styles__default.default.withTransition] = swipingInProgress.current === false,
-                    _c)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs__default.default([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
-                React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles__default.default.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_d = {},
-                        _d[styles__default.default.scrollLocked] = scrollLockedProp || swipingInProgress.current,
-                        _d[styles__default.default.hiddenScrollbar] = hideScrollbar,
-                        _d)), ref: mergeRefs__default.default([scrollableContainer, scrollableContainerRef]) }),
+        React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()), className: cn__default.default(styles__default.default.wrapper, (_c = {},
+                _c[styles__default.default.fullscreen] = headerOffset === 0 && sheetOffset === 0,
+                _c)), onTransitionEnd: setSheetHeight },
+            React__default.default.createElement("div", tslib.__assign({ className: cn__default.default(styles__default.default.component, bgClassName, className, (_d = {},
+                    _d[styles__default.default.withTransition] = swipingInProgress.current === false,
+                    _d)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs__default.default([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight }),
+                React__default.default.createElement("div", tslib.__assign({}, containerProps, { className: cn__default.default(styles__default.default.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_e = {},
+                        _e[styles__default.default.scrollLocked] = scrollLockedProp || swipingInProgress.current,
+                        _e[styles__default.default.hiddenScrollbar] = hideScrollbar,
+                        _e)), ref: mergeRefs__default.default([scrollableContainer, scrollableContainerRef]) }),
                     swipeable && React__default.default.createElement("div", { className: cn__default.default(styles__default.default.marker) }),
                     !hideHeader && !emptyHeader && React__default.default.createElement(components_header_Component.Header, tslib.__assign({}, headerProps)),
-                    React__default.default.createElement("div", { className: cn__default.default(styles__default.default.content, contentClassName, (_e = {},
-                            _e[styles__default.default.noHeader] = hideHeader || emptyHeader,
-                            _e[styles__default.default.noFooter] = !actionButton,
-                            _e)) }, children),
+                    React__default.default.createElement("div", { ref: contentRef, className: cn__default.default(styles__default.default.content, contentClassName, (_f = {},
+                            _f[styles__default.default.noHeader] = hideHeader || emptyHeader,
+                            _f[styles__default.default.noFooter] = !actionButton,
+                            _f)) }, children),
                     actionButton && (React__default.default.createElement(components_footer_Component.Footer, { sticky: stickyFooter, className: cn__default.default(bgClassName, footerClassName) }, actionButton)))))));
 });
 

package/bottom-sheet/cssm/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/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;
     /**
      * Обработчик закрытия
      */
@@ -220,7 +232,7 @@ type BottomSheetProps = {
      */
     onMagnetize?: (index: number) => void;
     /**
-     * Вызывается при изменеии положения шторки
+     * Вызывается при изменении положения шторки
      */
     onOffsetChange?: (offset: number, percent: number) => void;
 };

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) {