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

package/styled-components/cjs/components/Combobox/ComboboxNew/FloatingPopover.js

@@ -64,27 +64,13 @@ var FloatingPopover = exports.FloatingPopover = /*#__PURE__*/(0, _react2.forward
   /*#__PURE__*/
   // root - принимает ref контейнера портала.
   // id - если есть портал - не используется, если портала нет - подставляется 'wrappedId'.
-  _react2["default"].createElement(_react.FloatingPortal, getFloatingPortalProps(portal, wrappedId), /*#__PURE__*/_react2["default"].createElement("div", {
+  _react2["default"].createElement(_react.FloatingPortal, {
+    root: portal,
+    id: portal ? undefined : wrappedId
+  }, /*#__PURE__*/_react2["default"].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
-  };
-};
+});

package/styled-components/cjs/components/Combobox/ComboboxNew/hooks/useKeyboardNavigation.js

@@ -35,6 +35,7 @@ var useKeyNavigation = exports.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;
@@ -129,6 +130,7 @@ var useKeyNavigation = exports.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({
@@ -145,6 +147,32 @@ var useKeyNavigation = exports.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();
@@ -161,13 +189,23 @@ var useKeyNavigation = exports.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'
@@ -179,6 +217,17 @@ var useKeyNavigation = exports.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/styled-components/cjs/components/Modal/Modal.js

@@ -12,11 +12,14 @@ var _Popup = /*#__PURE__*/require("../Popup");
 var _Overlay = /*#__PURE__*/require("../Overlay");
 var _utils = /*#__PURE__*/require("../Popup/utils");
 var _hooks = /*#__PURE__*/require("../../hooks");
+var _IconClose2 = /*#__PURE__*/require("../_Icon/Icons/IconClose");
 var _Modal = /*#__PURE__*/require("./Modal.tokens");
 var _hooks2 = /*#__PURE__*/require("./hooks");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _ModalContext = /*#__PURE__*/require("./ModalContext");
-var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen"];
+var _Modal2 = /*#__PURE__*/require("./Modal.styles");
+var _IconClose;
+var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen", "hasBody", "hasClose"];
 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; }
 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); }
@@ -49,6 +52,8 @@ var modalRoot = exports.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 = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef, true);
@@ -78,6 +83,15 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
         onClose();
       }
     }, [closeOnOverlayClick, onOverlayClick, onClose]);
+    var overlayNode = /*#__PURE__*/_react["default"].createElement(_Overlay.Overlay, {
+      className: _Modal.classes.overlay,
+      zIndex: zIndex || _utils.DEFAULT_Z_INDEX,
+      backgroundColorProperty: overlayBackgroundToken,
+      withBlur: withBlur,
+      transparent: transparent,
+      isClickable: closeOnOverlayClick,
+      onOverlayClick: onModalOverlayKeyDown
+    });
     return /*#__PURE__*/_react["default"].createElement(Popup, _extends({
       id: innerId,
       opened: innerIsOpen,
@@ -85,18 +99,16 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
       popupInfo: modalInfo,
       withAnimation: withAnimation,
       zIndex: zIndex,
-      overlay: /*#__PURE__*/_react["default"].createElement(Root, {
+      overlay: hasBody ? overlayNode : /*#__PURE__*/_react["default"].createElement(Root, {
         view: view
-      }, /*#__PURE__*/_react["default"].createElement(_Overlay.Overlay, {
-        className: _Modal.classes.overlay,
-        zIndex: zIndex || _utils.DEFAULT_Z_INDEX,
-        backgroundColorProperty: overlayBackgroundToken,
-        withBlur: withBlur,
-        transparent: transparent,
-        isClickable: closeOnOverlayClick,
-        onOverlayClick: onModalOverlayKeyDown
-      }))
-    }, rest), children);
+      }, overlayNode)
+    }, rest), hasBody ? /*#__PURE__*/_react["default"].createElement(Root, {
+      view: view
+    }, /*#__PURE__*/_react["default"].createElement(_Modal2.ModalBody, null, /*#__PURE__*/_react["default"].createElement(_Modal2.ModalContent, null, hasClose && /*#__PURE__*/_react["default"].createElement(_Modal2.CloseButton, {
+      onClick: onClose
+    }, _IconClose || (_IconClose = /*#__PURE__*/_react["default"].createElement(_IconClose2.IconClose, {
+      size: "s"
+    }))), children))) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children));
   });
 };
 var modalConfig = exports.modalConfig = {

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

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ModalContent = exports.ModalBody = exports.CloseButton = void 0;
+var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
+var _Modal = /*#__PURE__*/require("./Modal.tokens");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var ModalBody = exports.ModalBody = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  componentId: "plasma-new-hope__sc-yxf3fb-0"
+})(["border-radius:var(", ");padding:var(", ");background:var(", ");box-shadow:0px 60px 112px -8px #00000014;"], _Modal.tokens.modalBodyBorderRadius, _Modal.tokens.modalBodyPadding, _Modal.tokens.modalBodyBackground);
+var ModalContent = exports.ModalContent = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  componentId: "plasma-new-hope__sc-yxf3fb-1"
+})(["position:relative;padding:var(", ");"], _Modal.tokens.modalContentPadding);
+var CloseButton = exports.CloseButton = /*#__PURE__*/_styledComponents["default"].button.withConfig({
+  componentId: "plasma-new-hope__sc-yxf3fb-2"
+})(["position:absolute;top:0;right:0;padding:0;margin:0;border:none;outline:none;cursor:pointer;background:transparent;"]);

package/styled-components/cjs/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/cjs/components/Modal/Modal.tokens.js

@@ -12,5 +12,9 @@ var classes = exports.classes = {
 };
 var tokens = exports.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'
 };

