@alfalab/core-components 38.3.0 → 39.0.0

package/modal/components/header/Component.d.ts

@@ -1,49 +1,5 @@
-import { FC, ReactNode } from 'react';
-type HeaderProps = {
-    /**
-     * Контент шапки
-     */
-    children?: ReactNode;
-    /**
-     * Слот слева
-     */
-    leftAddons?: ReactNode;
-    /**
-     * Наличие компонента крестика
-     */
-    hasCloser?: ReactNode;
-    /**
-     * Дополнительный класс
-     */
-    className?: string;
-    /**
-     * Дополнительный класс для аддонов
-     */
-    addonClassName?: string;
-    /**
-     * Дополнительный класс для контента
-     */
-    contentClassName?: string;
-    /**
-     * Заголовок шапки
-     */
-    title?: string;
-    /**
-     * Выравнивание заголовка
-     */
-    align?: 'left' | 'center';
-    /**
-     * Обрезать ли заголовок
-     */
-    trim?: boolean;
-    /**
-     * Фиксирует шапку
-     */
-    sticky?: boolean;
-    /**
-     * Идентификатор для систем автоматизированного тестирования
-     */
-    dataTestId?: string;
-};
+import { FC } from 'react';
+import { NavigationBarProps } from "../../../navigation-bar";
+type HeaderProps = Omit<NavigationBarProps, 'size' | 'view' | 'parentRef'>;
 declare const Header: FC<HeaderProps>;
 export { HeaderProps, Header };

package/modal/components/header/Component.js

@@ -1,61 +1,47 @@
+var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
-var CrossMIcon = require('@alfalab/icons-glyph/CrossMIcon');
+var coreComponentsNavigationBar = require('../../../navigation-bar');
 var Context = require('../../Context.js');
 var ResponsiveContext = require('../../ResponsiveContext.js');
-var components_closer_Component = require('../closer/Component.js');
 require('../../../base-modal');
-require('../../tslib.es6-e7db4bf6.js');
-require('../../../icon-button');
-require('@alfalab/icons-glyph/CrossHeavyMIcon');
 
 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 getDataTestId = function (dataTestId, element) {
-    var elementPart = element ? "-".concat(element.toLowerCase()) : '';
-    return dataTestId ? "".concat(dataTestId).concat(elementPart) : undefined;
-};
-
-var desktopStyles = {"header":"modal__header_1bipp","content":"modal__content_1bipp","s":"modal__s_1bipp","m":"modal__m_1bipp","l":"modal__l_1bipp","xl":"modal__xl_1bipp","fullscreen":"modal__fullscreen_1bipp","hasContent":"modal__hasContent_1bipp","sticky":"modal__sticky_1bipp"};
+var desktopStyles = {"header":"modal__header_z1sf9","content":"modal__content_z1sf9","s":"modal__s_z1sf9","m":"modal__m_z1sf9","l":"modal__l_z1sf9","xl":"modal__xl_z1sf9","fullscreen":"modal__fullscreen_z1sf9","sticky":"modal__sticky_z1sf9"};
 require('./desktop.css');
 
-var styles = {"header":"modal__header_1y70h","hasContent":"modal__hasContent_1y70h","highlighted":"modal__highlighted_1y70h","sticky":"modal__sticky_1y70h","content":"modal__content_1y70h","title":"modal__title_1y70h","addon":"modal__addon_1y70h","closer":"modal__closer_1y70h","left":"modal__left_1y70h","center":"modal__center_1y70h","right":"modal__right_1y70h","trim":"modal__trim_1y70h"};
+var styles = {"highlighted":"modal__highlighted_ppblj","sticky":"modal__sticky_ppblj","hasContent":"modal__hasContent_ppblj"};
 require('./index.css');
 
