@salutejs/plasma-new-hope 0.193.0 → 0.194.0-canary.1558.11852073996.0

package/styled-components/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx

@@ -3,6 +3,7 @@ import styled from 'styled-components';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
 import { SSRProvider } from '@salutejs/plasma-core';
+import { disableProps } from '@salutejs/plasma-sb-utils';
 
 import { PopupProvider, popupClasses } from '../Popup/Popup';
 import { Button } from '../Button/Button';
@@ -18,6 +19,7 @@ export default {
         docs: { story: { inline: false, iframeHeight: '30rem' } },
     },
     argTypes: {
+        ...disableProps(['hasBody']),
         placement: {
             options: [
                 'center',
@@ -75,6 +77,7 @@ type StoryModalProps = ComponentProps<typeof Modal> & {
     closeOnEsc: boolean;
     closeOnOverlayClick: boolean;
     withBlur: boolean;
+    hasClose?: boolean;
 };
 
 const StyledButton = styled(Button)`
@@ -135,6 +138,72 @@ const StoryModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProp
     const [isOpenB, setIsOpenB] = useState(false);
     const [isOpenC, setIsOpenC] = useState(false);
 
+    return (
+        <SSRProvider>
+            <StyledWrapper>
+                <PopupProvider>
+                    <ButtonWrapper>
+                        <StyledButton text="Открыть A" onClick={() => setIsOpenA(true)} />
+                    </ButtonWrapper>
+                    <StyledModal
+                        id="modalA"
+                        frame="theme-root"
+                        withAnimation
+                        onClose={() => setIsOpenA(false)}
+                        opened={isOpenA}
+                        placement={placement}
+                        offset={[offsetX, offsetY]}
+                        hasBody
+                        {...rest}
+                    >
+                        <Button onClick={() => setIsOpenA(false)}>Close</Button>
+                        <ButtonWrapper>
+                            <StyledButton text="Открыть B" onClick={() => setIsOpenB(true)} />
+                        </ButtonWrapper>
+                        <Modal
+                            id="modalB"
+                            frame="theme-root"
+                            onClose={() => setIsOpenB(false)}
+                            opened={isOpenB}
+                            placement="left"
+                            offset={[offsetX, offsetY]}
+                            hasBody
+                            {...rest}
+                        >
+                            <Button style={{ marginRight: '1rem' }} onClick={() => setIsOpenB(false)}>
+                                Close
+                            </Button>
+                            <ButtonWrapper>
+                                <StyledButton text="Открыть C" onClick={() => setIsOpenC(true)} />
+                            </ButtonWrapper>
+                            <Modal
+                                id="modalC"
+                                frame="theme-root"
+                                onClose={() => setIsOpenC(false)}
+                                opened={isOpenC}
+                                placement="top"
+                                offset={[offsetX, offsetY]}
+                                hasBody
+                                {...rest}
+                            >
+                                <Button style={{ marginRight: '1rem' }} onClick={() => setIsOpenC(false)}>
+                                    Close
+                                </Button>
+                                <>Content</>
+                            </Modal>
+                        </Modal>
+                    </StyledModal>
+                </PopupProvider>
+            </StyledWrapper>
+        </SSRProvider>
+    );
+};
+
+const StoryCustomModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
+    const [isOpenA, setIsOpenA] = useState(false);
+    const [isOpenB, setIsOpenB] = useState(false);
+    const [isOpenC, setIsOpenC] = useState(false);
+
     return (
         <SSRProvider>
             <StyledWrapper>
@@ -199,7 +268,7 @@ const StoryModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProp
     );
 };
 
-export const ModalDemo: StoryObj<StoryModalProps> = {
+export const Default: StoryObj<StoryModalProps> = {
     args: {
         placement: 'center',
         withBlur: false,
@@ -207,10 +276,30 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
         closeOnOverlayClick: true,
         offsetX: 0,
         offsetY: 0,
+        hasClose: true,
+    },
+    argTypes: {
+        hasClose: {
+            control: {
+                type: 'boolean',
+            },
+        },
     },
     render: (args) => <StoryModalDemo {...args} />,
 };
 
+export const CustomModalDemo: StoryObj<StoryModalProps> = {
+    args: {
+        placement: 'center',
+        withBlur: false,
+        closeOnEsc: true,
+        closeOnOverlayClick: true,
+        offsetX: 0,
+        offsetY: 0,
+    },
+    render: (args) => <StoryCustomModalDemo {...args} />,
+};
+
 const StyledModalAnimation = styled(Modal)`
     /* stylelint-disable */
     && .${popupClasses.root} {

package/styled-components/es/components/Modal/Modal.js

@@ -1,4 +1,5 @@
-var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen"];
+var _IconClose;
+var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen", "hasBody", "hasClose"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -9,10 +10,12 @@ import { popupConfig, usePopupContext } from '../Popup';
 import { Overlay } from '../Overlay';
 import { DEFAULT_Z_INDEX } from '../Popup/utils';
 import { useFocusTrap } from '../../hooks';
+import { IconClose } from '../_Icon/Icons/IconClose';
 import { classes, tokens } from './Modal.tokens';
 import { useModal } from './hooks';
 import { base as viewCSS } from './variations/_view/base';
 import { getIdLastModal } from './ModalContext';
+import { CloseButton, ModalBody, ModalContent } from './Modal.styles';
 
 // issue #823
 var Popup = /*#__PURE__*/component(popupConfig);
@@ -41,8 +44,11 @@ export var modalRoot = function modalRoot(Root) {
       view = _ref.view,
       opened = _ref.opened,
       isOpen = _ref.isOpen,
+      hasBody = _ref.hasBody,
+      hasClose = _ref.hasClose,
       rest = _objectWithoutProperties(_ref, _excluded);
     var innerIsOpen = Boolean(isOpen || opened);
+    var innerHasClose = hasClose === undefined && hasBody || hasClose;
     var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
     var popupController = usePopupContext();
     var innerRef = useForkRef(trapRef, outerRootRef);
@@ -70,6 +76,15 @@ export var modalRoot = function modalRoot(Root) {
         onClose();
       }
     }, [closeOnOverlayClick, onOverlayClick, onClose]);
+    var overlayNode = /*#__PURE__*/React.createElement(Overlay, {
+      className: classes.overlay,
+      zIndex: zIndex || DEFAULT_Z_INDEX,
+      backgroundColorProperty: overlayBackgroundToken,
+      withBlur: withBlur,
+      transparent: transparent,
+      isClickable: closeOnOverlayClick,
+      onOverlayClick: onModalOverlayKeyDown
+    });
     return /*#__PURE__*/React.createElement(Popup, _extends({
       id: innerId,
       opened: innerIsOpen,
@@ -77,18 +92,17 @@ export var modalRoot = function modalRoot(Root) {
       popupInfo: modalInfo,
       withAnimation: withAnimation,
       zIndex: zIndex,
-      overlay: /*#__PURE__*/React.createElement(Root, {
+      overlay: hasBody ? overlayNode : /*#__PURE__*/React.createElement(Root, {
         view: view
-      }, /*#__PURE__*/React.createElement(Overlay, {
-        className: classes.overlay,
-        zIndex: zIndex || DEFAULT_Z_INDEX,
-        backgroundColorProperty: overlayBackgroundToken,
-        withBlur: withBlur,
-        transparent: transparent,
-        isClickable: closeOnOverlayClick,
-        onOverlayClick: onModalOverlayKeyDown
-      }))
-    }, rest), children);
+      }, overlayNode)
+    }, rest), hasBody ? /*#__PURE__*/React.createElement(Root, {
+      view: view
+    }, /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(ModalContent, null, innerHasClose && /*#__PURE__*/React.createElement(CloseButton, {
+      onClick: onClose,
+      "data-test": "modal-close"
+    }, _IconClose || (_IconClose = /*#__PURE__*/React.createElement(IconClose, {
+      size: "s"
+    }))), children))) : /*#__PURE__*/React.createElement(React.Fragment, null, children));
   });
 };
 export var modalConfig = {

package/styled-components/es/components/Modal/Modal.styles.js

@@ -0,0 +1,17 @@
+import styled from 'styled-components';
+import { addFocus } from '../../mixins';
+import { tokens } from './Modal.tokens';
+export var ModalBody = /*#__PURE__*/styled.div.withConfig({
+  componentId: "plasma-new-hope__sc-yxf3fb-0"
+})(["border-radius:var(", ");padding:var(", ");background:var(", ");box-shadow:var(--shadow-down-soft-l);"], tokens.modalBodyBorderRadius, tokens.modalBodyPadding, tokens.modalBodyBackground);
+export var ModalContent = /*#__PURE__*/styled.div.withConfig({
+  componentId: "plasma-new-hope__sc-yxf3fb-1"
+})(["position:relative;padding:var(", ");"], tokens.modalContentPadding);
+export var CloseButton = /*#__PURE__*/styled.button.withConfig({
+  componentId: "plasma-new-hope__sc-yxf3fb-2"
+})(["top:0;right:0;width:1.5rem;height:1.5rem;display:flex;align-items:center;justify-content:center;border:none;border-radius:var(", ");padding:0;margin:0;outline:none;cursor:pointer;background:transparent;", ";position:absolute;"], tokens.modalCloseButtonRadius, /*#__PURE__*/addFocus({
+  outlineSize: '0.063rem',
+  outlineOffset: '-0.125rem',
+  outlineColor: /*#__PURE__*/"var(".concat(tokens.modalOutlineFocusColor, ")"),
+  outlineRadius: /*#__PURE__*/"calc(var(".concat(tokens.modalCloseButtonRadius, ") + 0.063rem)")
+}));

package/styled-components/es/components/Modal/Modal.template-doc.mdx

@@ -62,6 +62,53 @@ export function App() {
 }
 ```
 
+## Использование стилизованной обертки
+
+Для использования стилизованного мобального окна с отступами и крестиком для закрытия, добавьте свойство `hasBody`.
+```tsx live
+import React, { useState } from 'react';
+import { SSRProvider, Button, Modal, PopupProvider } from '@salutejs/{{ package }}';
+
+export function App() {
+    const [isOpenA, setIsOpenA] = useState(false);
+    const [isOpenB, setIsOpenB] = useState(false);
+
+    return (
+        <SSRProvider>
+            <PopupProvider>
+                <div style=\{{ height: "300px" }}>
+                    <div style=\{{ display: 'flex', flexDirection: 'column' }}>
+                        <Button text="Открыть A" onClick={() => setIsOpenA(true)} />
+                    </div>
+                    <Modal
+                        id="modalA"
+                        onClose={() => setIsOpenA(false)}
+                        opened={isOpenA}
+                        placement="center"
+                        offset={[0, 0]}
+                        hasBody
+                    >
+                        <Button onClick={() => setIsOpenA(false)}>Close</Button>
+                        <Button text="Открыть B" onClick={() => setIsOpenB(true)} />
+                        Content
+                        <Modal
+                            id="modalB"
+                            onClose={() => setIsOpenB(false)}
+                            opened={isOpenB}
+                            placement="right"
+                            offset={[0, 0]}
+                        >
+                            <Button onClick={() => setIsOpenB(false)}>Close</Button>
+                            Content
+                        </Modal>
+                    </Modal>
+                </div>
+            </PopupProvider>
+        </SSRProvider>
+    );
+}
+```
+
 ## Подключение анимации
 Подключение анимации аналогично тому, как это происходит в `Popup` - через свойство `withAnimation`(управление через `popupClasses`, `modalClasses`).
 Для добавления анимации в оверлей необходимо использовать класс `.modal-overlay` через переменную `modalClasses.overlay` из пакета.

package/styled-components/es/components/Modal/Modal.tokens.js

@@ -6,5 +6,11 @@ export var classes = {
 };
 export var tokens = {
   modalOverlayWithBlurColor: '--plasma-modal-overlay-with-blur-color',
-  modalOverlayColor: '--plasma-modal-overlay-color'
+  modalOverlayColor: '--plasma-modal-overlay-color',
+  modalBodyBackground: '--plasma-modal-body-background',
+  modalBodyBorderRadius: '--plasma-modal-body-border-radius',
+  modalBodyPadding: '--plasma-modal-body-padding',
+  modalContentPadding: '--plasma-modal-content-padding',
+  modalOutlineFocusColor: '--plasma-modal-outline-focus-color',
+  modalCloseButtonRadius: '--plasma-modal-close-button-radius'
 };

package/styled-components/es/examples/plasma_b2c/components/Modal/Modal.config.js

@@ -6,7 +6,7 @@ export var config = {
   },
   variations: {
     view: {
-      "default": /*#__PURE__*/css(["", ":var(--overlay-blur);", ":var(--overlay-soft);"], modalTokens.modalOverlayWithBlurColor, modalTokens.modalOverlayColor)
+      "default": /*#__PURE__*/css(["", ":var(--overlay-blur);", ":var(--overlay-soft);", ":var(--surface-solid-card);", ":1.25rem;", ":2rem;", ":0.625rem;", ":0.375rem;", ":var(--surface-accent);"], modalTokens.modalOverlayWithBlurColor, modalTokens.modalOverlayColor, modalTokens.modalBodyBackground, modalTokens.modalBodyBorderRadius, modalTokens.modalBodyPadding, modalTokens.modalContentPadding, modalTokens.modalCloseButtonRadius, modalTokens.modalOutlineFocusColor)
     }
   }
 };

package/styled-components/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx

@@ -3,6 +3,7 @@ import styled from 'styled-components';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
 import { SSRProvider } from '@salutejs/plasma-core';
+import { disableProps } from '@salutejs/plasma-sb-utils';
 
 import { PopupProvider, popupClasses } from '../Popup/Popup';
 import { Button } from '../Button/Button';
@@ -18,6 +19,7 @@ export default {
         docs: { story: { inline: false, iframeHeight: '30rem' } },
     },
     argTypes: {
+        ...disableProps(['hasBody']),
         placement: {
             options: [
                 'center',
@@ -75,6 +77,7 @@ type StoryModalProps = ComponentProps<typeof Modal> & {
     closeOnEsc: boolean;
     closeOnOverlayClick: boolean;
     withBlur: boolean;
+    hasClose?: boolean;
 };
 
 const StyledButton = styled(Button)`
@@ -135,6 +138,72 @@ const StoryModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProp
     const [isOpenB, setIsOpenB] = useState(false);
     const [isOpenC, setIsOpenC] = useState(false);
 
+    return (
+        <SSRProvider>
+            <StyledWrapper>
+                <PopupProvider>
+                    <ButtonWrapper>
+                        <StyledButton text="Открыть A" onClick={() => setIsOpenA(true)} />
+                    </ButtonWrapper>
+                    <StyledModal
+                        id="modalA"
+                        frame="theme-root"
+                        withAnimation
+                        onClose={() => setIsOpenA(false)}
+                        opened={isOpenA}
+                        placement={placement}
+                        offset={[offsetX, offsetY]}
+                        hasBody
+                        {...rest}
+                    >
+                        <Button onClick={() => setIsOpenA(false)}>Close</Button>
+                        <ButtonWrapper>
+                            <StyledButton text="Открыть B" onClick={() => setIsOpenB(true)} />
+                        </ButtonWrapper>
+                        <Modal
+                            id="modalB"
+                            frame="theme-root"
+                            onClose={() => setIsOpenB(false)}
+                            opened={isOpenB}
+                            placement="left"
+                            offset={[offsetX, offsetY]}
+                            hasBody
+                            {...rest}
+                        >
+                            <Button style={{ marginRight: '1rem' }} onClick={() => setIsOpenB(false)}>
+                                Close
+                            </Button>
+                            <ButtonWrapper>
+                                <StyledButton text="Открыть C" onClick={() => setIsOpenC(true)} />
+                            </ButtonWrapper>
+                            <Modal
+                                id="modalC"
+                                frame="theme-root"
+                                onClose={() => setIsOpenC(false)}
+                                opened={isOpenC}
+                                placement="top"
+                                offset={[offsetX, offsetY]}
+                                hasBody
+                                {...rest}
+                            >
+                                <Button style={{ marginRight: '1rem' }} onClick={() => setIsOpenC(false)}>
+                                    Close
+                                </Button>
+                                <>Content</>
+                            </Modal>
+                        </Modal>
+                    </StyledModal>
+                </PopupProvider>
+            </StyledWrapper>
+        </SSRProvider>
+    );
+};
+
+const StoryCustomModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
+    const [isOpenA, setIsOpenA] = useState(false);
+    const [isOpenB, setIsOpenB] = useState(false);
+    const [isOpenC, setIsOpenC] = useState(false);
+
     return (
         <SSRProvider>
             <StyledWrapper>
@@ -199,7 +268,7 @@ const StoryModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProp
     );
 };
 
