@alfalab/core-components-bottom-sheet 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.2](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-bottom-sheet@4.0.1...@alfalab/core-components-bottom-sheet@4.0.2) (2022-03-30)
+
+**Note:** Version bump only for package @alfalab/core-components-bottom-sheet
+
+
+
+
+
+## [4.0.1](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-bottom-sheet@4.0.0...@alfalab/core-components-bottom-sheet@4.0.1) (2022-03-28)
+
+
+### Bug Fixes
+
+* fix modal and bottom-sheet dark mode ([#1043](https://github.com/alfa-laboratory/core-components/issues/1043)) ([cad36a2](https://github.com/alfa-laboratory/core-components/commit/cad36a25b28bfa71296c3dd9dc325eec28b5c241))
+* **bottom-sheet:** fix bottom-sheet swipeable marker ([#1044](https://github.com/alfa-laboratory/core-components/issues/1044)) ([0734e55](https://github.com/alfa-laboratory/core-components/commit/0734e55cc0e394fb33452f875ffcf47819277aee))
+
+
+
+
+
 # [4.0.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-bottom-sheet@3.1.1...@alfalab/core-components-bottom-sheet@4.0.0) (2022-03-24)
 
 

package/dist/{component-0665a3d7.d.ts → component-8680d27f.d.ts}

@@ -12,7 +12,7 @@ type HeaderProps = {
     /**
      * Дополнительный класс
      */
-    className?: string;
+    headerClassName?: string;
     /**
      * Дополнительный класс для аддонов
      */
@@ -25,11 +25,6 @@ type HeaderProps = {
      * Дополнительный класс для компонента стрелки назад
      */
     backerClassName?: string;
-    /**
-     * Будет ли свайпаться шторка
-     * @default true
-     */
-    swipeable?: boolean;
     /**
      * Слот слева
      */
@@ -90,10 +85,18 @@ type BottomSheetProps = {
      * Дополнительный класс
      */
     contentClassName?: string;
+    /**
+     * Дополнительный класс
+     */
+    containerClassName?: string;
     /**
      * Дополнительный класс шапки
      */
     headerClassName?: string;
+    /**
+     * Дополнительный класс футера
+     */
+    footerClassName?: string;
     /**
      * Дополнительный класс для аддонов
      */

package/dist/{component-0665a3d7.js → component-8680d27f.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var tslib_es6 = require('./tslib.es6-4d9b8d1d.js');
+var tslib_es6 = require('./tslib.es6-c74c8bbc.js');
 var React = require('react');
 var cn = require('classnames');
 var reactDiv100vh = require('react-div-100vh');
@@ -17,12 +17,12 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"header":"bottom-sheet__header_6oyfh","sticky":"bottom-sheet__sticky_6oyfh","highlighted":"bottom-sheet__highlighted_6oyfh","justifyEnd":"bottom-sheet__justifyEnd_6oyfh","marker":"bottom-sheet__marker_6oyfh","addon":"bottom-sheet__addon_6oyfh","addonFixed":"bottom-sheet__addonFixed_6oyfh","addonLeft":"bottom-sheet__addonLeft_6oyfh","addonRight":"bottom-sheet__addonRight_6oyfh","title":"bottom-sheet__title_6oyfh","titleCenter":"bottom-sheet__titleCenter_6oyfh","titleLeft":"bottom-sheet__titleLeft_6oyfh","trimTitle":"bottom-sheet__trimTitle_6oyfh","titleBigIndentHorizontal":"bottom-sheet__titleBigIndentHorizontal_6oyfh","titleIndentRight":"bottom-sheet__titleIndentRight_6oyfh","titleIndentLeft":"bottom-sheet__titleIndentLeft_6oyfh"};
+var styles = {"header":"bottom-sheet__header_1ezhe","sticky":"bottom-sheet__sticky_1ezhe","highlighted":"bottom-sheet__highlighted_1ezhe","justifyEnd":"bottom-sheet__justifyEnd_1ezhe","addon":"bottom-sheet__addon_1ezhe","addonFixed":"bottom-sheet__addonFixed_1ezhe","addonLeft":"bottom-sheet__addonLeft_1ezhe","addonRight":"bottom-sheet__addonRight_1ezhe","title":"bottom-sheet__title_1ezhe","titleCenter":"bottom-sheet__titleCenter_1ezhe","titleLeft":"bottom-sheet__titleLeft_1ezhe","trimTitle":"bottom-sheet__trimTitle_1ezhe","titleBigIndentHorizontal":"bottom-sheet__titleBigIndentHorizontal_1ezhe","titleIndentRight":"bottom-sheet__titleIndentRight_1ezhe","titleIndentLeft":"bottom-sheet__titleIndentLeft_1ezhe"};
 require('./components/header/index.css')
 
 var Header = function (_a) {
     var _b, _c, _d, _e;
-    var title = _a.title, className = _a.className, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, swipeable = _a.swipeable, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, titleAlign = _a.titleAlign, trimTitle = _a.trimTitle, sticky = _a.sticky, onBack = _a.onBack;
+    var title = _a.title, headerClassName = _a.headerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, titleAlign = _a.titleAlign, trimTitle = _a.trimTitle, sticky = _a.sticky, onBack = _a.onBack;
     var _f = React.useContext(coreComponentsBaseModal.BaseModalContext), headerHighlighted = _f.headerHighlighted, setHasHeader = _f.setHasHeader, setHeaderOffset = _f.setHeaderOffset;
     var hasLeftPart = hasBacker || leftAddons || titleAlign === 'center';
     var hasRightPart = hasCloser || rightAddons || titleAlign === 'center';
@@ -44,12 +44,11 @@ var Header = function (_a) {
             _a[styles.titleIndentRight] = !sticky && !titleAlignedCenter && hasRightPart,
             _a));
     };
-    return (React__default['default'].createElement("div", { className: cn__default['default'](styles.header, className, (_b = {},
+    return (React__default['default'].createElement("div", { className: cn__default['default'](styles.header, headerClassName, (_b = {},
             _b[styles.justifyEnd] = !title,
             _b[styles.highlighted] = headerHighlighted && sticky,
             _b[styles.sticky] = sticky,
             _b)) },
-        swipeable && React__default['default'].createElement("div", { className: cn__default['default'](styles.marker) }),
         hasLeftPart && (React__default['default'].createElement("div", { className: cn__default['default'](styles.addon, addonClassName, (_c = {},
                 _c[styles.addonFixed] = !sticky,
                 _c[styles.addonLeft] = !sticky,
@@ -65,22 +64,23 @@ var Header = function (_a) {
                 _e)) }, hasCloser ? React__default['default'].createElement(components_closer_Component.Closer, { className: closerClassName }) : rightAddons))));
 };
 
-var styles$1 = {"modal":"bottom-sheet__modal_2931u","component":"bottom-sheet__component_2931u","withTransition":"bottom-sheet__withTransition_2931u","scrollableContainer":"bottom-sheet__scrollableContainer_2931u","marker":"bottom-sheet__marker_2931u","content":"bottom-sheet__content_2931u","noHeader":"bottom-sheet__noHeader_2931u","noFooter":"bottom-sheet__noFooter_2931u","scrollLocked":"bottom-sheet__scrollLocked_2931u","appear":"bottom-sheet__appear_2931u","enter":"bottom-sheet__enter_2931u","appearActive":"bottom-sheet__appearActive_2931u","enterActive":"bottom-sheet__enterActive_2931u","enterDone":"bottom-sheet__enterDone_2931u","appearDone":"bottom-sheet__appearDone_2931u","exit":"bottom-sheet__exit_2931u","exitActive":"bottom-sheet__exitActive_2931u"};
+var styles$1 = {"modal":"bottom-sheet__modal_1nq3o","component":"bottom-sheet__component_1nq3o","withTransition":"bottom-sheet__withTransition_1nq3o","scrollableContainer":"bottom-sheet__scrollableContainer_1nq3o","marker":"bottom-sheet__marker_1nq3o","content":"bottom-sheet__content_1nq3o","noHeader":"bottom-sheet__noHeader_1nq3o","noFooter":"bottom-sheet__noFooter_1nq3o","scrollLocked":"bottom-sheet__scrollLocked_1nq3o","appear":"bottom-sheet__appear_1nq3o","enter":"bottom-sheet__enter_1nq3o","appearActive":"bottom-sheet__appearActive_1nq3o","enterActive":"bottom-sheet__enterActive_1nq3o","enterDone":"bottom-sheet__enterDone_1nq3o","appearDone":"bottom-sheet__appearDone_1nq3o","exit":"bottom-sheet__exit_1nq3o","exitActive":"bottom-sheet__exitActive_1nq3o"};
 require('./index.css')
 
 var TIMEOUT = 300;
 var SWIPE_CLOSE_VELOCITY = 0.4;
 var MIN_BACKDROP_OPACITY = 0.2;
 var HEADER_HEIGHT = 56;
+var MARKET_HEIGHT = 24;
 /* Верхний отступ шторки, если она открыта на максимальную высоту */
 var HEADER_OFFSET = 24;
 var CLOSE_OFFSET = 0.2;
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var open = _a.open, title = _a.title, actionButton = _a.actionButton, contentClassName = _a.contentClassName, headerClassName = _a.headerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, stickyFooter = _a.stickyFooter, _f = _a.initialHeight, initialHeight = _f === void 0 ? 'default' : _f, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, children = _a.children, zIndex = _a.zIndex, _g = _a.transitionProps, transitionProps = _g === void 0 ? {} : _g, dataTestId = _a.dataTestId, _h = _a.swipeable, swipeable = _h === void 0 ? true : _h, onClose = _a.onClose, onBack = _a.onBack;
-    var _j = React.useState(0), sheetOffset = _j[0], setSheetOffset = _j[1];
-    var _k = React.useState(1), backdropOpacity = _k[0], setBackdropOpacity = _k[1];
-    var _l = React.useState(false), scrollLocked = _l[0], setScrollLocked = _l[1];
+    var open = _a.open, title = _a.title, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _f = _a.stickyFooter, stickyFooter = _f === void 0 ? true : _f, _g = _a.initialHeight, initialHeight = _g === void 0 ? 'default' : _g, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, children = _a.children, zIndex = _a.zIndex, _h = _a.transitionProps, transitionProps = _h === void 0 ? {} : _h, dataTestId = _a.dataTestId, _j = _a.swipeable, swipeable = _j === void 0 ? true : _j, onClose = _a.onClose, onBack = _a.onBack;
+    var _k = React.useState(0), sheetOffset = _k[0], setSheetOffset = _k[1];
+    var _l = React.useState(1), backdropOpacity = _l[0], setBackdropOpacity = _l[1];
+    var _m = React.useState(false), scrollLocked = _m[0], setScrollLocked = _m[1];
     var sheetHeight = React.useRef(0);
     var scrollableContainer = React.useRef(null);
     var scrollableContainerScrollValue = React.useRef(0);
@@ -94,7 +94,6 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         addonClassName: addonClassName,
         closerClassName: closerClassName,
         backerClassName: backerClassName,
-        swipeable: swipeable,
         leftAddons: leftAddons,
         rightAddons: rightAddons,
         hasCloser: hasCloser,
@@ -123,7 +122,8 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         if (!swipeable)
             return true;
         if (!scrollableContainer.current ||
-            (stickyHeader && offsetY <= HEADER_HEIGHT + HEADER_OFFSET)) {
+            (stickyHeader && offsetY <= HEADER_HEIGHT + HEADER_OFFSET) ||
+            (!stickyHeader && offsetY <= MARKET_HEIGHT + HEADER_OFFSET)) {
             return false;
         }
         if (!scrollableContainerScrollValue.current) {
@@ -221,16 +221,16 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         React__default['default'].createElement("div", tslib_es6.__assign({ className: cn__default['default'](styles$1.component, className, (_b = {},
                 _b[styles$1.withTransition] = !sheetOffset,
                 _b)), style: tslib_es6.__assign(tslib_es6.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeablehandlers),
-            React__default['default'].createElement("div", { className: cn__default['default'](styles$1.scrollableContainer, (_c = {},
+            React__default['default'].createElement("div", { className: cn__default['default'](styles$1.scrollableContainer, containerClassName, (_c = {},
                     _c[styles$1.scrollLocked] = scrollLocked,
                     _c)), ref: scrollableContainer },
-                swipeable && (hideHeader || emptyHeader) && (React__default['default'].createElement("div", { className: cn__default['default'](styles$1.marker) })),
+                swipeable && React__default['default'].createElement("div", { className: cn__default['default'](styles$1.marker) }),
                 !hideHeader && !emptyHeader && React__default['default'].createElement(Header, tslib_es6.__assign({}, headerProps)),
                 React__default['default'].createElement("div", { className: cn__default['default'](styles$1.content, contentClassName, (_d = {},
                         _d[styles$1.noHeader] = hideHeader || emptyHeader,
                         _d[styles$1.noFooter] = !actionButton,
                         _d)) }, children),
-                actionButton && React__default['default'].createElement(components_footer_Component.Footer, { sticky: stickyFooter }, actionButton)))));
+                actionButton && (React__default['default'].createElement(components_footer_Component.Footer, { sticky: stickyFooter, className: footerClassName }, actionButton))))));
 });
 
 exports.BottomSheet = BottomSheet;

package/dist/component.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('./tslib.es6-4d9b8d1d.js');
+require('./tslib.es6-c74c8bbc.js');
 require('react');
 require('classnames');
 require('react-div-100vh');
@@ -14,7 +14,7 @@ require('@alfalab/icons-glyph/CrossMIcon');
 require('./components/closer/Component.js');
 require('@alfalab/icons-glyph/ArrowBackMIcon');
 require('./components/backer/Component.js');
-var components_header_Component = require('./component-0665a3d7.js');
+var components_header_Component = require('./component-8680d27f.js');
 require('./components/footer/Component.js');
 require('@alfalab/core-components-backdrop');
 require('./components/swipeable-backdrop/Component.js');

package/dist/components/backer/Component.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-4d9b8d1d.js');
+var tslib_es6 = require('../../tslib.es6-c74c8bbc.js');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsIconButton = require('@alfalab/core-components-icon-button');
@@ -13,7 +13,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"backer":"bottom-sheet__backer_1svh2","button":"bottom-sheet__button_1svh2"};
+var styles = {"backer":"bottom-sheet__backer_kyu8g","button":"bottom-sheet__button_kyu8g"};
 require('./index.css')
 
 var Backer = function (_a) {

package/dist/components/backer/index.css

@@ -1,15 +1,20 @@
-/* hash: k9who */
-.bottom-sheet__backer_1svh2 {
+/* hash: 11qdr */
+:root {
+    --bottom-sheet-backer-bg-color: var(--color-light-bg-primary-inverted-alpha-3);
+}
+
+.bottom-sheet__backer_kyu8g {
     width: 32px;
     height: 32px;
     display: flex;
     justify-content: center;
     align-items: center;
     cursor: pointer;
+    color: var(--color-light-graphic-primary);
 }
 
-.bottom-sheet__button_1svh2 {
-    background: rgba(0, 0, 0, 0.04);
+.bottom-sheet__button_kyu8g {
+    background: var(--bottom-sheet-backer-bg-color);
     -webkit-backdrop-filter: blur(10px);
             backdrop-filter: blur(10px);
     border-radius: 50px;

package/dist/components/closer/Component.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-4d9b8d1d.js');
+var tslib_es6 = require('../../tslib.es6-c74c8bbc.js');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('@alfalab/core-components-base-modal');
@@ -14,7 +14,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"closer":"bottom-sheet__closer_3tn3y","button":"bottom-sheet__button_3tn3y"};
+var styles = {"closer":"bottom-sheet__closer_2ue0t","button":"bottom-sheet__button_2ue0t"};
 require('./index.css')
 
 var Closer = function (_a) {

package/dist/components/closer/index.css

@@ -1,15 +1,20 @@
-/* hash: ycx49 */
-.bottom-sheet__closer_3tn3y {
+/* hash: 1lw2h */
+:root {
+    --bottom-sheet-closer-bg-color: var(--color-light-bg-primary-inverted-alpha-3);
+}
+
+.bottom-sheet__closer_2ue0t {
     width: 32px;
     height: 32px;
     display: flex;
     justify-content: center;
     align-items: center;
     cursor: pointer;
+    color: var(--color-light-graphic-primary);
 }
 
-.bottom-sheet__button_3tn3y {
-    background: rgba(0, 0, 0, 0.04);
+.bottom-sheet__button_2ue0t {
+    background: var(--bottom-sheet-closer-bg-color);
     -webkit-backdrop-filter: blur(10px);
             backdrop-filter: blur(10px);
     border-radius: 50px;

package/dist/components/footer/Component.js

@@ -11,7 +11,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"footer":"bottom-sheet__footer_1jt1d","sticky":"bottom-sheet__sticky_1jt1d","highlighted":"bottom-sheet__highlighted_1jt1d"};
+var styles = {"footer":"bottom-sheet__footer_1fb6t","sticky":"bottom-sheet__sticky_1fb6t","highlighted":"bottom-sheet__highlighted_1fb6t"};
 require('./index.css')
 
 var Footer = function (_a) {

package/dist/components/footer/index.css

@@ -1,4 +1,4 @@
-/* hash: 1585q */
+/* hash: 12ev6 */
 :root {
     --color-light-bg-primary: #fff;
     --color-light-border-primary: #dbdee1;
@@ -18,15 +18,15 @@
     --bottom-sheet-footer-border-top: 1px solid var(--color-light-border-primary);
     --bottom-sheet-footer-background-color: var(--color-light-bg-primary);
 }
-.bottom-sheet__footer_1jt1d {
+.bottom-sheet__footer_1fb6t {
     padding: var(--gap-m) var(--gap-m);
     background-color: var(--color-light-bg-primary);
 }
-.bottom-sheet__sticky_1jt1d {
+.bottom-sheet__sticky_1fb6t {
     position: sticky;
     bottom: 0;
 }
-.bottom-sheet__highlighted_1jt1d {
+.bottom-sheet__highlighted_1fb6t {
     border-top: var(--bottom-sheet-footer-border-top);
     background-color: var(--bottom-sheet-footer-background-color);
 }

package/dist/components/header/Component.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../tslib.es6-4d9b8d1d.js');
+require('../../tslib.es6-c74c8bbc.js');
 require('react');
 require('classnames');
 require('react-div-100vh');
@@ -14,7 +14,7 @@ require('@alfalab/icons-glyph/CrossMIcon');
 require('../closer/Component.js');
 require('@alfalab/icons-glyph/ArrowBackMIcon');
 require('../backer/Component.js');
-var components_header_Component = require('../../component-0665a3d7.js');
+var components_header_Component = require('../../component-8680d27f.js');
 require('../footer/Component.js');
 require('@alfalab/core-components-backdrop');
 require('../swipeable-backdrop/Component.js');

package/dist/components/header/index.css

@@ -1,7 +1,6 @@
-/* hash: nztoa */
+/* hash: c5fqk */
 :root {
     --color-light-bg-primary: #fff;
-    --color-light-graphic-neutral: #dbdee1;
 }
 :root {
 
@@ -31,56 +30,44 @@
     --bottom-sheet-title-font-family: var(--font-family-system);
     --bottom-sheet-title-margin-vertical: var(--gap-2xs);
 }
-.bottom-sheet__header_6oyfh {
+.bottom-sheet__header_1ezhe {
     display: flex;
-    align-items: center;
     padding: var(--gap-xs);
     padding-bottom: 0;
     background-color: var(--color-light-bg-primary);
     border-top-right-radius: var(--border-radius-xl);
     border-top-left-radius: var(--border-radius-xl);
+    z-index: 1;
 }
-.bottom-sheet__sticky_6oyfh {
+.bottom-sheet__sticky_1ezhe {
     position: sticky;
     top: 0;
 }
-.bottom-sheet__highlighted_6oyfh {
+.bottom-sheet__highlighted_1ezhe {
     border-bottom: var(--bottom-sheet-header-border-bottom);
 }
-.bottom-sheet__justifyEnd_6oyfh {
+.bottom-sheet__justifyEnd_1ezhe {
     justify-content: flex-end;
 }
-.bottom-sheet__marker_6oyfh {
-    position: absolute;
-    top: var(--gap-2xs);
-    left: 50%;
-    width: 36px;
-    height: 4px;
-    border-radius: 20px;
-    transform: translateX(-50%);
-    background-color: var(--color-light-graphic-neutral);
-    z-index: 1000;
-}
-.bottom-sheet__addon_6oyfh {
+.bottom-sheet__addon_1ezhe {
     display: flex;
     justify-content: center;
     align-items: center;
     min-width: 48px;
     height: 48px;
 }
-.bottom-sheet__addonFixed_6oyfh {
+.bottom-sheet__addonFixed_1ezhe {
     position: fixed;
 }
-.bottom-sheet__addonLeft_6oyfh {
+.bottom-sheet__addonLeft_1ezhe {
     left: 0;
     margin-left: var(--gap-xs);
 }
-.bottom-sheet__addonRight_6oyfh {
+.bottom-sheet__addonRight_1ezhe {
     right: 0;
     margin-right: var(--gap-xs);
 }
-.bottom-sheet__title_6oyfh {
-    height: 24px;
+.bottom-sheet__title_1ezhe {
     padding: var(--gap-xs) var(--gap-xs);
     margin: var(--bottom-sheet-title-margin-vertical) 0;
     width: 100%;
@@ -89,23 +76,23 @@
     line-height: var(--bottom-sheet-title-line-height);
     font-family: var(--bottom-sheet-title-font-family);
 }
-.bottom-sheet__titleCenter_6oyfh {
+.bottom-sheet__titleCenter_1ezhe {
     text-align: center;
 }
-.bottom-sheet__titleLeft_6oyfh {
+.bottom-sheet__titleLeft_1ezhe {
     text-align: left;
 }
-.bottom-sheet__trimTitle_6oyfh {
+.bottom-sheet__trimTitle_1ezhe {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
-.bottom-sheet__titleBigIndentHorizontal_6oyfh {
+.bottom-sheet__titleBigIndentHorizontal_1ezhe {
     margin: var(--bottom-sheet-title-margin-vertical) var(--gap-4xl);
 }
-.bottom-sheet__titleIndentRight_6oyfh {
+.bottom-sheet__titleIndentRight_1ezhe {
     margin-right: var(--gap-4xl);
 }
-.bottom-sheet__titleIndentLeft_6oyfh {
+.bottom-sheet__titleIndentLeft_1ezhe {
     margin-left: var(--gap-4xl);
 }

package/dist/components/swipeable-backdrop/Component.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-4d9b8d1d.js');
+var tslib_es6 = require('../../tslib.es6-c74c8bbc.js');
 var React = require('react');
 var coreComponentsBackdrop = require('@alfalab/core-components-backdrop');
 

package/dist/{esm/component-2501d7d0.d.ts → cssm/component-d1b19e73.d.ts}

@@ -12,7 +12,7 @@ type HeaderProps = {
     /**
      * Дополнительный класс
      */
-    className?: string;
+    headerClassName?: string;
     /**
      * Дополнительный класс для аддонов
      */
@@ -25,11 +25,6 @@ type HeaderProps = {
      * Дополнительный класс для компонента стрелки назад
      */
     backerClassName?: string;
-    /**
-     * Будет ли свайпаться шторка
-     * @default true
-     */
-    swipeable?: boolean;
     /**
      * Слот слева
      */
@@ -90,10 +85,18 @@ type BottomSheetProps = {
      * Дополнительный класс
      */
     contentClassName?: string;
+    /**
+     * Дополнительный класс
+     */
+    containerClassName?: string;
     /**
      * Дополнительный класс шапки
      */
     headerClassName?: string;
+    /**
+     * Дополнительный класс футера
+     */
+    footerClassName?: string;
     /**
      * Дополнительный класс для аддонов
      */

package/dist/cssm/{component-4b59a168.js → component-d1b19e73.js}

@@ -23,7 +23,7 @@ var styles__default$1 = /*#__PURE__*/_interopDefaultLegacy(styles$1);
 
 var Header = function (_a) {
     var _b, _c, _d, _e;
-    var title = _a.title, className = _a.className, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, swipeable = _a.swipeable, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, titleAlign = _a.titleAlign, trimTitle = _a.trimTitle, sticky = _a.sticky, onBack = _a.onBack;
+    var title = _a.title, headerClassName = _a.headerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, titleAlign = _a.titleAlign, trimTitle = _a.trimTitle, sticky = _a.sticky, onBack = _a.onBack;
     var _f = React.useContext(coreComponentsBaseModal.BaseModalContext), headerHighlighted = _f.headerHighlighted, setHasHeader = _f.setHasHeader, setHeaderOffset = _f.setHeaderOffset;
     var hasLeftPart = hasBacker || leftAddons || titleAlign === 'center';
     var hasRightPart = hasCloser || rightAddons || titleAlign === 'center';
@@ -45,12 +45,11 @@ var Header = function (_a) {
             _a[styles__default['default'].titleIndentRight] = !sticky && !titleAlignedCenter && hasRightPart,
             _a));
     };
-    return (React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].header, className, (_b = {},
+    return (React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].header, headerClassName, (_b = {},
             _b[styles__default['default'].justifyEnd] = !title,
             _b[styles__default['default'].highlighted] = headerHighlighted && sticky,
             _b[styles__default['default'].sticky] = sticky,
             _b)) },
-        swipeable && React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].marker) }),
         hasLeftPart && (React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].addon, addonClassName, (_c = {},
                 _c[styles__default['default'].addonFixed] = !sticky,
                 _c[styles__default['default'].addonLeft] = !sticky,
@@ -70,15 +69,16 @@ var TIMEOUT = 300;
 var SWIPE_CLOSE_VELOCITY = 0.4;
 var MIN_BACKDROP_OPACITY = 0.2;
 var HEADER_HEIGHT = 56;
+var MARKET_HEIGHT = 24;
 /* Верхний отступ шторки, если она открыта на максимальную высоту */
 var HEADER_OFFSET = 24;
 var CLOSE_OFFSET = 0.2;
 var BottomSheet = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var open = _a.open, title = _a.title, actionButton = _a.actionButton, contentClassName = _a.contentClassName, headerClassName = _a.headerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, stickyFooter = _a.stickyFooter, _f = _a.initialHeight, initialHeight = _f === void 0 ? 'default' : _f, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, children = _a.children, zIndex = _a.zIndex, _g = _a.transitionProps, transitionProps = _g === void 0 ? {} : _g, dataTestId = _a.dataTestId, _h = _a.swipeable, swipeable = _h === void 0 ? true : _h, onClose = _a.onClose, onBack = _a.onBack;
-    var _j = React.useState(0), sheetOffset = _j[0], setSheetOffset = _j[1];
-    var _k = React.useState(1), backdropOpacity = _k[0], setBackdropOpacity = _k[1];
-    var _l = React.useState(false), scrollLocked = _l[0], setScrollLocked = _l[1];
+    var open = _a.open, title = _a.title, actionButton = _a.actionButton, contentClassName = _a.contentClassName, containerClassName = _a.containerClassName, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, addonClassName = _a.addonClassName, closerClassName = _a.closerClassName, backerClassName = _a.backerClassName, className = _a.className, leftAddons = _a.leftAddons, rightAddons = _a.rightAddons, hasCloser = _a.hasCloser, hasBacker = _a.hasBacker, _e = _a.titleAlign, titleAlign = _e === void 0 ? 'left' : _e, trimTitle = _a.trimTitle, stickyHeader = _a.stickyHeader, _f = _a.stickyFooter, stickyFooter = _f === void 0 ? true : _f, _g = _a.initialHeight, initialHeight = _g === void 0 ? 'default' : _g, hideOverlay = _a.hideOverlay, hideHeader = _a.hideHeader, disableOverlayClick = _a.disableOverlayClick, children = _a.children, zIndex = _a.zIndex, _h = _a.transitionProps, transitionProps = _h === void 0 ? {} : _h, dataTestId = _a.dataTestId, _j = _a.swipeable, swipeable = _j === void 0 ? true : _j, onClose = _a.onClose, onBack = _a.onBack;
+    var _k = React.useState(0), sheetOffset = _k[0], setSheetOffset = _k[1];
+    var _l = React.useState(1), backdropOpacity = _l[0], setBackdropOpacity = _l[1];
+    var _m = React.useState(false), scrollLocked = _m[0], setScrollLocked = _m[1];
     var sheetHeight = React.useRef(0);
     var scrollableContainer = React.useRef(null);
     var scrollableContainerScrollValue = React.useRef(0);
@@ -92,7 +92,6 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         addonClassName: addonClassName,
         closerClassName: closerClassName,
         backerClassName: backerClassName,
-        swipeable: swipeable,
         leftAddons: leftAddons,
         rightAddons: rightAddons,
         hasCloser: hasCloser,
@@ -121,7 +120,8 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         if (!swipeable)
             return true;
         if (!scrollableContainer.current ||
-            (stickyHeader && offsetY <= HEADER_HEIGHT + HEADER_OFFSET)) {
+            (stickyHeader && offsetY <= HEADER_HEIGHT + HEADER_OFFSET) ||
+            (!stickyHeader && offsetY <= MARKET_HEIGHT + HEADER_OFFSET)) {
             return false;
         }
         if (!scrollableContainerScrollValue.current) {
@@ -219,16 +219,16 @@ var BottomSheet = React.forwardRef(function (_a, ref) {
         React__default['default'].createElement("div", tslib_es6.__assign({ className: cn__default['default'](styles__default$1['default'].component, className, (_b = {},
                 _b[styles__default$1['default'].withTransition] = !sheetOffset,
                 _b)), style: tslib_es6.__assign(tslib_es6.__assign({}, getSwipeStyles()), getHeightStyles()) }, sheetSwipeablehandlers),
-            React__default['default'].createElement("div", { className: cn__default['default'](styles__default$1['default'].scrollableContainer, (_c = {},
+            React__default['default'].createElement("div", { className: cn__default['default'](styles__default$1['default'].scrollableContainer, containerClassName, (_c = {},
                     _c[styles__default$1['default'].scrollLocked] = scrollLocked,
                     _c)), ref: scrollableContainer },
-                swipeable && (hideHeader || emptyHeader) && (React__default['default'].createElement("div", { className: cn__default['default'](styles__default$1['default'].marker) })),
+                swipeable && React__default['default'].createElement("div", { className: cn__default['default'](styles__default$1['default'].marker) }),
                 !hideHeader && !emptyHeader && React__default['default'].createElement(Header, tslib_es6.__assign({}, headerProps)),
                 React__default['default'].createElement("div", { className: cn__default['default'](styles__default$1['default'].content, contentClassName, (_d = {},
                         _d[styles__default$1['default'].noHeader] = hideHeader || emptyHeader,
                         _d[styles__default$1['default'].noFooter] = !actionButton,
                         _d)) }, children),
-                actionButton && React__default['default'].createElement(components_footer_Component.Footer, { sticky: stickyFooter }, actionButton)))));
+                actionButton && (React__default['default'].createElement(components_footer_Component.Footer, { sticky: stickyFooter, className: footerClassName }, actionButton))))));
 });
 
 exports.BottomSheet = BottomSheet;

package/dist/cssm/component.js

@@ -17,7 +17,7 @@ require('@alfalab/icons-glyph/ArrowBackMIcon');
 require('./components/backer/index.module.css');
 require('./components/backer/Component.js');
 require('./components/header/index.module.css');
-var components_header_Component = require('./component-4b59a168.js');
+var components_header_Component = require('./component-d1b19e73.js');
 require('./components/footer/index.module.css');
 require('./components/footer/Component.js');
 require('@alfalab/core-components-backdrop/dist/cssm');

package/dist/cssm/components/backer/index.module.css

@@ -1,3 +1,7 @@
+:root {
+    --bottom-sheet-backer-bg-color: var(--color-light-bg-primary-inverted-alpha-3);
+}
+
 .backer {
     width: 32px;
     height: 32px;
@@ -5,10 +9,11 @@
     justify-content: center;
     align-items: center;
     cursor: pointer;
+    color: var(--color-light-graphic-primary);
 }
 
 .button {
-    background: rgba(0, 0, 0, 0.04);
+    background: var(--bottom-sheet-backer-bg-color);
     -webkit-backdrop-filter: blur(10px);
             backdrop-filter: blur(10px);
     border-radius: 50px;

package/dist/cssm/components/closer/index.module.css

@@ -1,3 +1,7 @@
+:root {
+    --bottom-sheet-closer-bg-color: var(--color-light-bg-primary-inverted-alpha-3);
+}
+
 .closer {
     width: 32px;
     height: 32px;
@@ -5,10 +9,11 @@
     justify-content: center;
     align-items: center;
     cursor: pointer;
+    color: var(--color-light-graphic-primary);
 }
 
 .button {
-    background: rgba(0, 0, 0, 0.04);
+    background: var(--bottom-sheet-closer-bg-color);
     -webkit-backdrop-filter: blur(10px);
             backdrop-filter: blur(10px);
     border-radius: 50px;