-var mobileStyles = {"sticky":"modal__sticky_qhyl3","content":"modal__content_qhyl3"};
+var mobileStyles = {"header":"modal__header_ye58l","sticky":"modal__sticky_ye58l","content":"modal__content_ye58l"};
 require('./mobile.css');
 
 var Header = function (_a) {
     var _b, _c;
-    var className = _a.className, addonClassName = _a.addonClassName, contentClassName = _a.contentClassName, leftAddons = _a.leftAddons, children = _a.children, _d = _a.align, align = _d === void 0 ? 'left' : _d, _e = _a.trim, trim = _e === void 0 ? true : _e, title = _a.title, _f = _a.hasCloser, hasCloser = _f === void 0 ? true : _f, sticky = _a.sticky, dataTestId = _a.dataTestId;
-    var _g = React.useContext(Context.ModalContext), headerHighlighted = _g.headerHighlighted, setHasHeader = _g.setHasHeader;
-    var _h = React.useContext(ResponsiveContext.ResponsiveContext), size = _h.size, view = _h.view;
-    var hasContent = title || Boolean(children);
+    var className = _a.className, sticky = _a.sticky, title = _a.title, children = _a.children, contentClassName = _a.contentClassName, _d = _a.hasCloser, hasCloser = _d === void 0 ? true : _d, restProps = tslib.__rest(_a, ["className", "sticky", "title", "children", "contentClassName", "hasCloser"]);
+    var _e = React.useContext(Context.ModalContext), setHasHeader = _e.setHasHeader, headerHighlighted = _e.headerHighlighted, parentRef = _e.parentRef, onClose = _e.onClose;
+    var _f = React.useContext(ResponsiveContext.ResponsiveContext), view = _f.view, size = _f.size;
     React.useEffect(function () {
         setHasHeader(true);
     }, [setHasHeader]);
-    return (React__default.default.createElement("div", { className: cn__default.default(styles.header, className, (_b = {},
+    var hasContent = Boolean(title || children);
+    return (React__default.default.createElement(coreComponentsNavigationBar.NavigationBar, tslib.__assign({}, restProps, { parentRef: parentRef, hasCloser: hasCloser, sticky: sticky, view: view, title: title, onClose: onClose, className: cn__default.default(className, (_b = {},
             _b[styles.highlighted] = hasContent && sticky && headerHighlighted,
             _b[styles.sticky] = sticky,
             _b[styles.hasContent] = hasContent,
             _b[desktopStyles.header] = view === 'desktop',
-            _b[desktopStyles.hasContent] = view === 'desktop' && hasContent,
             _b[desktopStyles.sticky] = view === 'desktop' && sticky,
             _b[desktopStyles[size]] = view === 'desktop',
+            _b[mobileStyles.header] = view === 'mobile',
             _b[mobileStyles.sticky] = view === 'mobile' && sticky,
-            _b)), "data-test-id": getDataTestId(dataTestId) },
-        (leftAddons || view === 'desktop') && (React__default.default.createElement("div", { className: cn__default.default(styles.addon, addonClassName) }, leftAddons)),
-        hasContent && (React__default.default.createElement("div", { className: cn__default.default(styles.content, contentClassName, styles[align], (_c = {},
-                _c[styles.trim] = trim,
-                _c[desktopStyles.content] = view === 'desktop',
-                _c[mobileStyles.content] = view === 'mobile',
-                _c)) },
-            children,
-            title && (React__default.default.createElement("div", { className: styles.title, "data-test-id": getDataTestId(dataTestId, 'title') }, title)))),
-        hasCloser && (React__default.default.createElement("div", { className: cn__default.default(styles.addon, styles.closer, addonClassName) }, view === 'desktop' ? (React__default.default.createElement(components_closer_Component.Closer, { dataTestId: getDataTestId(dataTestId, 'closer') })) : (React__default.default.createElement(components_closer_Component.Closer, { icon: CrossMIcon.CrossMIcon, size: 'xs', dataTestId: getDataTestId(dataTestId, 'closer') }))))));
+            _b)), contentClassName: cn__default.default(contentClassName, (_c = {},
+            _c[desktopStyles.content] = view === 'desktop',
+            _c[mobileStyles.content] = view === 'mobile',
+            _c)) }), children));
 };
 
 exports.Header = Header;

