@salutejs/plasma-new-hope 0.253.0-canary.1736.13068364841.0 → 0.254.0-canary.1720.13073153224.0

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

@@ -17,7 +17,7 @@ var _base2 = /*#__PURE__*/require("./variations/_view/base");
 var _base3 = /*#__PURE__*/require("./variations/_disabled/base");
 var _base4 = /*#__PURE__*/require("./variations/_readonly/base");
 var _SingleDate = /*#__PURE__*/require("./SingleDate.styles");
-var _excluded = ["className", "opened", "label", "labelPlacement", "keepPlaceholder", "required", "requiredPlacement", "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", "value", "label", "labelPlacement", "keepPlaceholder", "required", "requiredPlacement", "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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -34,6 +34,7 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
     var className = _ref.className,
       _ref$opened = _ref.opened,
       opened = _ref$opened === void 0 ? false : _ref$opened,
+      value = _ref.value,
       label = _ref.label,
       _ref$labelPlacement = _ref.labelPlacement,
       labelPlacement = _ref$labelPlacement === void 0 ? 'outer' : _ref$labelPlacement,
@@ -102,12 +103,12 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
       _useState2 = _slicedToArray(_useState, 2),
       isInnerOpen = _useState2[0],
       setIsInnerOpen = _useState2[1];
-    var _useState3 = (0, _react.useState)((0, _dateHelper.formatCalendarValue)(defaultDate, format, lang)),
+    var _useState3 = (0, _react.useState)((0, _dateHelper.formatCalendarValue)(value || defaultDate, format, lang)),
       _useState4 = _slicedToArray(_useState3, 2),
       calendarValue = _useState4[0],
       setCalendarValue = _useState4[1];
     var _useState5 = (0, _react.useState)((0, _dateHelper.formatInputValue)({
-        value: defaultDate,
+        value: value || defaultDate,
         format: format,
         lang: lang
       })),
@@ -137,7 +138,8 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
       datePickerErrorClass = _useDatePicker.datePickerErrorClass,
       datePickerSuccessClass = _useDatePicker.datePickerSuccessClass,
       handleChangeValue = _useDatePicker.handleChangeValue,
-      handleCommitDate = _useDatePicker.handleCommitDate;
+      handleCommitDate = _useDatePicker.handleCommitDate,
+      updateExternalDate = _useDatePicker.updateExternalDate;
     var handleToggle = function handleToggle(opened, event) {
       if (disabled || readOnly) {
         return;
@@ -189,22 +191,10 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
         return prevOpen !== opened && opened;
       });
     }, [opened]);
-    (0, _react.useEffect)(function () {
-      setCalendarValue((0, _dateHelper.formatCalendarValue)(defaultDate, format, lang));
-      setInputValue((0, _dateHelper.formatInputValue)({
-        value: defaultDate,
-        format: format,
-        lang: lang
-      }));
-    }, [defaultDate]);
-    (0, _react.useEffect)(function () {
-      setCalendarValue((0, _dateHelper.formatCalendarValue)(defaultDate, format, lang));
-      setInputValue((0, _dateHelper.formatInputValue)({
-        value: defaultDate,
-        format: format,
-        lang: lang
-      }));
-    }, [format, lang]);
+    (0, _react.useLayoutEffect)(function () {
+      var externalDate = value || defaultDate;
+      updateExternalDate(externalDate, setInputValue, setCalendarValue);
+    }, [value, defaultDate, format, lang]);
     return /*#__PURE__*/_react["default"].createElement(Root, _extends({
       view: view,
       size: size,

package/styled-components/cjs/components/DatePicker/hooks/useDatePicker.js

@@ -122,10 +122,32 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
       }
     });
   };
+  var updateExternalDate = function updateExternalDate(externalDate, inputSetter, calendarSetter) {
+    inputSetter((0, _dateHelper.formatInputValue)({
+      value: externalDate,
+      format: format,
+      lang: lang
+    }));
+    if (!format) {
+      calendarSetter((0, _dateHelper.formatCalendarValue)(externalDate, undefined, lang));
+      return;
+    }
+    if (!externalDate) {
+      calendarSetter(undefined);
+      return;
+    }
+    var _getDateFromFormat2 = (0, _dateHelper.getDateFromFormat)(externalDate, undefined, lang),
+      newDate = _getDateFromFormat2.value,
+      isError = _getDateFromFormat2.isError;
+    if (!isError) {
+      calendarSetter((0, _dateHelper.formatCalendarValue)(newDate, format, lang));
+    }
+  };
   return {
     datePickerErrorClass: datePickerErrorClass,
     datePickerSuccessClass: datePickerSuccessClass,
     handleChangeValue: handleChangeValue,
-    handleCommitDate: handleCommitDate
+    handleCommitDate: handleCommitDate,
+    updateExternalDate: updateExternalDate
   };
 };

