@alfalab/core-components-modal 6.1.12 → 7.0.0

package/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("@alfalab/core-components-navigation-bar").CloserProps>;
 };
 export { ModalDesktop };

package/Component.desktop.js

@@ -2,18 +2,15 @@
 
 var tslib = require('tslib');
 var React = require('react');
-var components_closer_Component = require('./components/closer/Component.js');
+var coreComponentsNavigationBar = require('@alfalab/core-components-navigation-bar');
 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('@alfalab/core-components-icon-button');
-require('@alfalab/icons-glyph/CrossHeavyMIcon');
 require('./Context.js');
 require('@alfalab/core-components-base-modal');
 require('./ResponsiveContext.js');
-require('@alfalab/icons-glyph/CrossMIcon');
 require('react-merge-refs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -25,7 +22,7 @@ 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/Component.js

@@ -13,13 +13,13 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var desktopStyles = {"wrapper":"modal__wrapper_1qc7d","component":"modal__component_1qc7d","fullscreen":"modal__fullscreen_1qc7d","s":"modal__s_1qc7d","m":"modal__m_1qc7d","l":"modal__l_1qc7d","xl":"modal__xl_1qc7d"};
+var desktopStyles = {"wrapper":"modal__wrapper_1h080","component":"modal__component_1h080","fullscreen":"modal__fullscreen_1h080","s":"modal__s_1h080","m":"modal__m_1h080","l":"modal__l_1h080","xl":"modal__xl_1h080"};
 require('./desktop.css')
 
-var mobileStyles = {"component":"modal__component_1ouph"};
+var mobileStyles = {"component":"modal__component_gwnha"};
 require('./mobile.css')
 
-var transitions = {"appear":"modal__appear_19gn2","enter":"modal__enter_19gn2","appearActive":"modal__appearActive_19gn2","enterActive":"modal__enterActive_19gn2","exit":"modal__exit_19gn2","exitActive":"modal__exitActive_19gn2","exitDone":"modal__exitDone_19gn2"};
+var transitions = {"appear":"modal__appear_14ixj","enter":"modal__enter_14ixj","appearActive":"modal__appearActive_14ixj","enterActive":"modal__enterActive_14ixj","exit":"modal__exit_14ixj","exitActive":"modal__exitActive_14ixj","exitDone":"modal__exitDone_14ixj"};
 require('./transitions.css')
 
 var Modal = React.forwardRef(function (_a, ref) {

package/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("@alfalab/core-components-navigation-bar").CloserProps>;
 };
 export { ModalMobile };

package/Component.mobile.js

@@ -2,18 +2,15 @@
 
 var tslib = require('tslib');
 var React = require('react');
-var components_closer_Component = require('./components/closer/Component.js');
+var coreComponentsNavigationBar = require('@alfalab/core-components-navigation-bar');
 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('@alfalab/core-components-icon-button');
-require('@alfalab/icons-glyph/CrossHeavyMIcon');
 require('./Context.js');
 require('@alfalab/core-components-base-modal');
 require('./ResponsiveContext.js');
-require('@alfalab/icons-glyph/CrossMIcon');
 require('react-merge-refs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -25,7 +22,7 @@ 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/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("@alfalab/core-components-navigation-bar").CloserProps>;
 };
 export { ModalResponsive };

package/Component.responsive.js

@@ -2,19 +2,16 @@
 
 var tslib = require('tslib');
 var React = require('react');
+var coreComponentsNavigationBar = require('@alfalab/core-components-navigation-bar');
 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('@alfalab/core-components-icon-button');
-require('@alfalab/icons-glyph/CrossHeavyMIcon');
 require('./Context.js');
 require('@alfalab/core-components-base-modal');
 require('./ResponsiveContext.js');
-require('@alfalab/icons-glyph/CrossMIcon');
 require('react-merge-refs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -33,7 +30,7 @@ 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/components/content/Component.js

@@ -11,22 +11,23 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var desktopStyles = {"s":"modal__s_1rous","m":"modal__m_1rous","l":"modal__l_1rous","xl":"modal__xl_1rous","fullscreen":"modal__fullscreen_1rous"};
+var desktopStyles = {"s":"modal__s_10lsq","m":"modal__m_10lsq","l":"modal__l_10lsq","xl":"modal__xl_10lsq","fullscreen":"modal__fullscreen_10lsq"};
 require('./desktop.css')
 
-var styles = {"content":"modal__content_4qg8n","flex":"modal__flex_4qg8n"};
+var styles = {"content":"modal__content_9o5rw","withHeader":"modal__withHeader_9o5rw","flex":"modal__flex_9o5rw"};
 require('./index.css')
 
-var mobileStyles = {"content":"modal__content_1ia6o"};
+var mobileStyles = {"content":"modal__content_rvw86"};
 require('./mobile.css')
 
 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.content, className, (_b = {},
             _b[styles.flex] = flex,
+            _b[styles.withHeader] = hasHeader,
             _b[desktopStyles[size]] = view === 'desktop' && size,
             _b[mobileStyles.content] = view === 'mobile',
             _b)), ref: contentRef }, children));