package/modal/components/header/desktop.css

@@ -1,4 +1,4 @@
-/* hash: nv248 */
+/* hash: 18toj */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -13,9 +13,8 @@
 } :root {
     --border-radius-l: 12px;
 } :root {
-    --gap-xs: 8px;
+    --gap-s: 12px;
     --gap-m: 16px;
-    --gap-xl: 24px;
     --gap-3xl: 40px;
 } :root {
     --font-family-system: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Helvetica,
@@ -28,51 +27,48 @@
     /* sizes */
 
     /* paddings */
-    --modal-s-header-paddings: var(--gap-xs) var(--gap-xs) var(--gap-m);
+    --modal-s-header-paddings: 28px 28px 0;
 
     /* scroll */
 
     /* desktop */
-    --modal-s-header-desktop-content-paddings: var(--gap-3xl) var(--gap-m) 0 0;
-    --modal-s-header-desktop-font-size: 22px;
+    --modal-s-header-desktop-content-paddings: var(--gap-s);
+    --modal-s-header-desktop-font-size: 20px;
     --modal-s-header-desktop-line-height: 26px;
-    --modal-l-header-desktop-content-paddings: var(--gap-3xl) var(--gap-m) 0 0;
+    --modal-l-header-desktop-content-paddings: 6px var(--gap-s) var(--gap-m);
     --modal-l-header-desktop-font-size: 30px;
     --modal-l-header-desktop-line-height: 36px;
     --modal-header-desktop-font-weight: bold;
     --modal-header-desktop-font-family: var(--font-family-system);
 
     /* mobile */
-} .modal__header_1bipp {
+
+    /* paddings */
+} .modal__header_z1sf9 {
     border-top-left-radius: var(--modal-border-radius);
     border-top-right-radius: var(--modal-border-radius);
-} .modal__content_1bipp {
+} .modal__content_z1sf9 {
     font-weight: var(--modal-header-desktop-font-weight);
     font-family: var(--modal-header-desktop-font-family);
-} .modal__s_1bipp .modal__content_1bipp,
-.modal__m_1bipp .modal__content_1bipp {
+} .modal__s_z1sf9 .modal__content_z1sf9,
+.modal__m_z1sf9 .modal__content_z1sf9 {
     padding: var(--modal-s-header-desktop-content-paddings);
     font-size: var(--modal-s-header-desktop-font-size);
     line-height: var(--modal-s-header-desktop-line-height);
-} .modal__l_1bipp .modal__content_1bipp,
-.modal__xl_1bipp .modal__content_1bipp,
-.modal__fullscreen_1bipp .modal__content_1bipp {
+} .modal__l_z1sf9 .modal__content_z1sf9,
+.modal__xl_z1sf9 .modal__content_z1sf9,
+.modal__fullscreen_z1sf9 .modal__content_z1sf9 {
     padding: var(--modal-l-header-desktop-content-paddings);
     font-size: var(--modal-l-header-desktop-font-size);
     line-height: var(--modal-l-header-desktop-line-height);
-} .modal__s_1bipp,
-.modal__m_1bipp {
-    padding: var(--modal-s-header-paddings)
-} .modal__s_1bipp:not(.modal__hasContent_1bipp), .modal__m_1bipp:not(.modal__hasContent_1bipp) {
-        padding-bottom: 0;
-    } .modal__l_1bipp,
-.modal__xl_1bipp,
-.modal__fullscreen_1bipp {
-    padding: var(--gap-xl) var(--gap-xl) var(--gap-m)
-} .modal__l_1bipp:not(.modal__hasContent_1bipp), .modal__xl_1bipp:not(.modal__hasContent_1bipp), .modal__fullscreen_1bipp:not(.modal__hasContent_1bipp) {
-        padding-bottom: var(--gap-m);
-    } .modal__sticky_1bipp {
+} .modal__s_z1sf9,
+.modal__m_z1sf9,
+.modal__l_z1sf9,
+.modal__xl_z1sf9,
+.modal__fullscreen_z1sf9 {
+    padding: var(--modal-s-header-paddings);
+} .modal__sticky_z1sf9 {
     top: calc(var(--modal-vertical-padding) * -1)
-} .modal__sticky_1bipp.modal__fullscreen_1bipp {
+} .modal__sticky_z1sf9.modal__fullscreen_z1sf9 {
         top: 0;
     }

