@salutejs/plasma-new-hope 0.156.0-canary.1451.11071985286.0 → 0.156.0-canary.1452.11101408453.0

package/styled-components/es/components/Slider/components/SliderBase/SliderBase.js

@@ -1,5 +1,7 @@
 import React, { useRef, useEffect } from 'react';
 import { useIsomorphicLayoutEffect } from '../../../../hooks';
+import { classes } from '../../Slider.tokens';
+import { cx } from '../../../../utils';
 import { Fill, Rail, RailWrap, Slider } from './SliderBase.styles';
 export var SliderBase = function SliderBase(_ref) {
   var max = _ref.max,
@@ -13,6 +15,7 @@ export var SliderBase = function SliderBase(_ref) {
     labelPlacement = _ref.labelPlacement,
     rangeValuesPlacement = _ref.rangeValuesPlacement,
     onChange = _ref.onChange,
+    orientation = _ref.orientation,
     _ref$settings = _ref.settings,
     settings = _ref$settings === void 0 ? {} : _ref$settings;
   var _settings$indent = settings.indent,
@@ -21,34 +24,41 @@ export var SliderBase = function SliderBase(_ref) {
     fontSizeMultiplier = _settings$fontSizeMul === void 0 ? 16 : _settings$fontSizeMul;
   var ref = useRef(null);
   var gap = indent * fontSizeMultiplier * 2;
+  var isVertical = orientation === 'vertical';
   useEffect(function () {
     var resizeHandler = function resizeHandler() {
       if (ref.current) {
-        var railSize = ref.current.offsetWidth - gap;
+        var railSize = isVertical ? ref.current.offsetHeight - gap : ref.current.offsetWidth - gap;
         var totalSteps = max - min;
         setStepSize(railSize / totalSteps);
       }
     };
     resizeHandler();
-  }, [labelPlacement, rangeValuesPlacement]);
+  }, [labelPlacement, rangeValuesPlacement, gap, isVertical]);
   var onHandleChange = function onHandleChange(e) {
     if (!onChange || disabled) {
       return;
     }
     var _e$currentTarget$getB = e.currentTarget.getBoundingClientRect(),
       x = _e$currentTarget$getB.x,
-      width = _e$currentTarget$getB.width;
-    var lastX = e.clientX - x;
-    var position = min + lastX / (width - gap) * (max - min);
+      width = _e$currentTarget$getB.width,
+      y = _e$currentTarget$getB.y,
+      height = _e$currentTarget$getB.height;
+    var lastPos = isVertical ? e.clientY - y : e.clientX - x;
+    var sliderWidth = isVertical ? height : width;
+    var position = min + lastPos / (sliderWidth - gap) * (max - min);
     var result = Math.max(min, Math.min(max, position));
-    onChange(result, {
-      lastX: lastX
-    });
+    var data = isVertical ? {
+      lastY: lastPos
+    } : {
+      lastX: lastPos
+    };
+    onChange(result, data);
   };
   useIsomorphicLayoutEffect(function () {
     var resizeHandler = function resizeHandler() {
       if (ref.current) {
-        var railSize = ref.current.offsetWidth - gap;
+        var railSize = isVertical ? ref.current.offsetHeight - gap : ref.current.offsetWidth - gap;
         var totalSteps = max - min;
         setStepSize(railSize / totalSteps);
       }
@@ -58,13 +68,18 @@ export var SliderBase = function SliderBase(_ref) {
     return function () {
       return window.removeEventListener('resize', resizeHandler);
     };
-  }, [min, max, setStepSize, gap, labelPlacement, rangeValuesPlacement]);
-  var fillStyle = {
+  }, [min, max, setStepSize, gap, labelPlacement, rangeValuesPlacement, isVertical]);
+  var fillStyle = isVertical ? {
+    top: "".concat(railFillXPosition, "px"),
+    height: "".concat(railFillWidth, "px"),
+    width: '100%'
+  } : {
     left: "".concat(railFillXPosition, "px"),
     width: "".concat(railFillWidth, "px")
   };
   return /*#__PURE__*/React.createElement(Slider, {
-    ref: ref
+    ref: ref,
+    className: cx(orientation === 'vertical' && classes.verticalOrientation)
   }, /*#__PURE__*/React.createElement(RailWrap, {
     "aria-hidden": "true",
     onMouseDown: onHandleChange

package/styled-components/es/components/Slider/components/SliderBase/SliderBase.styles.js

@@ -1,14 +1,14 @@
 import styled from 'styled-components';
-import { tokens } from '../../Slider.tokens';
-export var Slider = /*#__PURE__*/styled.div.withConfig({
+import { classes, tokens } from '../../Slider.tokens';
+export var Rail = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-ik0bjb-0"
-})(["flex:1;position:relative;user-select:none;height:var(", ");"], tokens.height);
-export var RailWrap = /*#__PURE__*/styled.div.withConfig({
+})(["position:relative;top:50%;height:var(", ");border-radius:var(", ");background-color:var(", ");overflow:hidden;transform:translateY(-50%);"], tokens.railThickness, tokens.railBorderRadius, tokens.railBackgroundColor);
+export var Slider = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-ik0bjb-1"
-})(["height:100%;"]);
-export var Rail = /*#__PURE__*/styled.div.withConfig({
+})(["flex:1;position:relative;user-select:none;height:var(", ");&.", "{width:var(", ");height:auto;", "{top:0;left:50%;transform:translateX(-50%);width:var(", ");height:100%;}}"], tokens.size, classes.verticalOrientation, tokens.size, Rail, tokens.railThickness);
+export var RailWrap = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-ik0bjb-2"
-})(["position:relative;top:50%;height:var(", ");border-radius:var(", ");background-color:var(", ");overflow:hidden;transform:translateY(-50%);"], tokens.railHeight, tokens.railBorderRadius, tokens.railBackgroundColor);
+})(["height:100%;"]);
 export var Fill = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-ik0bjb-3"
 })(["position:absolute;height:100%;top:0;left:0;background:var(", ");width:0;"], tokens.fillColor);