-export const ModalDemo: StoryObj<StoryModalProps> = {
+export const Default: StoryObj<StoryModalProps> = {
     args: {
         placement: 'center',
         withBlur: false,
@@ -207,10 +276,30 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
         closeOnOverlayClick: true,
         offsetX: 0,
         offsetY: 0,
+        hasClose: true,
+    },
+    argTypes: {
+        hasClose: {
+            control: {
+                type: 'boolean',
+            },
+        },
     },
     render: (args) => <StoryModalDemo {...args} />,
 };
 
+export const CustomModalDemo: StoryObj<StoryModalProps> = {
+    args: {
+        placement: 'center',
+        withBlur: false,
+        closeOnEsc: true,
+        closeOnOverlayClick: true,
+        offsetX: 0,
+        offsetY: 0,
+    },
+    render: (args) => <StoryCustomModalDemo {...args} />,
+};
+
 const StyledModalAnimation = styled(Modal)`
     /* stylelint-disable */
     && .${popupClasses.root} {

package/styled-components/es/examples/plasma_web/components/Modal/Modal.config.js

@@ -6,7 +6,7 @@ export var config = {
   },
   variations: {
     view: {
-      "default": /*#__PURE__*/css(["", ":var(--overlay-blur);", ":var(--overlay-soft);"], modalTokens.modalOverlayWithBlurColor, modalTokens.modalOverlayColor)
+      "default": /*#__PURE__*/css(["", ":var(--overlay-blur);", ":var(--overlay-soft);", ":var(--surface-solid-card);", ":1.25rem;", ":2rem;", ":0.625rem;", ":0.375rem;", ":var(--surface-accent);"], modalTokens.modalOverlayWithBlurColor, modalTokens.modalOverlayColor, modalTokens.modalBodyBackground, modalTokens.modalBodyBorderRadius, modalTokens.modalBodyPadding, modalTokens.modalContentPadding, modalTokens.modalCloseButtonRadius, modalTokens.modalOutlineFocusColor)
     }
   }
 };

package/styled-components/es/examples/plasma_web/components/Modal/Modal.stories.tsx

@@ -3,6 +3,7 @@ import styled from 'styled-components';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
 import { SSRProvider } from '@salutejs/plasma-core';
+import { disableProps } from '@salutejs/plasma-sb-utils';
 
 import { PopupProvider, popupClasses } from '../Popup/Popup';
 import { Button } from '../Button/Button';
@@ -18,6 +19,7 @@ export default {
         docs: { story: { inline: false, iframeHeight: '30rem' } },
     },
     argTypes: {
+        ...disableProps(['hasBody']),
         placement: {
             options: [
                 'center',
@@ -75,6 +77,7 @@ type StoryModalProps = ComponentProps<typeof Modal> & {
     closeOnEsc: boolean;
     closeOnOverlayClick: boolean;
     withBlur: boolean;
+    hasClose?: boolean;
 };
 
 const StyledButton = styled(Button)`
@@ -135,6 +138,72 @@ const StoryModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProp
     const [isOpenB, setIsOpenB] = useState(false);
     const [isOpenC, setIsOpenC] = useState(false);
 
+    return (
+        <SSRProvider>
+            <StyledWrapper>
+                <PopupProvider>
+                    <ButtonWrapper>
+                        <StyledButton text="Открыть A" onClick={() => setIsOpenA(true)} />
+                    </ButtonWrapper>
+                    <StyledModal
+                        id="modalA"
+                        frame="theme-root"
+                        withAnimation
+                        onClose={() => setIsOpenA(false)}
+                        opened={isOpenA}
+                        placement={placement}
+                        offset={[offsetX, offsetY]}
+                        hasBody
+                        {...rest}
+                    >
+                        <Button onClick={() => setIsOpenA(false)}>Close</Button>
+                        <ButtonWrapper>
+                            <StyledButton text="Открыть B" onClick={() => setIsOpenB(true)} />
+                        </ButtonWrapper>
+                        <Modal
+                            id="modalB"
+                            frame="theme-root"
+                            onClose={() => setIsOpenB(false)}
+                            opened={isOpenB}
+                            placement="left"
+                            offset={[offsetX, offsetY]}
+                            hasBody
+                            {...rest}
+                        >
+                            <Button style={{ marginRight: '1rem' }} onClick={() => setIsOpenB(false)}>
+                                Close
+                            </Button>
+                            <ButtonWrapper>
+                                <StyledButton text="Открыть C" onClick={() => setIsOpenC(true)} />
+                            </ButtonWrapper>
+                            <Modal
+                                id="modalC"
+                                frame="theme-root"
+                                onClose={() => setIsOpenC(false)}
+                                opened={isOpenC}
+                                placement="top"
+                                offset={[offsetX, offsetY]}
+                                hasBody
+                                {...rest}
+                            >
+                                <Button style={{ marginRight: '1rem' }} onClick={() => setIsOpenC(false)}>
+                                    Close
+                                </Button>
+                                <>Content</>
+                            </Modal>
+                        </Modal>
+                    </StyledModal>
+                </PopupProvider>
+            </StyledWrapper>
+        </SSRProvider>
+    );
+};
+
+const StoryCustomModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
+    const [isOpenA, setIsOpenA] = useState(false);
+    const [isOpenB, setIsOpenB] = useState(false);
+    const [isOpenC, setIsOpenC] = useState(false);
+
     return (
         <SSRProvider>
             <StyledWrapper>
@@ -199,7 +268,7 @@ const StoryModalDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProp
     );
 };
 