package/modal/components/header/index.css

@@ -1,7 +1,8 @@
-/* hash: wor7n */
+/* hash: 1hndm */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-primary: #fff;
+    --color-light-border-secondary: #e7e9eb;
 } :root {
 } :root {
 } :root {
@@ -24,54 +25,19 @@
 
     /* scroll */
     --modal-header-highlight-background: var(--color-light-bg-primary);
-    --modal-header-highlight-box-shadow: none;
+    --modal-header-highlight-box-shadow: 0 1px 0 0 var(--color-light-border-secondary);
 
     /* desktop */
 
     /* mobile */
-} .modal__header_1y70h {
-    width: 100%;
-    box-sizing: border-box;
-    display: flex;
-    align-items: stretch;
-    justify-content: space-between;
-    transition: box-shadow 0.2s ease, background 0.2s ease
-} .modal__header_1y70h:not(.modal__hasContent_1y70h) {
-        pointer-events: none;
-    } .modal__highlighted_1y70h {
+
+    /* paddings */
+} .modal__highlighted_ppblj {
     background: var(--modal-header-highlight-background);
     box-shadow: var(--modal-header-highlight-box-shadow);
-} .modal__sticky_1y70h {
+} .modal__sticky_ppblj {
     position: sticky;
     z-index: 1
-} .modal__sticky_1y70h.modal__hasContent_1y70h {
+} .modal__sticky_ppblj.modal__hasContent_ppblj {
         background: var(--modal-header-background);
-    } .modal__content_1y70h {
-    flex-grow: 1;
-} .modal__title_1y70h {
-    word-break: break-word;
-} .modal__addon_1y70h {
-    min-width: 48px;
-    height: 48px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    pointer-events: all;
-} .modal__closer_1y70h {
-    margin-left: auto;
-} .modal__left_1y70h {
-    justify-content: flex-start;
-    text-align: left;
-} .modal__center_1y70h {
-    justify-content: center;
-    text-align: center;
-} .modal__right_1y70h {
-    justify-content: flex-end;
-    text-align: right;
-} .modal__trim_1y70h {
-    overflow: hidden
-} .modal__trim_1y70h .modal__title_1y70h {
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
     }

package/modal/components/header/mobile.css