package/styled-components/cjs/components/Toast/Toast.js

@@ -15,7 +15,7 @@ var _base2 = /*#__PURE__*/require("./variations/_size/base");
 var _base3 = /*#__PURE__*/require("./variations/_pilled/base");
 var _base4 = /*#__PURE__*/require("./variations/_closeIconType/base");
 var _Toast2 = /*#__PURE__*/require("./Toast.styles");
-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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -42,6 +42,7 @@ var toastRoot = exports.toastRoot = function toastRoot(Root) {
       style = props.style,
       closeIconType = props.closeIconType,
       onCloseButtonClick = props.onCloseButtonClick,
+      textColor = props.textColor,
       rest = _objectWithoutProperties(props, _excluded);
     var pilledClass = pilled ? _Toast.classes.toastPilled : undefined;
     var fixedWidth = !Number.isNaN(Number(width)) ? "".concat(width, "%") : width;
@@ -65,7 +66,9 @@ var toastRoot = exports.toastRoot = function toastRoot(Root) {
       role: role,
       "aria-live": ariaLive,
       "aria-atomic": ariaAtomic
-    }, rest), contentLeft && /*#__PURE__*/_react["default"].createElement(_Toast2.StyledContentLeft, null, contentLeft), /*#__PURE__*/_react["default"].createElement(_Toast2.StyledContent, null, text), hasClose && /*#__PURE__*/_react["default"].createElement(_Toast2.CloseIconWrapper, {
+    }, rest), contentLeft && /*#__PURE__*/_react["default"].createElement(_Toast2.StyledContentLeft, null, contentLeft), /*#__PURE__*/_react["default"].createElement(_Toast2.StyledContent, {
+      textColor: textColor
+    }, text), hasClose && /*#__PURE__*/_react["default"].createElement(_Toast2.CloseIconWrapper, {
       view: "clear",
       size: "s",
       onClick: onCloseButtonClick,

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

@@ -42,7 +42,10 @@ var StyledOverlay = exports.StyledOverlay = /*#__PURE__*/(0, _styledComponents["
 })(["&&.", "{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(_Toast.classes.toastFadeShowed), /*#__PURE__*/String(_Toast.classes.toastFadeHidden));
 var StyledContentLeft = exports.StyledContentLeft = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-19l9ekl-3"
-})(["display:flex;--plasma_private-left-content-margin:var(", ");margin:var(--plasma_private-left-content-margin);"], _Toast.tokens.leftContentMargin);
+})(["display:flex;--plasma_private-content-left-margin:var(", ");margin:var(--plasma_private-content-left-margin);color:var(", ");"], _Toast.tokens.contentLeftMargin, _Toast.tokens.contentLeftColor);
 var StyledContent = exports.StyledContent = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-19l9ekl-4"
-})([""]);
+})(["color:", ";"], function (_ref5) {
+  var textColor = _ref5.textColor;
+  return textColor || 'currentColor';
+});

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

@@ -25,7 +25,8 @@ var tokens = exports.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/cjs/components/Toast/ToastProvider/ToastProvider.js

