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

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

@@ -4,14 +4,14 @@ var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('../../../base-modal');
-var coreComponentsNavigationBar = require('../../../navigation-bar');
+var coreComponentsNavigationBarPrivate = require('../../../navigation-bar-private');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"headerWrapper":"bottom-sheet__headerWrapper_14dgd","hasContent":"bottom-sheet__hasContent_14dgd","header":"bottom-sheet__header_14dgd","sticky":"bottom-sheet__sticky_14dgd","highlighted":"bottom-sheet__highlighted_14dgd","justifyEnd":"bottom-sheet__justifyEnd_14dgd","addon":"bottom-sheet__addon_14dgd","addonFixed":"bottom-sheet__addonFixed_14dgd","title":"bottom-sheet__title_14dgd","titleCenter":"bottom-sheet__titleCenter_14dgd","titleLeft":"bottom-sheet__titleLeft_14dgd","trimTitle":"bottom-sheet__trimTitle_14dgd"};
+var styles = {"headerWrapper":"bottom-sheet__headerWrapper_tkyol","hasContent":"bottom-sheet__hasContent_tkyol","header":"bottom-sheet__header_tkyol","sticky":"bottom-sheet__sticky_tkyol","highlighted":"bottom-sheet__highlighted_tkyol","justifyEnd":"bottom-sheet__justifyEnd_tkyol","addon":"bottom-sheet__addon_tkyol","addonFixed":"bottom-sheet__addonFixed_tkyol","title":"bottom-sheet__title_tkyol","titleCenter":"bottom-sheet__titleCenter_tkyol","titleLeft":"bottom-sheet__titleLeft_tkyol","trimTitle":"bottom-sheet__trimTitle_tkyol"};
 require('./index.css');
 
 var Header = function (_a) {
@@ -25,7 +25,7 @@ var Header = function (_a) {
         setHasHeader(true);
     }, [setHasHeader]);
     var hasContent = Boolean(title || children);