package/components/content/desktop.css

@@ -1,4 +1,4 @@
-/* hash: 3fjyg */
+/* hash: 31pcf */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -12,7 +12,7 @@
     /* Hard up */
 } :root {
 } :root {
-    --gap-6xl: 72px;
+    --gap-3xl: 40px;
 } :root {
 } :root {
 } :root {
@@ -20,23 +20,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 */
-} .modal__s_1rous,
-.modal__m_1rous {
+
+    /* paddings */
+} .modal__s_10lsq,
+.modal__m_10lsq,
+.modal__l_10lsq,
+.modal__xl_10lsq,
+.modal__fullscreen_10lsq {
     padding: var(--modal-s-content-paddings)
-} .modal__s_1rous:last-child, .modal__m_1rous:last-child {
+} .modal__s_10lsq:last-child, .modal__m_10lsq:last-child, .modal__l_10lsq:last-child, .modal__xl_10lsq:last-child, .modal__fullscreen_10lsq:last-child {
         padding-bottom: var(--modal-s-content-only-bottom-padding);
-    } .modal__l_1rous,
-.modal__xl_1rous,
-.modal__fullscreen_1rous {
-    padding: 0 var(--gap-6xl)
-} .modal__l_1rous:last-child, .modal__xl_1rous:last-child, .modal__fullscreen_1rous:last-child {
-        padding-bottom: var(--gap-6xl);
     }

package/components/content/index.css

@@ -1,4 +1,4 @@
-/* hash: 8dl35 */
+/* hash: 7zqh4 */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -25,9 +25,13 @@
     /* desktop */
 
     /* mobile */
-} .modal__content_4qg8n {
+
+    /* paddings */
+} .modal__content_9o5rw {
     box-sizing: border-box;
-    width: 100%;
-} .modal__flex_4qg8n {
+    width: 100%
+} .modal__content_9o5rw.modal__withHeader_9o5rw {
+        padding-top: 0;
+    } .modal__flex_9o5rw {
     flex: 1;
 }

package/components/content/mobile.css

@@ -1,4 +1,4 @@
-/* hash: uxhv9 */
+/* hash: q0wl1 */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -26,8 +26,10 @@
     /* desktop */
 
     /* mobile */
-} .modal__content_1ia6o {
-    padding: 0 var(--gap-m)
-} .modal__content_1ia6o:last-child {
+
+    /* paddings */
+} .modal__content_rvw86 {
+    padding: var(--gap-m) var(--gap-m) 0
+} .modal__content_rvw86:last-child {
         padding-bottom: var(--gap-m);
     }

package/components/footer/Component.js

