@salutejs/plasma-new-hope 0.195.0-canary.1546.11913646617.0 → 0.195.0-canary.1556.11929098791.0

package/styled-components/cjs/examples/plasma_b2c/components/TextField/TextField.stories.tsx

@@ -87,6 +87,12 @@ const meta: Meta<typeof TextField> = {
                 type: 'inline-radio',
             },
         },
+        hasPlaceholder: {
+            control: {
+                type: 'boolean',
+            },
+            if: { arg: 'labelPlacement', eq: 'inner' },
+        },
         size: {
             options: sizes,
             control: {
@@ -210,6 +216,7 @@ export const Default: StoryObj<StoryPropsDefault> = {
         view: 'default',
         label: 'Лейбл',
         labelPlacement: 'outer',
+        hasPlaceholder: false,
         titleCaption: 'Подпись к полю',
         textBefore: '',
         textAfter: '',

package/styled-components/cjs/examples/plasma_web/components/Badge/Badge.config.js

@@ -22,10 +22,10 @@ var config = exports.config = {
       light: /*#__PURE__*/(0, _styledComponents.css)(["", ":var(--on-light-text-primary);", ":var(--on-dark-surface-solid-default);", ":var(--on-dark-text-primary);", ":var(--on-dark-surface-transparent-card);", ":var(--on-dark-text-primary);"], _Badge.badgeTokens.color, _Badge.badgeTokens.background, _Badge.badgeTokens.colorTransparent, _Badge.badgeTokens.backgroundTransparent, _Badge.badgeTokens.colorClear)
     },
     size: {
-      l: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.5rem;", ":1.75rem;", ":0 0.6875rem;", ":0 0.375rem;", ":var(--plasma-typo-body-s-font-family);", ":var(--plasma-typo-body-s-font-size);", ":var(--plasma-typo-body-s-font-style);", ":var(--plasma-typo-body-s-font-weight);", ":var(--plasma-typo-body-s-letter-spacing);", ":var(--plasma-typo-body-s-line-height);", ":-0.0625rem;", ":0.25rem;", ":0.25rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.padding, _Badge.badgeTokens.paddingIconOnly, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
-      m: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.5rem;", ":0 0.5625rem;", ":0 0.375rem;", ":var(--plasma-typo-body-xs-font-family);", ":var(--plasma-typo-body-xs-font-size);", ":var(--plasma-typo-body-xs-font-style);", ":var(--plasma-typo-body-xs-font-weight);", ":var(--plasma-typo-body-xs-letter-spacing);", ":var(--plasma-typo-body-xs-line-height);", ":-0.0625rem;", ":0.1875rem;", ":0.1875rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.padding, _Badge.badgeTokens.paddingIconOnly, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
-      s: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.25rem;", ":0 0.4375rem;", ":0 0.25rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.padding, _Badge.badgeTokens.paddingIconOnly, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
-      xs: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.25rem;", ":1rem;", ":0 0.25rem;", ":0 0.188rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.padding, _Badge.badgeTokens.paddingIconOnly, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight)
+      l: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.5rem;", ":1.75rem;", ":0.6875rem;", ":0.6875rem;", ":var(--plasma-typo-body-s-font-family);", ":var(--plasma-typo-body-s-font-size);", ":var(--plasma-typo-body-s-font-style);", ":var(--plasma-typo-body-s-font-weight);", ":var(--plasma-typo-body-s-letter-spacing);", ":var(--plasma-typo-body-s-line-height);", ":-0.0625rem;", ":0.25rem;", ":0.25rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
+      m: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.5rem;", ":0.5625rem;", ":0.5625rem;", ":var(--plasma-typo-body-xs-font-family);", ":var(--plasma-typo-body-xs-font-size);", ":var(--plasma-typo-body-xs-font-style);", ":var(--plasma-typo-body-xs-font-weight);", ":var(--plasma-typo-body-xs-letter-spacing);", ":var(--plasma-typo-body-xs-line-height);", ":-0.0625rem;", ":0.1875rem;", ":0.1875rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
+      s: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.25rem;", ":0.4375rem;", ":0.4375rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
+      xs: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.25rem;", ":1rem;", ":0.25rem;", ":0.25rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight)
     },
     pilled: {
       "true": /*#__PURE__*/(0, _styledComponents.css)(["", ":1.25rem;"], _Badge.badgeTokens.pilledBorderRadius)
@@ -34,7 +34,7 @@ var config = exports.config = {
       "true": /*#__PURE__*/(0, _styledComponents.css)([""])
     },
     clear: {
-      "true": /*#__PURE__*/(0, _styledComponents.css)(["", ":var(--surface-clear);"], _Badge.badgeTokens.backgroundClear)
+      "true": /*#__PURE__*/(0, _styledComponents.css)([""])
     }
   }
 };

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

