@salutejs/plasma-new-hope 0.248.2-canary.1712.12989534632.0 → 0.249.0-canary.1719.12951148116.0

package/styled-components/es/components/Toast/Toast.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 = ["role", "width", "text", "hasClose", "contentLeft", "view", "size", "pilled", "className", "style", "closeIconType", "onCloseButtonClick"];
+var _excluded = ["role", "width", "text", "hasClose", "contentLeft", "view", "size", "pilled", "className", "style", "closeIconType", "onCloseButtonClick", "textColor"];
 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; }
@@ -35,6 +35,7 @@ export var toastRoot = function toastRoot(Root) {
       style = props.style,
       closeIconType = props.closeIconType,
       onCloseButtonClick = props.onCloseButtonClick,
+      textColor = props.textColor,
       rest = _objectWithoutProperties(props, _excluded);
     var pilledClass = pilled ? classes.toastPilled : undefined;
     var fixedWidth = !Number.isNaN(Number(width)) ? "".concat(width, "%") : width;
@@ -58,7 +59,9 @@ export var toastRoot = function toastRoot(Root) {
       role: role,
       "aria-live": ariaLive,
       "aria-atomic": ariaAtomic
-    }, rest), contentLeft && /*#__PURE__*/React.createElement(StyledContentLeft, null, contentLeft), /*#__PURE__*/React.createElement(StyledContent, null, text), hasClose && /*#__PURE__*/React.createElement(CloseIconWrapper, {
+    }, rest), contentLeft && /*#__PURE__*/React.createElement(StyledContentLeft, null, contentLeft), /*#__PURE__*/React.createElement(StyledContent, {
+      textColor: textColor
+    }, text), hasClose && /*#__PURE__*/React.createElement(CloseIconWrapper, {
       view: "clear",
       size: "s",
       onClick: onCloseButtonClick,

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

@@ -34,7 +34,10 @@ export var StyledOverlay = /*#__PURE__*/styled(Overlay).withConfig({
 })(["&&.", "{animation:0.3s showFadeAnimation ease-out forwards;}&&.", "{animation:0.3s hideFadeAnimation ease-out forwards;}@keyframes showFadeAnimation{0%{opacity:0;}100%{opacity:1;}}@keyframes hideFadeAnimation{0%{opacity:1;}100%{opacity:0;}}"], /*#__PURE__*/String(classes.toastFadeShowed), /*#__PURE__*/String(classes.toastFadeHidden));
 export var StyledContentLeft = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-19l9ekl-3"
-})(["display:flex;--plasma_private-left-content-margin:var(", ");margin:var(--plasma_private-left-content-margin);"], tokens.leftContentMargin);
+})(["display:flex;--plasma_private-content-left-margin:var(", ");margin:var(--plasma_private-content-left-margin);color:var(", ");"], tokens.contentLeftMargin, tokens.contentLeftColor);
 export var StyledContent = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-19l9ekl-4"
-})([""]);
+})(["color:", ";"], function (_ref5) {
+  var textColor = _ref5.textColor;
+  return textColor || 'currentColor';
+});

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