-    return (React__default.default.createElement(coreComponentsNavigationBar.NavigationBar, tslib.__assign({}, restProps, { ref: headerRef, title: title, onClose: onClose, sticky: sticky, view: 'mobile', className: cn__default.default(styles.headerWrapper, className, (_b = {},
+    return (React__default.default.createElement(coreComponentsNavigationBarPrivate.NavigationBarPrivate, tslib.__assign({}, restProps, { ref: headerRef, title: title, onClose: onClose, sticky: sticky, view: 'mobile', className: cn__default.default(styles.headerWrapper, className, (_b = {},
             _b[styles.highlighted] = hasContent && headerHighlighted && sticky,
             _b[styles.sticky] = sticky,
             _b[styles.hasContent] = hasContent,

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

@@ -1,4 +1,4 @@
-/* hash: sd5sa */
+/* hash: ohohc */
 :root { /* 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 */ /* 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 */ :root {
     --color-light-neutral-300: #e7e8eb; /* 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_14dgd {
+} .bottom-sheet__headerWrapper_tkyol {
     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_14dgd {
+} .bottom-sheet__hasContent_tkyol {
     background-color: inherit;
-} .bottom-sheet__header_14dgd {
+} .bottom-sheet__header_tkyol {
     display: flex;
-} .bottom-sheet__sticky_14dgd {
+} .bottom-sheet__sticky_tkyol {
     position: sticky;
     top: 0;
-} .bottom-sheet__highlighted_14dgd {
+} .bottom-sheet__highlighted_tkyol {
     border-bottom: var(--bottom-sheet-header-border-bottom);
-} .bottom-sheet__justifyEnd_14dgd {
+} .bottom-sheet__justifyEnd_tkyol {
     justify-content: flex-end;
-} .bottom-sheet__addon_14dgd {
+} .bottom-sheet__addon_tkyol {
     display: flex;
     justify-content: center;
     align-items: center;
     min-width: 48px;
     height: 48px;
-} .bottom-sheet__addonFixed_14dgd {
+} .bottom-sheet__addonFixed_tkyol {
     position: fixed;
-} .bottom-sheet__title_14dgd {
+} .bottom-sheet__title_tkyol {
     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_14dgd {
+} .bottom-sheet__titleCenter_tkyol {
     text-align: center;
-} .bottom-sheet__titleLeft_14dgd {
+} .bottom-sheet__titleLeft_tkyol {
     text-align: left;
-} .bottom-sheet__trimTitle_14dgd {
+} .bottom-sheet__trimTitle_tkyol {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;

package/bottom-sheet/consts/swipeConsts.d.ts

@@ -0,0 +1,2 @@
+declare const horizontalDirections: [string, string];
+export { horizontalDirections };

package/bottom-sheet/consts/swipeConsts.js

@@ -0,0 +1,7 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var enums_swipeEnums = require('../enums/swipeEnums.js');
+
+var horizontalDirections = [enums_swipeEnums.SwipeDirection.Left, enums_swipeEnums.SwipeDirection.Right];
+
+exports.horizontalDirections = horizontalDirections;

package/bottom-sheet/cssm/component.js

@@ -11,6 +11,7 @@ var coreComponentsShared = require('../../shared/cssm');
 var components_footer_Component = require('./components/footer/Component.js');
 var components_header_Component = require('./components/header/Component.js');
 var components_swipeableBackdrop_Component = require('./components/swipeable-backdrop/Component.js');
+var consts_swipeConsts = require('./consts/swipeConsts.js');
 var utils = require('./utils.js');
 var styles = require('./index.module.css');
 
@@ -29,12 +30,15 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
     var magneticAreas = React.useMemo(function () {
+        var _a;
         if (magneticAreasProp) {
             return magneticAreasProp.map(function (area) {
                 return utils.convertPercentToNumber(area, fullHeight, headerOffset);
             });
         }
-        return [0, fullHeight - headerOffset];
+        var iOSViewHeight = ((_a = document === null || document === void 0 ? void 0 : document.documentElement) === null || _a === void 0 ? void 0 : _a.clientHeight) || window.innerHeight;
+        var viewHeight = coreComponentsShared.os.isIOS() ? iOSViewHeight : fullHeight;
+        return [0, viewHeight - headerOffset];
     }, [fullHeight, headerOffset, magneticAreasProp]);
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
     var _t = React.useState(0), sheetOffset = _t[0], setSheetOffset = _t[1];
@@ -184,8 +188,9 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
      * Если контент внутри шторки скроллится - то шторка не должна свайпаться
      * Если шапка внутри шторки зафиксирована - то шторка должна свайпаться только в области шапки
      */
-    var shouldSkipSwiping = function (deltaY, startY, event) {
+    var shouldSkipSwiping = function (swipeParams) {
         var _a;
+        var deltaY = swipeParams.deltaY, startY = swipeParams.startY, event = swipeParams.event, dir = swipeParams.dir;
         if (scrollLockedProp || swipingInProgress)
             return false;
         if (!swipeableContent && ((_a = contentRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
@@ -210,18 +215,24 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         if (!scrollOccurred.current && shouldScroll) {
             scrollOccurred.current = true;
         }
+        // Если контент внутри шторки скроллится горизонально - то шторка не должна закрываться
+        if (consts_swipeConsts.horizontalDirections.includes(dir)) {
+            return true;
+        }
         return shouldScroll;
     };
-    var handleSheetSwipe = function (_a) {
-        var initial = _a.initial, velocity = _a.velocity, deltaY = _a.deltaY, event = _a.event;
-        if (scrollOccurred.current || shouldSkipSwiping(deltaY, initial[1], event)) {
+    var handleSheetSwipeEnd = function (swipeParams) {
+        var initial = swipeParams.initial, velocity = swipeParams.velocity, deltaY = swipeParams.deltaY, event = swipeParams.event, dir = swipeParams.dir;
+        var shouldPreventSwipe = scrollOccurred.current ||
+            shouldSkipSwiping({ deltaY: deltaY, startY: initial[1], event: event, dir: dir });
+        if (shouldPreventSwipe) {
             return;
         }
         magnetize(velocity, deltaY);
     };
-    var handleSheetSwipeStart = function (_a) {
-        var deltaY = _a.deltaY, initial = _a.initial, event = _a.event;
-        if (shouldSkipSwiping(deltaY, initial[1], event)) {
+    var handleSheetSwipeStart = function (swipeParams) {
+        var deltaY = swipeParams.deltaY, initial = swipeParams.initial, event = swipeParams.event, dir = swipeParams.dir;
+        if (shouldSkipSwiping({ deltaY: deltaY, startY: initial[1], event: event, dir: dir })) {
             return;
         }
         startSwiping(event);
@@ -230,9 +241,11 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         var event = _a.event;
         return stopSwiping(event);
     };
-    var handleSheetSwiping = function (_a) {
-        var initial = _a.initial, deltaY = _a.deltaY, event = _a.event;
-        if (scrollOccurred.current || shouldSkipSwiping(deltaY, initial[1], event)) {
+    var handleSheetSwipeMove = function (swipeParams) {
+        var initial = swipeParams.initial, deltaY = swipeParams.deltaY, event = swipeParams.event, dir = swipeParams.dir;
+        var shouldPreventSwipe = scrollOccurred.current ||
+            shouldSkipSwiping({ deltaY: deltaY, startY: initial[1], event: event, dir: dir });
+        if (shouldPreventSwipe) {
             return;
         }
         if (!swipingInProgress) {
@@ -245,8 +258,8 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
     };
     var sheetSwipeableHandlers = reactSwipeable.useSwipeable({
         onSwipeStart: handleSheetSwipeStart,
-        onSwiping: handleSheetSwiping,
-        onSwiped: handleSheetSwipe,
+        onSwiping: handleSheetSwipeMove,
+        onSwiped: handleSheetSwipeEnd,
         onTouchEndOrOnMouseUp: handleTouchEnd,
         trackMouse: swipeable,
         trackTouch: swipeable,
@@ -331,11 +344,12 @@ 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, onEnter: handleEnter, onExit: handleExit }), disableAutoFocus: disableAutoFocus, disableEscapeKeyDown: disableEscapeKeyDown, disableRestoreFocus: disableRestoreFocus, keepMounted: keepMounted },
-        React__default.default.createElement("div", { style: tslib.__assign({}, getHeightStyles()), className: cn__default.default(styles__default.default.wrapper, (_c = {},
+        React__default.default.createElement("div", { 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 === false,
+                    _d[styles__default.default.safeAreaBottom] = coreComponentsShared.os.isIOS(),
                     _d)), style: tslib.__assign(tslib.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs__default.default([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: handleTransitionEnd }),
                 renderMarker(),
                 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 = {},

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

@@ -1,6 +1,6 @@
 import { FC, RefObject } from 'react';
-import { NavigationBarProps } from "../../../../navigation-bar";
-type HeaderProps = Omit<NavigationBarProps, 'view' | 'size'> & {
+import { NavigationBarPrivateProps } from "../../../../navigation-bar-private";
+type HeaderProps = Omit<NavigationBarPrivateProps, 'view' | 'size'> & {
     headerRef: RefObject<HTMLDivElement>;
     headerOffset: number;
 };

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

@@ -4,7 +4,7 @@ var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('../../../../base-modal/cssm');
-var coreComponentsNavigationBar = require('../../../../navigation-bar/cssm');
+var coreComponentsNavigationBarPrivate = require('../../../../navigation-bar-private/cssm');
 var styles = require('./index.module.css');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -24,7 +24,7 @@ var Header = function (_a) {
         setHasHeader(true);
     }, [setHasHeader]);
     var hasContent = Boolean(title || children);
-    return (React__default.default.createElement(coreComponentsNavigationBar.NavigationBar, tslib.__assign({}, restProps, { ref: headerRef, title: title, onClose: onClose, sticky: sticky, view: 'mobile', className: cn__default.default(styles__default.default.headerWrapper, className, (_b = {},
+    return (React__default.default.createElement(coreComponentsNavigationBarPrivate.NavigationBarPrivate, tslib.__assign({}, restProps, { ref: headerRef, title: title, onClose: onClose, sticky: sticky, view: 'mobile', className: cn__default.default(styles__default.default.headerWrapper, className, (_b = {},
             _b[styles__default.default.highlighted] = hasContent && headerHighlighted && sticky,
             _b[styles__default.default.sticky] = sticky,
             _b[styles__default.default.hasContent] = hasContent,

package/bottom-sheet/cssm/consts/swipeConsts.d.ts

@@ -0,0 +1,2 @@
+declare const horizontalDirections: [string, string];
+export { horizontalDirections };

package/bottom-sheet/cssm/consts/swipeConsts.js

@@ -0,0 +1,7 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var enums_swipeEnums = require('../enums/swipeEnums.js');
+
+var horizontalDirections = [enums_swipeEnums.SwipeDirection.Left, enums_swipeEnums.SwipeDirection.Right];
+
+exports.horizontalDirections = horizontalDirections;

package/bottom-sheet/cssm/enums/swipeEnums.d.ts

@@ -0,0 +1,7 @@
+declare enum SwipeDirection {
+    Left = "Left",
+    Right = "Right",
+    Up = "Up",
+    Down = "Down"
+}
+export { SwipeDirection };

package/bottom-sheet/cssm/enums/swipeEnums.js

@@ -0,0 +1,9 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+
+exports.SwipeDirection = void 0;
+(function (SwipeDirection) {
+    SwipeDirection["Left"] = "Left";
+    SwipeDirection["Right"] = "Right";
+    SwipeDirection["Up"] = "Up";
+    SwipeDirection["Down"] = "Down";
+})(exports.SwipeDirection || (exports.SwipeDirection = {}));

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

@@ -135,7 +135,9 @@
     } .exitActive .wrapper {
         transition: var(--bottom-sheet-out-transition);
         transform: translateY(100%);
-    } .background-accent {
+    } .safeAreaBottom {
+    padding-bottom: env(safe-area-inset-bottom);
+} .background-accent {
             background-color: var(--color-light-bg-accent);
         } .background-info {
             background-color: var(--color-light-bg-info);

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

@@ -0,0 +1,9 @@
+import { SwipeDirections } from 'react-swipeable';
+import { HandledEvents } from 'react-swipeable/es/types';
+type ShouldSkipSwipingParams = {
+    deltaY: number;
+    startY: number;
+    event: HandledEvents;
+    dir: SwipeDirections;
+};
+export { ShouldSkipSwipingParams };

package/bottom-sheet/cssm/types/swipeTypes.js

@@ -0,0 +1 @@
+

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

@@ -3,7 +3,7 @@ import { HTMLAttributes, ReactElement, ReactNode, RefObject } from 'react';
 import { HandledEvents } from 'react-swipeable/es/types';
 import { TransitionProps } from 'react-transition-group/Transition';
 import { BaseModalProps } from "../../base-modal";
-import { NavigationBarProps } from "../../navigation-bar";
+import { NavigationBarPrivateProps as NavigationBarProps } from "../../navigation-bar-private";
 type BackgroundColorType = "accent" | "info" | "attention-muted" | "positive-muted" | "negative-muted" | "primary" | "primary-inverted" | "secondary" | "secondary-inverted" | "tertiary" | "tertiary-inverted" | "quaternary" | "quaternary-inverted" | "specialbg-component" | "specialbg-component-inverted" | "specialbg-primary-grouped" | "specialbg-secondary-grouped" | "specialbg-tertiary-grouped" | "specialbg-secondary-transparent" | "specialbg-secondary-transparent-inverted" | "specialbg-tertiary-transparent" | "specialbg-tertiary-transparent-inverted";
 type BottomSheetTitleAlign = 'center' | 'left';
 type BottomSheetProps = {

package/bottom-sheet/enums/swipeEnums.d.ts

@@ -0,0 +1,7 @@
+declare enum SwipeDirection {
+    Left = "Left",
+    Right = "Right",
+    Up = "Up",
+    Down = "Down"
+}
+export { SwipeDirection };

package/bottom-sheet/enums/swipeEnums.js

@@ -0,0 +1,9 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+
+exports.SwipeDirection = void 0;
+(function (SwipeDirection) {
+    SwipeDirection["Left"] = "Left";
+    SwipeDirection["Right"] = "Right";
+    SwipeDirection["Up"] = "Up";
+    SwipeDirection["Down"] = "Down";
+})(exports.SwipeDirection || (exports.SwipeDirection = {}));

package/bottom-sheet/esm/component.js

@@ -5,15 +5,17 @@ import mergeRefs from 'react-merge-refs';
 import { useSwipeable } from 'react-swipeable';
 import cn from 'classnames';
 import { BaseModal } from '../../base-modal/esm';
-import { fnUtils, getDataTestId } from '../../shared/esm';
+import { fnUtils, os, getDataTestId } from '../../shared/esm';
 import { Footer } from './components/footer/Component.js';
 import { Header } from './components/header/Component.js';
 import { SwipeableBackdrop } from './components/swipeable-backdrop/Component.js';
+import { horizontalDirections } from './consts/swipeConsts.js';
 import { convertPercentToNumber, TIMEOUT, MARKER_HEIGHT, SCROLL_OFFSET, SWIPE_VELOCITY, CLOSE_OFFSET } from './utils.js';
-import '../../navigation-bar/esm';
+import '../../navigation-bar-private/esm';
 import '../../backdrop/esm';
+import './enums/swipeEnums.js';
 
-var styles = {"modal":"bottom-sheet__modal_tmbtb","wrapper":"bottom-sheet__wrapper_tmbtb","fullscreen":"bottom-sheet__fullscreen_tmbtb","component":"bottom-sheet__component_tmbtb","withTransition":"bottom-sheet__withTransition_tmbtb","scrollableContainer":"bottom-sheet__scrollableContainer_tmbtb","marker":"bottom-sheet__marker_tmbtb","defaultMarker":"bottom-sheet__defaultMarker_tmbtb","content":"bottom-sheet__content_tmbtb","noHeader":"bottom-sheet__noHeader_tmbtb","noFooter":"bottom-sheet__noFooter_tmbtb","scrollLocked":"bottom-sheet__scrollLocked_tmbtb","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_tmbtb","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_tmbtb","appear":"bottom-sheet__appear_tmbtb","enter":"bottom-sheet__enter_tmbtb","appearActive":"bottom-sheet__appearActive_tmbtb","enterActive":"bottom-sheet__enterActive_tmbtb","enterDone":"bottom-sheet__enterDone_tmbtb","appearDone":"bottom-sheet__appearDone_tmbtb","exit":"bottom-sheet__exit_tmbtb","exitActive":"bottom-sheet__exitActive_tmbtb","background-accent":"bottom-sheet__background-accent_tmbtb","background-info":"bottom-sheet__background-info_tmbtb","background-attention-muted":"bottom-sheet__background-attention-muted_tmbtb","background-positive-muted":"bottom-sheet__background-positive-muted_tmbtb","background-negative-muted":"bottom-sheet__background-negative-muted_tmbtb","background-primary":"bottom-sheet__background-primary_tmbtb","background-primary-inverted":"bottom-sheet__background-primary-inverted_tmbtb","background-secondary":"bottom-sheet__background-secondary_tmbtb","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_tmbtb","background-tertiary":"bottom-sheet__background-tertiary_tmbtb","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_tmbtb","background-quaternary":"bottom-sheet__background-quaternary_tmbtb","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_tmbtb","background-specialbg-component":"bottom-sheet__background-specialbg-component_tmbtb","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_tmbtb","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_tmbtb","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_tmbtb","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_tmbtb","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_tmbtb","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_tmbtb","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_tmbtb","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_tmbtb"};
+var styles = {"modal":"bottom-sheet__modal_1j3fs","wrapper":"bottom-sheet__wrapper_1j3fs","fullscreen":"bottom-sheet__fullscreen_1j3fs","component":"bottom-sheet__component_1j3fs","withTransition":"bottom-sheet__withTransition_1j3fs","scrollableContainer":"bottom-sheet__scrollableContainer_1j3fs","marker":"bottom-sheet__marker_1j3fs","defaultMarker":"bottom-sheet__defaultMarker_1j3fs","content":"bottom-sheet__content_1j3fs","noHeader":"bottom-sheet__noHeader_1j3fs","noFooter":"bottom-sheet__noFooter_1j3fs","scrollLocked":"bottom-sheet__scrollLocked_1j3fs","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_1j3fs","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_1j3fs","appear":"bottom-sheet__appear_1j3fs","enter":"bottom-sheet__enter_1j3fs","appearActive":"bottom-sheet__appearActive_1j3fs","enterActive":"bottom-sheet__enterActive_1j3fs","enterDone":"bottom-sheet__enterDone_1j3fs","appearDone":"bottom-sheet__appearDone_1j3fs","exit":"bottom-sheet__exit_1j3fs","exitActive":"bottom-sheet__exitActive_1j3fs","safeAreaBottom":"bottom-sheet__safeAreaBottom_1j3fs","background-accent":"bottom-sheet__background-accent_1j3fs","background-info":"bottom-sheet__background-info_1j3fs","background-attention-muted":"bottom-sheet__background-attention-muted_1j3fs","background-positive-muted":"bottom-sheet__background-positive-muted_1j3fs","background-negative-muted":"bottom-sheet__background-negative-muted_1j3fs","background-primary":"bottom-sheet__background-primary_1j3fs","background-primary-inverted":"bottom-sheet__background-primary-inverted_1j3fs","background-secondary":"bottom-sheet__background-secondary_1j3fs","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1j3fs","background-tertiary":"bottom-sheet__background-tertiary_1j3fs","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1j3fs","background-quaternary":"bottom-sheet__background-quaternary_1j3fs","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1j3fs","background-specialbg-component":"bottom-sheet__background-specialbg-component_1j3fs","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1j3fs","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1j3fs","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1j3fs","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1j3fs","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1j3fs","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1j3fs","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1j3fs","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1j3fs"};
 require('./index.css');
 
 var isNil = fnUtils.isNil;
@@ -24,12 +26,15 @@ var BottomSheet = forwardRef(function (_a, ref) {
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     var isFirstRender = fullHeight === 0;
     var magneticAreas = useMemo(function () {
+        var _a;
         if (magneticAreasProp) {
             return magneticAreasProp.map(function (area) {
                 return convertPercentToNumber(area, fullHeight, headerOffset);
             });
         }
-        return [0, fullHeight - headerOffset];
+        var iOSViewHeight = ((_a = document === null || document === void 0 ? void 0 : document.documentElement) === null || _a === void 0 ? void 0 : _a.clientHeight) || window.innerHeight;
+        var viewHeight = os.isIOS() ? iOSViewHeight : fullHeight;
+        return [0, viewHeight - headerOffset];
     }, [fullHeight, headerOffset, magneticAreasProp]);
     var lastMagneticArea = magneticAreas[magneticAreas.length - 1];
     var _t = useState(0), sheetOffset = _t[0], setSheetOffset = _t[1];
@@ -179,8 +184,9 @@ var BottomSheet = forwardRef(function (_a, ref) {
      * Если контент внутри шторки скроллится - то шторка не должна свайпаться
      * Если шапка внутри шторки зафиксирована - то шторка должна свайпаться только в области шапки
      */
-    var shouldSkipSwiping = function (deltaY, startY, event) {
+    var shouldSkipSwiping = function (swipeParams) {
         var _a;
+        var deltaY = swipeParams.deltaY, startY = swipeParams.startY, event = swipeParams.event, dir = swipeParams.dir;
         if (scrollLockedProp || swipingInProgress)
             return false;
         if (!swipeableContent && ((_a = contentRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
@@ -205,18 +211,24 @@ var BottomSheet = forwardRef(function (_a, ref) {
         if (!scrollOccurred.current && shouldScroll) {
             scrollOccurred.current = true;
         }
+        // Если контент внутри шторки скроллится горизонально - то шторка не должна закрываться
+        if (horizontalDirections.includes(dir)) {
+            return true;
+        }
         return shouldScroll;
     };
-    var handleSheetSwipe = function (_a) {
-        var initial = _a.initial, velocity = _a.velocity, deltaY = _a.deltaY, event = _a.event;
-        if (scrollOccurred.current || shouldSkipSwiping(deltaY, initial[1], event)) {
+    var handleSheetSwipeEnd = function (swipeParams) {
+        var initial = swipeParams.initial, velocity = swipeParams.velocity, deltaY = swipeParams.deltaY, event = swipeParams.event, dir = swipeParams.dir;
+        var shouldPreventSwipe = scrollOccurred.current ||
+            shouldSkipSwiping({ deltaY: deltaY, startY: initial[1], event: event, dir: dir });
+        if (shouldPreventSwipe) {
             return;
         }
         magnetize(velocity, deltaY);
     };
-    var handleSheetSwipeStart = function (_a) {
-        var deltaY = _a.deltaY, initial = _a.initial, event = _a.event;
-        if (shouldSkipSwiping(deltaY, initial[1], event)) {
+    var handleSheetSwipeStart = function (swipeParams) {
+        var deltaY = swipeParams.deltaY, initial = swipeParams.initial, event = swipeParams.event, dir = swipeParams.dir;
+        if (shouldSkipSwiping({ deltaY: deltaY, startY: initial[1], event: event, dir: dir })) {
             return;
         }
         startSwiping(event);
@@ -225,9 +237,11 @@ var BottomSheet = forwardRef(function (_a, ref) {
         var event = _a.event;
         return stopSwiping(event);
     };
-    var handleSheetSwiping = function (_a) {
-        var initial = _a.initial, deltaY = _a.deltaY, event = _a.event;
-        if (scrollOccurred.current || shouldSkipSwiping(deltaY, initial[1], event)) {
+    var handleSheetSwipeMove = function (swipeParams) {
+        var initial = swipeParams.initial, deltaY = swipeParams.deltaY, event = swipeParams.event, dir = swipeParams.dir;
+        var shouldPreventSwipe = scrollOccurred.current ||
+            shouldSkipSwiping({ deltaY: deltaY, startY: initial[1], event: event, dir: dir });
+        if (shouldPreventSwipe) {
             return;
         }
         if (!swipingInProgress) {
@@ -240,8 +254,8 @@ var BottomSheet = forwardRef(function (_a, ref) {
     };
     var sheetSwipeableHandlers = useSwipeable({
         onSwipeStart: handleSheetSwipeStart,
-        onSwiping: handleSheetSwiping,
-        onSwiped: handleSheetSwipe,
+        onSwiping: handleSheetSwipeMove,
+        onSwiped: handleSheetSwipeEnd,
         onTouchEndOrOnMouseUp: handleTouchEnd,
         trackMouse: swipeable,
         trackTouch: swipeable,
@@ -326,11 +340,12 @@ var BottomSheet = forwardRef(function (_a, ref) {
     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, onEnter: handleEnter, onExit: handleExit }), disableAutoFocus: disableAutoFocus, disableEscapeKeyDown: disableEscapeKeyDown, disableRestoreFocus: disableRestoreFocus, keepMounted: keepMounted },
-        React.createElement("div", { style: __assign({}, getHeightStyles()), className: cn(styles.wrapper, (_c = {},
+        React.createElement("div", { 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[styles.safeAreaBottom] = os.isIOS(),
                     _d)), style: __assign(__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeableHandlers, { ref: mergeRefs([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: handleTransitionEnd }),
                 renderMarker(),
                 React.createElement("div", __assign({}, containerProps, { className: cn(styles.scrollableContainer, containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, containerClassName, (_e = {},

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_c562w","sticky":"bottom-sheet__sticky_c562w","highlighted":"bottom-sheet__highlighted_c562w","background-accent":"bottom-sheet__background-accent_c562w","background-info":"bottom-sheet__background-info_c562w","background-attention-muted":"bottom-sheet__background-attention-muted_c562w","background-positive-muted":"bottom-sheet__background-positive-muted_c562w","background-negative-muted":"bottom-sheet__background-negative-muted_c562w","background-primary":"bottom-sheet__background-primary_c562w","background-primary-inverted":"bottom-sheet__background-primary-inverted_c562w","background-secondary":"bottom-sheet__background-secondary_c562w","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_c562w","background-tertiary":"bottom-sheet__background-tertiary_c562w","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_c562w","background-quaternary":"bottom-sheet__background-quaternary_c562w","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_c562w","background-specialbg-component":"bottom-sheet__background-specialbg-component_c562w","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_c562w","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_c562w","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_c562w","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_c562w","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_c562w","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_c562w","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_c562w","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_c562w"};
+var styles = {"footer":"bottom-sheet__footer_9nz0t","sticky":"bottom-sheet__sticky_9nz0t","highlighted":"bottom-sheet__highlighted_9nz0t","background-accent":"bottom-sheet__background-accent_9nz0t","background-info":"bottom-sheet__background-info_9nz0t","background-attention-muted":"bottom-sheet__background-attention-muted_9nz0t","background-positive-muted":"bottom-sheet__background-positive-muted_9nz0t","background-negative-muted":"bottom-sheet__background-negative-muted_9nz0t","background-primary":"bottom-sheet__background-primary_9nz0t","background-primary-inverted":"bottom-sheet__background-primary-inverted_9nz0t","background-secondary":"bottom-sheet__background-secondary_9nz0t","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_9nz0t","background-tertiary":"bottom-sheet__background-tertiary_9nz0t","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_9nz0t","background-quaternary":"bottom-sheet__background-quaternary_9nz0t","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_9nz0t","background-specialbg-component":"bottom-sheet__background-specialbg-component_9nz0t","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_9nz0t","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_9nz0t","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_9nz0t","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_9nz0t","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_9nz0t","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_9nz0t","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_9nz0t","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_9nz0t"};
 require('./index.css');
 
 var Footer = function (_a) {

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

@@ -1,4 +1,4 @@
-/* hash: 1ezh4 */
+/* hash: 1b3zt */
 :root { /* 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 */ /* 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 */ :root {
     --color-light-bg-accent: #ef3124;
@@ -46,58 +46,58 @@
     /* footer */
     --bottom-sheet-footer-border-top: 1px solid var(--color-light-neutral-300);
     --bottom-sheet-footer-background-color: var(--color-light-modal-bg-primary);
-} .bottom-sheet__footer_c562w {
+} .bottom-sheet__footer_9nz0t {
     padding: var(--gap-m) var(--gap-m);
     background-color: var(--color-light-modal-bg-primary);
-} .bottom-sheet__sticky_c562w {
+} .bottom-sheet__sticky_9nz0t {
     position: sticky;
     bottom: 0;
     z-index: 1;
-} .bottom-sheet__highlighted_c562w {
+} .bottom-sheet__highlighted_9nz0t {
     border-top: var(--bottom-sheet-footer-border-top);
     background-color: var(--bottom-sheet-footer-background-color);
-} .bottom-sheet__background-accent_c562w {
+} .bottom-sheet__background-accent_9nz0t {
             background-color: var(--color-light-bg-accent);
-        } .bottom-sheet__background-info_c562w {
+        } .bottom-sheet__background-info_9nz0t {
             background-color: var(--color-light-bg-info);
-        } .bottom-sheet__background-attention-muted_c562w {
+        } .bottom-sheet__background-attention-muted_9nz0t {
             background-color: var(--color-light-bg-attention-muted);
-        } .bottom-sheet__background-positive-muted_c562w {
+        } .bottom-sheet__background-positive-muted_9nz0t {
             background-color: var(--color-light-bg-positive-muted);
-        } .bottom-sheet__background-negative-muted_c562w {
+        } .bottom-sheet__background-negative-muted_9nz0t {
             background-color: var(--color-light-bg-negative-muted);
-        } .bottom-sheet__background-primary_c562w {
+        } .bottom-sheet__background-primary_9nz0t {
             background-color: var(--color-light-bg-primary);
-        } .bottom-sheet__background-primary-inverted_c562w {
+        } .bottom-sheet__background-primary-inverted_9nz0t {
             background-color: var(--color-light-bg-primary-inverted);
-        } .bottom-sheet__background-secondary_c562w {
+        } .bottom-sheet__background-secondary_9nz0t {
             background-color: var(--color-light-bg-secondary);
-        } .bottom-sheet__background-secondary-inverted_c562w {
+        } .bottom-sheet__background-secondary-inverted_9nz0t {
             background-color: var(--color-light-bg-secondary-inverted);
-        } .bottom-sheet__background-tertiary_c562w {
+        } .bottom-sheet__background-tertiary_9nz0t {
             background-color: var(--color-light-bg-tertiary);
-        } .bottom-sheet__background-tertiary-inverted_c562w {
+        } .bottom-sheet__background-tertiary-inverted_9nz0t {
             background-color: var(--color-light-bg-tertiary-inverted);
-        } .bottom-sheet__background-quaternary_c562w {
+        } .bottom-sheet__background-quaternary_9nz0t {
             background-color: var(--color-light-bg-quaternary);
-        } .bottom-sheet__background-quaternary-inverted_c562w {
+        } .bottom-sheet__background-quaternary-inverted_9nz0t {
             background-color: var(--color-light-bg-quaternary-inverted);
-        } .bottom-sheet__background-specialbg-component_c562w {
+        } .bottom-sheet__background-specialbg-component_9nz0t {
             background-color: var(--color-light-specialbg-component);
-        } .bottom-sheet__background-specialbg-component-inverted_c562w {
+        } .bottom-sheet__background-specialbg-component-inverted_9nz0t {
             background-color: var(--color-light-specialbg-component-inverted);
-        } .bottom-sheet__background-specialbg-primary-grouped_c562w {
+        } .bottom-sheet__background-specialbg-primary-grouped_9nz0t {
             background-color: var(--color-light-specialbg-primary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-grouped_c562w {
+        } .bottom-sheet__background-specialbg-secondary-grouped_9nz0t {
             background-color: var(--color-light-specialbg-secondary-grouped);
-        } .bottom-sheet__background-specialbg-tertiary-grouped_c562w {
+        } .bottom-sheet__background-specialbg-tertiary-grouped_9nz0t {
             background-color: var(--color-light-specialbg-tertiary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-transparent_c562w {
+        } .bottom-sheet__background-specialbg-secondary-transparent_9nz0t {
             background-color: var(--color-light-specialbg-secondary-transparent);
-        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_c562w {
+        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_9nz0t {
             background-color: var(--color-light-specialbg-secondary-transparent-inverted);
-        } .bottom-sheet__background-specialbg-tertiary-transparent_c562w {
+        } .bottom-sheet__background-specialbg-tertiary-transparent_9nz0t {
             background-color: var(--color-light-specialbg-tertiary-transparent);
-        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_c562w {
+        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_9nz0t {
             background-color: var(--color-light-specialbg-tertiary-transparent-inverted);
         }

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

@@ -1,6 +1,6 @@
 import { FC, RefObject } from 'react';
-import { NavigationBarProps } from "../../../../navigation-bar";
-type HeaderProps = Omit<NavigationBarProps, 'view' | 'size'> & {
+import { NavigationBarPrivateProps } from "../../../../navigation-bar-private";
+type HeaderProps = Omit<NavigationBarPrivateProps, 'view' | 'size'> & {
     headerRef: RefObject<HTMLDivElement>;
     headerOffset: number;
 };