@@ -11,16 +11,16 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var desktopStyles = {"footer":"modal__footer_1sboe","sticky":"modal__sticky_1sboe","fullscreen":"modal__fullscreen_1sboe","s":"modal__s_1sboe","m":"modal__m_1sboe","l":"modal__l_1sboe","xl":"modal__xl_1sboe"};
+var desktopStyles = {"footer":"modal__footer_kzf10","sticky":"modal__sticky_kzf10","fullscreen":"modal__fullscreen_kzf10","s":"modal__s_kzf10","m":"modal__m_kzf10","l":"modal__l_kzf10","xl":"modal__xl_kzf10"};
 require('./desktop.css')
 
-var styles = {"footer":"modal__footer_1de14","sticky":"modal__sticky_1de14","highlighted":"modal__highlighted_1de14"};
+var styles = {"footer":"modal__footer_19247","sticky":"modal__sticky_19247","highlighted":"modal__highlighted_19247"};
 require('./index.css')
 
-var layoutStyles = {"column":"modal__column_ecmie","gap-16":"modal__gap-16_ecmie","gap-24":"modal__gap-24_ecmie","gap-32":"modal__gap-32_ecmie","start":"modal__start_ecmie","center":"modal__center_ecmie","space-between":"modal__space-between_ecmie"};
+var layoutStyles = {"column":"modal__column_161h6","gap-16":"modal__gap-16_161h6","gap-24":"modal__gap-24_161h6","gap-32":"modal__gap-32_161h6","start":"modal__start_161h6","center":"modal__center_161h6","space-between":"modal__space-between_161h6"};
 require('./layout.css')
 
-var mobileStyles = {"footer":"modal__footer_1paqu","sticky":"modal__sticky_1paqu"};
+var mobileStyles = {"footer":"modal__footer_vmdq8","sticky":"modal__sticky_vmdq8"};
 require('./mobile.css')
 
 var Footer = function (_a) {

package/components/footer/desktop.css

@@ -1,4 +1,4 @@
-/* hash: e7e26 */
+/* hash: 1hqlk */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -14,9 +14,7 @@
     --border-radius-l: 12px;
 } :root {
     --gap-xl: 24px;
-    --gap-2xl: 32px;
     --gap-3xl: 40px;
-    --gap-6xl: 72px;
 } :root {
 } :root {
 } :root {
@@ -26,25 +24,26 @@
     /* sizes */
 
     /* paddings */
-    --modal-s-footer-paddings: var(--gap-xl) 56px 56px;
+    --modal-s-footer-paddings: var(--gap-xl) var(--gap-3xl) var(--gap-3xl);
 
     /* scroll */
 
     /* desktop */
 
     /* mobile */
-} .modal__footer_1sboe {
+
+    /* paddings */
+} .modal__footer_kzf10 {
     border-bottom-left-radius: var(--modal-border-radius);
     border-bottom-right-radius: var(--modal-border-radius);
-} .modal__sticky_1sboe {
+} .modal__sticky_kzf10 {
     bottom: calc(var(--modal-vertical-padding) * -1)
-} .modal__sticky_1sboe.modal__fullscreen_1sboe {
+} .modal__sticky_kzf10.modal__fullscreen_kzf10 {
         bottom: 0;
-    } .modal__s_1sboe,
-.modal__m_1sboe {
+    } .modal__s_kzf10,
+.modal__m_kzf10,
+.modal__l_kzf10,
+.modal__xl_kzf10,
+.modal__fullscreen_kzf10 {
     padding: var(--modal-s-footer-paddings);
-} .modal__l_1sboe,
-.modal__xl_1sboe,
-.modal__fullscreen_1sboe {
-    padding: var(--gap-2xl) var(--gap-6xl) var(--gap-6xl);
 }

package/components/footer/index.css

