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

package/styled-components/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/styled-components/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/styled-components/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/styled-components/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/styled-components/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/styled-components/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/styled-components/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/styled-components/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/styled-components/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/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,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/styled-components/es/components/Modal/Modal.styles.js

@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+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:0px 60px 112px -8px #00000014;"], 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"
+})(["position:absolute;top:0;right:0;padding:0;margin:0;border:none;outline:none;cursor:pointer;background:transparent;"]);

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,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'
 };

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

@@ -9,7 +9,7 @@ export var SelectPerPageRoot = /*#__PURE__*/styled.div.withConfig({
 })(["display:flex;align-items:center;gap:0.5rem;"]);
 export var SelectPerPageSelect = /*#__PURE__*/styled(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(", ");"], selectTokens.buttonColor, tokens.buttonColor, selectTokens.buttonColorHover, tokens.buttonColorHover, selectTokens.buttonColorActive, tokens.buttonColorActive, selectTokens.buttonBackgroundColor, tokens.buttonBackgroundColor, selectTokens.buttonBackgroundColorHover, tokens.buttonBackgroundColorHover, selectTokens.buttonBackgroundColorActive, tokens.buttonBackgroundColorActive, selectTokens.targetHeight, tokens.buttonHeight, selectTokens.buttonPadding, tokens.selectTargetPadding, selectTokens.borderRadius, tokens.buttonRadius, selectTokens.buttonArrowColor, tokens.buttonArrowColor, selectTokens.buttonArrowColorHover, tokens.buttonArrowColorHover, selectTokens.buttonArrowColorActive, tokens.buttonArrowColorActive, selectTokens.buttonArrowMargin, tokens.buttonArrowMargin, selectTokens.padding, selectTokens.itemPadding, tokens.selectItemPadding, selectTokens.itemBorderRadius, tokens.buttonRadius, selectTokens.itemIconMargin, selectTokens.itemIconSize, selectTokens.itemHeight, tokens.selectItemHeight, selectTokens.fontFamily, tokens.paginationFontFamily, selectTokens.fontSize, tokens.paginationFontSize, selectTokens.fontStyle, tokens.paginationFontStyle, selectTokens.fontWeight, tokens.paginationFontWeight, selectTokens.fontLetterSpacing, tokens.paginationLetterSpacing, selectTokens.fontLineHeight, 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(", ");"], selectTokens.targetButtonColor, tokens.buttonColor, selectTokens.targetButtonColorHover, tokens.buttonColorHover, selectTokens.targetButtonColorActive, tokens.buttonColorActive, selectTokens.targetButtonBackgroundColor, tokens.buttonBackgroundColor, selectTokens.targetButtonBackgroundColorHover, tokens.buttonBackgroundColorHover, selectTokens.targetButtonBackgroundColorActive, tokens.buttonBackgroundColorActive, selectTokens.targetHeight, tokens.buttonHeight, selectTokens.targetButtonPadding, tokens.selectTargetPadding, selectTokens.borderRadius, tokens.buttonRadius, selectTokens.targetButtonArrowColor, tokens.buttonArrowColor, selectTokens.targetButtonArrowColorHover, tokens.buttonArrowColorHover, selectTokens.targetButtonArrowColorActive, tokens.buttonArrowColorActive, selectTokens.targetButtonArrowMargin, tokens.buttonArrowMargin, selectTokens.padding, selectTokens.focusOffset, selectTokens.itemPadding, tokens.selectItemPadding, selectTokens.itemBorderRadius, tokens.buttonRadius, selectTokens.itemIconMargin, selectTokens.itemIconSize, selectTokens.itemHeight, tokens.selectItemHeight, selectTokens.fontFamily, tokens.paginationFontFamily, selectTokens.fontSize, tokens.paginationFontSize, selectTokens.fontStyle, tokens.paginationFontStyle, selectTokens.fontWeight, tokens.paginationFontWeight, selectTokens.fontLetterSpacing, tokens.paginationLetterSpacing, selectTokens.fontLineHeight, tokens.paginationLineHeight);
 export var SelectPerPageTypography = /*#__PURE__*/styled.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(", ");"], tokens.paginationFontFamily, tokens.paginationFontSize, tokens.paginationFontStyle, tokens.paginationFontWeight, tokens.paginationLetterSpacing, tokens.paginationLineHeight);