package/styled-components/cjs/components/Pagination/ui/PaginationSelectPerPage/PaginationSelectPerPage.styles.js

@@ -16,7 +16,7 @@ var SelectPerPageRoot = exports.SelectPerPageRoot = /*#__PURE__*/_styledComponen
 })(["display:flex;align-items:center;gap:0.5rem;"]);
 var SelectPerPageSelect = exports.SelectPerPageSelect = /*#__PURE__*/(0, _styledComponents["default"])(Select).withConfig({
   componentId: "plasma-new-hope__sc-1g304l9-1"
-})(["", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":0.125rem;", ":var(", ");", ":calc(var(", ") - 0.125rem);", ":0 0.375rem 0 0;", ":1.5rem;", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");"], _Select.selectTokens.buttonColor, _Pagination.tokens.buttonColor, _Select.selectTokens.buttonColorHover, _Pagination.tokens.buttonColorHover, _Select.selectTokens.buttonColorActive, _Pagination.tokens.buttonColorActive, _Select.selectTokens.buttonBackgroundColor, _Pagination.tokens.buttonBackgroundColor, _Select.selectTokens.buttonBackgroundColorHover, _Pagination.tokens.buttonBackgroundColorHover, _Select.selectTokens.buttonBackgroundColorActive, _Pagination.tokens.buttonBackgroundColorActive, _Select.selectTokens.targetHeight, _Pagination.tokens.buttonHeight, _Select.selectTokens.buttonPadding, _Pagination.tokens.selectTargetPadding, _Select.selectTokens.borderRadius, _Pagination.tokens.buttonRadius, _Select.selectTokens.buttonArrowColor, _Pagination.tokens.buttonArrowColor, _Select.selectTokens.buttonArrowColorHover, _Pagination.tokens.buttonArrowColorHover, _Select.selectTokens.buttonArrowColorActive, _Pagination.tokens.buttonArrowColorActive, _Select.selectTokens.buttonArrowMargin, _Pagination.tokens.buttonArrowMargin, _Select.selectTokens.padding, _Select.selectTokens.itemPadding, _Pagination.tokens.selectItemPadding, _Select.selectTokens.itemBorderRadius, _Pagination.tokens.buttonRadius, _Select.selectTokens.itemIconMargin, _Select.selectTokens.itemIconSize, _Select.selectTokens.itemHeight, _Pagination.tokens.selectItemHeight, _Select.selectTokens.fontFamily, _Pagination.tokens.paginationFontFamily, _Select.selectTokens.fontSize, _Pagination.tokens.paginationFontSize, _Select.selectTokens.fontStyle, _Pagination.tokens.paginationFontStyle, _Select.selectTokens.fontWeight, _Pagination.tokens.paginationFontWeight, _Select.selectTokens.fontLetterSpacing, _Pagination.tokens.paginationLetterSpacing, _Select.selectTokens.fontLineHeight, _Pagination.tokens.paginationLineHeight);
+})(["", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":0.125rem;", ":0.125rem;", ":var(", ");", ":calc(var(", ") - 0.125rem);", ":0 0.375rem 0 0;", ":1.5rem;", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");", ":var(", ");"], _Select.selectTokens.targetButtonColor, _Pagination.tokens.buttonColor, _Select.selectTokens.targetButtonColorHover, _Pagination.tokens.buttonColorHover, _Select.selectTokens.targetButtonColorActive, _Pagination.tokens.buttonColorActive, _Select.selectTokens.targetButtonBackgroundColor, _Pagination.tokens.buttonBackgroundColor, _Select.selectTokens.targetButtonBackgroundColorHover, _Pagination.tokens.buttonBackgroundColorHover, _Select.selectTokens.targetButtonBackgroundColorActive, _Pagination.tokens.buttonBackgroundColorActive, _Select.selectTokens.targetHeight, _Pagination.tokens.buttonHeight, _Select.selectTokens.targetButtonPadding, _Pagination.tokens.selectTargetPadding, _Select.selectTokens.borderRadius, _Pagination.tokens.buttonRadius, _Select.selectTokens.targetButtonArrowColor, _Pagination.tokens.buttonArrowColor, _Select.selectTokens.targetButtonArrowColorHover, _Pagination.tokens.buttonArrowColorHover, _Select.selectTokens.targetButtonArrowColorActive, _Pagination.tokens.buttonArrowColorActive, _Select.selectTokens.targetButtonArrowMargin, _Pagination.tokens.buttonArrowMargin, _Select.selectTokens.padding, _Select.selectTokens.focusOffset, _Select.selectTokens.itemPadding, _Pagination.tokens.selectItemPadding, _Select.selectTokens.itemBorderRadius, _Pagination.tokens.buttonRadius, _Select.selectTokens.itemIconMargin, _Select.selectTokens.itemIconSize, _Select.selectTokens.itemHeight, _Pagination.tokens.selectItemHeight, _Select.selectTokens.fontFamily, _Pagination.tokens.paginationFontFamily, _Select.selectTokens.fontSize, _Pagination.tokens.paginationFontSize, _Select.selectTokens.fontStyle, _Pagination.tokens.paginationFontStyle, _Select.selectTokens.fontWeight, _Pagination.tokens.paginationFontWeight, _Select.selectTokens.fontLetterSpacing, _Pagination.tokens.paginationLetterSpacing, _Select.selectTokens.fontLineHeight, _Pagination.tokens.paginationLineHeight);
 var SelectPerPageTypography = exports.SelectPerPageTypography = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-1g304l9-2"
 })(["font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");"], _Pagination.tokens.paginationFontFamily, _Pagination.tokens.paginationFontSize, _Pagination.tokens.paginationFontStyle, _Pagination.tokens.paginationFontWeight, _Pagination.tokens.paginationLetterSpacing, _Pagination.tokens.paginationLineHeight);