@@ -104,6 +104,10 @@ export interface ShowToastArgs {
      * Время отображения подсказки. Если не передать значение, подсказка будет отображаться пока ее не закроют.
      */
     timeout?: number;
+    /**
+     * Цвет текста (по умолчанию берётся цвет из view)
+     */
+    textColor?: string;
     /**
      * callback срабатывающий в момент события hideToast
      */
@@ -117,9 +121,11 @@ export interface ShowToastArgs {
 
 ## Пример использования
 
+Для изменения цветовой темы компонента `Toast` используйте свойство `view` компонента `ViewContainer`.
+
 ```jsx live
 import React from 'react'
-import { useToast, ToastProvider, Button } from '@salutejs/{{ package }}'
+import { useToast, ToastProvider, Button, ViewContainer } from '@salutejs/{{ package }}'
 
 export function App() {
 
@@ -130,12 +136,13 @@ export function App() {
         const onHide = () => {}
         const toastData = {
             text: 'Подсказка вызванная showToast',
+            textColor: 'cyan',
             position: 'bottom',
             role: 'status',
             hasClose: true,
             fade: false,
             size: 'm',
-            view: 'dark',
+            view: 'default',
             timeout: 3000,
             onShow,
             onHide
@@ -145,9 +152,19 @@ export function App() {
     }
 
     return (
-        <ToastProvider>
-            <ToastExample />
-        </ToastProvider>
+        <div style=\{{ display: 'flex', gap: '1rem' }}>
+            <ViewContainer view="onLight">
+                <ToastProvider>
+                    <ToastExample />
+                </ToastProvider>
+            </ViewContainer>
+
+            <ViewContainer view="onDark">
+                <ToastProvider>
+                    <ToastExample />
+                </ToastProvider>
+            </ViewContainer>
+        </div>
     )
 }
 ```

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

@@ -19,7 +19,8 @@ export var tokens = {
   letterSpacing: '--plasma-toast-letter-spacing',
   lineHeight: '--plasma-toast-lineheight',
   pilledBorderRadius: '--plasma-toast-pilled-border-radius',
-  leftContentMargin: '--plasma-toast-left-content-margin',
+  contentLeftMargin: '--plasma-toast-content-left-margin',
+  contentLeftColor: '--plasma-toast-content-left-color',
   closeIconMargin: '--plasma-toast-close-icon-margin',
   closeIconColor: '--plasma-toast-close-icon-color',
   closeIconColorOnHover: '--plasma-toast-close-icon-color-on-hover',

package/styled-components/es/components/Toast/ToastController.js

@@ -7,7 +7,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-import React from 'react';
+import React, { useEffect } from 'react';
 import { classes } from './Toast.tokens';
 import { StyledOverlay, StyledRoot } from './Toast.styles';
 import { useToastInner } from './ToastProvider';
@@ -22,7 +22,9 @@ export var ToastControllerHoc = function ToastControllerHoc(ToastComponent) {
       rest = _objectWithoutProperties(props, _excluded);
     var _useToastInner = useToastInner(),
       hideToast = _useToastInner.hideToast,
-      isVisible = _useToastInner.isVisible;
+      isVisible = _useToastInner.isVisible,
+      hideTimeout = _useToastInner.hideTimeout,
+      animationRunTimeout = _useToastInner.animationRunTimeout;
     var toastKey = "".concat(text).concat(position);
     var showedClass = isVisible ? classes.toastShowed : classes.toastHidden;
     var showedFadeClass = isVisible ? classes.toastFadeShowed : classes.toastFadeHidden;
@@ -30,6 +32,16 @@ export var ToastControllerHoc = function ToastControllerHoc(ToastComponent) {
       text: text,
       onCloseButtonClick: hideToast
     }, rest);
+    useEffect(function () {
+      return function () {
+        if (hideTimeout !== null && hideTimeout !== void 0 && hideTimeout.current) {
+          clearTimeout(hideTimeout.current);
+        }
+        if (animationRunTimeout !== null && animationRunTimeout !== void 0 && animationRunTimeout.current) {
+          clearTimeout(animationRunTimeout.current);
+        }
+      };
+    }, []);
     if (!text) {
       return null;
     }

package/styled-components/es/components/Toast/ToastProvider/ToastProvider.js

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }
 import React, { createContext, useCallback, useContext, useEffect, useRef, useState } from 'react';
-import { DEFAULT_FADE, DEFAULT_POSITION, TIMER_DELAY } from '../utils';
+import { DEFAULT_CLOSE_ICON_TYPE, DEFAULT_FADE, DEFAULT_POSITION, TIMER_DELAY } from '../utils';
 export var ToastContext = /*#__PURE__*/createContext(null);
 export var useToastInner = function useToastInner() {
   var context = useContext(ToastContext);
@@ -118,6 +118,9 @@ export var ToastProviderHoc = function ToastProviderHoc(ToastComponent) {
         size = _getShowToastCallSign.size,
         view = _getShowToastCallSign.view,
         width = _getShowToastCallSign.width,
+        _getShowToastCallSign4 = _getShowToastCallSign.closeIconType,
+        closeIconType = _getShowToastCallSign4 === void 0 ? DEFAULT_CLOSE_ICON_TYPE : _getShowToastCallSign4,
+        textColor = _getShowToastCallSign.textColor,
         onHide = _getShowToastCallSign.onHide,
         onShow = _getShowToastCallSign.onShow;
       setToastProps({
@@ -131,7 +134,9 @@ export var ToastProviderHoc = function ToastProviderHoc(ToastComponent) {
         pilled: pilled,
         hasClose: hasClose,
         size: size,
-        view: view
+        view: view,
+        closeIconType: closeIconType,
+        textColor: textColor
       });
       setToastInfo({
         timeout: timeout,
@@ -145,16 +150,15 @@ export var ToastProviderHoc = function ToastProviderHoc(ToastComponent) {
     var onHide = toastInfo.onHide,
       timeout = toastInfo.timeout;
     var hideToast = useCallback(function () {
+      if (!isVisible) {
+        return;
+      }
       if (hideTimeout !== null && hideTimeout !== void 0 && hideTimeout.current) {
         clearTimeout(hideTimeout.current);
         hideTimeout.current = null;
       }
-      if (!isVisible) {
-        return;
-      }
       onHide === null || onHide === void 0 || onHide();
       setIsVisible(false);
-      console.log('!!! set animationRunTimeout');
       animationRunTimeout.current = setTimeout(function () {
         setIsHidden(true);
         setToastProps(initialToastData);
@@ -162,31 +166,16 @@ export var ToastProviderHoc = function ToastProviderHoc(ToastComponent) {
     }, [onHide, isVisible, isHidden]);
     useEffect(function () {
       if (timeout === null && animationRunTimeout.current !== null) {
-        console.log('!!! clean animationRunTimeout');
         clearTimeout(animationRunTimeout.current);
         animationRunTimeout.current = null;
       }
-      return function () {
-        console.log('!!! clean:return animationRunTimeout');
-        if (animationRunTimeout !== null && animationRunTimeout !== void 0 && animationRunTimeout.current) {
-          clearTimeout(animationRunTimeout.current);
-        }
-      };
     }, [timeout]);
     useEffect(function () {
       if (timeout && isVisible) {
-        console.log('!!! set hideTimeout');
         hideTimeout.current = setTimeout(function () {
           hideToast();
         }, timeout);
       }
-      return function () {
-        console.log('!!! clean hideTimeout');
-        if (hideTimeout !== null && hideTimeout !== void 0 && hideTimeout.current) {
-          clearTimeout(hideTimeout.current);
-          hideTimeout.current = null;
-        }
-      };
     }, [isVisible, timeout]);
     return /*#__PURE__*/React.createElement(ToastContext.Provider, {
       value: {

package/styled-components/es/components/Toast/utils.js

@@ -2,6 +2,7 @@ import { buttonConfig } from '../Button';
 import { component, mergeConfig } from '../../engines';
 export var DEFAULT_FADE = true;
 export var DEFAULT_POSITION = 'bottom';
+export var DEFAULT_CLOSE_ICON_TYPE = 'default';
 export var TIMER_DELAY = 300;
 export var FADE_Z_INDEX = '9900';
 export var TOAST_Z_INDEX = '9901';

package/styled-components/es/components/Toast/variations/_pilled/base.js

@@ -1,3 +1,3 @@
 import { css } from 'styled-components';
 import { classes, tokens } from '../../Toast.tokens';
-export var base = /*#__PURE__*/css(["&.", "{--plasma_private-left-content-margin:var(", ");--plasma_private-close-icon-margin:var(", ");border-radius:var(", ");}"], /*#__PURE__*/String(classes.toastPilled), tokens.leftContentMargin, tokens.closeIconMargin, tokens.pilledBorderRadius);
+export var base = /*#__PURE__*/css(["&.", "{--plasma_private-content-left-margin:var(", ");--plasma_private-close-icon-margin:var(", ");border-radius:var(", ");}"], /*#__PURE__*/String(classes.toastPilled), tokens.contentLeftMargin, tokens.closeIconMargin, tokens.pilledBorderRadius);

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

@@ -9,14 +9,24 @@ export var config = {
   variations: {
     view: {
       "default": /*#__PURE__*/css(["", ":var(--text-primary);", ":var(--surface-solid-card-brightness);", ":var(--text-secondary);", ":var(--text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      positive: /*#__PURE__*/css(["", ":var(--text-primary);", ":var(--surface-solid-card-brightness);", ":var(--text-positive);", ":var(--text-secondary);", ":var(--text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.contentLeftColor, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      negative: /*#__PURE__*/css(["", ":var(--text-primary);", ":var(--surface-solid-card-brightness);", ":var(--text-negative);", ":var(--text-secondary);", ":var(--text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.contentLeftColor, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      /**
+       * @deprecated
+       * светлый и темный фон регулировать через `view` компонента `ViewContainer`
+       */
       dark: /*#__PURE__*/css(["", ":var(--on-dark-text-primary);", ":var(--on-dark-surface-solid-primary-brightness);", ":var(--on-dark-text-secondary);", ":var(--on-dark-text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      /**
+       * @deprecated
+       * светлый и темный фон регулировать через `view` компонента `ViewContainer`
+       */
       light: /*#__PURE__*/css(["", ":var(--on-light-text-primary);", ":var(--on-light-surface-solid-primary-brightness);", ":var(--on-light-text-secondary);", ":var(--on-light-text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover)
     },
     size: {
-      m: /*#__PURE__*/css(["", ":0.75rem;", ":calc(100vw - 5rem);", ":0.5625rem 0.75rem;", ":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.375rem -0.0625rem -0.125rem;", ":-0.0625rem -0.25rem -0.0625rem 0.5rem;"], toastTokens.borderRadius, toastTokens.maxWidth, toastTokens.padding, toastTokens.fontFamily, toastTokens.fontSize, toastTokens.fontStyle, toastTokens.fontWeight, toastTokens.letterSpacing, toastTokens.lineHeight, toastTokens.leftContentMargin, toastTokens.closeIconMargin)
+      m: /*#__PURE__*/css(["", ":0.75rem;", ":calc(100vw - 5rem);", ":0.5625rem 0.75rem;", ":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.375rem -0.0625rem -0.125rem;", ":-0.0625rem -0.25rem -0.0625rem 0.5rem;"], toastTokens.borderRadius, toastTokens.maxWidth, toastTokens.padding, toastTokens.fontFamily, toastTokens.fontSize, toastTokens.fontStyle, toastTokens.fontWeight, toastTokens.letterSpacing, toastTokens.lineHeight, toastTokens.contentLeftMargin, toastTokens.closeIconMargin)
     },
     pilled: {
-      "true": /*#__PURE__*/css(["", ":1.5rem;", ":-0.0625rem 0.375rem -0.0625rem -0.25rem;", ":-0.0625rem -0.25rem -0.0625rem 0.375rem;"], toastTokens.pilledBorderRadius, toastTokens.leftContentMargin, toastTokens.closeIconMargin)
+      "true": /*#__PURE__*/css(["", ":1.5rem;", ":-0.0625rem 0.375rem -0.0625rem -0.25rem;", ":-0.0625rem -0.25rem -0.0625rem 0.375rem;"], toastTokens.pilledBorderRadius, toastTokens.contentLeftMargin, toastTokens.closeIconMargin)
     },
     closeIconType: {
       "default": /*#__PURE__*/css(["", ":1rem;", ":1.5rem;"], toastTokens.closeIconButtonSize, toastTokens.closeIconSize),

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

@@ -4,21 +4,39 @@ import { action } from '@storybook/addon-actions';
 import styled from 'styled-components';
 import { disableProps } from '@salutejs/plasma-sb-utils';
 
-import { toastConfig } from '../../../../components/Toast';
-import { mergeConfig } from '../../../../engines';
-import { WithTheme, argTypesFromConfig } from '../../../_helpers';
+import { WithTheme } from '../../../_helpers';
 import { Button } from '../Button/Button';
 import { PopupProvider } from '../Popup/Popup';
 import { addNotification } from '../../../../../src/components/Notification';
 import { NotificationsProvider } from '../Notification/Notification';
 import { Modal } from '../Modal/Modal';
 
-import { config } from './Toast.config';
 import { Toast, ToastController, ToastProvider, useToast } from './Toast';
 
+const views = ['default', 'positive', 'negative'];
+const closeIconTypes = ['default', 'thin'];
+
 const meta: Meta<typeof ToastController> = {
     title: 'b2c/Overlay/Toast',
     decorators: [WithTheme],
+    argTypes: {
+        view: {
+            options: views,
+            control: {
+                type: 'select',
+            },
+        },
+        closeIconType: {
+            options: closeIconTypes,
+            control: {
+                type: 'select',
+            },
+        },
+        textColor: {
+            control: 'color',
+        },
+        ...disableProps(['size']),
+    },
 };
 
 export default meta;
@@ -49,7 +67,6 @@ const StyledWrapper = styled.div`
 `;
 
 const ToastContainer = styled.div`
-    position: fixed;
     transform: translateX(50%);
 `;
 
@@ -61,6 +78,7 @@ const Container = styled.div`
 export const ToastComponent: StoryComponent = {
     args: {
         text: 'Текст всплывающего уведомления',
+        textColor: undefined,
         view: 'default',
         closeIconType: 'default',
         size: 'm',
@@ -68,14 +86,6 @@ export const ToastComponent: StoryComponent = {
         enableContentLeft: true,
         pilled: false,
     },
-    argTypes: {
-        closeIconType: {
-            options: ['default', 'thin'],
-            control: {
-                type: 'select',
-            },
-        },
-    },
     render: ({ enableContentLeft, ...args }) => (
         <ToastContainer>
             <Toast contentLeft={enableContentLeft && <BellIcon width="1rem" height="1rem" />} {...args} />
@@ -94,6 +104,8 @@ const StoryLiveDemo = ({
     size,
     hasClose,
     enableContentLeft,
+    closeIconType,
+    textColor,
 }: StoryProps) => {
     const { showToast, hideToast } = useToast();
     const contentLeft = enableContentLeft && <BellIcon width="1rem" height="1rem" />;
@@ -114,6 +126,8 @@ const StoryLiveDemo = ({
                         view,
                         size,
                         hasClose,
+                        closeIconType,
+                        textColor,
                         onHide: action('onHide'),
                         onShow: action('onShow'),
                     });
@@ -141,7 +155,6 @@ export const LiveDemo: Story = {
                 type: 'inline-radio',
             },
         },
-        ...argTypesFromConfig(mergeConfig(toastConfig, config)),
         ...disableProps(['role', 'onShow', 'onHide', 'contentLeft']),
     },
     parameters: {
@@ -167,6 +180,8 @@ const StoryComplex = ({
     size,
     hasClose,
     enableContentLeft,
+    closeIconType,
+    textColor,
 }: StoryProps) => {
     const [isModalOpen, setIsModalOpen] = useState(false);
 
@@ -185,6 +200,8 @@ const StoryComplex = ({
             view,
             size,
             hasClose,
+            closeIconType,
+            textColor,
             onHide: action('onHide'),
             onShow: action('onShow'),
         });

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

@@ -9,14 +9,24 @@ export var config = {
   variations: {
     view: {
       "default": /*#__PURE__*/css(["", ":var(--text-primary);", ":var(--surface-solid-card-brightness);", ":var(--text-secondary);", ":var(--text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      positive: /*#__PURE__*/css(["", ":var(--text-primary);", ":var(--surface-solid-card-brightness);", ":var(--text-positive);", ":var(--text-secondary);", ":var(--text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.contentLeftColor, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      negative: /*#__PURE__*/css(["", ":var(--text-primary);", ":var(--surface-solid-card-brightness);", ":var(--text-negative);", ":var(--text-secondary);", ":var(--text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.contentLeftColor, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      /**
+       * @deprecated
+       * светлый и темный фон регулировать через `view` компонента `ViewContainer`
+       */
       dark: /*#__PURE__*/css(["", ":var(--on-dark-text-primary);", ":var(--on-dark-surface-solid-primary-brightness);", ":var(--on-dark-text-secondary);", ":var(--on-dark-text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover),
+      /**
+       * @deprecated
+       * светлый и темный фон регулировать через `view` компонента `ViewContainer`
+       */
       light: /*#__PURE__*/css(["", ":var(--on-light-text-primary);", ":var(--on-light-surface-solid-primary-brightness);", ":var(--on-light-text-secondary);", ":var(--on-light-text-secondary);"], toastTokens.color, toastTokens.background, toastTokens.closeIconColor, toastTokens.closeIconColorOnHover)
     },
     size: {
-      m: /*#__PURE__*/css(["", ":0.75rem;", ":calc(100vw - 5rem);", ":0.5625rem 0.75rem;", ":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.375rem -0.0625rem -0.125rem;", ":-0.0625rem -0.25rem -0.0625rem 0.5rem;"], toastTokens.borderRadius, toastTokens.maxWidth, toastTokens.padding, toastTokens.fontFamily, toastTokens.fontSize, toastTokens.fontStyle, toastTokens.fontWeight, toastTokens.letterSpacing, toastTokens.lineHeight, toastTokens.leftContentMargin, toastTokens.closeIconMargin)
+      m: /*#__PURE__*/css(["", ":0.75rem;", ":calc(100vw - 5rem);", ":0.5625rem 0.75rem;", ":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.375rem -0.0625rem -0.125rem;", ":-0.0625rem -0.25rem -0.0625rem 0.5rem;"], toastTokens.borderRadius, toastTokens.maxWidth, toastTokens.padding, toastTokens.fontFamily, toastTokens.fontSize, toastTokens.fontStyle, toastTokens.fontWeight, toastTokens.letterSpacing, toastTokens.lineHeight, toastTokens.contentLeftMargin, toastTokens.closeIconMargin)
     },
     pilled: {
-      "true": /*#__PURE__*/css(["", ":1.5rem;", ":-0.0625rem 0.375rem -0.0625rem -0.25rem;", ":-0.0625rem -0.25rem -0.0625rem 0.375rem;"], toastTokens.pilledBorderRadius, toastTokens.leftContentMargin, toastTokens.closeIconMargin)
+      "true": /*#__PURE__*/css(["", ":1.5rem;", ":-0.0625rem 0.375rem -0.0625rem -0.25rem;", ":-0.0625rem -0.25rem -0.0625rem 0.375rem;"], toastTokens.pilledBorderRadius, toastTokens.contentLeftMargin, toastTokens.closeIconMargin)
     },
     closeIconType: {
       "default": /*#__PURE__*/css(["", ":1rem;", ":1.5rem;"], toastTokens.closeIconButtonSize, toastTokens.closeIconSize),

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

@@ -4,21 +4,39 @@ import { action } from '@storybook/addon-actions';
 import styled from 'styled-components';
 import { disableProps } from '@salutejs/plasma-sb-utils';
 
-import { toastConfig } from '../../../../components/Toast';
-import { mergeConfig } from '../../../../engines';
-import { WithTheme, argTypesFromConfig } from '../../../_helpers';
+import { WithTheme } from '../../../_helpers';
 import { Button } from '../Button/Button';
 import { PopupProvider } from '../Popup/Popup';
 import { addNotification } from '../../../../../src/components/Notification';
 import { NotificationsProvider } from '../Notification/Notification';
 import { Modal } from '../Modal/Modal';
 
-import { config } from './Toast.config';
 import { Toast, ToastController, ToastProvider, useToast } from './Toast';
 
+const views = ['default', 'positive', 'negative'];
+const closeIconTypes = ['default', 'thin'];
+
 const meta: Meta<typeof ToastController> = {
     title: 'web/Overlay/Toast',
     decorators: [WithTheme],
+    argTypes: {
+        view: {
+            options: views,
+            control: {
+                type: 'select',
+            },
+        },
+        closeIconType: {
+            options: closeIconTypes,
+            control: {
+                type: 'select',
+            },
+        },
+        textColor: {
+            control: 'color',
+        },
+        ...disableProps(['size']),
+    },
 };
 
 export default meta;
@@ -49,7 +67,6 @@ const StyledWrapper = styled.div`
 `;
 
 const ToastContainer = styled.div`
-    position: fixed;
     transform: translateX(50%);
 `;
 
@@ -61,6 +78,7 @@ const Container = styled.div`
 export const ToastComponent: StoryComponent = {
     args: {
         text: 'Текст всплывающего уведомления',
+        textColor: undefined,
         view: 'default',
         closeIconType: 'default',
         size: 'm',
@@ -68,14 +86,6 @@ export const ToastComponent: StoryComponent = {
         enableContentLeft: true,
         pilled: false,
     },
-    argTypes: {
-        closeIconType: {
-            options: ['default', 'thin'],
-            control: {
-                type: 'select',
-            },
-        },
-    },
     render: ({ enableContentLeft, ...args }) => (
         <ToastContainer>
             <Toast contentLeft={enableContentLeft && <BellIcon width="1rem" height="1rem" />} {...args} />
@@ -94,6 +104,8 @@ const StoryLiveDemo = ({
     size,
     hasClose,
     enableContentLeft,
+    closeIconType,
+    textColor,
 }: StoryProps) => {
     const { showToast, hideToast } = useToast();
     const contentLeft = enableContentLeft && <BellIcon width="1rem" height="1rem" />;
@@ -114,6 +126,8 @@ const StoryLiveDemo = ({
                         view,
                         size,
                         hasClose,
+                        closeIconType,
+                        textColor,
                         onHide: action('onHide'),
                         onShow: action('onShow'),
                     });
@@ -141,7 +155,6 @@ export const LiveDemo: Story = {
                 type: 'inline-radio',
             },
         },
-        ...argTypesFromConfig(mergeConfig(toastConfig, config)),
         ...disableProps(['role', 'onShow', 'onHide', 'contentLeft']),
     },
     parameters: {
@@ -167,6 +180,8 @@ const StoryComplex = ({
     size,
     hasClose,
     enableContentLeft,
+    closeIconType,
+    textColor,
 }: StoryProps) => {
     const [isModalOpen, setIsModalOpen] = useState(false);
 
@@ -185,6 +200,8 @@ const StoryComplex = ({
             view,
             size,
             hasClose,
+            closeIconType,
+            textColor,
             onHide: action('onHide'),
             onShow: action('onShow'),
         });

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

@@ -50,5 +50,7 @@ export declare const CloseIconWrapper: import("@linaria/react").StyledMeta & imp
 } & import("react").RefAttributes<HTMLButtonElement>))>;
 export declare const StyledOverlay: import("@linaria/react").StyledMeta & import("react").FC<import("../Overlay").OverlayProps>;
 export declare const StyledContentLeft: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & Record<never, unknown>>;
-export declare const StyledContent: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & Record<never, unknown>>;
+export declare const StyledContent: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & {
+    textColor?: string | undefined;
+}>;
 //# sourceMappingURL=Toast.styles.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Toast.styles.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/Toast.styles.ts"],"names":[],"mappings":";AASA,eAAO,MAAM,IAAI,0CAUhB,CAAC;AAEF,eAAO,MAAM,UAAU;cAA0B,MAAM;eAAa,OAAO;;EAmD1E,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAU5B,CAAC;AAEF,eAAO,MAAM,aAAa,6FA4BzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qKAI7B,CAAC;AAEF,eAAO,MAAM,aAAa,qKAAe,CAAC"}
+{"version":3,"file":"Toast.styles.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/Toast.styles.ts"],"names":[],"mappings":";AASA,eAAO,MAAM,IAAI,0CAUhB,CAAC;AAEF,eAAO,MAAM,UAAU;cAA0B,MAAM;eAAa,OAAO;;EAmD1E,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAU5B,CAAC;AAEF,eAAO,MAAM,aAAa,6FA4BzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qKAK7B,CAAC;AAEF,eAAO,MAAM,aAAa;;EAEzB,CAAC"}

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

@@ -19,7 +19,8 @@ export declare const tokens: {
     letterSpacing: string;
     lineHeight: string;
     pilledBorderRadius: string;
-    leftContentMargin: string;
+    contentLeftMargin: string;
+    contentLeftColor: string;
     closeIconMargin: string;
     closeIconColor: string;
     closeIconColorOnHover: string;

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

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

package/types/components/Toast/Toast.types.d.ts

@@ -56,6 +56,10 @@ export declare type ToastControllerProps = {
      * Вид закрывающей иконки в Notification.
      */
     closeIconType?: 'default' | 'thin';
+    /**
+     * Цвет текста (по умолчанию берётся цвет из view)
+     */
+    textColor?: string;
 };
 export declare type CustomToastProps = {
     /**
@@ -96,6 +100,10 @@ export declare type CustomToastProps = {
      * Вид закрывающей иконки в Notification.
      */
     closeIconType?: 'default' | 'thin';
+    /**
+     * Цвет текста (по умолчанию берётся цвет из view)
+     */
+    textColor?: string;
     /**
      * Колбек при нажатии на кнопку закрытия.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"Toast.types.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/Toast.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvD,oBAAY,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AACnD,oBAAY,aAAa,GAAG,KAAK,GAAG,QAAQ,CAAC;AAE7C,oBAAY,oBAAoB,GAAG;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CACtC,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC3B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;CACnC,CAAC;AAEF,oBAAY,UAAU,GAAG,cAAc,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC"}
+{"version":3,"file":"Toast.types.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/Toast.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvD,oBAAY,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AACnD,oBAAY,aAAa,GAAG,KAAK,GAAG,QAAQ,CAAC;AAE7C,oBAAY,oBAAoB,GAAG;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC3B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;CACnC,CAAC;AAEF,oBAAY,UAAU,GAAG,cAAc,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC"}

package/types/components/Toast/ToastController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToastController.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/ToastController.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKjE,eAAO,MAAM,kBAAkB,iEACK,oBAAoB,uBAwCnD,CAAC"}
+{"version":3,"file":"ToastController.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/ToastController.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKjE,eAAO,MAAM,kBAAkB,iEACK,oBAAoB,uBAmDnD,CAAC"}

package/types/components/Toast/ToastProvider/ToastProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToastProvider.d.ts","sourceRoot":"","sources":["../../../../src/components/Toast/ToastProvider/ToastProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8E,MAAM,OAAO,CAAC;AACnG,OAAO,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,KAAK,EAA0C,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGzF,OAAO,KAAK,EAAE,SAAS,EAAyC,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEhH,eAAO,MAAM,YAAY,wCAA+C,CAAC;AAEzE,eAAO,MAAM,aAAa,wBAMzB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;CAGpB,CAAC;AA4BF,eAAO,MAAM,gBAAgB;cACwB,SAAS;iBAsHzD,CAAC"}
+{"version":3,"file":"ToastProvider.d.ts","sourceRoot":"","sources":["../../../../src/components/Toast/ToastProvider/ToastProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8E,MAAM,OAAO,CAAC;AACnG,OAAO,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,KAAK,EAA0C,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGzF,OAAO,KAAK,EAAE,SAAS,EAAyC,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEhH,eAAO,MAAM,YAAY,wCAA+C,CAAC;AAEzE,eAAO,MAAM,aAAa,wBAMzB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;CAGpB,CAAC;AA4BF,eAAO,MAAM,gBAAgB;cACwB,SAAS;iBAuGzD,CAAC"}

package/types/components/Toast/utils.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 export declare const DEFAULT_FADE = true;
 export declare const DEFAULT_POSITION = "bottom";
+export declare const DEFAULT_CLOSE_ICON_TYPE = "default";
 export declare const TIMER_DELAY = 300;
 export declare const FADE_Z_INDEX = "9900";
 export declare const TOAST_Z_INDEX = "9901";

package/types/components/Toast/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/utils.ts"],"names":[],"mappings":";AAGA,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,aAAa,SAAS,CAAC;AAEpC,eAAO,MAAM,SAAS;;;CAGrB,CAAC;AAGF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAgC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/Toast/utils.ts"],"names":[],"mappings":";AAGA,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,aAAa,SAAS,CAAC;AAEpC,eAAO,MAAM,SAAS;;;CAGrB,CAAC;AAGF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAgC,CAAC"}