@@ -1,4 +1,4 @@
-/* hash: 9tx7t */
+/* hash: 1ilyy */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -12,9 +12,9 @@
     /* Hard up */
 } :root {
 } :root {
+    --gap-2xs: 4px;
     --gap-xs: 8px;
     --gap-s: 12px;
-    --gap-m: 16px;
 } :root {
     --font-family-system: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Helvetica,
         sans-serif;
@@ -30,14 +30,19 @@
     /* desktop */
 
     /* mobile */
-    --modal-header-mobile-content-paddings: var(--gap-s) var(--gap-xs) var(--gap-s) var(--gap-m);
+    --modal-header-mobile-content-paddings: var(--gap-s) var(--gap-xs);
     --modal-header-mobile-font-size: 18px;
     --modal-header-mobile-line-height: 24px;
     --modal-header-mobile-font-family: var(--font-family-system);
     --modal-header-mobile-font-weight: bold;
-} .modal__sticky_qhyl3 {
+
+    /* paddings */
+    --modal-header-mobile-paddings: var(--gap-2xs) var(--gap-xs);
+} .modal__header_ye58l {
+    padding: var(--modal-header-mobile-paddings);
+} .modal__sticky_ye58l {
     top: 0;
-} .modal__content_qhyl3 {
+} .modal__content_ye58l {
     font-size: var(--modal-header-mobile-font-size);
     line-height: var(--modal-header-mobile-line-height);
     font-family: var(--modal-header-mobile-font-family);

package/modal/cssm/Component.desktop.d.ts

@@ -10,6 +10,6 @@ declare const ModalDesktop: React.ForwardRefExoticComponent<BaseModalProps & {
     Content: React.FC<import("./typings").ContentProps>;
     Header: React.FC<import("./components/header/Component").HeaderProps>;
     Footer: React.FC<import("./components/footer/Component").FooterProps>;
-    Closer: React.FC<import("./components/closer/Component").CloserProps>;
+    Closer: React.FC<import("../../navigation-bar").CloserProps>;
 };
 export { ModalDesktop };

package/modal/cssm/Component.desktop.js

@@ -1,16 +1,13 @@
-var tslib_es6 = require('./tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
-var components_closer_Component = require('./components/closer/Component.js');
+var coreComponentsNavigationBar = require('../../navigation-bar/cssm');
 var components_content_Component = require('./components/content/Component.js');
 var components_footer_Component = require('./components/footer/Component.js');
 var components_header_Component = require('./components/header/Component.js');
 var Component = require('./Component.js');
 require('classnames');
-require('../../icon-button/cssm');
-require('@alfalab/icons-glyph/CrossHeavyMIcon');
 require('./Context.js');
 require('../../base-modal/cssm');
-require('./components/closer/index.module.css');
 require('./ResponsiveContext.js');
 require('./components/content/desktop.module.css');
 require('./components/content/index.module.css');
@@ -19,7 +16,6 @@ require('./components/footer/desktop.module.css');
 require('./components/footer/index.module.css');
 require('./components/footer/layout.module.css');
 require('./components/footer/mobile.module.css');
-require('@alfalab/icons-glyph/CrossMIcon');
 require('./components/header/desktop.module.css');
 require('./components/header/index.module.css');
 require('./components/header/mobile.module.css');
@@ -32,12 +28,12 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
-var ModalDesktopComponent = React.forwardRef(function (props, ref) { return (React__default.default.createElement(Component.Modal, tslib_es6.__assign({}, props, { ref: ref, view: 'desktop' }))); });
+var ModalDesktopComponent = React.forwardRef(function (props, ref) { return (React__default.default.createElement(Component.Modal, tslib.__assign({}, props, { ref: ref, view: 'desktop' }))); });
 var ModalDesktop = Object.assign(ModalDesktopComponent, {
     Content: components_content_Component.Content,
     Header: components_header_Component.Header,
     Footer: components_footer_Component.Footer,
-    Closer: components_closer_Component.Closer,
+    Closer: coreComponentsNavigationBar.Closer,
 });
 
 exports.ModalDesktop = ModalDesktop;

package/modal/cssm/Component.js

@@ -1,4 +1,4 @@
-var tslib_es6 = require('./tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
 var mergeRefs = require('react-merge-refs');
 var cn = require('classnames');
@@ -19,7 +19,7 @@ var transitions__default = /*#__PURE__*/_interopDefaultCompat(transitions);
 
 var Modal = React.forwardRef(function (_a, ref) {
     var _b;
-    var _c = _a.size, size = _c === void 0 ? 's' : _c, fixedPosition = _a.fixedPosition, fullscreen = _a.fullscreen, children = _a.children, className = _a.className, wrapperClassName = _a.wrapperClassName, _d = _a.transitionProps, transitionProps = _d === void 0 ? {} : _d, view = _a.view, restProps = tslib_es6.__rest(_a, ["size", "fixedPosition", "fullscreen", "children", "className", "wrapperClassName", "transitionProps", "view"]);
+    var _c = _a.size, size = _c === void 0 ? 's' : _c, fixedPosition = _a.fixedPosition, fullscreen = _a.fullscreen, children = _a.children, className = _a.className, wrapperClassName = _a.wrapperClassName, _d = _a.transitionProps, transitionProps = _d === void 0 ? {} : _d, view = _a.view, restProps = tslib.__rest(_a, ["size", "fixedPosition", "fullscreen", "children", "className", "wrapperClassName", "transitionProps", "view"]);
     // TODO: удалить, после удаления пропсы fullscreen
     var componentSize = fullscreen ? 'fullscreen' : size;
     var modalRef = React.useRef(null);
@@ -42,17 +42,17 @@ var Modal = React.forwardRef(function (_a, ref) {
                 _b[desktopStyles__default.default.fullscreen] = componentSize === 'fullscreen',
                 _b)),
             className: cn__default.default(desktopStyles__default.default.component, className, desktopStyles__default.default[componentSize]),
-            backdropProps: tslib_es6.__assign({ invisible: componentSize === 'fullscreen' }, restProps.backdropProps),
-            transitionProps: tslib_es6.__assign(tslib_es6.__assign({ classNames: transitions__default.default }, transitionProps), { onEntered: handleEntered }),
+            backdropProps: tslib.__assign({ invisible: componentSize === 'fullscreen' }, restProps.backdropProps),
+            transitionProps: tslib.__assign(tslib.__assign({ classNames: transitions__default.default }, transitionProps), { onEntered: handleEntered }),
         }
         : {
             ref: ref,
-            transitionProps: tslib_es6.__assign({ classNames: transitions__default.default }, transitionProps),
+            transitionProps: tslib.__assign({ classNames: transitions__default.default }, transitionProps),
             className: cn__default.default(className, mobileStyles__default.default.component),
         };
     var contextValue = React.useMemo(function () { return ({ size: componentSize, view: view }); }, [componentSize, view]);
     return (React__default.default.createElement(ResponsiveContext.ResponsiveContext.Provider, { value: contextValue },
-        React__default.default.createElement(coreComponentsBaseModal.BaseModal, tslib_es6.__assign({}, restProps, baseModalProps), children)));
+        React__default.default.createElement(coreComponentsBaseModal.BaseModal, tslib.__assign({}, restProps, baseModalProps), children)));
 });
 
 exports.Modal = Modal;