@@ -1,8 +1,8 @@
-/* hash: 6ef5k */
+/* hash: 19xmn */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-primary: #fff;
-    --color-light-border-primary: #dbdee1;
+    --color-light-border-secondary: #e7e9eb;
 } :root {
 } :root {
 } :root {
@@ -25,19 +25,21 @@
 
     /* scroll */
     --modal-footer-highlight-background: var(--color-light-bg-primary);
-    --modal-footer-highlight-box-shadow: 0 -1px 0 0 var(--color-light-border-primary);
+    --modal-footer-highlight-box-shadow: 0 -1px 0 0 var(--color-light-border-secondary);
 
     /* desktop */
 
     /* mobile */
-} .modal__footer_1de14 {
+
+    /* paddings */
+} .modal__footer_19247 {
     width: 100%;
     box-sizing: border-box;
     transition: box-shadow 0.2s ease, background 0.2s ease;
-} .modal__sticky_1de14 {
+} .modal__sticky_19247 {
     background: var(--modal-footer-background);
     position: sticky;
-} .modal__highlighted_1de14 {
+} .modal__highlighted_19247 {
     background: var(--modal-footer-highlight-background);
     box-shadow: var(--modal-footer-highlight-box-shadow);
 }

package/components/footer/layout.css

@@ -1,4 +1,4 @@
-/* hash: 19r38 */
+/* hash: e96ok */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -29,45 +29,47 @@
     /* desktop */
 
     /* mobile */
-} .modal__column_ecmie {
+
+    /* paddings */
+} .modal__column_161h6 {
     display: flex;
     flex-direction: column
-} .modal__column_ecmie > * {
+} .modal__column_161h6 > * {
         margin-bottom: var(--modal-footer-default-gap);
-    } .modal__column_ecmie > *:last-child,
-    .modal__column_ecmie > *:only-child {
+    } .modal__column_161h6 > *:last-child,
+    .modal__column_161h6 > *:only-child {
         margin-bottom: 0;
-    } .modal__column_ecmie.modal__gap-16_ecmie > * {
+    } .modal__column_161h6.modal__gap-16_161h6 > * {
         margin-bottom: var(--gap-m);
-    } .modal__column_ecmie.modal__gap-24_ecmie > * {
+    } .modal__column_161h6.modal__gap-24_161h6 > * {
         margin-bottom: var(--gap-xl);
-    } .modal__column_ecmie.modal__gap-32_ecmie > * {
+    } .modal__column_161h6.modal__gap-32_161h6 > * {
         margin-bottom: var(--gap-2xl);
-    } .modal__start_ecmie {
+    } .modal__start_161h6 {
     justify-content: flex-start;
-} .modal__center_ecmie {
+} .modal__center_161h6 {
     justify-content: center;
-} .modal__space-between_ecmie {
+} .modal__space-between_161h6 {
     justify-content: space-between
-} .modal__space-between_ecmie > * {
+} .modal__space-between_161h6 > * {
         flex: 1;
-    } .modal__start_ecmie,
-.modal__center_ecmie,
-.modal__space-between_ecmie {
+    } .modal__start_161h6,
+.modal__center_161h6,
+.modal__space-between_161h6 {
     display: flex
-} .modal__start_ecmie > *, .modal__center_ecmie > *, .modal__space-between_ecmie > * {
+} .modal__start_161h6 > *, .modal__center_161h6 > *, .modal__space-between_161h6 > * {
         margin-right: var(--modal-footer-default-gap);
-    } .modal__start_ecmie > *:last-child,
-    .modal__start_ecmie > *:only-child,
-    .modal__center_ecmie > *:last-child,
-    .modal__center_ecmie > *:only-child,
-    .modal__space-between_ecmie > *:last-child,
-    .modal__space-between_ecmie > *:only-child {
+    } .modal__start_161h6 > *:last-child,
+    .modal__start_161h6 > *:only-child,
+    .modal__center_161h6 > *:last-child,
+    .modal__center_161h6 > *:only-child,
+    .modal__space-between_161h6 > *:last-child,
+    .modal__space-between_161h6 > *:only-child {
         margin-right: 0;
-    } .modal__start_ecmie.modal__gap-16_ecmie > *, .modal__center_ecmie.modal__gap-16_ecmie > *, .modal__space-between_ecmie.modal__gap-16_ecmie > * {
+    } .modal__start_161h6.modal__gap-16_161h6 > *, .modal__center_161h6.modal__gap-16_161h6 > *, .modal__space-between_161h6.modal__gap-16_161h6 > * {
         margin-right: var(--gap-m);
-    } .modal__start_ecmie.modal__gap-24_ecmie > *, .modal__center_ecmie.modal__gap-24_ecmie > *, .modal__space-between_ecmie.modal__gap-24_ecmie > * {
+    } .modal__start_161h6.modal__gap-24_161h6 > *, .modal__center_161h6.modal__gap-24_161h6 > *, .modal__space-between_161h6.modal__gap-24_161h6 > * {
         margin-right: var(--gap-xl);
-    } .modal__start_ecmie.modal__gap-32_ecmie > *, .modal__center_ecmie.modal__gap-32_ecmie > *, .modal__space-between_ecmie.modal__gap-32_ecmie > * {
+    } .modal__start_161h6.modal__gap-32_161h6 > *, .modal__center_161h6.modal__gap-32_161h6 > *, .modal__space-between_161h6.modal__gap-32_161h6 > * {
         margin-right: var(--gap-2xl);
     }

