@salutejs/plasma-new-hope 0.193.0-canary.1550.11804452240.0 → 0.193.0-canary.1558.11807380775.0

package/emotion/cjs/examples/plasma_web/components/Select/Select.stories.tsx

@@ -25,58 +25,54 @@ const meta: Meta<StorySelectProps> = {
     component: Select,
     argTypes: {
         target: {
-            control: 'select',
             options: ['button-like', 'textfield-like'],
+            control: {
+                type: 'select',
+            },
         },
         size: {
-            control: 'select',
             options: size,
+            control: {
+                type: 'select',
+            },
         },
         view: {
-            control: 'select',
             options: view,
+            control: {
+                type: 'select',
+            },
         },
         labelPlacement: {
-            control: 'select',
             options: labelPlacement,
-            if: {
-                arg: 'target',
-                eq: 'textfield-like',
+            control: {
+                type: 'select',
             },
         },
         chipView: {
-            control: 'select',
             options: chip,
-            if: {
-                arg: 'target',
-                eq: 'textfield-like',
+            control: {
+                type: 'select',
             },
         },
         variant: {
-            control: 'select',
             options: variant,
+            control: {
+                type: 'select',
+            },
         },
         listWidth: {
-            control: 'text',
+            control: {
+                type: 'text',
+            },
         },
         listOverflow: {
-            control: 'text',
-        },
-        listHeight: {
-            control: 'text',
-        },
-        helperText: {
-            control: 'text',
-            if: {
-                arg: 'target',
-                eq: 'textfield-like',
+            control: {
+                type: 'text',
             },
         },
-        enableContentLeft: {
-            control: 'boolean',
-            if: {
-                arg: 'target',
-                eq: 'textfield-like',
+        listHeight: {
+            control: {
+                type: 'text',
             },
         },
     },
@@ -88,7 +84,7 @@ const meta: Meta<StorySelectProps> = {
         helperText: 'Helper text',
         size: 'm',
         view: 'default',
-        chipView: 'secondary',
+        chipView: 'default',
         enableContentLeft: false,
         isTargetAmount: false,
         variant: 'normal',
@@ -342,18 +338,13 @@ const SingleStory = (args: StorySelectProps) => {
                 items={items}
                 value={value}
                 onChange={setValue}
-                contentLeft={args.enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                contentLeft={args.enableContentLeft ? <IconDone size="s" /> : undefined}
             />
         </div>
     );
 };
 
 export const Single: StoryObj<StorySelectProps> = {
-    parameters: {
-        controls: {
-            exclude: ['chipView', 'isTargetAmount'],
-        },
-    },
     render: (args) => <SingleStory {...args} />,
     args: {
         closeAfterSelect: true,
@@ -370,7 +361,7 @@ const MultiselectStory = (args: StorySelectProps) => {
                 items={items}
                 value={value}
                 onChange={setValue}
-                contentLeft={args.enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                contentLeft={args.enableContentLeft ? <IconDone size="s" /> : undefined}
             />
         </div>
     );
@@ -395,7 +386,7 @@ const PredefinedStory = (args: StorySelectProps) => {
                 items={items}
                 value={valueSingle}
                 onChange={setValueSingle}
-                contentLeft={args.enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                contentLeft={args.enableContentLeft ? <IconDone size="s" /> : undefined}
             />
 
             <br />
@@ -406,7 +397,7 @@ const PredefinedStory = (args: StorySelectProps) => {
                 multiselect
                 value={valueMultiple}
                 onChange={setValueMultiple}
-                contentLeft={args.enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                contentLeft={args.enableContentLeft ? <IconDone size="s" /> : undefined}
             />
         </div>
     );
@@ -471,7 +462,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={value}
                                     onChange={setValue}
                                     view="default"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -484,7 +475,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={valueMultiple}
                                     onChange={setValueMultiple}
                                     view="default"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -615,7 +606,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={value}
                                     onChange={setValue}
                                     view="positive"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -628,7 +619,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={valueMultiple}
                                     onChange={setValueMultiple}
                                     view="positive"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -668,7 +659,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={value}
                                     onChange={setValue}
                                     view="warning"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -681,7 +672,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={valueMultiple}
                                     onChange={setValueMultiple}
                                     view="warning"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -721,7 +712,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={value}
                                     onChange={setValue}
                                     view="negative"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -734,7 +725,7 @@ const CommonStory = (args: StorySelectProps) => {
                                     value={valueMultiple}
                                     onChange={setValueMultiple}
                                     view="negative"
-                                    contentLeft={enableContentLeft ? <IconDone size="s" color="inherit" /> : undefined}
+                                    contentLeft={enableContentLeft ? <IconDone size="s" /> : undefined}
                                 />
                             </div>
                         </td>
@@ -844,7 +835,9 @@ export const Common: StoryObj<StorySelectProps> = {
     argTypes: {
         size: {
             options: size,
-            control: 'select',
+            control: {
+                type: 'select',
+            },
         },
     },
     args: {

package/emotion/cjs/index.js

@@ -47,17 +47,6 @@ Object.keys(_utils).forEach(function (key) {
     }
   });
 });
-var _types = /*#__PURE__*/require("./types");
-Object.keys(_types).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _types[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _types[key];
-    }
-  });
-});
 var _Button = /*#__PURE__*/require("./components/Button");
 Object.keys(_Button).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/emotion/cjs/utils/index.js

@@ -17,8 +17,7 @@ var _exportNames = {
   setRefList: true,
   isEmpty: true,
   constants: true,
-  noop: true,
-  fixedForwardRef: true
+  noop: true
 };
 Object.defineProperty(exports, "IS_REACT_18", {
   enumerable: true,
@@ -39,12 +38,6 @@ Object.defineProperty(exports, "extractTextFrom", {
     return _extractTextFrom.extractTextFrom;
   }
 });
-Object.defineProperty(exports, "fixedForwardRef", {
-  enumerable: true,
-  get: function get() {
-    return _fixedForwardRef.fixedForwardRef;
-  }
-});
 Object.defineProperty(exports, "getSizeValueFromProp", {
   enumerable: true,
   get: function get() {
@@ -109,7 +102,6 @@ Object.keys(_getPopoverPlacement).forEach(function (key) {
   });
 });
 var _noop = /*#__PURE__*/require("./noop");
-var _fixedForwardRef = /*#__PURE__*/require("./fixedForwardRef");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var cx = exports.cx = function cx() {

package/emotion/es/components/Cell/Cell.js

@@ -36,9 +36,7 @@ export var cellRoot = function cellRoot(Root) {
       className: cx(stretchingClass, classes.cellRoot, className)
     }, contentLeftDeprecated && /*#__PURE__*/React.createElement(CellLeft, {
       align: alignContentLeft
-    }, contentLeftDeprecated), /*#__PURE__*/React.createElement(CellContentWrapper, null, /*#__PURE__*/React.createElement(CellContent, {
-      className: "cell-content"
-    }, titleText || subtitle || label ? /*#__PURE__*/React.createElement(CellTextbox, {
+    }, contentLeftDeprecated), /*#__PURE__*/React.createElement(CellContentWrapper, null, /*#__PURE__*/React.createElement(CellContent, null, titleText || subtitle || label ? /*#__PURE__*/React.createElement(CellTextbox, {
       label: label,
       title: titleText,
       subtitle: subtitle

package/emotion/es/components/Cell/ui/CellTextbox/CellTextbox.js

@@ -8,11 +8,5 @@ export var CellTextbox = function CellTextbox(_ref) {
     title = _ref.title,
     subtitle = _ref.subtitle,
     children = _ref.children;
-  return (
-    /*#__PURE__*/
-    // TODO: #1548
-    React.createElement(CellTextboxStyled, {
-      className: "cell-textbox"
-    }, label || title || subtitle ? /*#__PURE__*/React.createElement(React.Fragment, null, label && /*#__PURE__*/React.createElement(CellTextboxLabel, null, label), title && /*#__PURE__*/React.createElement(CellTextboxTitle, null, title), subtitle && /*#__PURE__*/React.createElement(CellTextboxSubtitle, null, subtitle)) : children)
-  );
+  return /*#__PURE__*/React.createElement(CellTextboxStyled, null, label || title || subtitle ? /*#__PURE__*/React.createElement(React.Fragment, null, label && /*#__PURE__*/React.createElement(CellTextboxLabel, null, label), title && /*#__PURE__*/React.createElement(CellTextboxTitle, null, title), subtitle && /*#__PURE__*/React.createElement(CellTextboxSubtitle, null, subtitle)) : children);
 };

package/emotion/es/components/Cell/ui/CellTextboxTitle/CellTextboxTitle.js

@@ -1,8 +1,5 @@
 import React from 'react';
 import { StyledTextboxTitle } from './CellTextboxTitle.styles';
 export var CellTextboxTitle = function CellTextboxTitle(props) {
-  // TODO: #1548
-  return /*#__PURE__*/React.createElement(StyledTextboxTitle, {
-    className: "cell-textbox-title"
-  }, props.children);
+  return /*#__PURE__*/React.createElement(StyledTextboxTitle, null, props.children);
 };

package/emotion/es/components/Chip/Chip.js

@@ -37,9 +37,7 @@ export var chipRoot = function chipRoot(Root) {
     var txt = !text && typeof children === 'string' ? children : text;
     var pilledClass = pilled ? classes.pilled : undefined;
     var handleClick = function handleClick(event) {
-      // TODO: #1547
-      // eslint-disable-next-line no-underscore-dangle
-      if (disabled || readOnly && !rest._forceChipManipulationWithReadonly) {
+      if (disabled || readOnly) {
         return;
       }
       onClick === null || onClick === void 0 || onClick(event);

package/emotion/es/components/Combobox/ComboboxNew/Combobox.js

@@ -301,6 +301,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
         focusedToValueMap: focusedToValueMap,
         handleListToggle: handleListToggle,
         handlePressDown: handlePressDown,
+        multiselect: multiple,
         setTextValue: setTextValue
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;

package/emotion/es/components/Combobox/ComboboxNew/Combobox.tokens.js

@@ -51,6 +51,7 @@ export var tokens = {
   checkboxIconColor: '--plasma-combobox-checkbox-icon-color',
   checkboxTriggerBorderColor: '--plasma-combobox-checkbox-trigger-border-color',
   indicatorSize: '--plasma-combobox-indicator-size',
+  targetHeight: '--plasma-combobox-target-height',
   // Токены для TextField
   textFieldColor: '--plasma-combobox-new-textfield-color',
   textFieldClearColor: '--plasma-combobox-new-textfield-clear-color',

package/emotion/es/components/Combobox/ComboboxNew/FloatingPopover.js

@@ -56,28 +56,14 @@ var FloatingPopover = /*#__PURE__*/forwardRef(function (_ref, ref) {
   /*#__PURE__*/
   // root - принимает ref контейнера портала.
   // id - если есть портал - не используется, если портала нет - подставляется 'wrappedId'.
-  React.createElement(FloatingPortal, getFloatingPortalProps(portal, wrappedId), /*#__PURE__*/React.createElement("div", {
+  React.createElement(FloatingPortal, {
+    root: portal,
+    id: portal ? undefined : wrappedId
+  }, /*#__PURE__*/React.createElement("div", {
     ref: refs.setFloating,
     style: _objectSpread(_objectSpread({}, floatingStyles), {}, {
       zIndex: 1
     })
   }, children)));
 });
-// root - принимает ref контейнера портала.
-// id - если есть портал - не используется, если портала нет - подставляется 'wrappedId'.
-var getFloatingPortalProps = function getFloatingPortalProps(portal, wrappedId) {
-  if (!portal) {
-    return {
-      id: wrappedId
-    };
-  }
-  if (typeof portal === 'string') {
-    return {
-      id: portal
-    };
-  }
-  return {
-    root: portal
-  };
-};
 export { FloatingPopover };

package/emotion/es/components/Combobox/ComboboxNew/hooks/useKeyboardNavigation.js

@@ -29,6 +29,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
     focusedToValueMap = _ref.focusedToValueMap,
     handleListToggle = _ref.handleListToggle,
     handlePressDown = _ref.handlePressDown,
+    multiselect = _ref.multiselect,
     setTextValue = _ref.setTextValue;
   var currentIndex = (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[focusedPath.length - 1]) || 0;
   var currentLength = pathMap.get(path === null || path === void 0 ? void 0 : path[focusedPath.length - 1]) || 0;
@@ -123,6 +124,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
               break;
             }
             var currentItem = getItemByFocused(focusedPath, focusedToValueMap);
+            console.log('currentItem', currentItem, focusedPath, focusedToValueMap);
             if (currentItem !== null && currentItem !== void 0 && currentItem.items) {
               if (path.length > focusedPath.length) {
                 dispatchFocusedPath({
@@ -139,6 +141,32 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
           }
           break;
         }
+      case keys.Backspace:
+        {
+          if (!multiselect) break;
+          break;
+        }
+
+      // case keys.Space: {
+      //     event.preventDefault();
+      //
+      //     const currentItem = getItemByFocused(focusedPath, focusedToValueMap);
+      //
+      //     if (!path[0]) {
+      //         dispatchPath({ type: 'opened_first_level' });
+      //         dispatchFocusedPath({ type: 'set_initial_focus' });
+      //         break;
+      //     }
+      //
+      //     if (!currentItem || currentItem?.disabled) {
+      //         break;
+      //     }
+      //
+      //     handlePressDown(currentItem);
+      //
+      //     break;
+      // }
+
       case keys.Enter:
         {
           event.preventDefault();
@@ -155,13 +183,23 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             });
             break;
           }
+
+          // if (currentItem?.items) {
+          //     if (path.length > focusedPath.length) {
+          //         dispatchFocusedPath({ type: 'add_focus', value: 0 });
+          //     } else {
+          //         dispatchPath({ type: 'added_next_level', value: currentItem.value.toString() });
+          //     }
+          //
+          //     break;
+          // }
+
           if (_currentItem) {
             handlePressDown(_currentItem);
           }
           break;
         }
       case keys.Tab:
-      case keys.Escape:
         {
           dispatchPath({
             type: 'reset'
@@ -173,6 +211,17 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
           setTextValue('');
           break;
         }
+      case keys.Escape:
+        {
+          dispatchPath({
+            type: 'reset'
+          });
+          dispatchFocusedPath({
+            type: 'reset'
+          });
+          handleListToggle(false);
+          break;
+        }
       case keys.Home:
         {
           if (path[0]) {

package/emotion/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,6 +44,8 @@ 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 trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
@@ -70,6 +75,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 +91,16 @@ 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, hasClose && /*#__PURE__*/React.createElement(CloseButton, {
+      onClick: onClose
+    }, _IconClose || (_IconClose = /*#__PURE__*/React.createElement(IconClose, {
+      size: "s"
+    }))), children))) : /*#__PURE__*/React.createElement(React.Fragment, null, children));
   });
 };
 export var modalConfig = {

package/emotion/es/components/Modal/Modal.styles.js

@@ -0,0 +1,23 @@
+import _styled from "@emotion/styled/base";
+function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
+import { tokens } from './Modal.tokens';
+export var ModalBody = /*#__PURE__*/_styled("div", {
+  target: "e1gvpqag2",
+  label: "plasma-new-hope__ModalBody"
+})("border-radius:var(", tokens.modalBodyBorderRadius, ");padding:var(", tokens.modalBodyPadding, ");background:var(", tokens.modalBodyBackground, ");box-shadow:0px 60px 112px -8px #00000014;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvTW9kYWwvTW9kYWwuc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUltQyIsImZpbGUiOiIuLi8uLi8uLi8uLi9zcmMtZW1vdGlvbi9jb21wb25lbnRzL01vZGFsL01vZGFsLnN0eWxlcy50cyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBzdHlsZWQgZnJvbSAnQGVtb3Rpb24vc3R5bGVkJztcblxuaW1wb3J0IHsgdG9rZW5zIH0gZnJvbSAnLi9Nb2RhbC50b2tlbnMnO1xuXG5leHBvcnQgY29uc3QgTW9kYWxCb2R5ID0gc3R5bGVkLmRpdmBcbiAgICBib3JkZXItcmFkaXVzOiB2YXIoJHt0b2tlbnMubW9kYWxCb2R5Qm9yZGVyUmFkaXVzfSk7XG4gICAgcGFkZGluZzogdmFyKCR7dG9rZW5zLm1vZGFsQm9keVBhZGRpbmd9KTtcbiAgICBiYWNrZ3JvdW5kOiB2YXIoJHt0b2tlbnMubW9kYWxCb2R5QmFja2dyb3VuZH0pO1xuICAgIGJveC1zaGFkb3c6IDBweCA2MHB4IDExMnB4IC04cHggIzAwMDAwMDE0O1xuYDtcblxuZXhwb3J0IGNvbnN0IE1vZGFsQ29udGVudCA9IHN0eWxlZC5kaXZgXG4gICAgcG9zaXRpb246IHJlbGF0aXZlO1xuICAgIHBhZGRpbmc6IHZhcigke3Rva2Vucy5tb2RhbENvbnRlbnRQYWRkaW5nfSk7XG5gO1xuXG5leHBvcnQgY29uc3QgQ2xvc2VCdXR0b24gPSBzdHlsZWQuYnV0dG9uYFxuICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTtcbiAgICB0b3A6IDA7XG4gICAgcmlnaHQ6IDA7XG5cbiAgICBwYWRkaW5nOiAwO1xuICAgIG1hcmdpbjogMDtcbiAgICBib3JkZXI6IG5vbmU7XG4gICAgb3V0bGluZTogbm9uZTtcblxuICAgIGN1cnNvcjogcG9pbnRlcjtcblxuICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50O1xuYDtcbiJdfQ== */"));
+export var ModalContent = /*#__PURE__*/_styled("div", {
+  target: "e1gvpqag1",
+  label: "plasma-new-hope__ModalContent"
+})("position:relative;padding:var(", tokens.modalContentPadding, ");" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvTW9kYWwvTW9kYWwuc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVdzQyIsImZpbGUiOiIuLi8uLi8uLi8uLi9zcmMtZW1vdGlvbi9jb21wb25lbnRzL01vZGFsL01vZGFsLnN0eWxlcy50cyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBzdHlsZWQgZnJvbSAnQGVtb3Rpb24vc3R5bGVkJztcblxuaW1wb3J0IHsgdG9rZW5zIH0gZnJvbSAnLi9Nb2RhbC50b2tlbnMnO1xuXG5leHBvcnQgY29uc3QgTW9kYWxCb2R5ID0gc3R5bGVkLmRpdmBcbiAgICBib3JkZXItcmFkaXVzOiB2YXIoJHt0b2tlbnMubW9kYWxCb2R5Qm9yZGVyUmFkaXVzfSk7XG4gICAgcGFkZGluZzogdmFyKCR7dG9rZW5zLm1vZGFsQm9keVBhZGRpbmd9KTtcbiAgICBiYWNrZ3JvdW5kOiB2YXIoJHt0b2tlbnMubW9kYWxCb2R5QmFja2dyb3VuZH0pO1xuICAgIGJveC1zaGFkb3c6IDBweCA2MHB4IDExMnB4IC04cHggIzAwMDAwMDE0O1xuYDtcblxuZXhwb3J0IGNvbnN0IE1vZGFsQ29udGVudCA9IHN0eWxlZC5kaXZgXG4gICAgcG9zaXRpb246IHJlbGF0aXZlO1xuICAgIHBhZGRpbmc6IHZhcigke3Rva2Vucy5tb2RhbENvbnRlbnRQYWRkaW5nfSk7XG5gO1xuXG5leHBvcnQgY29uc3QgQ2xvc2VCdXR0b24gPSBzdHlsZWQuYnV0dG9uYFxuICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTtcbiAgICB0b3A6IDA7XG4gICAgcmlnaHQ6IDA7XG5cbiAgICBwYWRkaW5nOiAwO1xuICAgIG1hcmdpbjogMDtcbiAgICBib3JkZXI6IG5vbmU7XG4gICAgb3V0bGluZTogbm9uZTtcblxuICAgIGN1cnNvcjogcG9pbnRlcjtcblxuICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50O1xuYDtcbiJdfQ== */"));
+export var CloseButton = /*#__PURE__*/_styled("button", {
+  target: "e1gvpqag0",
+  label: "plasma-new-hope__CloseButton"
+})(process.env.NODE_ENV === "production" ? {
+  name: "30g3ga",
+  styles: "position:absolute;top:0;right:0;padding:0;margin:0;border:none;outline:none;cursor:pointer;background:transparent"
+} : {
+  name: "30g3ga",
+  styles: "position:absolute;top:0;right:0;padding:0;margin:0;border:none;outline:none;cursor:pointer;background:transparent",
+  map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2NvbXBvbmVudHMvTW9kYWwvTW9kYWwuc3R5bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWdCd0MiLCJmaWxlIjoiLi4vLi4vLi4vLi4vc3JjLWVtb3Rpb24vY29tcG9uZW50cy9Nb2RhbC9Nb2RhbC5zdHlsZXMudHMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5cbmltcG9ydCB7IHRva2VucyB9IGZyb20gJy4vTW9kYWwudG9rZW5zJztcblxuZXhwb3J0IGNvbnN0IE1vZGFsQm9keSA9IHN0eWxlZC5kaXZgXG4gICAgYm9yZGVyLXJhZGl1czogdmFyKCR7dG9rZW5zLm1vZGFsQm9keUJvcmRlclJhZGl1c30pO1xuICAgIHBhZGRpbmc6IHZhcigke3Rva2Vucy5tb2RhbEJvZHlQYWRkaW5nfSk7XG4gICAgYmFja2dyb3VuZDogdmFyKCR7dG9rZW5zLm1vZGFsQm9keUJhY2tncm91bmR9KTtcbiAgICBib3gtc2hhZG93OiAwcHggNjBweCAxMTJweCAtOHB4ICMwMDAwMDAxNDtcbmA7XG5cbmV4cG9ydCBjb25zdCBNb2RhbENvbnRlbnQgPSBzdHlsZWQuZGl2YFxuICAgIHBvc2l0aW9uOiByZWxhdGl2ZTtcbiAgICBwYWRkaW5nOiB2YXIoJHt0b2tlbnMubW9kYWxDb250ZW50UGFkZGluZ30pO1xuYDtcblxuZXhwb3J0IGNvbnN0IENsb3NlQnV0dG9uID0gc3R5bGVkLmJ1dHRvbmBcbiAgICBwb3NpdGlvbjogYWJzb2x1dGU7XG4gICAgdG9wOiAwO1xuICAgIHJpZ2h0OiAwO1xuXG4gICAgcGFkZGluZzogMDtcbiAgICBtYXJnaW46IDA7XG4gICAgYm9yZGVyOiBub25lO1xuICAgIG91dGxpbmU6IG5vbmU7XG5cbiAgICBjdXJzb3I6IHBvaW50ZXI7XG5cbiAgICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDtcbmA7XG4iXX0= */",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+});

package/emotion/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/emotion/es/components/Modal/Modal.tokens.js

@@ -6,5 +6,9 @@ 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'
 };