-export const ModalDemo: StoryObj<StoryModalProps> = {
+export const Default: StoryObj<StoryModalProps> = {
     args: {
         placement: 'center',
         withBlur: false,
@@ -207,10 +276,30 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
         closeOnOverlayClick: true,
         offsetX: 0,
         offsetY: 0,
+        hasClose: true,
+    },
+    argTypes: {
+        hasClose: {
+            control: {
+                type: 'boolean',
+            },
+        },
     },
     render: (args) => <StoryModalDemo {...args} />,
 };
 
+export const CustomModalDemo: StoryObj<StoryModalProps> = {
+    args: {
+        placement: 'center',
+        withBlur: false,
+        closeOnEsc: true,
+        closeOnOverlayClick: true,
+        offsetX: 0,
+        offsetY: 0,
+    },
+    render: (args) => <StoryCustomModalDemo {...args} />,
+};
+
 const StyledModalAnimation = styled(Modal)`
     /* stylelint-disable */
     && .${popupClasses.root} {

package/types/components/Modal/Modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAa,MAAM,eAAe,CAAC;AAOrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C;;;GAGG;AACH,eAAO,MAAM,SAAS,SAAU,UAAU,cAAc,EAAE,UAAU,CAAC,sFA2FhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBA7FQ,UAAU,cAAc,EAAE,UAAU,CAAC;;;;;;;;;;CA0GpE,CAAC"}
+{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAa,MAAM,eAAe,CAAC;AAQrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAS3C;;;GAGG;AACH,eAAO,MAAM,SAAS,SAAU,UAAU,cAAc,EAAE,UAAU,CAAC,sFA6GhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBA/GQ,UAAU,cAAc,EAAE,UAAU,CAAC;;;;;;;;;;CA4HpE,CAAC"}

package/types/components/Modal/Modal.styles.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare const ModalBody: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & Record<never, unknown>>;
+export declare const ModalContent: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & Record<never, unknown>>;
+export declare const CloseButton: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLButtonElement> & import("react").ButtonHTMLAttributes<HTMLButtonElement> & Record<never, unknown>>;
+//# sourceMappingURL=Modal.styles.d.ts.map

package/types/components/Modal/Modal.styles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Modal.styles.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.styles.ts"],"names":[],"mappings":";AAMA,eAAO,MAAM,SAAS,qKAKrB,CAAC;AAEF,eAAO,MAAM,YAAY,qKAGxB,CAAC;AAEF,eAAO,MAAM,WAAW,iLA8BvB,CAAC"}

package/types/components/Modal/Modal.tokens.d.ts

@@ -4,5 +4,11 @@ export declare const classes: {
 export declare const tokens: {
     modalOverlayWithBlurColor: string;
     modalOverlayColor: string;
+    modalBodyBackground: string;
+    modalBodyBorderRadius: string;
+    modalBodyPadding: string;
+    modalContentPadding: string;
+    modalOutlineFocusColor: string;
+    modalCloseButtonRadius: string;
 };
 //# sourceMappingURL=Modal.tokens.d.ts.map

package/types/components/Modal/Modal.tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Modal.tokens.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.tokens.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO;;CAKnB,CAAC;AAEF,eAAO,MAAM,MAAM;;;CAGlB,CAAC"}
+{"version":3,"file":"Modal.tokens.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.tokens.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO;;CAKnB,CAAC;AAEF,eAAO,MAAM,MAAM;;;;;;;;;CASlB,CAAC"}

package/types/components/Modal/Modal.types.d.ts

@@ -1,6 +1,25 @@
 /// <reference types="react" />
 import { PopupHookArgs, PopupProps, PopupRootProps } from '../Popup/Popup.types';
-export interface ModalProps extends PopupProps {
+export declare type ModalBodyProps = {
+    /**
+     * Оборачивает children в стилизованную обертку
+     */
+    hasBody: true;
+    /**
+     * Отображает кнопку с крестиком для закрытия
+     */
+    hasClose?: never | boolean;
+} | {
+    /**
+     * Оборачивает children в стилизованную обертку
+     */
+    hasBody?: never | false;
+    /**
+     * Отображает кнопку с крестиком для закрытия
+     */
+    hasClose?: never;
+};
+export interface CommonModalProps extends PopupProps {
     /**
      * Нужно ли применять blur для подложки.
      */
@@ -36,6 +55,7 @@ export interface ModalProps extends PopupProps {
     onClose?: () => void;
     view?: string;
 }
+export declare type ModalProps = CommonModalProps & ModalBodyProps;
 export declare type ModalBaseRootProps = PopupRootProps & Pick<ModalProps, 'initialFocusRef' | 'focusAfterRef' | 'onClose'>;
 export declare type ModalOverlayProps = Pick<PopupRootProps, 'id' | 'zIndex'> & Pick<ModalProps, 'withBlur' | 'closeOnOverlayClick' | 'onOverlayClick' | 'onClose'>;
 export declare type ModalHookArgs = Pick<PopupHookArgs, 'id' | 'popupInfo' | 'isOpen'> & Pick<ModalProps, 'closeOnEsc' | 'onEscKeyDown' | 'onClose'>;