package/components/footer/mobile.css

@@ -1,4 +1,4 @@
-/* hash: 1t8zi */
+/* hash: 5pqlo */
 :root {
 } /* deprecated */ :root {
 } :root {
@@ -26,8 +26,10 @@
     /* desktop */
 
     /* mobile */
-} .modal__footer_1paqu {
+
+    /* paddings */
+} .modal__footer_vmdq8 {
     padding: var(--gap-m);
-} .modal__sticky_1paqu {
+} .modal__sticky_vmdq8 {
     bottom: 0;
 }

package/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 "@alfalab/core-components-navigation-bar";
+type HeaderProps = Omit<NavigationBarProps, 'size' | 'view' | 'parentRef'>;
 declare const Header: FC<HeaderProps>;
 export { HeaderProps, Header };

package/components/header/Component.js

@@ -1,63 +1,49 @@
 'use strict';
 
+var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
-var CrossMIcon = require('@alfalab/icons-glyph/CrossMIcon');
+var coreComponentsNavigationBar = require('@alfalab/core-components-navigation-bar');
 var Context = require('../../Context.js');
 var ResponsiveContext = require('../../ResponsiveContext.js');
-var components_closer_Component = require('../closer/Component.js');
 require('@alfalab/core-components-base-modal');
-require('tslib');
-require('@alfalab/core-components-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_1sbjx","content":"modal__content_1sbjx","s":"modal__s_1sbjx","m":"modal__m_1sbjx","l":"modal__l_1sbjx","xl":"modal__xl_1sbjx","fullscreen":"modal__fullscreen_1sbjx","hasContent":"modal__hasContent_1sbjx","sticky":"modal__sticky_1sbjx"};
+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_fyqm8","hasContent":"modal__hasContent_fyqm8","highlighted":"modal__highlighted_fyqm8","sticky":"modal__sticky_fyqm8","content":"modal__content_fyqm8","title":"modal__title_fyqm8","addon":"modal__addon_fyqm8","closer":"modal__closer_fyqm8","left":"modal__left_fyqm8","center":"modal__center_fyqm8","right":"modal__right_fyqm8","trim":"modal__trim_fyqm8"};
+var styles = {"highlighted":"modal__highlighted_ppblj","sticky":"modal__sticky_ppblj","hasContent":"modal__hasContent_ppblj"};
 require('./index.css')
 
-var mobileStyles = {"sticky":"modal__sticky_1tlb4","content":"modal__content_1tlb4"};
+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;