package/modal/cssm/Component.mobile.d.ts

@@ -5,6 +5,6 @@ declare const ModalMobile: React.ForwardRefExoticComponent<ModalMobileProps & Re
     Content: React.FC<import("./typings").ContentProps>;
     Header: React.FC<import("./components/header/Component").HeaderProps>;
     Footer: React.FC<import("./components/footer/Component").FooterProps>;
-    Closer: React.FC<import("./components/closer/Component").CloserProps>;
+    Closer: React.FC<import("../../navigation-bar").CloserProps>;
 };
 export { ModalMobile };

package/modal/cssm/Component.mobile.js

@@ -1,16 +1,13 @@
-var tslib_es6 = require('./tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
-var components_closer_Component = require('./components/closer/Component.js');
+var coreComponentsNavigationBar = require('../../navigation-bar/cssm');
 var components_content_Component = require('./components/content/Component.js');
 var components_footer_Component = require('./components/footer/Component.js');
 var components_header_Component = require('./components/header/Component.js');
 var Component = require('./Component.js');
 require('classnames');
-require('../../icon-button/cssm');
-require('@alfalab/icons-glyph/CrossHeavyMIcon');
 require('./Context.js');
 require('../../base-modal/cssm');
-require('./components/closer/index.module.css');
 require('./ResponsiveContext.js');
 require('./components/content/desktop.module.css');
 require('./components/content/index.module.css');
@@ -19,7 +16,6 @@ require('./components/footer/desktop.module.css');
 require('./components/footer/index.module.css');
 require('./components/footer/layout.module.css');
 require('./components/footer/mobile.module.css');
-require('@alfalab/icons-glyph/CrossMIcon');
 require('./components/header/desktop.module.css');
 require('./components/header/index.module.css');
 require('./components/header/mobile.module.css');
@@ -32,12 +28,12 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
-var ModalMobileComponent = React.forwardRef(function (props, ref) { return (React__default.default.createElement(Component.Modal, tslib_es6.__assign({}, props, { ref: ref, view: 'mobile' }))); });
+var ModalMobileComponent = React.forwardRef(function (props, ref) { return (React__default.default.createElement(Component.Modal, tslib.__assign({}, props, { ref: ref, view: 'mobile' }))); });
 var ModalMobile = Object.assign(ModalMobileComponent, {
     Content: components_content_Component.Content,
     Header: components_header_Component.Header,
     Footer: components_footer_Component.Footer,
-    Closer: components_closer_Component.Closer,
+    Closer: coreComponentsNavigationBar.Closer,
 });
 
 exports.ModalMobile = ModalMobile;

package/modal/cssm/Component.responsive.d.ts

@@ -12,6 +12,6 @@ declare const ModalResponsive: React.ForwardRefExoticComponent<BaseModalProps &
     Header: React.FC<import("./components/header/Component").HeaderProps>;
     Content: React.FC<import("./typings").ContentProps>;
     Footer: React.FC<import("./components/footer/Component").FooterProps>;
-    Closer: React.FC<import("./components/closer/Component").CloserProps>;
+    Closer: React.FC<import("../../navigation-bar").CloserProps>;
 };
 export { ModalResponsive };