package/styled-components/es/components/Slider/ui/Handler/Handler.js

@@ -1,5 +1,9 @@
-var _excluded = ["stepSize", "onChangeCommitted", "onChange", "xPosition", "min", "max", "bounds", "zIndex", "disabled", "side", "showCurrentValue", "startOffset", "endOffset", "value"];
+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 = ["size", "orientation", "stepSize", "onChangeCommitted", "onChange", "position", "min", "max", "bounds", "zIndex", "disabled", "side", "showCurrentValue", "startOffset", "endOffset", "value", "valuePlacement"];
 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+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 _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); }
@@ -10,8 +14,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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, { useRef, forwardRef } from 'react';
 import Draggable from 'react-draggable';
+import { cx } from '../../../../utils';
 import { getSliderThumbValue, getOffsets } from '../../utils';
 import { Thumb } from '../Thumb/Thumb';
+import { classes } from '../../Slider.tokens';
 import { HandlerStyled, StyledValue } from './Handler.styles';
 
 // TODO: PLASMA-1707
@@ -27,11 +33,13 @@ var KeyboardSupport = {
   ArrowDown: 40
 };
 export var Handler = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var stepSize = _ref.stepSize,
+  var size = _ref.size,
+    orientation = _ref.orientation,
+    stepSize = _ref.stepSize,
     onChangeCommitted = _ref.onChangeCommitted,
     onChange = _ref.onChange,
-    _ref$xPosition = _ref.xPosition,
-    xPosition = _ref$xPosition === void 0 ? 0 : _ref$xPosition,
+    _ref$position = _ref.position,
+    position = _ref$position === void 0 ? 0 : _ref$position,
     min = _ref.min,
     max = _ref.max,
     _ref$bounds = _ref.bounds,
@@ -46,36 +54,35 @@ export var Handler = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _ref$endOffset = _ref.endOffset,
     endOffset = _ref$endOffset === void 0 ? 0 : _ref$endOffset,
     value = _ref.value,
+    valuePlacement = _ref.valuePlacement,
     rest = _objectWithoutProperties(_ref, _excluded);
+  var isVertical = orientation === 'vertical';
   var lastOnChangeValue = useRef();
-  var _getOffsets = getOffsets(ref, side),
+  var _getOffsets = getOffsets(ref, side, isVertical),
     _getOffsets2 = _slicedToArray(_getOffsets, 2),
-    offsetLeft = _getOffsets2[0],
-    offsetRight = _getOffsets2[1];
+    startClientOffset = _getOffsets2[0],
+    endClientOffset = _getOffsets2[1];
   var _bounds = _slicedToArray(bounds, 2),
