@alfalab/core-components-modal 4.2.0 → 5.0.2

package/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.1](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-modal@5.0.0...@alfalab/core-components-modal@5.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))
+
+
+
+
+
+# [5.0.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-modal@4.2.0...@alfalab/core-components-modal@5.0.0) (2022-03-24)
+
+
+### Features
+
+* **modal:** update styles ([#1024](https://github.com/alfa-laboratory/core-components/issues/1024)) ([fdf2cdc](https://github.com/alfa-laboratory/core-components/commit/fdf2cdca9f785b27cd5d3998245a34d42e1240d1))
+
+
+### BREAKING CHANGES
+
+* **modal:** Большое обновление стилей и темизации
+
+* fix(modal): remove unused align
+
+
+
+
+
 # [4.2.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-modal@4.1.0...@alfalab/core-components-modal@4.2.0) (2022-03-04)
 
 

package/dist/Component.desktop.d.ts

@@ -6,9 +6,10 @@ type ModalDesktopProps = BaseModalProps & {
      * Ширина модального окна
      * @default "m"
      */
-    size?: 's' | 'm' | 'l';
+    size?: 's' | 'm' | 'l' | 'xl' | 'fullscreen';
     /**
      * Растягивает модальное окно на весь экран
+     * @deprecated Используйте размер fullscreen
      */
     fullscreen?: boolean;
     /**
@@ -27,9 +28,10 @@ declare const ModalDesktop: React.ForwardRefExoticComponent<BaseModalProps & {
      * Ширина модального окна
      * @default "m"
      */
-    size?: "s" | "m" | "l" | undefined;
+    size?: "s" | "m" | "l" | "xl" | "fullscreen" | undefined;
     /**
      * Растягивает модальное окно на весь экран
+     * @deprecated Используйте размер fullscreen
      */
     fullscreen?: boolean | undefined;
     /**

package/dist/Component.desktop.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('./tslib.es6-7f8fab53.js');
+var tslib_es6 = require('./tslib.es6-aeaa6cae.js');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('@alfalab/core-components-base-modal');
@@ -17,7 +17,7 @@ require('./components/content/Component.js');
 var components_content_Component_desktop = require('./components/content/Component.desktop.js');
 require('./components/footer/Component.js');
 var components_footer_Component_desktop = require('./components/footer/Component.desktop.js');
-var transitions_module = require('./transitions.module-b2682a08.js');
+var transitions_module = require('./transitions.module-ff9f50b2.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,12 +25,14 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
 
-var styles = {"wrapper":"modal__wrapper_1c75b","component":"modal__component_1c75b","fullscreen":"modal__fullscreen_1c75b","s":"modal__s_1c75b","m":"modal__m_1c75b","l":"modal__l_1c75b"};
+var styles = {"wrapper":"modal__wrapper_1v5rf","component":"modal__component_1v5rf","fullscreen":"modal__fullscreen_1v5rf","s":"modal__s_1v5rf","m":"modal__m_1v5rf","l":"modal__l_1v5rf","xl":"modal__xl_1v5rf"};
 require('./desktop.css')
 
 var ModalDesktopComponent = 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, restProps = tslib_es6.__rest(_a, ["size", "fixedPosition", "fullscreen", "children", "className", "wrapperClassName", "transitionProps"]);
+    // TODO: удалить, после удаления пропсы fullscreen
+    var componentSize = fullscreen ? 'fullscreen' : size;
     var modalRef = React.useRef(null);
     var handleEntered = React.useCallback(function (node, isAppearing) {
         if (fixedPosition && modalRef.current) {
@@ -45,11 +47,9 @@ var ModalDesktopComponent = React.forwardRef(function (_a, ref) {
         }
     }, [fixedPosition, transitionProps]);
     return (React__default['default'].createElement(coreComponentsBaseModal.BaseModal, tslib_es6.__assign({}, restProps, { ref: mergeRefs__default['default']([ref, modalRef]), wrapperClassName: cn__default['default'](styles.wrapper, wrapperClassName, (_b = {},
-            _b[styles.fullscreen] = fullscreen,
-            _b)), className: cn__default['default'](styles.component, className, !fullscreen && styles[size]), backdropProps: tslib_es6.__assign(tslib_es6.__assign({}, restProps.backdropProps), { invisible: fullscreen }), transitionProps: tslib_es6.__assign(tslib_es6.__assign({ classNames: transitions_module.transitions }, transitionProps), { onEntered: handleEntered }) }), React__default['default'].Children.map(children, function (child) {
-        return React.isValidElement(child)
-            ? React.cloneElement(child, { size: child.props.size || size, fullscreen: fullscreen })
-            : child;
+            _b[styles.fullscreen] = componentSize === 'fullscreen',
+            _b)), className: cn__default['default'](styles.component, className, styles[componentSize]), backdropProps: tslib_es6.__assign(tslib_es6.__assign({}, restProps.backdropProps), { invisible: componentSize === 'fullscreen' }), transitionProps: tslib_es6.__assign(tslib_es6.__assign({ classNames: transitions_module.transitions }, transitionProps), { onEntered: handleEntered }) }), React__default['default'].Children.map(children, function (child) {
+        return React.isValidElement(child) ? React.cloneElement(child, { size: componentSize }) : child;
     })));
 });
 var ModalDesktop = Object.assign(ModalDesktopComponent, {

package/dist/Component.mobile.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('./tslib.es6-7f8fab53.js');
+var tslib_es6 = require('./tslib.es6-aeaa6cae.js');
 var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('@alfalab/core-components-base-modal');
@@ -13,8 +13,7 @@ require('@alfalab/icons-glyph/CrossHeavyMIcon');
 var components_closer_Component = require('./components/closer/Component.js');
 require('./components/content/Component.js');
 require('./components/footer/Component.js');
-var transitions_module = require('./transitions.module-b2682a08.js');
-var hooks = require('@alfalab/hooks');
+var transitions_module = require('./transitions.module-ff9f50b2.js');
 require('@alfalab/icons-glyph/CrossMIcon');
 var components_header_Component_mobile = require('./components/header/Component.mobile.js');
 var components_content_Component_mobile = require('./components/content/Component.mobile.js');
@@ -25,20 +24,12 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"component":"modal__component_cp777"};
+var styles = {"component":"modal__component_1tsg6"};
 require('./mobile.css')
 
 var ModalMobileComponent = React.forwardRef(function (_a, ref) {
     var children = _a.children, className = _a.className, restProps = tslib_es6.__rest(_a, ["children", "className"]);
-    var size = hooks.useMedia([
-        ['s', '(max-width: 375px)'],
-        ['m', '(min-width: 376px)'],
-    ], 's')[0];
-    return (React__default['default'].createElement(coreComponentsBaseModal.BaseModal, tslib_es6.__assign({}, restProps, { ref: ref, transitionProps: tslib_es6.__assign({ classNames: transitions_module.transitions }, restProps.transitionProps), className: cn__default['default'](className, styles.component), backdropProps: tslib_es6.__assign(tslib_es6.__assign({}, restProps.backdropProps), { invisible: true }) }), React__default['default'].Children.map(children, function (child) {
-        return React.isValidElement(child)
-            ? React.cloneElement(child, { size: child.props.size || size, fullscreen: true })
-            : child;
-    })));
+    return (React__default['default'].createElement(coreComponentsBaseModal.BaseModal, tslib_es6.__assign({}, restProps, { ref: ref, transitionProps: tslib_es6.__assign({ classNames: transitions_module.transitions }, restProps.transitionProps), className: cn__default['default'](className, styles.component) }), children));
 });
 var ModalMobile = Object.assign(ModalMobileComponent, {
     Content: components_content_Component_mobile.ContentMobile,

package/dist/Component.responsive.d.ts

@@ -6,14 +6,14 @@ type ModalResponsiveProps = ModalMobileProps & ModalDesktopProps;
 declare const ModalResponsive: React.ForwardRefExoticComponent<import("packages/base-modal/src").BaseModalProps & {
     hasCloser?: boolean | undefined;
 } & {
-    size?: "s" | "m" | "l" | undefined;
+    size?: "s" | "m" | "l" | "xl" | "fullscreen" | undefined;
     fullscreen?: boolean | undefined;
     fixedPosition?: boolean | undefined;
     hasCloser?: boolean | undefined;
 } & React.RefAttributes<HTMLDivElement>> & {
-    Header: React.FC<import("./components/header/Component.desktop").HeaderDesktopProps> | React.FC<import("./components/header/Component.mobile").HeaderMobileProps>;
-    Content: React.FC<import("./components/content/Component.desktop").ContentDesktopProps> | React.FC<import("./components/content/Component").ContentProps>;
-    Footer: React.FC<import("./components/footer/Component.desktop").FooterDesktopProps> | React.FC<import("./components/footer/Component").FooterProps>;
+    Header: React.FC<import("./components/header/Component.mobile").HeaderMobileProps> | React.FC<import("./components/header/Component.desktop").HeaderDesktopProps>;
+    Content: React.FC<import("./components/content/Component").ContentProps> | React.FC<import("./components/content/Component.desktop").ContentDesktopProps>;
+    Footer: React.FC<import("./components/footer/Component").FooterProps> | React.FC<import("./components/footer/Component.desktop").FooterDesktopProps>;
     Closer: React.FC<import("./components/closer/Component").CloserProps>;
 };
 export { ModalResponsiveProps, ModalResponsive };

package/dist/Component.responsive.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('./tslib.es6-7f8fab53.js');
+var tslib_es6 = require('./tslib.es6-aeaa6cae.js');
 var React = require('react');
 require('classnames');
 require('@alfalab/core-components-base-modal');
@@ -18,13 +18,13 @@ require('./components/content/Component.desktop.js');
 require('./components/footer/Component.js');
 require('./components/footer/Component.desktop.js');
 var Component_desktop = require('./Component.desktop.js');
-require('./transitions.module-b2682a08.js');
-var hooks = require('@alfalab/hooks');
+require('./transitions.module-ff9f50b2.js');
 require('@alfalab/icons-glyph/CrossMIcon');
 require('./components/header/Component.mobile.js');
 require('./components/content/Component.mobile.js');
 require('./components/footer/Component.mobile.js');
 var Component_mobile = require('./Component.mobile.js');
+var hooks = require('@alfalab/hooks');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -44,8 +44,8 @@ function createResponsive(desktop, mobile) {
 var ModalResponsiveComponent = React.forwardRef(function (_a, ref) {
     var children = _a.children, restProps = tslib_es6.__rest(_a, ["children"]);
     var view = hooks.useMedia([
-        ['mobile', '(max-width: 767px)'],
-        ['desktop', '(min-width: 768px)'],
+        ['mobile', '(max-width: 1023px)'],
+        ['desktop', '(min-width: 1024px)'],
     ], 'desktop')[0];
     var contextValue = React.useMemo(function () { return ({ view: view }); }, [view]);
     var Component = view === 'desktop' ? Component_desktop.ModalDesktop : Component_mobile.ModalMobile;

package/dist/components/closer/Component.d.ts

@@ -14,13 +14,16 @@ type CloserProps = ButtonHTMLAttributes<HTMLButtonElement> & {
      */
     size?: IconButtonProps['size'];
     /**
-     * Иконка
+     * Фиксирует крестик
      */
-    icon?: ElementType;
+    sticky?: boolean;
     /**
-     * Флаг, что модальное окно открыто на весь экран
+     * Иконка
      */
-    fullscreen?: boolean;
+    icon?: ElementType;
 };
+/**
+ * @deprecated Компонент только для внутреннего использования. Используйте <Header />
+ */
 declare const Closer: FC<CloserProps>;
 export { CloserProps, Closer };

package/dist/components/closer/Component.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-7f8fab53.js');
+var tslib_es6 = require('../../tslib.es6-aeaa6cae.js');
 var React = require('react');
 var cn = require('classnames');
 require('@alfalab/core-components-base-modal');
@@ -15,16 +15,23 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"closer":"modal__closer_w3br9","left":"modal__left_w3br9","right":"modal__right_w3br9","fullscreen":"modal__fullscreen_w3br9"};
+var styles = {"closer":"modal__closer_1f1xv","button":"modal__button_1f1xv","sticky":"modal__sticky_1f1xv"};
 require('./index.css')
 
+/**
+ * @deprecated Компонент только для внутреннего использования. Используйте <Header />
+ */
 var Closer = function (_a) {
-    var className = _a.className, fullscreen = _a.fullscreen, align = _a.align, _b = _a.size, size = _b === void 0 ? 's' : _b, _c = _a.icon, icon = _c === void 0 ? CrossHeavyMIcon.CrossHeavyMIcon : _c, restProps = tslib_es6.__rest(_a, ["className", "fullscreen", "align", "size", "icon"]);
+    var _b;
+    var className = _a.className, _c = _a.size, size = _c === void 0 ? 's' : _c, sticky = _a.sticky, _d = _a.icon, icon = _d === void 0 ? CrossHeavyMIcon.CrossHeavyMIcon : _d, restProps = tslib_es6.__rest(_a, ["className", "size", "sticky", "icon"]);
     var onClose = React.useContext(Context.ModalContext).onClose;
     var handleClick = React.useCallback(function (event) {
         onClose(event, 'closerClick');
     }, [onClose]);
-    return (React__default['default'].createElement(coreComponentsIconButton.IconButton, tslib_es6.__assign({ size: size, className: cn__default['default'](styles.closer, className, fullscreen && styles.fullscreen, align && styles[align]), "aria-label": '\u0437\u0430\u043A\u0440\u044B\u0442\u044C', onClick: handleClick, icon: icon }, restProps)));
+    return (React__default['default'].createElement("div", { className: cn__default['default'](styles.closer, className, (_b = {},
+            _b[styles.sticky] = sticky,
+            _b)) },
+        React__default['default'].createElement(coreComponentsIconButton.IconButton, tslib_es6.__assign({ size: size, className: styles.button, "aria-label": '\u0437\u0430\u043A\u0440\u044B\u0442\u044C', onClick: handleClick, icon: icon }, restProps))));
 };
 
 exports.Closer = Closer;

package/dist/components/closer/index.css

@@ -1,4 +1,7 @@
-/* hash: a0u92 */
+/* hash: 1psyv */
+:root {
+    --color-light-bg-primary-alpha-40: rgba(255, 255, 255, 0.4);
+}
 :root {
 
     /* Hard */
@@ -17,28 +20,31 @@
 
     /* paddings */
 
-    /* sticky */
-
     /* scroll */
 
+    /* desktop */
+
     /* mobile */
 }
-.modal__closer_w3br9 {
+:root {
+    --modal-closer-bg-color: var(--color-light-bg-primary-alpha-40);
+}
+.modal__closer_1f1xv {
     flex-shrink: 0;
-
-    background: rgba(255, 255, 255, 0.4);
+    width: 48px;
+    height: 48px;
+    margin-left: auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.modal__button_1f1xv {
+    background: var(--modal-closer-bg-color);
     -webkit-backdrop-filter: blur(10px);
             backdrop-filter: blur(10px);
     border-radius: 50px;
 }
-.modal__left_w3br9,
-.modal__right_w3br9 {
+.modal__sticky_1f1xv {
     position: sticky;
     top: calc(var(--modal-vertical-padding) * -1);
 }
-.modal__right_w3br9 {
-    margin-left: auto;
-}
-.modal__fullscreen_w3br9 {
-    top: 0;
-}

package/dist/components/content/Component.d.ts

@@ -13,7 +13,5 @@ type ContentProps = {
      */
     flex?: boolean;
 };
-declare const Content: FC<ContentProps & {
-    styles: Record<string, string>;
-}>;
+declare const Content: FC<ContentProps>;
 export { ContentProps, Content };

package/dist/components/content/Component.desktop.d.ts

@@ -1,14 +1,11 @@
 import { FC } from 'react';
 import { ContentProps } from "./Component";
+import { ModalDesktopProps } from "../../Component.desktop";
 type ContentDesktopProps = ContentProps & {
     /**
      * Размер
      */
-    size?: 's' | 'm' | 'l';
-    /**
-     * Флаг, что модальное окно открыто на весь экран
-     */
-    fullscreen?: boolean;
+    size?: ModalDesktopProps['size'];
 };
 declare const ContentDesktop: FC<ContentDesktopProps>;
 export { ContentDesktopProps, ContentDesktop };

package/dist/components/content/Component.desktop.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-7f8fab53.js');
+var tslib_es6 = require('../../tslib.es6-aeaa6cae.js');
 var React = require('react');
 var cn = require('classnames');
 require('@alfalab/core-components-base-modal');
@@ -14,12 +14,12 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"content":"modal__content_1ooog modal__content_km6k3","flex":"modal__flex_1ooog modal__flex_km6k3","s":"modal__s_1ooog","m":"modal__m_1ooog","l":"modal__l_1ooog","fullscreen":"modal__fullscreen_1ooog"};
+var styles = {"s":"modal__s_1ua1i","m":"modal__m_1ua1i","l":"modal__l_1ua1i","xl":"modal__xl_1ua1i","fullscreen":"modal__fullscreen_1ua1i"};
 require('./desktop.css')
 
 var ContentDesktop = function (_a) {
-    var size = _a.size, className = _a.className, fullscreen = _a.fullscreen, restProps = tslib_es6.__rest(_a, ["size", "className", "fullscreen"]);
-    return (React__default['default'].createElement(components_content_Component.Content, tslib_es6.__assign({ className: cn__default['default'](className, size && styles[size], fullscreen && styles.fullscreen), styles: styles }, restProps)));
+    var size = _a.size, className = _a.className, restProps = tslib_es6.__rest(_a, ["size", "className"]);
+    return (React__default['default'].createElement(components_content_Component.Content, tslib_es6.__assign({ className: cn__default['default'](className, size && styles[size]) }, restProps)));
 };
 
 exports.ContentDesktop = ContentDesktop;

package/dist/components/content/Component.js

@@ -12,9 +12,12 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
+var styles = {"content":"modal__content_q7jmp","flex":"modal__flex_q7jmp"};
+require('./index.css')
+
 var Content = function (_a) {
     var _b;
-    var children = _a.children, flex = _a.flex, className = _a.className, styles = _a.styles;
+    var children = _a.children, flex = _a.flex, className = _a.className;
     var contentRef = React.useContext(Context.ModalContext).contentRef;
     return (React__default['default'].createElement("div", { className: cn__default['default'](styles.content, className, (_b = {},
             _b[styles.flex] = flex,

package/dist/components/content/Component.mobile.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-7f8fab53.js');
+var tslib_es6 = require('../../tslib.es6-aeaa6cae.js');
 var React = require('react');
-require('classnames');
+var cn = require('classnames');
 require('@alfalab/core-components-base-modal');
 require('../../Context.js');
 var components_content_Component = require('./Component.js');
@@ -12,10 +12,14 @@ var components_content_Component = require('./Component.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"content":"modal__content_1ulr5 modal__content_km6k3","flex":"modal__flex_1ulr5 modal__flex_km6k3"};
+var styles = {"content":"modal__content_1s1lg"};
 require('./mobile.css')
 
-var ContentMobile = function (props) { return (React__default['default'].createElement(components_content_Component.Content, tslib_es6.__assign({ styles: styles }, props))); };
+var ContentMobile = function (_a) {
+    var className = _a.className, restProps = tslib_es6.__rest(_a, ["className"]);
+    return (React__default['default'].createElement(components_content_Component.Content, tslib_es6.__assign({ className: cn__default['default'](className, styles.content) }, restProps)));
+};
 
 exports.ContentMobile = ContentMobile;