@@ -31,13 +31,6 @@ const meta: Meta<typeof Badge> = {
             control: { type: 'boolean' },
             if: { arg: 'clear', truthy: false },
         },
-        maxWidth: {
-            control: { type: 'text' },
-        },
-        text: {
-            control: { type: 'text' },
-            if: { arg: 'enableText', truthy: true },
-        },
         ...disableProps(['contentLeft', 'contentRight']),
     },
 };
@@ -47,7 +40,6 @@ export default meta;
 type StoryProps = ComponentProps<typeof Badge> & {
     enableContentLeft: boolean;
     enableContentRight: boolean;
-    enableText: boolean;
 };
 type Story = StoryObj<StoryProps>;
 
@@ -68,39 +60,26 @@ export const Default: Story = {
         },
         enableContentRight: {
             control: { type: 'boolean' },
-            if: { arg: 'enableText', truthy: true },
+            if: { arg: 'enableContentLeft', truthy: false },
         },
     },
     args: {
+        text: 'Hello',
         view: 'default',
         size: 'm',
-        enableText: true,
-        text: 'Hello',
         enableContentLeft: false,
         enableContentRight: false,
         clear: false,
         pilled: false,
         transparent: false,
-        maxWidth: '',
     },
-    render: ({ enableContentLeft, enableContentRight, enableText, size, ...rest }: StoryProps) => {
-        const iconSize = () => {
-            switch (size) {
-                case 'l':
-                    return '1rem';
-                case 'xs':
-                    return '0.625rem';
-                default:
-                    return '0.75rem';
-            }
-        };
+    render: ({ enableContentLeft, enableContentRight, size, ...rest }: StoryProps) => {
+        const iconSize = size === 'l' ? '1rem' : '0.75rem';
 
         return (
             <Badge
-                contentLeft={
-                    enableContentLeft || !enableText ? <BellIcon width={iconSize()} height={iconSize()} /> : undefined
-                }
-                contentRight={enableContentRight ? <BellIcon width={iconSize()} height={iconSize()} /> : undefined}
+                contentLeft={enableContentLeft ? <BellIcon width={iconSize} height={iconSize} /> : undefined}
+                contentRight={enableContentRight ? <BellIcon width={iconSize} height={iconSize} /> : undefined}
                 size={size}
                 {...rest}
             />

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

@@ -87,6 +87,12 @@ const meta: Meta<typeof TextField> = {
                 type: 'inline-radio',
             },
         },
+        hasPlaceholder: {
+            control: {
+                type: 'boolean',
+            },
+            if: { arg: 'labelPlacement', eq: 'inner' },
+        },
         size: {
             options: sizes,
             control: {
@@ -210,6 +216,7 @@ export const Default: StoryObj<StoryPropsDefault> = {
         view: 'default',
         label: 'Лейбл',
         labelPlacement: 'outer',
+        hasPlaceholder: false,
         titleCaption: 'Подпись к полю',
         textBefore: '',
         textAfter: '',
@@ -219,11 +226,11 @@ export const Default: StoryObj<StoryPropsDefault> = {
         readOnly: false,
         enableContentLeft: true,
         enableContentRight: true,
-        clear: false,
-        hasDivider: false,
         optional: false,
         required: false,
         requiredPlacement: 'right',
+        clear: false,
+        hasDivider: false,
         hasHint: true,
         hintText: 'Текст подсказки',
         hintTrigger: 'hover',

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

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "portal", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch", "hintText"];
+var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "hasPlaceholder", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "portal", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch", "hintText"];
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -28,6 +28,7 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
       view = _ref.view,
       size = _ref.size,
       labelPlacement = _ref.labelPlacement,
+      hasPlaceholder = _ref.hasPlaceholder,
       disabled = _ref.disabled,
       readOnly = _ref.readOnly,
       label = _ref.label,
@@ -147,6 +148,11 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
         "aria-activedescendant": "".concat(listId, "/").concat(focused),
         "aria-describedby": helperTextId,
         hintText: String(hintText || '')
+      }, labelPlacement === 'inner' ? {
+        labelPlacement: labelPlacement,
+        hasPlaceholder: hasPlaceholder
+      } : {
+        labelPlacement: labelPlacement
       }, rest)),
       preventOverflow: false,
       ref: targetRef,

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

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["children", "className", "style", "text", "contentLeft", "contentRight", "size", "view", "customColor", "customBackgroundColor", "pilled", "transparent", "clear", "maxWidth"];
+var _excluded = ["children", "className", "text", "contentLeft", "contentRight", "size", "view", "pilled", "transparent", "clear", "maxWidth"];
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -16,20 +16,16 @@ import { base as pilledCSS } from './variations/_pilled/base';
 import { base as transparentCSS } from './variations/_transparent/base';
 import { base as clearCSS } from './variations/_clear/base';
 import { StyledContentLeft, StyledContentMain, StyledContentRight, base } from './Badge.styles';
-import { classes, privateTokens } from './Badge.tokens';
+import { classes } from './Badge.tokens';
 export var badgeRoot = function badgeRoot(Root) {
   return /*#__PURE__*/forwardRef(function (props, ref) {
-    var _StyledContentLeft, _StyledContentMain, _StyledContentMain2, _StyledContentRight;
     var children = props.children,
       className = props.className,
-      style = props.style,
       text = props.text,
       contentLeft = props.contentLeft,
       contentRight = props.contentRight,
       size = props.size,
       view = props.view,
-      customColor = props.customColor,
-      customBackgroundColor = props.customBackgroundColor,
       _props$pilled = props.pilled,
       pilled = _props$pilled === void 0 ? false : _props$pilled,
       _props$transparent = props.transparent,
@@ -44,25 +40,19 @@ export var badgeRoot = function badgeRoot(Root) {
     var clearClass = clear ? classes.badgeClear : undefined;
     var truncateClass = maxWidth !== 'auto' ? classes.badgeTruncate : undefined;
     var txt = !text && typeof children === 'string' ? children : text;
-    var iconOnlyClass = !txt && contentLeft ? classes.iconOnly : undefined;
-    var BadgeContent = function BadgeContent() {
-      if (contentLeft) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, _StyledContentLeft || (_StyledContentLeft = /*#__PURE__*/React.createElement(StyledContentLeft, null, contentLeft)), txt ? _StyledContentMain || (_StyledContentMain = /*#__PURE__*/React.createElement(StyledContentMain, null, txt)) : children);
-      }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, txt ? _StyledContentMain2 || (_StyledContentMain2 = /*#__PURE__*/React.createElement(StyledContentMain, null, txt)) : children, contentRight && (_StyledContentRight || (_StyledContentRight = /*#__PURE__*/React.createElement(StyledContentRight, null, contentRight))));
-    };
     return /*#__PURE__*/React.createElement(Root, _extends({
       ref: ref,
-      className: cx(pilledClass, transparentClass, clearClass, truncateClass, iconOnlyClass, className),
+      className: cx(pilledClass, transparentClass, clearClass, truncateClass, className),
       view: view,
       size: size,
       pilled: pilled,
       transparent: transparent,
-      clear: clear,
-      style: _objectSpread(_objectSpread({}, style), {}, _defineProperty(_defineProperty({
+      clear: clear
+    }, rest, {
+      style: _objectSpread(_objectSpread({}, rest.style), {}, {
         maxWidth: maxWidth
-      }, privateTokens.customBackground, customBackgroundColor), privateTokens.customColor, customColor))
-    }, rest), /*#__PURE__*/React.createElement(BadgeContent, null));
+      })
+    }), contentLeft && /*#__PURE__*/React.createElement(StyledContentLeft, null, contentLeft), txt ? /*#__PURE__*/React.createElement(StyledContentMain, null, txt) : children, contentRight && /*#__PURE__*/React.createElement(StyledContentRight, null, contentRight));
   });
 };
 export var badgeConfig = {

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

@@ -52,7 +52,16 @@ export function App() {
 ```
 
 ### Вид badge
-Вид `badge` задается с помощью свойства `view`.
+Вид `badge` задается с помощью свойства `view`. Возможные значения свойства `view`:
+
++ `"primary"` – основной badge;
++ `"accent"` – бейдж акцентного цвета;
++ `"positive"` – успешное завершение;
++ `"warning"` – предупреждение;
++ `"negative"` – ошибка;
++ `"dark"` – темный badge;
++ `"light"` – светлый badge.
+
 Так же на вид badge влияет свойства `transparent` и `clear`.
 
 ```tsx live 
@@ -63,7 +72,7 @@ export function App() {
     const Badges = ({transparent, clear}) => {
         return (
             <div style=\{{ display: 'flex', gap: '0.5rem' }}>
-                <Badge text="Бейдж" size="l" view="default" transparent={transparent} clear={clear} />
+                <Badge text="Бейдж" size="l" view="primary" transparent={transparent} clear={clear} />
                 <Badge text="Бейдж" size="l" view="accent" transparent={transparent} clear={clear} />
                 <Badge text="Бейдж" size="l" view="positive" transparent={transparent} clear={clear} />
                 <Badge text="Бейдж" size="l" view="warning" transparent={transparent} clear={clear} />
@@ -85,8 +94,7 @@ export function App() {
 ```
 
 ### Иконка слева / справа
-В левой или правой части badge можно отобразить иконку. 
-Если же нужен Badge с иконкой без текста, нужно использовать `contentLeft`.
+В левой и/или правой части badge можно отобразить иконку:
 
 ```tsx live
 import React from 'react';
@@ -99,49 +107,17 @@ export function App() {
             <Badge 
                 text="Бейдж" 
                 size="l"   
-                view="default" 
+                view="primary" 
                 contentLeft={
                     <IconEye color="inherit" size="xs" />
-                } 
-            />
+                } />
             <Badge 
                 text="Бейдж" 
                 size="l"   
-                view="default" 
+                view="primary" 
                 contentRight={
                     <IconEye color="inherit" size="xs" />
-                }
-            />
-            <Badge 
-                size="l"   
-                view="default" 
-                contentLeft={
-                    <IconEye color="inherit" size="xs" />
-                } 
-            />
-        </div>
-    );
-}
-```
-
-### Задание цвета текста и фона
-Цвет текста и фона можно задать с помощью свойств 
-`customColor` и `customBackgroundColor` соответственно.
-
-```tsx live
-import React from 'react';
-import { Badge } from '@salutejs/{{ package }}';
-
-export function App() {
-    return (
-        <div>
-            <Badge 
-                text="Бейдж" 
-                size="l"   
-                view="default" 
-                customColor="antiquewhite"
-                customBackgroundColor="darkolivegreen" 
-            />
+                } />
         </div>
     );
 }

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

@@ -2,12 +2,7 @@ export var classes = {
   badgePilled: 'badge-pilled',
   badgeTransparent: 'badge-transparent',
   badgeClear: 'badge-clear',
-  badgeTruncate: 'badge-truncate',
-  iconOnly: 'badge-icon-only'
-};
-export var privateTokens = {
-  customBackground: '--plasma-badge-custom-background',
-  customColor: '--plasma-badge-custom-color'
+  badgeTruncate: 'badge-truncate'
 };
 export var tokens = {
   background: '--plasma-badge-background',
@@ -15,12 +10,13 @@ export var tokens = {
   backgroundTransparent: '--plasma-badge-background-transparent',
   colorTransparent: '--plasma-badge-color-transparent',
   colorClear: '--plasma-badge-color-clear',
-  backgroundClear: '--plasma-badge-background-clear',
   borderRadius: '--plasma-badge-border-radius',
   pilledBorderRadius: '--plasma-badge-pilled-border-radius',
   height: '--plasma-badge-height',
-  padding: '--plasma-badge-padding',
-  paddingIconOnly: '--plasma-badge-padding-icon-only',
+  paddingTop: '--plasma-badge-padding-top',
+  paddingRight: '--plasma-badge-padding-right',
+  paddingBottom: '--plasma-badge-padding-bottom',
+  paddingLeft: '--plasma-badge-padding-left',
   fontFamily: '--plasma-badge-font-family',
   fontSize: '--plasma-badge-font-size',
   fontStyle: '--plasma-badge-font-style',

package/styled-components/es/components/Badge/variations/_clear/base.js

@@ -1,3 +1,3 @@
 import { css } from 'styled-components';
-import { classes, privateTokens, tokens } from '../../Badge.tokens';
-export var base = /*#__PURE__*/css(["&.", "{color:var(", ",var(", "));background-color:var(", ",var(", "));}"], classes.badgeClear, privateTokens.customColor, tokens.colorClear, privateTokens.customBackground, tokens.backgroundClear);
+import { classes, tokens } from '../../Badge.tokens';
+export var base = /*#__PURE__*/css(["&.", "{color:var(", ");background-color:transparent;padding:0;}"], classes.badgeClear, tokens.colorClear);

package/styled-components/es/components/Badge/variations/_size/base.js

@@ -1,4 +1,3 @@
 import { css } from 'styled-components';
-import { classes, tokens } from '../../Badge.tokens';
-import { StyledContentLeft } from '../../Badge.styles';
-export var base = /*#__PURE__*/css(["font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");border-radius:var(", ");height:var(", ");padding:var(", ");&.", "{padding:var(", ");", "{margin:0;}}"], tokens.fontFamily, tokens.fontSize, tokens.fontStyle, tokens.fontWeight, tokens.letterSpacing, tokens.lineHeight, tokens.borderRadius, tokens.height, tokens.padding, classes.iconOnly, tokens.paddingIconOnly, StyledContentLeft);
+import { tokens } from '../../Badge.tokens';
+export var base = /*#__PURE__*/css(["font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");border-radius:var(", ");height:var(", ");padding-top:var(", ");padding-right:var(", ");padding-bottom:var(", ");padding-left:var(", ");"], tokens.fontFamily, tokens.fontSize, tokens.fontStyle, tokens.fontWeight, tokens.letterSpacing, tokens.lineHeight, tokens.borderRadius, tokens.height, tokens.paddingTop, tokens.paddingRight, tokens.paddingBottom, tokens.paddingLeft);

package/styled-components/es/components/Badge/variations/_transparent/base.js

@@ -1,3 +1,3 @@
 import { css } from 'styled-components';
-import { classes, privateTokens, tokens } from '../../Badge.tokens';
-export var base = /*#__PURE__*/css(["&.", "{color:var(", ",var(", "));background-color:var(", ",var(", "));}"], classes.badgeTransparent, privateTokens.customColor, tokens.colorTransparent, privateTokens.customBackground, tokens.backgroundTransparent);
+import { classes, tokens } from '../../Badge.tokens';
+export var base = /*#__PURE__*/css(["&.", "{color:var(", ");background-color:var(", ");}"], classes.badgeTransparent, tokens.colorTransparent, tokens.backgroundTransparent);

package/styled-components/es/components/Badge/variations/_view/base.js

@@ -1,3 +1,3 @@
 import { css } from 'styled-components';
-import { privateTokens, tokens } from '../../Badge.tokens';
-export var base = /*#__PURE__*/css(["color:var(", ",var(", "));background-color:var(", ",var(", "));"], privateTokens.customColor, tokens.color, privateTokens.customBackground, tokens.background);
+import { tokens } from '../../Badge.tokens';
+export var base = /*#__PURE__*/css(["color:var(", ");background-color:var(", ");"], tokens.color, tokens.background);

package/styled-components/es/components/Combobox/ComboboxNew/Combobox.js

@@ -1,5 +1,9 @@
-var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "targetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
+var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "targetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "hasPlaceholder", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -55,6 +59,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
       view = props.view,
       size = props.size,
       labelPlacement = props.labelPlacement,
+      hasPlaceholder = props.hasPlaceholder,
       _props$readOnly = props.readOnly,
       readOnly = _props$readOnly === void 0 ? false : _props$readOnly,
       _props$disabled = props.disabled,
@@ -177,9 +182,24 @@ export var comboboxRoot = function comboboxRoot(Root) {
 
     // Обработчик чипов
     var handleChipsChange = function handleChipsChange(chipLabels) {
-      onChange(chipLabels.map(function (chipLabel) {
-        return labelToItemMap.get(chipLabel).value;
-      }));
+      if (!Array.isArray(value)) return;
+
+      // TODO: #1564
+      // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
+      if (renderValue && !isTargetAmount) {
+        var resultValues = _toConsumableArray(value);
+        value.forEach(function (_, index) {
+          var labelAfterRenderValue = renderValue(labelToItemMap.get(valueToItemMap.get(value[index]).label));
+          if (!chipLabels.includes(labelAfterRenderValue)) {
+            resultValues.splice(index, 1);
+          }
+        });
+        onChange(resultValues);
+      } else {
+        onChange(chipLabels.map(function (chipLabel) {
+          return labelToItemMap.get(chipLabel).value;
+        }));
+      }
     };
 
     // Обработчик открытия/закрытия выпадающего списка
@@ -348,7 +368,6 @@ export var comboboxRoot = function comboboxRoot(Root) {
         handleItemClick: handleItemClick,
         variant: variant,
         renderItem: renderItem,
-        valueToItemMap: valueToItemMap,
         treeId: treeId
       }
     }, /*#__PURE__*/React.createElement(FloatingPopover, {
@@ -368,7 +387,6 @@ export var comboboxRoot = function comboboxRoot(Root) {
           onChange: handleTextValueChange,
           size: size,
           view: view,
-          labelPlacement: labelPlacement,
           disabled: disabled,
           readOnly: readOnly,
           label: label,
@@ -391,6 +409,11 @@ export var comboboxRoot = function comboboxRoot(Root) {
           "aria-controls": "".concat(treeId, "_tree_level_1"),
           "aria-expanded": isCurrentListOpen,
           "aria-activedescendant": activeDescendantItemValue ? getItemId(treeId, activeDescendantItemValue) : ''
+        }, labelPlacement === 'inner' ? {
+          labelPlacement: labelPlacement,
+          hasPlaceholder: hasPlaceholder
+        } : {
+          labelPlacement: labelPlacement
         }, multiple ? {
           enumerationType: 'chip',
           chips: getChips(),

package/styled-components/es/components/Combobox/ComboboxNew/ui/Inner/ui/Item/Item.js

@@ -31,7 +31,6 @@ export var Item = function Item(_ref) {
     handleItemClick = _useContext.handleItemClick,
     variant = _useContext.variant,
     renderItem = _useContext.renderItem,
-    valueToItemMap = _useContext.valueToItemMap,
     treeId = _useContext.treeId;
   var disabledClassName = disabled ? classes.dropdownItemIsDisabled : undefined;
   var focusedClass = currentLevel === focusedPath.length - 1 && index === (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[currentLevel]) ? classes.dropdownItemIsFocused : undefined;
@@ -85,7 +84,7 @@ export var Item = function Item(_ref) {
   }))), !multiple && checked.get(item.value) === 'done' && /*#__PURE__*/React.createElement(IconDone, {
     size: sizeToIconSize(size, variant),
     color: "inherit"
-  })), renderItem ? /*#__PURE__*/React.createElement(StyledText, null, renderItem(valueToItemMap.get(value))) : /*#__PURE__*/React.createElement(StyledWrapper, null, /*#__PURE__*/React.createElement(StyledCell, {
+  })), renderItem ? /*#__PURE__*/React.createElement(StyledText, null, renderItem(item)) : /*#__PURE__*/React.createElement(StyledWrapper, null, /*#__PURE__*/React.createElement(StyledCell, {
     view: "default",
     size: "l",
     contentLeft: contentLeft,

package/styled-components/es/components/DatePicker/SingleDate/SingleDate.js

@@ -1,4 +1,4 @@
-var _excluded = ["className", "opened", "label", "labelPlacement", "placeholder", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "view", "size", "readOnly", "disabled", "name", "defaultDate", "valueError", "valueSuccess", "format", "lang", "maskWithFormat", "min", "max", "includeEdgeDates", "eventList", "disabledList", "eventMonthList", "disabledMonthList", "eventQuarterList", "disabledQuarterList", "eventYearList", "disabledYearList", "type", "frame", "usePortal", "placement", "closeOnOverlayClick", "closeOnEsc", "offset", "onChangeValue", "onCommitDate", "onToggle", "onFocus", "onBlur", "onChange"];
+var _excluded = ["className", "opened", "label", "labelPlacement", "hasPlaceholder", "placeholder", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "view", "size", "readOnly", "disabled", "name", "defaultDate", "valueError", "valueSuccess", "format", "lang", "maskWithFormat", "min", "max", "includeEdgeDates", "eventList", "disabledList", "eventMonthList", "disabledMonthList", "eventQuarterList", "disabledQuarterList", "eventYearList", "disabledYearList", "type", "frame", "usePortal", "placement", "closeOnOverlayClick", "closeOnEsc", "offset", "onChangeValue", "onCommitDate", "onToggle", "onFocus", "onBlur", "onChange"];
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -28,6 +28,7 @@ export var datePickerRoot = function datePickerRoot(Root) {
       label = _ref.label,
       _ref$labelPlacement = _ref.labelPlacement,
       labelPlacement = _ref$labelPlacement === void 0 ? 'outer' : _ref$labelPlacement,
+      hasPlaceholder = _ref.hasPlaceholder,
       placeholder = _ref.placeholder,
       leftHelper = _ref.leftHelper,
       contentLeft = _ref.contentLeft,
@@ -164,10 +165,14 @@ export var datePickerRoot = function datePickerRoot(Root) {
       },
       onFocus: onFocus,
       onBlur: onBlur,
-      onKeyDown: onKeyDown
-    }, innerLabelPlacement && {
-      label: label,
+      onKeyDown: onKeyDown,
       labelPlacement: labelPlacement
+    }, labelPlacement === 'inner' ? {
+      label: label,
+      labelPlacement: labelPlacement,
+      hasPlaceholder: hasPlaceholder
+    } : {
+      labelPlacement: undefined
     }));
     useEffect(function () {
       setIsInnerOpen(function (prevOpen) {

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

@@ -1,4 +1,4 @@
-var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "alwaysOpened", "portal"];
+var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "alwaysOpened", "portal", "renderItem"];
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -60,6 +60,7 @@ export var dropdownRoot = function dropdownRoot(Root) {
       _ref$alwaysOpened = _ref.alwaysOpened,
       alwaysOpened = _ref$alwaysOpened === void 0 ? false : _ref$alwaysOpened,
       portal = _ref.portal,
+      renderItem = _ref.renderItem,
       rest = _objectWithoutProperties(_ref, _excluded);
     var _useReducer = useReducer(pathReducer, []),
       _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -135,7 +136,8 @@ export var dropdownRoot = function dropdownRoot(Root) {
         onItemClick: onItemClick,
         onItemSelect: onItemSelect,
         hasArrow: hasArrow,
-        treeId: treeId
+        treeId: treeId,
+        renderItem: renderItem
       }
     }, /*#__PURE__*/React.createElement(FloatingPopover, {
       ref: floatingPopoverRef,

package/styled-components/es/components/Dropdown/ui/DropdownItem/DropdownItem.js

@@ -4,7 +4,7 @@ import { cx } from '../../../../utils';
 import { IconDisclosureRight } from '../../../_Icon';
 import { Context } from '../../Dropdown';
 import { getItemId } from '../../utils';
-import { Wrapper, DisclosureIconWrapper, Divider, CellWrapper, StyledCell } from './DropdownItem.styles';
+import { Wrapper, DisclosureIconWrapper, Divider, CellWrapper, StyledCell, RenderItemWrapper } from './DropdownItem.styles';
 export var DropdownItem = function DropdownItem(_ref) {
   var item = _ref.item,
     path = _ref.path,
@@ -34,7 +34,8 @@ export var DropdownItem = function DropdownItem(_ref) {
     onItemSelect = _useContext.onItemSelect,
     onItemClick = _useContext.onItemClick,
     hasArrow = _useContext.hasArrow,
-    treeId = _useContext.treeId;
+    treeId = _useContext.treeId,
+    renderItem = _useContext.renderItem;
   var hasDescendants = Boolean(item.items);
   var disclosureIconSize = size === 'xs' ? 'xs' : 's';
   var isDisabledClassName = disabled || isDisabled ? classes.dropdownItemIsDisabled : undefined;
@@ -85,7 +86,7 @@ export var DropdownItem = function DropdownItem(_ref) {
     "aria-expanded": ariaExpanded,
     "aria-level": ariaLevel,
     "aria-label": ariaLabel
-  }, /*#__PURE__*/React.createElement(CellWrapper, null, /*#__PURE__*/React.createElement(StyledCell, {
+  }, renderItem ? /*#__PURE__*/React.createElement(RenderItemWrapper, null, renderItem(item)) : /*#__PURE__*/React.createElement(CellWrapper, null, /*#__PURE__*/React.createElement(StyledCell, {
     contentLeft: contentLeft,
     contentRight: contentRight,
     alignContentLeft: "center",

package/styled-components/es/components/Dropdown/ui/DropdownItem/DropdownItem.styles.js

@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 import { classes, tokens, constants } from '../../Dropdown.tokens';
-import { addFocus } from '../../../../mixins';
+import { addFocus, applyEllipsis } from '../../../../mixins';
 import { cellConfig, cellTokens } from '../../../Cell';
 import { component, mergeConfig } from '../../../../engines';
 var mergedCellConfig = /*#__PURE__*/mergeConfig(cellConfig);
@@ -35,4 +35,7 @@ export var Wrapper = /*#__PURE__*/styled.li.withConfig({
   outlineRadius: /*#__PURE__*/"var(".concat(tokens.itemBorderRadius, ")"),
   hasTransition: false,
   customFocusRules: /*#__PURE__*/"\n            &.".concat(classes.dropdownItemIsFocused, ":before {\n                outline: none;\n                box-shadow: 0 0 0 0.0625rem var(").concat(constants.focusColor, ");\n            }\n        ")
-}));
+}));
+export var RenderItemWrapper = /*#__PURE__*/styled.div.withConfig({
+  componentId: "plasma-new-hope__sc-hs0ek1-5"
+})(["", ";flex:1;"], /*#__PURE__*/applyEllipsis());

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

@@ -272,7 +272,6 @@ export var selectRoot = function selectRoot(Root) {
         handleItemClick: handleItemClick,
         variant: variant,
         renderItem: renderItem,
-        valueToItemMap: valueToItemMap,
         treeId: treeId
       }
     }, /*#__PURE__*/React.createElement(FloatingPopover, {