-    leftValueBound = _bounds[0],
-    rightValueBound = _bounds[1];
-  var leftPositionBound = leftValueBound ? (leftValueBound - min) * stepSize : null;
-  var rightPositionBound = rightValueBound ? (rightValueBound - min) * stepSize : null;
-  var position = typeof xPosition === 'number' ? {
-    x: xPosition,
-    y: 0
+    startValueBound = _bounds[0],
+    endValueBound = _bounds[1];
+  var startPositionBound = startValueBound ? (startValueBound - min) * stepSize : null;
+  var endPositionBound = endValueBound ? (endValueBound - min) * stepSize : null;
+  var dragPosition = typeof position === 'number' ? {
+    x: isVertical ? 0 : position,
+    y: isVertical ? position : 0
   } : undefined;
   var tabIndex = disabled ? -1 : 0;
-  var computedBounds = {
-    left: (leftPositionBound !== null && leftPositionBound !== void 0 ? leftPositionBound : 0) - (offsetLeft ? stepSize : 0),
-    right: (rightPositionBound !== null && rightPositionBound !== void 0 ? rightPositionBound : stepSize * (max - min)) - (offsetRight ? stepSize : 0)
-  };
-  var showCurrentValueCondition = showCurrentValue && (xPosition >= startOffset && xPosition <= max * stepSize - endOffset || xPosition === 0 && value !== 0);
+  var computedBounds = _defineProperty(_defineProperty({}, isVertical ? 'top' : 'left', (startPositionBound !== null && startPositionBound !== void 0 ? startPositionBound : 0) - (startClientOffset ? stepSize : 0)), isVertical ? 'bottom' : 'right', (endPositionBound !== null && endPositionBound !== void 0 ? endPositionBound : stepSize * (max - min)) - (endClientOffset ? stepSize : 0));
+  var showCurrentValueCondition = showCurrentValue && (position >= startOffset && position <= max * stepSize - endOffset || position === 0 && value !== 0);
   var onDrag = function onDrag(_, data) {
-    var newValue = getSliderThumbValue(data.x, stepSize, min, max);
+    var newValue = getSliderThumbValue(isVertical ? data.y : data.x, stepSize, min, max);
     if (lastOnChangeValue.current !== newValue) {
       onChange === null || onChange === void 0 || onChange(newValue, data);
       lastOnChangeValue.current = newValue;
     }
   };
   var onStop = function onStop(_, data) {
-    var newValue = getSliderThumbValue(data.x, stepSize, min, max);
+    var newValue = getSliderThumbValue(isVertical ? data.y : data.x, stepSize, min, max);
     onChangeCommitted && onChangeCommitted(newValue, data);
   };
   var onKeyPress = function onKeyPress(event) {
@@ -97,7 +104,7 @@ export var Handler = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var data = {
       x: 0,
       deltaX: stepSize,
-      lastX: xPosition,
+      lastX: position,
       y: 0,
       deltaY: 0,
       lastY: 0,
@@ -106,19 +113,19 @@ export var Handler = /*#__PURE__*/forwardRef(function (_ref, ref) {
     switch (keyCode) {
       case ArrowUp:
       case ArrowRight:
-        data.x = xPosition + stepSize;
+        data.x = position + stepSize;
         break;
       case ArrowDown:
       case ArrowLeft:
-        data.x = xPosition - stepSize;
+        data.x = position - stepSize;
         data.deltaX = -stepSize;
         break;
       case PageUp:
-        data.x = xPosition + computedMultipleSteps;
+        data.x = position + computedMultipleSteps;
         data.deltaX = computedMultipleSteps;
         break;
       case PageDown:
-        data.x = xPosition - computedMultipleSteps;
+        data.x = position - computedMultipleSteps;
         data.deltaX = -computedMultipleSteps;
         break;
       case End:
@@ -144,24 +151,27 @@ export var Handler = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onChangeCommitted && onChangeCommitted(computedValue, data);
   };
   return /*#__PURE__*/React.createElement(Draggable, {
-    axis: "x",
+    axis: isVertical ? 'y' : 'x',
     bounds: computedBounds,
-    grid: [stepSize, 1],
+    grid: isVertical ? [1, stepSize] : [stepSize, 1],
     onStop: onStop,
     onDrag: onDrag,
-    position: position,
+    position: dragPosition,
     disabled: disabled
   }, /*#__PURE__*/React.createElement(HandlerStyled, {
     ref: ref,
     style: {
       zIndex: zIndex
     },
+    className: cx(isVertical && classes.verticalOrientation, valuePlacement === 'left' && classes.valuePlacementLeft),
+    isLarge: size === 'l',
     onKeyDown: onKeyPress
   }, /*#__PURE__*/React.createElement(Thumb, _extends({
     tabIndex: tabIndex,
     min: min,
     max: max,
     value: value,
-    disabled: disabled
+    disabled: disabled,
+    orientation: orientation
   }, rest)), showCurrentValueCondition && /*#__PURE__*/React.createElement(StyledValue, null, value)));
 });

package/styled-components/es/components/Slider/ui/Handler/Handler.styles.js

@@ -1,8 +1,11 @@
 import styled from 'styled-components';
-import { tokens } from '../../Slider.tokens';
-export var HandlerStyled = /*#__PURE__*/styled.div.withConfig({
-  componentId: "plasma-new-hope__sc-a1py3c-0"
-})(["cursor:pointer;position:absolute;z-index:1;top:0;left:0;"]);
+import { classes, tokens } from '../../Slider.tokens';
 export var StyledValue = /*#__PURE__*/styled.span.withConfig({
+  componentId: "plasma-new-hope__sc-a1py3c-0"
+})(["position:absolute;z-index:1;top:var(", ");text-align:center;width:100%;margin-left:-0.125rem;display:flex;justify-content:center;font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");"], tokens.currentValueTopOffset, tokens.currentValueFontFamily, tokens.currentValueFontSize, tokens.currentValueFontStyle, tokens.currentValueFontWeight, tokens.currentValueLetterSpacing, tokens.currentValueLineHeight);
+export var HandlerStyled = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-a1py3c-1"
-})(["position:absolute;z-index:1;top:var(", ");text-align:center;width:100%;margin-left:-0.125rem;display:flex;justify-content:center;font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");"], tokens.currentValueTopOffset, tokens.currentValueFontFamily, tokens.currentValueFontSize, tokens.currentValueFontStyle, tokens.currentValueFontWeight, tokens.currentValueLetterSpacing, tokens.currentValueLineHeight);
+})(["cursor:pointer;position:absolute;z-index:1;top:0;left:0;bottom:0;display:flex;align-items:center;--thumb-size:", ";&.", "{left:0.125rem;right:0;align-items:flex-start;justify-content:center;", "{margin:0;top:0;bottom:0;right:0;left:calc(var(", ") - (var(", ") - var(--thumb-size)) / 2 + 0.25rem);align-items:center;justify-content:flex-start;}}&.", "{", "{left:auto;right:calc(var(", ") - (var(", ") - var(--thumb-size)) / 2 + 0.3125rem);justify-content:flex-end;}}"], function (_ref) {
+  var isLarge = _ref.isLarge;
+  return isLarge ? "var(".concat(tokens.thumbSizeLarge, ")") : "var(".concat(tokens.thumbSize, ")");
+}, classes.verticalOrientation, StyledValue, tokens.size, tokens.size, classes.valuePlacementLeft, StyledValue, tokens.size, tokens.size);

package/styled-components/es/components/Slider/ui/Thumb/Thumb.js

@@ -1,4 +1,4 @@
-var _excluded = ["min", "max", "value", "ariaValueMin", "ariaLabel", "disabled"];
+var _excluded = ["min", "max", "value", "ariaValueMin", "ariaLabel", "disabled", "orientation"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -12,6 +12,7 @@ export var Thumb = function Thumb(_ref) {
     ariaValueMin = _ref$ariaValueMin === void 0 ? min : _ref$ariaValueMin,
     ariaLabel = _ref.ariaLabel,
     disabled = _ref.disabled,
+    orientation = _ref.orientation,
     rest = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(ThumbBase, _extends({
     role: "slider",
@@ -20,6 +21,6 @@ export var Thumb = function Thumb(_ref) {
     "aria-valuemax": max,
     "aria-valuenow": value,
     disabled: disabled,
-    "aria-orientation": "horizontal"
+    "aria-orientation": orientation
   }, rest));
 };

package/styled-components/es/components/Slider/ui/Thumb/Thumb.styles.js

@@ -3,8 +3,8 @@ import { addFocus } from '../../../../mixins';
 import { tokens } from '../../Slider.tokens';
 export var ThumbBase = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-13botku-0"
-})(["width:var(", ");height:var(", ");position:relative;left:-0.125rem;top:-0.125rem;border-radius:50%;box-sizing:border-box;background:var(", ");margin:0.125rem;transition:border-color 0.1s ease-in-out;&:after{background:var(", ");margin:-0.125rem;content:'';position:absolute;inset:0;z-index:-1;border-radius:inherit;}&:not([disabled]):hover:after,&:not([disabled]):active:after{background:var(", ");}&[disabled]{cursor:not-allowed;}&:focus{outline:none;}", ""], tokens.thumbSize, tokens.thumbSize, tokens.thumbBackgroundColor, tokens.thumbBorderColor, tokens.thumbFocusBorderColor, /*#__PURE__*/addFocus({
-  outlineOffset: '0.125rem',
+})(["width:var(--thumb-size);height:var(--thumb-size);min-width:var(--thumb-size);min-height:var(--thumb-size);position:relative;left:-0.0625rem;top:-0.0625rem;border-radius:50%;box-sizing:border-box;background:var(", ");margin:0.0625rem;transition:border-color 0.1s ease-in-out;&:after{background:var(", ");margin:-0.0625rem;content:'';position:absolute;inset:0;z-index:-1;border-radius:inherit;}&:not([disabled]):hover:after,&:not([disabled]):active:after{background:var(", ");}&[disabled]{cursor:not-allowed;}&:focus{outline:none;}", ""], tokens.thumbBackgroundColor, tokens.thumbBorderColor, tokens.thumbFocusBorderColor, /*#__PURE__*/addFocus({
+  outlineOffset: '0.0625rem',
   outlineSize: '0.125rem',
   outlineRadius: '50%',
   outlineColor: /*#__PURE__*/"var(".concat(tokens.thumbFocusBorderColor, ")")

package/styled-components/es/components/Slider/utils/index.js

@@ -6,8 +6,8 @@
  * @param {number} max
  * @return {number}
  */
-export function getSliderThumbValue(handleCenterXRelative, stepSize, min, max) {
-  var newValue = Math.round(handleCenterXRelative / stepSize) + min;
+export function getSliderThumbValue(handleCenterPosRelative, stepSize, min, max) {
+  var newValue = Math.round(handleCenterPosRelative / stepSize) + min;
   return Math.min(Math.max(newValue, min), max);
 }
 
@@ -18,11 +18,11 @@ export function getSliderThumbValue(handleCenterXRelative, stepSize, min, max) {
  * @param {'left' | 'right'} side
  * @return Array<number>
  */
-export function getOffsets(ref, side) {
+export function getOffsets(ref, side, isVertical) {
   if (!ref || !('current' in ref) || !ref.current || !side) {
     return [0, 0];
   }
-  var size = ref.current.clientWidth;
+  var size = isVertical ? ref.current.clientHeight : ref.current.clientWidth;
   if (side === 'left') {
     return [0, size];
   }
@@ -33,15 +33,33 @@ export function getOffsets(ref, side) {
 }
 export var sizeData = {
   s: {
-    indent: 0.5,
-    fontSizeMultiplier: 16
+    s: {
+      indent: 0.5,
+      fontSizeMultiplier: 16
+    },
+    l: {
+      indent: 0.625,
+      fontSizeMultiplier: 16
+    }
   },
   m: {
-    indent: 0.75,
-    fontSizeMultiplier: 16
+    s: {
+      indent: 0.5,
+      fontSizeMultiplier: 16
+    },
+    l: {
+      indent: 0.625,
+      fontSizeMultiplier: 16
+    }
   },
   l: {
-    indent: 0.75,
-    fontSizeMultiplier: 16
+    s: {
+      indent: 0.5,
+      fontSizeMultiplier: 16
+    },
+    l: {
+      indent: 0.625,
+      fontSizeMultiplier: 16
+    }
   }
 };

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

@@ -1,2 +1,3 @@
 import { css } from 'styled-components';
-export var base = /*#__PURE__*/css([""]);
+import { classes } from '../../Slider.tokens';
+export var base = /*#__PURE__*/css(["&.", "{height:100%;display:inline-flex;}"], classes.verticalOrientation);

package/styled-components/es/components/TextArea/TextArea.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 = ["helperText", "status", "resize", "rightHelper", "leftHelper", "contentRight", "autoResize", "minAuto", "maxAuto", "label", "labelPlacement", "placeholder", "defaultValue", "height", "width", "value", "disabled", "required", "requiredPlacement", "optional", "clear", "hasDivider", "size", "view", "id", "style", "className", "readOnly", "rows", "cols", "onChange"];
+var _excluded = ["helperText", "status", "resize", "rightHelper", "leftHelper", "contentRight", "autoResize", "minAuto", "maxAuto", "label", "labelPlacement", "placeholder", "defaultValue", "height", "width", "value", "disabled", "required", "requiredPlacement", "optional", "size", "view", "id", "style", "className", "readOnly", "rows", "cols", "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 _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."); }
@@ -28,7 +28,6 @@ import { StyledContent, StyledHelpers, StyledLeftHelper, StyledRightHelper, Styl
 import { classes } from './TextArea.tokens';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
-import { base as clearCSS } from './variations/_clear/base';
 import { base as disabledCSS } from './variations/_disabled/base';
 var innerPlaceholderUp = classes.innerPlaceholderUp,
   focusedOuterPlaceholderColor = classes.focusedOuterPlaceholderColor,
@@ -54,6 +53,7 @@ export var getDynamicLabelClasses = function getDynamicLabelClasses(props, focus
   var readOnly = props.readOnly,
     label = props.label,
     labelPlacement = props.labelPlacement,
+    autoResize = props.autoResize,
     rows = props.rows,
     value = props.value,
     size = props.size;
@@ -62,10 +62,10 @@ export var getDynamicLabelClasses = function getDynamicLabelClasses(props, focus
   var withFocusedOuterUpPlaceholder = !readOnly && focused && (!label || labelPlacement === 'outer') ? focusedOuterPlaceholderColor : undefined;
 
   // Добавить класс отвечающий за поднятие и уменьшение плейсхолдера
-  var withInnerPlaceholderUp = labelPlacement === 'inner' && label && !rows && size !== 'xs' && (!readOnly && (value || focused) || readOnly && value) ? innerPlaceholderUp : undefined;
+  var withInnerPlaceholderUp = labelPlacement === 'inner' && label && !autoResize && !rows && size !== 'xs' && (!readOnly && (value || focused) || readOnly && value) ? innerPlaceholderUp : undefined;
 
   // Добавить класс отвечающий за скрытие плейсхолдера
-  var withHidePlaceholder = value && !label || labelPlacement === 'inner' && (focused && !readOnly || value) && label && rows || labelPlacement === 'outer' && value || labelPlacement === 'inner' && size === 'xs' && value ? hidePlaceHolder : undefined;
+  var withHidePlaceholder = value && !label || labelPlacement === 'inner' && (focused && !readOnly || value) && label && (rows || autoResize) || labelPlacement === 'outer' && value || labelPlacement === 'inner' && size === 'xs' && value ? hidePlaceHolder : undefined;
   return [withFocusedOuterUpPlaceholder, withInnerPlaceholderUp, withHidePlaceholder];
 };
 export var textAreaRoot = function textAreaRoot(Root) {
@@ -96,8 +96,6 @@ export var textAreaRoot = function textAreaRoot(Root) {
       requiredPlacement = _props$requiredPlacem === void 0 ? 'right' : _props$requiredPlacem,
       _props$optional = props.optional,
       optional = _props$optional === void 0 ? false : _props$optional,
-      clear = props.clear,
-      hasDivider = props.hasDivider,
       size = props.size,
       view = props.view,
       id = props.id,
@@ -130,8 +128,6 @@ export var textAreaRoot = function textAreaRoot(Root) {
     var textareaHelperId = id ? "".concat(id, "-helper") : undefined;
     var applyCustomWidth = resize !== 'horizontal' && resize !== 'both' && !cols;
     var placeholderLabel = hasInnerLabel ? label : placeholder;
-    var clearClass = clear ? classes.clear : undefined;
-    var hasDividerClass = hasDivider ? classes.hasDivider : undefined;
     var requiredPlacementClass = requiredPlacement === 'right' ? 'align-right ' : undefined;
     useResizeObserver(outerRef, function (currentElement) {
       var inlineWidth = currentElement.style.width;
@@ -141,7 +137,7 @@ export var textAreaRoot = function textAreaRoot(Root) {
         setHelperWidth("".concat(elementWidth / ROOT_FONT_SIZE, "rem"));
       }
     });
-    useAutoResize(autoResize || Boolean(clear), outerRef, value, minAuto, maxAuto);
+    useAutoResize(autoResize, outerRef, value, minAuto, maxAuto);
     var onFocusHandler = useCallback(function () {
       setFocused(true);
     }, []);
@@ -155,25 +151,27 @@ export var textAreaRoot = function textAreaRoot(Root) {
       }
       onChange === null || onChange === void 0 || onChange(event);
     }, [value, onChange]);
-    var dynamicLabelClasses = getDynamicLabelClasses({
+    var dynamicLabelClasses = getDynamicLabelClasses(_objectSpread({
       size: size,
       readOnly: readOnly,
       label: label,
       labelPlacement: labelPlacement,
-      value: value || uncontrolledValue || defaultValue,
+      value: value || uncontrolledValue || defaultValue
+    }, rows ? {
       rows: rows
-    }, focused);
+    } : {
+      autoResize: autoResize
+    }), focused);
     var optionalTextNode = innerOptional ? /*#__PURE__*/React.createElement(StyledOptionalText, null, Boolean(hasPlaceholderOptional ? placeholderLabel : label) && '\xa0', optionalText) : null;
     return /*#__PURE__*/React.createElement(Root, {
       view: overriddenView,
       size: size,
       disabled: disabled,
       readOnly: readOnly,
-      clear: clear,
       style: _objectSpread({
         width: helperWidth
       }, style),
-      className: cx(clearClass, hasDividerClass, className)
+      className: className
     }, hasOuterLabel && /*#__PURE__*/React.createElement(StyledLabel, null, required && /*#__PURE__*/React.createElement(StyledIndicator, {
       className: cx(classes.outerLabelPlacement, requiredPlacementClass)
     }), label, optionalTextNode), /*#__PURE__*/React.createElement(StyledContainer, {
@@ -194,7 +192,7 @@ export var textAreaRoot = function textAreaRoot(Root) {
       applyCustomWidth: applyCustomWidth,
       ref: outerRef,
       disabled: disabled,
-      height: autoResize || Boolean(clear) ? minAuto : height,
+      height: autoResize ? minAuto : height,
       width: width,
       placeholder: placeholderLabel,
       "aria-describedby": textareaHelperId,
@@ -227,10 +225,6 @@ export var textAreaConfig = {
     view: {
       css: viewCSS
     },
-    clear: {
-      css: clearCSS,
-      attrs: true
-    },
     disabled: {
       css: disabledCSS,
       attrs: true

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

@@ -104,35 +104,6 @@ export function App() {
 }
 ```
 
-### Clear
-На отображение TextArea влияют свойства `clear` и `hasDivider`.
-При этом `hasDivider` не может использоваться без `clear`.
-Свойства `minAuto`, `maxAuto`, `autoResize`, `rows` и `cols`, `height` и `width` игнорируются.
-Высота TextArea в таком случае регулируется по длине контента внутри:
-
-```tsx live
-import React from 'react';
-import { TextArea } from '@salutejs/{{ package }}';
-
-export function App() {
-    const [value, setValue] = React.useState('Значение');
-
-    return (
-        <div>
-            <TextArea
-                placeholder="Введите значение"
-                value={value}
-                onChange={(e) => {
-                    setValue(e.target.value);
-                }}
-                clear
-                hasDivider
-            />
-        </div>
-    );
-}
-```
-
 ### Подсказка
 Для вывода подсказки снизу от поля используйте свойство `leftHelper` и/или `rightHelper`.
 

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

@@ -16,10 +16,7 @@ export var classes = {
   /** Класс для компонента `StyledHelpers` */
   styledHelpers: 'textarea-helpers',
   innerLabelPlacement: 'label-placement-inner',
-  outerLabelPlacement: 'label-placement-outer',
-  /** Класс для view `clear` */
-  clear: 'textfield-clear',
-  hasDivider: 'hasDivider'
+  outerLabelPlacement: 'label-placement-outer'
 };
 export var tokens = {
   /** Цвет фона для элемента textarea */
@@ -48,14 +45,12 @@ export var tokens = {
   helpersBackgroundColorFocus: '--plasma-textarea-helpers-background-color-focus',
   /** Цвет текста для элемента textarea */
   inputColor: '--plasma-textarea-input-color',
-  clearInputColor: '--plasma-textarea-input-clear-color',
   /** Цвет текста для элемента textarea в состоянии focus */
   inputColorFocus: '--plasma-textarea-input-color-focus',
   /** Цвет каретки для элемента textarea */
   inputCaretColor: '--plasma-textarea-input-caret-color',
   /** Цвет элемента placeholder */
   placeholderColor: '--plasma-textarea-placeholder-color',
-  clearPlaceholderColor: '--plasma-textfield__clear-placeholder-color',
   /** Цвет элемента placeholder в состоянии focus */
   placeholderColorFocus: '--plasma-textarea-placeholder-color-focus',
   /** Цвет элемента optional */
@@ -96,7 +91,6 @@ export var tokens = {
   inputPaddingLeft: '--plasma-textarea-input-padding-left',
   /** Отступ сверху для блока подписей */
   helpersPaddingTop: '--plasma-textarea-helpers-padding-top',
-  clearHelpersPaddingTop: '--plasma-textarea-clear-helpers-padding-top',
   /** Отступ справа для блока подписей */
   helpersPaddingRight: '--plasma-textarea-helpers-padding-right',
   /** Отступ снизу для блока подписей */
@@ -127,7 +121,6 @@ export var tokens = {
   labelOuterLineHeight: '--plasma-textarea-label-outer-line-height',
   /** Отступ сверху для элемента label, когда он внутри и уменьшен */
   labelMarginBottom: '--plasma-textarea-label-margin-bottom',
-  clearLabelMarginBottom: '--plasma-textarea-clear-label-margin-bottom',
   /** Шрифт для элемента label, когда он внутри и уменьшен */
   labelInnerFontFamily: '--plasma-textarea-label-inner-font-family',
   /** Размер шрифта для элемента label, когда он внутри и уменьшен */
@@ -179,11 +172,5 @@ export var tokens = {
   indicatorLabelPlacementInner: '--plasma-textarea-indicator-placement-inner',
   indicatorLabelPlacementOuter: '--plasma-textarea-indicator-placement-outer',
   indicatorLabelPlacementInnerRight: '--plasma-textarea-indicator-placement-inner-right',
-  indicatorLabelPlacementOuterRight: '--plasma-textarea-indicator-placement-outer-right',
-  clearIndicatorLabelPlacementInner: '--plasma-textarea__clear-indicator-placement-inner',
-  clearIndicatorLabelPlacementInnerRight: '--plasma-textarea__clear-indicator-placement-inner-right',
-  dividerColor: '--plasma-textfield-divider-color',
-  dividerColorHover: '--plasma-textfield-divider-color-hover',
-  dividerColorFocus: '--plasma-textfield-divider-color-focus',
-  dividerColorReadOnly: '--plasma-textfield-divider-color-readonly'
+  indicatorLabelPlacementOuterRight: '--plasma-textarea-indicator-placement-outer-right'
 };

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

@@ -3,5 +3,5 @@ import { tokens, classes } from '../../TextArea.tokens';
 var styledContainer = classes.styledContainer,
   styledTextAreaWrapper = classes.styledTextAreaWrapper,
   styledHelpers = classes.styledHelpers;
-var exclusionSelectors = /*#__PURE__*/"not(.".concat(classes.clear, "):not([disabled]):not([readonly]):not(:focus-within)");
+var exclusionSelectors = 'not([disabled]):not([readonly]):not(:focus-within)';
 export var base = /*#__PURE__*/css([".", "{transition:box-shadow 0.1s ease-in-out;border-radius:var(", ");border:var(", ") solid var(", ");}.", "{transition:background-color 0.1s ease-in-out,box-shadow 0.1s ease-in-out;box-shadow:inset 0 0 0 var(", ",1px) var(", ");}&:focus-within:not([readonly]) .", "{background-color:var(", ");box-shadow:inset 0 0 0 var(", ",1px) var(", ");}&:focus-within:not([readonly]) .", "{border:var(", ") solid var(", ");}&:focus-within:not([readonly]) .", "{background-color:var(", ");}&:hover:", " .", "{border:var(", ") solid var(", ");}&:hover:", " .", "{box-shadow:inset 0 0 0 var(", ",1px) var(", ");background-color:var(", ");}&:hover:", " .", " + .", "{background-color:var(", ");}&:active:", " .", "{box-shadow:inset 0 0 0 var(", ",1px) var(", ");background-color:var(", ");}&:active:", " .", " + .", "{background-color:var(", ");}"], /*#__PURE__*/String(styledContainer), tokens.borderRadius, tokens.borderSize, tokens.borderColor, /*#__PURE__*/String(styledTextAreaWrapper), tokens.borderSize, tokens.inputBorderColor, /*#__PURE__*/String(styledTextAreaWrapper), tokens.inputBackgroundColorFocus, tokens.borderSize, tokens.inputBorderColorFocus, /*#__PURE__*/String(styledContainer), tokens.borderSize, tokens.borderColorFocus, /*#__PURE__*/String(styledHelpers), tokens.helpersBackgroundColorFocus, exclusionSelectors, /*#__PURE__*/String(styledContainer), tokens.borderSize, tokens.borderColorHover, exclusionSelectors, /*#__PURE__*/String(styledTextAreaWrapper), tokens.borderSize, tokens.inputBorderColorHover, tokens.inputBackgroundColorHover, exclusionSelectors, /*#__PURE__*/String(styledTextAreaWrapper), /*#__PURE__*/String(styledHelpers), tokens.helpersBackgroundColorHover, exclusionSelectors, /*#__PURE__*/String(styledTextAreaWrapper), tokens.borderSize, tokens.inputBorderColorActive, tokens.inputBackgroundColorActive, exclusionSelectors, /*#__PURE__*/String(styledTextAreaWrapper), /*#__PURE__*/String(styledHelpers), tokens.helpersBackgroundColorActive);