package/modal/cssm/Component.responsive.js

@@ -1,17 +1,14 @@
-var tslib_es6 = require('./tslib.es6-bbd6cd2a.js');
+var tslib = require('tslib');
 var React = require('react');
+var coreComponentsNavigationBar = require('../../navigation-bar/cssm');
 var hooks = require('@alfalab/hooks');
-var components_closer_Component = require('./components/closer/Component.js');
 var components_content_Component = require('./components/content/Component.js');
 var components_footer_Component = require('./components/footer/Component.js');
 var components_header_Component = require('./components/header/Component.js');
 var Component = require('./Component.js');
 require('classnames');
-require('../../icon-button/cssm');
-require('@alfalab/icons-glyph/CrossHeavyMIcon');
 require('./Context.js');
 require('../../base-modal/cssm');
-require('./components/closer/index.module.css');
 require('./ResponsiveContext.js');
 require('./components/content/desktop.module.css');
 require('./components/content/index.module.css');
@@ -20,7 +17,6 @@ require('./components/footer/desktop.module.css');
 require('./components/footer/index.module.css');
 require('./components/footer/layout.module.css');
 require('./components/footer/mobile.module.css');
-require('@alfalab/icons-glyph/CrossMIcon');
 require('./components/header/desktop.module.css');
 require('./components/header/index.module.css');
 require('./components/header/mobile.module.css');
@@ -34,18 +30,18 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var ModalResponsiveComponent = React.forwardRef(function (_a, ref) {
-    var children = _a.children, _b = _a.breakpoint, breakpoint = _b === void 0 ? 1024 : _b, restProps = tslib_es6.__rest(_a, ["children", "breakpoint"]);
+    var children = _a.children, _b = _a.breakpoint, breakpoint = _b === void 0 ? 1024 : _b, restProps = tslib.__rest(_a, ["children", "breakpoint"]);
     var view = hooks.useMedia([
         ['mobile', "(max-width: ".concat(breakpoint - 1, "px)")],
         ['desktop', "(min-width: ".concat(breakpoint, "px)")],
     ], 'desktop')[0];
-    return (React__default.default.createElement(Component.Modal, tslib_es6.__assign({ ref: ref }, restProps, { view: view }), children));
+    return (React__default.default.createElement(Component.Modal, tslib.__assign({ ref: ref }, restProps, { view: view }), children));
 });
 var ModalResponsive = Object.assign(ModalResponsiveComponent, {
     Header: components_header_Component.Header,
     Content: components_content_Component.Content,
     Footer: components_footer_Component.Footer,
-    Closer: components_closer_Component.Closer,
+    Closer: coreComponentsNavigationBar.Closer,
 });
 
 exports.ModalResponsive = ModalResponsive;

