@salutejs/plasma-new-hope 0.176.0-canary.1514.11570064677.0 → 0.176.1-canary.1510.11572230988.0

package/emotion/es/components/Slider/Slider.js

@@ -4,10 +4,13 @@ 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; }
 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, { forwardRef } from 'react';
+import { cx } from '../../utils';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
 import { base as disabledCSS } from './variations/_disabled/base';
 import { SingleSlider, DoubleUncontrolled } from './components';
+import { classes } from './Slider.tokens';
+
 // TODO: проверить, можно ли обойтись без каста типов
 
 var isSingleValueProps = function isSingleValueProps(props, type) {
@@ -21,9 +24,15 @@ export var sliderRoot = function sliderRoot(Root) {
     var _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'single' : _ref$type,
       props = _objectWithoutProperties(_ref, _excluded);
-    return /*#__PURE__*/React.createElement(Root, _extends({}, props, {
+    if (isSingleValueProps(props, type)) {
+      return /*#__PURE__*/React.createElement(Root, _extends({}, props, {
+        className: cx(props.orientation === 'vertical' && classes.verticalOrientation, props.className),
+        ref: ref
+      }), /*#__PURE__*/React.createElement(SingleSlider, props));
+    }
+    return /*#__PURE__*/React.createElement(Root, _extends({
       ref: ref
-    }), isSingleValueProps(props, type) && /*#__PURE__*/React.createElement(SingleSlider, props), isDoubleValueProps(props, type) && /*#__PURE__*/React.createElement(DoubleUncontrolled, props));
+    }, props), isDoubleValueProps(props, type) && /*#__PURE__*/React.createElement(DoubleUncontrolled, props));
   });
 };
 export var sliderConfig = {

package/emotion/es/components/Slider/Slider.template-doc.mdx

@@ -76,3 +76,29 @@ export function App() {
     );
 }
 ```
+
+# Вертикальное отображение
+
+```tsx live
+import React from 'react';
+import { Slider  } from '@salutejs/{{ package }}';
+import { IconMic } from '@salutejs/plasma-icons';
+
+export function App() {
+    return (
+        <section style={{ height: '300px' }}>
+            <Slider
+                onChangeCommitted={() => {}}
+                min={0}
+                max={100}
+                value={30}
+                label="Громкость"
+                labelContent={<IconMic size="s" />}
+                orientation="vertical"
+                sliderAlign="center"
+                size="m"
+            />
+        </section>
+    );
+}
+```

package/emotion/es/components/Slider/Slider.tokens.js

@@ -1,6 +1,12 @@
 export var classes = {
   labelPlacementOuter: 'slider-label-placement-outer',
   labelPlacementInner: 'slider-label-placement-inner',
+  labelPlacementBottom: 'slider-label-placement-bottom',
+  labelAlignLeft: 'slider-label-align-left',
+  labelAlignCenter: 'slider-label-align-center',
+  labelAlignRight: 'slider-label-align-right',
+  labelAlignNone: 'slider-label-align-none',
+  labelContentReversed: 'slider-label-content-reversed',
   rangeValuesPlacementOuter: 'slider-range-values-placement-outer',
   rangeValuesPlacementInner: 'slider-range-values-placement-inner',
   maxRangeValue: 'slider-max-range-value',
@@ -9,13 +15,17 @@ export var classes = {
   textFieldActive: 'slider-text-field-active',
   firstTextField: 'slider-first-text-field',
   secondTextField: 'slider-second-text-field',
-  activeRangeValue: 'slider-active-range-value'
+  activeRangeValue: 'slider-active-range-value',
+  verticalOrientation: 'slider-vertical-orientation',
+  valuePlacementLeft: 'slider-value-placement-left',
+  reversed: 'slider-reversed'
 };
 export var tokens = {
-  height: '--plasma-slider-height',
+  size: '--plasma-slider-size',
   labelWrapperGap: '--plasma-slider-label-wrapper-gap',
   labelWrapperMarginBottom: '--plasma-slider-label-wrapper-margin-bottom',
   labelWrapperMarginRight: '--plasma-slider-label-wrapper-margin-right',
+  labelWrapperVerticalMargin: '--plasma-slider-label-wrapper-vertical-margin',
   labelColor: '--plasma-slider-label-color',
   labelFontFamily: '--plasma-slider-label-font-family',
   labelFontSize: '--plasma-slider-label-font-size',
@@ -23,31 +33,27 @@ export var tokens = {
   labelFontWeight: '--plasma-slider-label-font-weight',
   labelLetterSpacing: '--plasma-slider-label-letter-spacing',
   labelLineHeight: '--plasma-slider-label-line-height',
-  rangeMinValueMargin: '--plasma-slider-range-min-value-margin',
-  rangeMaxValueMargin: '--plasma-slider-range-max-value-margin',
   rangeValueBottomOffset: '--plasma-slider-range-value-bottom-offset',
+  rangeValueHorizontalMargin: '--plasma-slider-range-value-horizontal-margin',
+  rangeValueHorizontalOffset: '--plasma-slider-range-value-horizontal-offset',
+  rangeValueVerticalMargin: '--plasma-slider-range-value-vertical-margin',
   rangeValueColor: '--plasma-slider-range-value-color',
-  rangeValueFontFamily: '--plasma-slider-range-value-font-family',
-  rangeValueFontSize: '--plasma-slider-range-value-font-size',
-  rangeValueFontStyle: '--plasma-slider-range-value-font-style',
-  rangeValueFontWeight: '--plasma-slider-range-value-font-weight',
-  rangeValueLetterSpacing: '--plasma-slider-range-value-letter-spacing',
-  rangeValueLineHeight: '--plasma-slider-range-value-line-height',
+  valueFontFamily: '--plasma-slider-value-font-family',
+  valueFontSize: '--plasma-slider-value-font-size',
+  valueFontStyle: '--plasma-slider-value-font-style',
+  valueFontWeight: '--plasma-slider-value-font-weight',
+  valueLetterSpacing: '--plasma-slider-value-letter-spacing',
+  valueLineHeight: '--plasma-slider-value-line-height',
   doubleWrapperGap: '--plasma-slider-double-wrapper-gap',
   thumbSize: '--plasma-slider-thumb-size',
+  thumbSizeLarge: '--plasma-slider-thumb-size-large',
   thumbBorder: '--plasma-slider-thumb-border',
   thumbBorderColor: '--plasma-slider-thumb-border-color',
   thumbBackgroundColor: '--plasma-slider-thumb-background-color',
   thumbFocusBorderColor: '--plasma-slider-thumb-focus-border-color',
   currentValueTopOffset: '--plasma-slider-current-value-top-offset',
-  currentValueFontFamily: '--plasma-slider-current-value-font-family',
-  currentValueFontSize: '--plasma-slider-current-value-font-size',
-  currentValueFontStyle: '--plasma-slider-current-value-font-style',
-  currentValueFontWeight: '--plasma-slider-current-value-font-weight',
-  currentValueLetterSpacing: '--plasma-slider-current-value-letter-spacing',
-  currentValueLineHeight: '--plasma-slider-current-value-line-height',
   railBackgroundColor: '--plasma-slider-rail-background-color',
-  railHeight: '--plasma-slider-rail-height',
+  railThickness: '--plasma-slider-rail-thickness',
   railBorderRadius: '--plasma-slider-rail-border-radius',
   railIndent: '--plasma-slider-rail-indent',
   fillColor: '--plasma-slider-fill-color',

package/emotion/es/components/Slider/components/Double/Double.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 = ["min", "max", "value", "disabled", "label", "labelContentLeft", "size", "onChangeCommitted", "onChangeTextField", "onBlurTextField", "onKeyDownTextField", "onChange", "ariaLabel", "multipleStepSize", "name"];
+var _excluded = ["min", "max", "value", "disabled", "label", "labelContentLeft", "size", "pointerSize", "onChangeCommitted", "onChangeTextField", "onBlurTextField", "onKeyDownTextField", "onChange", "ariaLabel", "multipleStepSize", "name"];
 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; }
@@ -38,6 +38,8 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     labelContentLeft = _ref.labelContentLeft,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'm' : _ref$size,
+    _ref$pointerSize = _ref.pointerSize,
+    pointerSize = _ref$pointerSize === void 0 ? 'small' : _ref$pointerSize,
     onChangeCommitted = _ref.onChangeCommitted,
     onChangeTextField = _ref.onChangeTextField,
     onBlurTextField = _ref.onBlurTextField,
@@ -64,20 +66,30 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     setState = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    firstInputActive = _useState4[0],
-    setFirstInputActive = _useState4[1];
+    firstInputHovered = _useState4[0],
+    setFirstInputHovered = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    secondInputActive = _useState6[0],
-    setSecondInputActive = _useState6[1];
-  var _useState7 = useState(value[0]),
+    firstInputFocused = _useState6[0],
+    setFirstInputFocused = _useState6[1];
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    firstValue = _useState8[0],
-    setFirstValue = _useState8[1];
-  var _useState9 = useState(value[1]),
+    secondInputHovered = _useState8[0],
+    setSecondInputHovered = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    secondValue = _useState10[0],
-    setSecondValue = _useState10[1];
+    secondInputFocused = _useState10[0],
+    setSecondInputFocused = _useState10[1];
+  var firstInputActive = firstInputHovered || firstInputFocused;
+  var secondInputActive = secondInputHovered || secondInputFocused;
+  var _useState11 = useState(value[0]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    firstValue = _useState12[0],
+    setFirstValue = _useState12[1];
+  var _useState13 = useState(value[1]),
+    _useState14 = _slicedToArray(_useState13, 2),
+    secondValue = _useState14[0],
+    setSecondValue = _useState14[1];
   var firstHandleRef = useRef(null);
   var secondHandleRef = useRef(null);
   var firstHandleValue = useRef(value[0]);
@@ -102,6 +114,16 @@ export var DoubleSlider = function DoubleSlider(_ref) {
       });
     });
   }, [value, stepSize, min, max, setFirstValue, setSecondValue]);
+  useEffect(function () {
+    var onMouseUp = function onMouseUp() {
+      setFirstInputFocused(false);
+      setSecondInputFocused(false);
+    };
+    window.addEventListener('mouseup', onMouseUp);
+    return function () {
+      window.removeEventListener('mouseup', onMouseUp);
+    };
+  }, []);
   var setStepSize = useCallback(function (newStepSize) {
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
@@ -243,16 +265,20 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     ariaLabelLeft = _ref3[0],
     ariaLabelRight = _ref3[1];
   var currentFirstSliderValue = Math.max(state.firstValue, min);
+  var settings = sizeData[size][pointerSize === 'large' ? 'large' : 'small'];
   return /*#__PURE__*/React.createElement(DoubleWrapper, null, hasLabelContent && /*#__PURE__*/React.createElement(LabelWrapper, null, labelContentLeft && /*#__PURE__*/React.createElement(LabelContentLeft, null, labelContentLeft), label && /*#__PURE__*/React.createElement(Label, null, label)), /*#__PURE__*/React.createElement(SliderWrapper, null, /*#__PURE__*/React.createElement(SliderBase, _extends({
     min: min,
     max: max,
+    size: size,
     disabled: disabled,
     setStepSize: setStepSize,
     railFillWidth: state.railFillWidth,
-    settings: sizeData[size],
-    railFillXPosition: state.railFillXPosition
+    settings: settings,
+    railFillXPosition: state.railFillXPosition,
+    orientation: "horizontal"
   }, rest), /*#__PURE__*/React.createElement(Handler, {
     ref: firstHandleRef,
+    size: pointerSize,
     stepSize: state.stepSize,
     multipleStepSize: multipleStepSize,
     onChangeCommitted: onFirstHandleChangeCommitted,
@@ -262,18 +288,23 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     disabled: disabled,
     bounds: [min, state.secondValue],
     side: "left",
-    xPosition: state.xFirstHandle,
+    orientation: "horizontal",
+    position: state.xFirstHandle,
     zIndex: state.firstHandleZIndex,
     value: currentFirstSliderValue,
     ariaLabel: ariaLabelLeft,
+    onMouseDown: function onMouseDown() {
+      return setFirstInputFocused(true);
+    },
     onMouseEnter: function onMouseEnter() {
-      return setFirstInputActive(true);
+      return setFirstInputHovered(true);
     },
     onMouseLeave: function onMouseLeave() {
-      return setFirstInputActive(false);
+      return setFirstInputHovered(false);
     }
   }), /*#__PURE__*/React.createElement(Handler, {
     ref: secondHandleRef,
+    size: pointerSize,
     stepSize: state.stepSize,
     multipleStepSize: multipleStepSize,
     onChangeCommitted: onSecondHandleChangeCommitted,
@@ -284,15 +315,19 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     disabled: disabled,
     bounds: [state.firstValue, max],
     side: "right",
-    xPosition: state.xSecondHandle,
+    orientation: "horizontal",
+    position: state.xSecondHandle,
     zIndex: state.secondHandleZIndex,
     value: Math.max(state.secondValue, min),
     ariaLabel: ariaLabelRight,
+    onMouseDown: function onMouseDown() {
+      return setSecondInputFocused(true);
+    },
     onMouseEnter: function onMouseEnter() {
-      return setSecondInputActive(true);
+      return setSecondInputHovered(true);
     },
     onMouseLeave: function onMouseLeave() {
-      return setSecondInputActive(false);
+      return setSecondInputHovered(false);
     }
   })), /*#__PURE__*/React.createElement(InputsWrapper, null, /*#__PURE__*/React.createElement(StyledInput, {
     className: cx(classes.firstTextField, firstInputActiveClass),

package/emotion/es/components/Slider/components/Single/Single.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 = ["min", "max", "value", "disabled", "onChangeCommitted", "onChange", "ariaLabel", "label", "labelContentLeft", "showRangeValues", "showCurrentValue", "hideMinValueDiff", "hideMaxValueDiff", "labelPlacement", "rangeValuesPlacement", "multipleStepSize", "defaultValue", "size", "name"];
+var _excluded = ["min", "max", "value", "disabled", "onChangeCommitted", "onChange", "ariaLabel", "label", "labelContentLeft", "labelContent", "sliderAlign", "showScale", "showRangeValues", "showCurrentValue", "hideMinValueDiff", "hideMaxValueDiff", "labelPlacement", "rangeValuesPlacement", "scaleAlign", "multipleStepSize", "defaultValue", "size", "name", "pointerSize", "orientation", "reversed", "labelReversed"];
 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; }
@@ -21,7 +21,7 @@ import { sizeData } from '../../utils';
 import { cx, isNumber, noop } from '../../../../utils';
 import { classes } from '../../Slider.tokens';
 import { InputHidden } from '../SliderBase/SliderBase.styles';
-import { Label, LabelContentLeft, LabelWrapper, SingleWrapper, SliderBaseWrapper, StyledRangeValue } from './Single.styles';
+import { Label, LabelContent, LabelWrapper, SingleWrapper, SliderBaseWrapper, StyledRangeValue } from './Single.styles';
 export var SingleSlider = function SingleSlider(_ref) {
   var _ref2;
   var min = _ref.min,
@@ -33,23 +33,35 @@ export var SingleSlider = function SingleSlider(_ref) {
     ariaLabel = _ref.ariaLabel,
     label = _ref.label,
     labelContentLeft = _ref.labelContentLeft,
+    labelContent = _ref.labelContent,
+    _ref$sliderAlign = _ref.sliderAlign,
+    sliderAlign = _ref$sliderAlign === void 0 ? 'left' : _ref$sliderAlign,
+    showScale = _ref.showScale,
     showRangeValues = _ref.showRangeValues,
     showCurrentValue = _ref.showCurrentValue,
     hideMinValueDiff = _ref.hideMinValueDiff,
     hideMaxValueDiff = _ref.hideMaxValueDiff,
     _ref$labelPlacement = _ref.labelPlacement,
-    labelPlacement = _ref$labelPlacement === void 0 ? 'outer' : _ref$labelPlacement,
-    _ref$rangeValuesPlace = _ref.rangeValuesPlacement,
-    rangeValuesPlacement = _ref$rangeValuesPlace === void 0 ? 'outer' : _ref$rangeValuesPlace,
+    labelPlacement = _ref$labelPlacement === void 0 ? 'top' : _ref$labelPlacement,
+    rangeValuesPlacementOld = _ref.rangeValuesPlacement,
+    _ref$scaleAlign = _ref.scaleAlign,
+    scaleAlign = _ref$scaleAlign === void 0 ? 'bottom' : _ref$scaleAlign,
     _ref$multipleStepSize = _ref.multipleStepSize,
     multipleStepSize = _ref$multipleStepSize === void 0 ? 10 : _ref$multipleStepSize,
     defaultValue = _ref.defaultValue,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'm' : _ref$size,
     name = _ref.name,
+    _ref$pointerSize = _ref.pointerSize,
+    pointerSize = _ref$pointerSize === void 0 ? 'small' : _ref$pointerSize,
+    _ref$orientation = _ref.orientation,
+    orientation = _ref$orientation === void 0 ? 'horizontal' : _ref$orientation,
+    reversed = _ref.reversed,
+    labelReversed = _ref.labelReversed,
     rest = _objectWithoutProperties(_ref, _excluded);
+  var isVertical = orientation === 'vertical';
   var _useState = useState({
-      xHandle: 0,
+      handlePosition: 0,
       stepSize: 0,
       railFillWidth: 0
     }),
@@ -65,23 +77,28 @@ export var SingleSlider = function SingleSlider(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     endOffset = _useState6[0],
     setEndOffset = _useState6[1];
-  var _useState7 = useState((_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : min),
+  var innerValue = (_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : min;
+  var _useState7 = useState(innerValue),
     _useState8 = _slicedToArray(_useState7, 2),
     dragValue = _useState8[0],
     setDragValue = _useState8[1];
   var stepSize = state.stepSize;
-  var hasLabelContent = label || labelContentLeft;
-  var labelPlacementClass = labelPlacement === 'outer' ? classes.labelPlacementOuter : classes.labelPlacementInner;
-  var rangeValuesPlacementClass = rangeValuesPlacement === 'outer' ? classes.rangeValuesPlacementOuter : classes.rangeValuesPlacementInner;
+  var innerShowScale = showRangeValues || showScale;
+  var hasLabelContent = Boolean(label || labelContentLeft || labelContent) && (!isVertical || isVertical && sliderAlign !== 'none');
+  var labelPlacementClass = !isVertical && (labelPlacement === 'outer' || labelPlacement === 'top') ? classes.labelPlacementOuter : classes.labelPlacementInner;
+  var rangeValuesPlacement = rangeValuesPlacementOld === 'outer' || scaleAlign === 'bottom' ? 'outer' : 'inner';
+  var scaleAlignClass = rangeValuesPlacement === 'outer' ? classes.rangeValuesPlacementOuter : classes.rangeValuesPlacementInner;
   var hideMinValueDiffClass = hideMinValueDiff && dragValue - min <= hideMinValueDiff ? classes.hideMinValue : '';
   var hideMaxValueDiffClass = hideMaxValueDiff && max - dragValue <= hideMaxValueDiff ? classes.hideMaxValue : '';
+  var verticalOrientationClass = orientation === 'vertical' ? classes.verticalOrientation : '';
   var startLabelRef = useRef(null);
   var endLabelRef = useRef(null);
   var activeFirstValue = dragValue === min ? classes.activeRangeValue : undefined;
   var activeSecondValue = dragValue === max ? classes.activeRangeValue : undefined;
   useEffect(function () {
-    var localValue = Math.min(Math.max(dragValue, min), max) - min;
-    if (rangeValuesPlacement === 'outer') {
+    var visibleValue = reversed ? max - dragValue + min : dragValue;
+    var localValue = Math.min(Math.max(visibleValue, min), max) - min;
+    if (!isVertical && rangeValuesPlacement === 'outer') {
       var _startLabelRef$curren, _endLabelRef$current;
       var startWidth = (_startLabelRef$curren = startLabelRef.current) === null || _startLabelRef$curren === void 0 ? void 0 : _startLabelRef$curren.offsetWidth;
       if (isNumber(startWidth)) {
@@ -91,30 +108,35 @@ export var SingleSlider = function SingleSlider(_ref) {
       if (isNumber(endWidth)) {
         setEndOffset(Number(endWidth));
       }
+    } else if (isVertical && innerShowScale && sliderAlign !== 'center') {
+      setStartOffset(12);
+      setEndOffset(12);
     } else {
       setStartOffset(1);
       setEndOffset(1);
     }
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
-        xHandle: stepSize * localValue,
+        handlePosition: stepSize * localValue,
         railFillWidth: stepSize * localValue
       });
     });
-  }, [dragValue, labelPlacement, stepSize, rangeValuesPlacement, min, max, setStartOffset, setEndOffset]);
+  }, [dragValue, innerShowScale, labelPlacement, stepSize, rangeValuesPlacement, min, max, isVertical, reversed,
+  // для перерасчета размеров
+  sliderAlign, size]);
   var setStepSize = useCallback(function (newStepSize) {
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
         stepSize: newStepSize
       });
     });
-  }, [setState]);
+  }, []);
   var onHandleChange = function onHandleChange(handleValue, data) {
-    var newHandleXPosition = data.x;
-    var newValue = Math.round(handleValue);
+    var newValue = Math.round(reversed ? max - handleValue + min : handleValue);
+    var newHandlePosition = isVertical ? data.y : data.x;
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
-        railFillWidth: newHandleXPosition
+        railFillWidth: newHandlePosition
       });
     });
     if (onChange) {
@@ -132,41 +154,49 @@ export var SingleSlider = function SingleSlider(_ref) {
     }
     setDragValue(newValue);
   };
-  var onHandleChangeCommitted = function onHandleChangeCommitted(handleValue, data) {
-    var newValue = Math.round(handleValue);
+  var onHandleChangeCommitted = useCallback(function (handleValue, data) {
+    var newValue = Math.round(reversed ? max - handleValue + min : handleValue);
     if (onChangeCommitted) {
       onChangeCommitted(newValue);
     }
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
-        xHandle: data.lastX,
-        railFillWidth: data.lastX
+        handlePosition: isVertical ? data.lastY : data.lastX,
+        railFillWidth: isVertical ? data.lastY : data.lastX
       });
     });
     setDragValue(newValue);
-  };
+  }, [isVertical, min, max, reversed]);
+  var labelVerticalPlacement = reversed ? 'bottom' : 'top';
+  var valuePlacement = sliderAlign === 'right' ? 'left' : 'right';
+  var settings = sizeData[size][pointerSize === 'large' ? 'large' : 'small'];
   return /*#__PURE__*/React.createElement(SingleWrapper, {
-    className: labelPlacementClass
-  }, hasLabelContent && /*#__PURE__*/React.createElement(LabelWrapper, null, labelContentLeft && /*#__PURE__*/React.createElement(LabelContentLeft, null, labelContentLeft), label && /*#__PURE__*/React.createElement(Label, null, label)), /*#__PURE__*/React.createElement(SliderBaseWrapper, {
-    className: rangeValuesPlacementClass
-  }, showRangeValues && /*#__PURE__*/React.createElement(StyledRangeValue, {
+    className: cx(labelPlacementClass, scaleAlignClass, verticalOrientationClass, sliderAlign === 'right' && classes.labelAlignLeft, (sliderAlign === 'center' || sliderAlign === 'none') && classes.labelAlignCenter, sliderAlign === 'left' && classes.labelAlignRight, labelVerticalPlacement === 'bottom' && classes.labelPlacementBottom, labelReversed && classes.labelContentReversed)
+  }, hasLabelContent && /*#__PURE__*/React.createElement(LabelWrapper, null, (labelContentLeft || labelContent) && /*#__PURE__*/React.createElement(LabelContent, null, labelContent), label && /*#__PURE__*/React.createElement(Label, null, label)), /*#__PURE__*/React.createElement(SliderBaseWrapper, {
+    className: cx(!isVertical && rangeValuesPlacement === 'outer' && classes.rangeValuesPlacementOuter, !isVertical && rangeValuesPlacement !== 'outer' && classes.rangeValuesPlacementInner, verticalOrientationClass)
+  }, innerShowScale && /*#__PURE__*/React.createElement(StyledRangeValue, {
     ref: startLabelRef,
     className: cx(hideMinValueDiffClass, activeFirstValue)
-  }, min), /*#__PURE__*/React.createElement(SliderBase, _extends({
+  }, reversed ? max : min), /*#__PURE__*/React.createElement(SliderBase, _extends({
     min: min,
     max: max,
     disabled: disabled,
+    size: size,
+    sliderAlign: sliderAlign,
     setStepSize: setStepSize,
     onChange: onHandleChangeCommitted,
     railFillWidth: state.railFillWidth,
-    settings: sizeData[size],
+    settings: settings,
     labelPlacement: labelPlacement,
-    rangeValuesPlacement: rangeValuesPlacement
+    rangeValuesPlacement: rangeValuesPlacement,
+    orientation: orientation
   }, rest), /*#__PURE__*/React.createElement(Handler, {
+    size: pointerSize,
+    orientation: orientation,
     stepSize: state.stepSize,
     onChangeCommitted: onHandleChangeCommitted,
     onChange: onHandleChange,
-    xPosition: state.xHandle,
+    position: state.handlePosition,
     min: min,
     max: max,
     startOffset: startOffset,
@@ -175,11 +205,12 @@ export var SingleSlider = function SingleSlider(_ref) {
     disabled: disabled,
     ariaLabel: ariaLabel,
     multipleStepSize: multipleStepSize,
-    showCurrentValue: showCurrentValue
-  })), showRangeValues && /*#__PURE__*/React.createElement(StyledRangeValue, {
+    showCurrentValue: showCurrentValue,
+    valuePlacement: valuePlacement
+  })), innerShowScale && /*#__PURE__*/React.createElement(StyledRangeValue, {
     ref: endLabelRef,
     className: cx(classes.maxRangeValue, hideMaxValueDiffClass, activeSecondValue)
-  }, max)), /*#__PURE__*/React.createElement(InputHidden, _extends({
+  }, reversed ? min : max)), /*#__PURE__*/React.createElement(InputHidden, _extends({
     name: name,
     type: "number",
     datatype: "slider-single",