@@ -126,6 +126,9 @@ var ToastProviderHoc = exports.ToastProviderHoc = function ToastProviderHoc(Toas
         size = _getShowToastCallSign.size,
         view = _getShowToastCallSign.view,
         width = _getShowToastCallSign.width,
+        _getShowToastCallSign4 = _getShowToastCallSign.closeIconType,
+        closeIconType = _getShowToastCallSign4 === void 0 ? _utils.DEFAULT_CLOSE_ICON_TYPE : _getShowToastCallSign4,
+        textColor = _getShowToastCallSign.textColor,
         onHide = _getShowToastCallSign.onHide,
         onShow = _getShowToastCallSign.onShow;
       setToastProps({
@@ -139,7 +142,9 @@ var ToastProviderHoc = exports.ToastProviderHoc = function ToastProviderHoc(Toas
         pilled: pilled,
         hasClose: hasClose,
         size: size,
-        view: view
+        view: view,
+        closeIconType: closeIconType,
+        textColor: textColor
       });
       setToastInfo({
         timeout: timeout,

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

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.gradients = exports.TOAST_Z_INDEX = exports.TIMER_DELAY = exports.FADE_Z_INDEX = exports.DEFAULT_POSITION = exports.DEFAULT_FADE = exports.Button = void 0;
+exports.gradients = exports.TOAST_Z_INDEX = exports.TIMER_DELAY = exports.FADE_Z_INDEX = exports.DEFAULT_POSITION = exports.DEFAULT_FADE = exports.DEFAULT_CLOSE_ICON_TYPE = exports.Button = void 0;
 var _Button = /*#__PURE__*/require("../Button");
 var _engines = /*#__PURE__*/require("../../engines");
 var DEFAULT_FADE = exports.DEFAULT_FADE = true;
 var DEFAULT_POSITION = exports.DEFAULT_POSITION = 'bottom';
+var DEFAULT_CLOSE_ICON_TYPE = exports.DEFAULT_CLOSE_ICON_TYPE = 'default';
 var TIMER_DELAY = exports.TIMER_DELAY = 300;
 var FADE_Z_INDEX = exports.FADE_Z_INDEX = '9900';
 var TOAST_Z_INDEX = exports.TOAST_Z_INDEX = '9901';

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

@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", {
 exports.base = void 0;
 var _styledComponents = /*#__PURE__*/require("styled-components");
 var _Toast = /*#__PURE__*/require("../../Toast.tokens");
-var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)(["&.", "{--plasma_private-left-content-margin:var(", ");--plasma_private-close-icon-margin:var(", ");border-radius:var(", ");}"], /*#__PURE__*/String(_Toast.classes.toastPilled), _Toast.tokens.leftContentMargin, _Toast.tokens.closeIconMargin, _Toast.tokens.pilledBorderRadius);
+var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)(["&.", "{--plasma_private-content-left-margin:var(", ");--plasma_private-close-icon-margin:var(", ");border-radius:var(", ");}"], /*#__PURE__*/String(_Toast.classes.toastPilled), _Toast.tokens.contentLeftMargin, _Toast.tokens.closeIconMargin, _Toast.tokens.pilledBorderRadius);

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

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

package/styled-components/cjs/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/cjs/examples/plasma_web/components/Toast/Toast.config.js

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

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

@@ -3,7 +3,6 @@ export var classes = {
   fixedStretching: 'accordion-stretching-fixed',
   accordionRoot: 'accordion-root',
   accordionItem: 'accordion-item',
-  accordionItemOpened: 'accordion-item-opened',
   clearAccordionItem: 'clear-accordion-item',
   accordionItemShowBody: 'accordion-item-show-body',
   accordionPlusAnimationElement: 'accordion-plus-animation-element',
@@ -27,7 +26,6 @@ export var tokens = {
   accordionItemIconColor: '--plasma-accordion-item-color-icon',
   accordionItemIconSize: '--plasma-accordion-item-icon-szie',
   accordionItemTitleColor: '--plasma-accordion-item-title-color',
-  accordionItemOpenedTitleColor: '--plasma-accordion-item-title-opened-color',
   accordionItemTitleFontFamily: '--plasma-accordion-item-title-font-family',
   accordionItemTitleFontSize: '--plasma-accordion-item-title-font-size',
   accordionItemTitleFontStyle: '--plasma-accordion-item-title-font-style',

package/styled-components/es/components/Accordion/ui/AccordionItem/AccordionItem.js

@@ -74,7 +74,6 @@ export var AccordionItem = /*#__PURE__*/forwardRef(function (_ref, outerRef) {
     }));
   };
   var accordionBorderRadius = convertRoundnessMatrix(pin, "var(".concat(tokens.accordionItemBorderRadius, ")"), '1.5rem');
-  var openedClass = (opened !== null && opened !== void 0 ? opened : value) ? classes.accordionItemOpened : '';
   var disabledClass = disabled ? classes.accordionDisabled : '';
   var leftContent = contentLeft !== null && contentLeft !== void 0 ? contentLeft : type === 'arrow' ? /*#__PURE__*/React.createElement(StyledArrow, {
     size: "xs",
@@ -85,7 +84,7 @@ export var AccordionItem = /*#__PURE__*/forwardRef(function (_ref, outerRef) {
   var rightContent = contentRight !== null && contentRight !== void 0 ? contentRight : type === 'sign' ? /*#__PURE__*/React.createElement(StyledAnimationPlus, null) : undefined;
   var rightContentRotate = type === 'sign' && (opened !== null && opened !== void 0 ? opened : value) ? classes.accordionItemShowBody : undefined;
   return /*#__PURE__*/React.createElement(StyledAccordionItem, {
-    className: cx(classes.accordionItem, className, openedClass, disabledClass),
+    className: cx(classes.accordionItem, className, disabledClass),
     key: key,
     ref: outerRef,
     style: _objectSpread({