package/modal/cssm/components/content/Component.js

@@ -18,10 +18,11 @@ var mobileStyles__default = /*#__PURE__*/_interopDefaultCompat(mobileStyles);
 var Content = function (_a) {
     var _b;
     var children = _a.children, flex = _a.flex, className = _a.className;
-    var contentRef = React.useContext(Context.ModalContext).contentRef;
-    var _c = React.useContext(ResponsiveContext.ResponsiveContext), size = _c.size, view = _c.view;
+    var _c = React.useContext(Context.ModalContext), contentRef = _c.contentRef, hasHeader = _c.hasHeader;
+    var _d = React.useContext(ResponsiveContext.ResponsiveContext), size = _d.size, view = _d.view;
     return (React__default.default.createElement("div", { className: cn__default.default(styles__default.default.content, className, (_b = {},
             _b[styles__default.default.flex] = flex,
+            _b[styles__default.default.withHeader] = hasHeader,
             _b[desktopStyles__default.default[size]] = view === 'desktop' && size,
             _b[mobileStyles__default.default.content] = view === 'mobile',
             _b)), ref: contentRef }, children));

package/modal/cssm/components/content/desktop.module.css

@@ -11,7 +11,7 @@
     /* Hard up */
 } :root {
 } :root {
-    --gap-6xl: 72px;
+    --gap-3xl: 40px;
 } :root {
 } :root {
 } :root {
@@ -19,23 +19,22 @@
     /* sizes */
 
     /* paddings */
-    --modal-s-content-paddings: 0 56px;
-    --modal-s-content-only-bottom-padding: 56px;
+    --modal-s-content-paddings: var(--gap-3xl) var(--gap-3xl) 0;
+    --modal-s-content-only-bottom-padding: var(--gap-3xl);
 
     /* scroll */
 
     /* desktop */
 
     /* mobile */
+
+    /* paddings */
 } .s,
-.m {
-    padding: var(--modal-s-content-paddings)
-} .s:last-child, .m:last-child {
-        padding-bottom: var(--modal-s-content-only-bottom-padding);
-    } .l,
+.m,
+.l,
 .xl,
 .fullscreen {
-    padding: 0 var(--gap-6xl)
-} .l:last-child, .xl:last-child, .fullscreen:last-child {
-        padding-bottom: var(--gap-6xl);
+    padding: var(--modal-s-content-paddings)
+} .s:last-child, .m:last-child, .l:last-child, .xl:last-child, .fullscreen:last-child {
+        padding-bottom: var(--modal-s-content-only-bottom-padding);
     }

package/modal/cssm/components/content/index.module.css

@@ -24,9 +24,13 @@
     /* desktop */
 
     /* mobile */
+
+    /* paddings */
 } .content {
     box-sizing: border-box;
-    width: 100%;
-} .flex {
+    width: 100%
+} .content.withHeader {
+        padding-top: 0;
+    } .flex {
     flex: 1;
 }

package/modal/cssm/components/content/mobile.module.css

@@ -25,8 +25,10 @@
     /* desktop */
 
     /* mobile */
+
+    /* paddings */
 } .content {
-    padding: 0 var(--gap-m)
+    padding: var(--gap-m) var(--gap-m) 0
 } .content:last-child {
         padding-bottom: var(--gap-m);
     }