@salutejs/plasma-new-hope 0.174.0-canary.1452.11462555994.0 → 0.174.0-canary.1488.11483339131.0

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

@@ -4,13 +4,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; }
 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) {
@@ -24,15 +21,9 @@ export var sliderRoot = function sliderRoot(Root) {
     var _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'single' : _ref$type,
       props = _objectWithoutProperties(_ref, _excluded);
-    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({
+    return /*#__PURE__*/React.createElement(Root, _extends({}, props, {
       ref: ref
-    }, props), isDoubleValueProps(props, type) && /*#__PURE__*/React.createElement(DoubleUncontrolled, props));
+    }), isSingleValueProps(props, type) && /*#__PURE__*/React.createElement(SingleSlider, props), isDoubleValueProps(props, type) && /*#__PURE__*/React.createElement(DoubleUncontrolled, props));
   });
 };
 export var sliderConfig = {

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

@@ -76,29 +76,3 @@ 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>
-            <Slider
-                onChangeCommitted={() => {}}
-                min={0}
-                max={100}
-                value={30}
-                label="Громкость"
-                labelContent={<IconMic size="s" />}
-                orientation="vertical"
-                sliderAlign="center"
-                size="m"
-            />
-        </section>
-    );
-}
-```

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

@@ -1,12 +1,6 @@
 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',
@@ -15,17 +9,13 @@ export var classes = {
   textFieldActive: 'slider-text-field-active',
   firstTextField: 'slider-first-text-field',
   secondTextField: 'slider-second-text-field',
-  activeRangeValue: 'slider-active-range-value',
-  verticalOrientation: 'slider-vertical-orientation',
-  valuePlacementLeft: 'slider-value-placement-left',
-  reversed: 'slider-reversed'
+  activeRangeValue: 'slider-active-range-value'
 };
 export var tokens = {
-  size: '--plasma-slider-size',
+  height: '--plasma-slider-height',
   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',
@@ -33,27 +23,31 @@ 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',
-  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',
+  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',
   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',
-  railThickness: '--plasma-slider-rail-thickness',
+  railHeight: '--plasma-slider-rail-height',
   railBorderRadius: '--plasma-slider-rail-border-radius',
   railIndent: '--plasma-slider-rail-indent',
   fillColor: '--plasma-slider-fill-color',

package/styled-components/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", "pointerSize", "onChangeCommitted", "onChangeTextField", "onBlurTextField", "onKeyDownTextField", "onChange", "ariaLabel", "multipleStepSize", "name"];
+var _excluded = ["min", "max", "value", "disabled", "label", "labelContentLeft", "size", "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,8 +38,6 @@ 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,
@@ -66,30 +64,20 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     setState = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    firstInputHovered = _useState4[0],
-    setFirstInputHovered = _useState4[1];
+    firstInputActive = _useState4[0],
+    setFirstInputActive = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    firstInputFocused = _useState6[0],
-    setFirstInputFocused = _useState6[1];
-  var _useState7 = useState(false),
+    secondInputActive = _useState6[0],
+    setSecondInputActive = _useState6[1];
+  var _useState7 = useState(value[0]),
     _useState8 = _slicedToArray(_useState7, 2),
-    secondInputHovered = _useState8[0],
-    setSecondInputHovered = _useState8[1];
-  var _useState9 = useState(false),
+    firstValue = _useState8[0],
+    setFirstValue = _useState8[1];
+  var _useState9 = useState(value[1]),
     _useState10 = _slicedToArray(_useState9, 2),
-    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];
+    secondValue = _useState10[0],
+    setSecondValue = _useState10[1];
   var firstHandleRef = useRef(null);
   var secondHandleRef = useRef(null);
   var firstHandleValue = useRef(value[0]);
@@ -114,16 +102,6 @@ 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), {}, {
@@ -265,20 +243,16 @@ 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: settings,
-    railFillXPosition: state.railFillXPosition,
-    orientation: "horizontal"
+    settings: sizeData[size],
+    railFillXPosition: state.railFillXPosition
   }, rest), /*#__PURE__*/React.createElement(Handler, {
     ref: firstHandleRef,
-    size: pointerSize,
     stepSize: state.stepSize,
     multipleStepSize: multipleStepSize,
     onChangeCommitted: onFirstHandleChangeCommitted,
@@ -288,23 +262,18 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     disabled: disabled,
     bounds: [min, state.secondValue],
     side: "left",
-    orientation: "horizontal",
-    position: state.xFirstHandle,
+    xPosition: state.xFirstHandle,
     zIndex: state.firstHandleZIndex,
     value: currentFirstSliderValue,
     ariaLabel: ariaLabelLeft,
-    onMouseDown: function onMouseDown() {
-      return setFirstInputFocused(true);
-    },
     onMouseEnter: function onMouseEnter() {
-      return setFirstInputHovered(true);
+      return setFirstInputActive(true);
     },
     onMouseLeave: function onMouseLeave() {
-      return setFirstInputHovered(false);
+      return setFirstInputActive(false);
     }
   }), /*#__PURE__*/React.createElement(Handler, {
     ref: secondHandleRef,
-    size: pointerSize,
     stepSize: state.stepSize,
     multipleStepSize: multipleStepSize,
     onChangeCommitted: onSecondHandleChangeCommitted,
@@ -315,19 +284,15 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     disabled: disabled,
     bounds: [state.firstValue, max],
     side: "right",
-    orientation: "horizontal",
-    position: state.xSecondHandle,
+    xPosition: state.xSecondHandle,
     zIndex: state.secondHandleZIndex,
     value: Math.max(state.secondValue, min),
     ariaLabel: ariaLabelRight,
-    onMouseDown: function onMouseDown() {
-      return setSecondInputFocused(true);
-    },
     onMouseEnter: function onMouseEnter() {
-      return setSecondInputHovered(true);
+      return setSecondInputActive(true);
     },
     onMouseLeave: function onMouseLeave() {
-      return setSecondInputHovered(false);
+      return setSecondInputActive(false);
     }
   })), /*#__PURE__*/React.createElement(InputsWrapper, null, /*#__PURE__*/React.createElement(StyledInput, {
     className: cx(classes.firstTextField, firstInputActiveClass),

package/styled-components/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", "labelContent", "sliderAlign", "showScale", "showRangeValues", "showCurrentValue", "hideMinValueDiff", "hideMaxValueDiff", "labelPlacement", "rangeValuesPlacement", "scaleAlign", "multipleStepSize", "defaultValue", "size", "name", "pointerSize", "orientation", "reversed", "labelReversed"];
+var _excluded = ["min", "max", "value", "disabled", "onChangeCommitted", "onChange", "ariaLabel", "label", "labelContentLeft", "showRangeValues", "showCurrentValue", "hideMinValueDiff", "hideMaxValueDiff", "labelPlacement", "rangeValuesPlacement", "multipleStepSize", "defaultValue", "size", "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; }
@@ -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, LabelContent, LabelWrapper, SingleWrapper, SliderBaseWrapper, StyledRangeValue } from './Single.styles';
+import { Label, LabelContentLeft, LabelWrapper, SingleWrapper, SliderBaseWrapper, StyledRangeValue } from './Single.styles';
 export var SingleSlider = function SingleSlider(_ref) {
   var _ref2;
   var min = _ref.min,
@@ -33,35 +33,23 @@ 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 ? 'top' : _ref$labelPlacement,
-    rangeValuesPlacementOld = _ref.rangeValuesPlacement,
-    _ref$scaleAlign = _ref.scaleAlign,
-    scaleAlign = _ref$scaleAlign === void 0 ? 'bottom' : _ref$scaleAlign,
+    labelPlacement = _ref$labelPlacement === void 0 ? 'outer' : _ref$labelPlacement,
+    _ref$rangeValuesPlace = _ref.rangeValuesPlacement,
+    rangeValuesPlacement = _ref$rangeValuesPlace === void 0 ? 'outer' : _ref$rangeValuesPlace,
     _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({
-      handlePosition: 0,
+      xHandle: 0,
       stepSize: 0,
       railFillWidth: 0
     }),
@@ -77,28 +65,23 @@ export var SingleSlider = function SingleSlider(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     endOffset = _useState6[0],
     setEndOffset = _useState6[1];
-  var innerValue = (_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : min;
-  var _useState7 = useState(innerValue),
+  var _useState7 = useState((_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : min),
     _useState8 = _slicedToArray(_useState7, 2),
     dragValue = _useState8[0],
     setDragValue = _useState8[1];
   var stepSize = state.stepSize;
-  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 hasLabelContent = label || labelContentLeft;
+  var labelPlacementClass = labelPlacement === 'outer' ? classes.labelPlacementOuter : classes.labelPlacementInner;
+  var rangeValuesPlacementClass = 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 visibleValue = reversed ? max - dragValue + min : dragValue;
-    var localValue = Math.min(Math.max(visibleValue, min), max) - min;
-    if (!isVertical && rangeValuesPlacement === 'outer') {
+    var localValue = Math.min(Math.max(dragValue, min), max) - min;
+    if (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)) {
@@ -108,35 +91,30 @@ 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), {}, {
-        handlePosition: stepSize * localValue,
+        xHandle: stepSize * localValue,
         railFillWidth: stepSize * localValue
       });
     });
-  }, [dragValue, innerShowScale, labelPlacement, stepSize, rangeValuesPlacement, min, max, isVertical, reversed,
-  // для перерасчета размеров
-  sliderAlign, size]);
+  }, [dragValue, labelPlacement, stepSize, rangeValuesPlacement, min, max, setStartOffset, setEndOffset]);
   var setStepSize = useCallback(function (newStepSize) {
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
         stepSize: newStepSize
       });
     });
-  }, []);
+  }, [setState]);
   var onHandleChange = function onHandleChange(handleValue, data) {
-    var newValue = Math.round(reversed ? max - handleValue + min : handleValue);
-    var newHandlePosition = isVertical ? data.y : data.x;
+    var newHandleXPosition = data.x;
+    var newValue = Math.round(handleValue);
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
-        railFillWidth: newHandlePosition
+        railFillWidth: newHandleXPosition
       });
     });
     if (onChange) {
@@ -154,49 +132,41 @@ export var SingleSlider = function SingleSlider(_ref) {
     }
     setDragValue(newValue);
   };
-  var onHandleChangeCommitted = useCallback(function (handleValue, data) {
-    var newValue = Math.round(reversed ? max - handleValue + min : handleValue);
+  var onHandleChangeCommitted = function onHandleChangeCommitted(handleValue, data) {
+    var newValue = Math.round(handleValue);
     if (onChangeCommitted) {
       onChangeCommitted(newValue);
     }
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
-        handlePosition: isVertical ? data.lastY : data.lastX,
-        railFillWidth: isVertical ? data.lastY : data.lastX
+        xHandle: data.lastX,
+        railFillWidth: 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: 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, {
+    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, {
     ref: startLabelRef,
     className: cx(hideMinValueDiffClass, activeFirstValue)
-  }, reversed ? max : min), /*#__PURE__*/React.createElement(SliderBase, _extends({
+  }, min), /*#__PURE__*/React.createElement(SliderBase, _extends({
     min: min,
     max: max,
     disabled: disabled,
-    size: size,
-    sliderAlign: sliderAlign,
     setStepSize: setStepSize,
     onChange: onHandleChangeCommitted,
     railFillWidth: state.railFillWidth,
-    settings: settings,
+    settings: sizeData[size],
     labelPlacement: labelPlacement,
-    rangeValuesPlacement: rangeValuesPlacement,
-    orientation: orientation
+    rangeValuesPlacement: rangeValuesPlacement
   }, rest), /*#__PURE__*/React.createElement(Handler, {
-    size: pointerSize,
-    orientation: orientation,
     stepSize: state.stepSize,
     onChangeCommitted: onHandleChangeCommitted,
     onChange: onHandleChange,
-    position: state.handlePosition,
+    xPosition: state.xHandle,
     min: min,
     max: max,
     startOffset: startOffset,
@@ -205,12 +175,11 @@ export var SingleSlider = function SingleSlider(_ref) {
     disabled: disabled,
     ariaLabel: ariaLabel,
     multipleStepSize: multipleStepSize,
-    showCurrentValue: showCurrentValue,
-    valuePlacement: valuePlacement
-  })), innerShowScale && /*#__PURE__*/React.createElement(StyledRangeValue, {
+    showCurrentValue: showCurrentValue
+  })), showRangeValues && /*#__PURE__*/React.createElement(StyledRangeValue, {
     ref: endLabelRef,
     className: cx(classes.maxRangeValue, hideMaxValueDiffClass, activeSecondValue)
-  }, reversed ? min : max)), /*#__PURE__*/React.createElement(InputHidden, _extends({
+  }, max)), /*#__PURE__*/React.createElement(InputHidden, _extends({
     name: name,
     type: "number",
     datatype: "slider-single",

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

@@ -3,18 +3,18 @@ import { classes, tokens } from '../../Slider.tokens';
 export var LabelWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-0"
 })(["color:var(", ");display:flex;gap:var(", ");"], tokens.labelColor, tokens.labelWrapperGap);
-export var LabelContent = /*#__PURE__*/styled.div.withConfig({
+export var LabelContentLeft = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-1"
-})(["display:inline-flex;"]);
+})([""]);
 export var Label = /*#__PURE__*/styled.label.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-2"
 })(["font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");"], tokens.labelFontFamily, tokens.labelFontSize, tokens.labelFontStyle, tokens.labelFontWeight, tokens.labelLetterSpacing, tokens.labelLineHeight);
 export var StyledRangeValue = /*#__PURE__*/styled.span.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-3"
-})(["color:var(", ");font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");transition:opacity 0.1s ease-in-out;&.", ",&.", "{opacity:0;}&.", "{color:var(", ");}"], tokens.rangeValueColor, tokens.valueFontFamily, tokens.valueFontSize, tokens.valueFontStyle, tokens.valueFontWeight, tokens.valueLetterSpacing, tokens.valueLineHeight, classes.hideMinValue, classes.hideMaxValue, classes.activeRangeValue, tokens.labelColor);
+})(["color:var(", ");font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");transition:opacity 0.1s ease-in-out;&.", ",&.", "{opacity:0;}&.", "{color:var(", ");}"], tokens.rangeValueColor, tokens.rangeValueFontFamily, tokens.rangeValueFontSize, tokens.rangeValueFontStyle, tokens.rangeValueFontWeight, tokens.rangeValueLetterSpacing, tokens.rangeValueLineHeight, classes.hideMinValue, classes.hideMaxValue, classes.activeRangeValue, tokens.labelColor);
 export var SliderBaseWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-4"
-})(["position:relative;display:flex;flex:1;&.", "{", "{position:absolute;bottom:calc(var(", ") * -1.5 - var(", "));left:0;&.", "{left:unset;right:0;}}}&.", "{align-items:center;", "{margin-right:var(", ");&.", "{margin-right:0;margin-left:var(", ");}}}"], classes.rangeValuesPlacementOuter, StyledRangeValue, tokens.railThickness, tokens.rangeValueBottomOffset, classes.maxRangeValue, classes.rangeValuesPlacementInner, StyledRangeValue, tokens.rangeValueHorizontalMargin, classes.maxRangeValue, tokens.rangeValueHorizontalMargin);
+})(["position:relative;display:flex;flex:1;&.", "{", "{position:absolute;bottom:var(", ");left:0;&.", "{left:unset;right:0;}}}&.", "{align-items:center;", "{margin-right:var(", ");&.", "{margin-right:0;margin-left:var(", ");}}}"], classes.rangeValuesPlacementOuter, StyledRangeValue, tokens.rangeValueBottomOffset, classes.maxRangeValue, classes.rangeValuesPlacementInner, StyledRangeValue, tokens.rangeMinValueMargin, classes.maxRangeValue, tokens.rangeMaxValueMargin);
 export var SingleWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-5"
-})(["display:flex;opacity:var(", ");&.", "{flex-direction:column;", "{margin-bottom:var(", ");}}&.", "{", "{margin-right:var(", ");}}&.", "{flex-direction:column;align-items:center;&.", "{", "{flex-direction:column-reverse;}&.", "{", "{flex-direction:column;}&.", "{", "{flex-direction:column-reverse;}}}&.", "{", "{flex-direction:column;}}}", "{align-items:center;}", "{width:var(", ");}&.", "{", "{margin-right:0;margin-bottom:var(", ");}}&.", "{align-items:flex-end;", "{flex-direction:row-reverse;}}&.", "{align-items:flex-start;}&.", "{flex-direction:column-reverse;", "{margin-top:var(", ");margin-right:0;margin-bottom:0;}}}&.", "{flex-direction:column;align-items:center;justify-content:center;", "{flex-direction:column;align-items:center;justify-content:center;}&.", "{", "{position:static;bottom:0;left:0;margin-bottom:var(", ");&.", "{left:0;right:0;bottom:0;margin-top:var(", ");margin-bottom:0;}}}&.", ",&.", "{", "{margin-right:0;margin-bottom:0;position:absolute;top:0;right:calc( var(", ") / 2 + var(", ") / 2 + var(", ") );&.", "{margin-right:0;margin-left:0;top:auto;bottom:0;}}}&.", "{", "{left:calc(var(", ") + var(", "));}}}"], tokens.disabledOpacity, classes.labelPlacementOuter, LabelWrapper, tokens.labelWrapperMarginBottom, classes.labelPlacementInner, LabelWrapper, tokens.labelWrapperMarginRight, classes.verticalOrientation, classes.labelAlignCenter, LabelWrapper, classes.labelPlacementBottom, LabelWrapper, classes.labelContentReversed, LabelWrapper, classes.labelContentReversed, LabelWrapper, LabelWrapper, SliderBaseWrapper, tokens.size, classes.labelPlacementInner, LabelWrapper, tokens.labelWrapperVerticalMargin, classes.labelAlignLeft, LabelWrapper, classes.labelAlignRight, classes.labelPlacementBottom, LabelWrapper, tokens.labelWrapperVerticalMargin, classes.verticalOrientation, SliderBaseWrapper, classes.labelAlignCenter, StyledRangeValue, tokens.rangeValueVerticalMargin, classes.maxRangeValue, tokens.rangeValueVerticalMargin, classes.labelAlignLeft, classes.labelAlignRight, StyledRangeValue, tokens.railThickness, tokens.size, tokens.rangeValueHorizontalOffset, classes.maxRangeValue, classes.labelAlignRight, StyledRangeValue, tokens.size, tokens.railThickness);
+})(["display:flex;opacity:var(", ");&.", "{flex-direction:column;", "{margin-bottom:var(", ");}}&.", "{", "{margin-right:var(", ");}}"], tokens.disabledOpacity, classes.labelPlacementOuter, LabelWrapper, tokens.labelWrapperMarginBottom, classes.labelPlacementInner, LabelWrapper, tokens.labelWrapperMarginRight);

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

@@ -1,7 +1,5 @@
 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,
@@ -15,9 +13,6 @@ export var SliderBase = function SliderBase(_ref) {
     labelPlacement = _ref.labelPlacement,
     rangeValuesPlacement = _ref.rangeValuesPlacement,
     onChange = _ref.onChange,
-    orientation = _ref.orientation,
-    size = _ref.size,
-    sliderAlign = _ref.sliderAlign,
     _ref$settings = _ref.settings,
     settings = _ref$settings === void 0 ? {} : _ref$settings;
   var _settings$indent = settings.indent,
@@ -26,43 +21,34 @@ 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 = isVertical ? ref.current.offsetHeight - gap : ref.current.offsetWidth - gap;
+        var railSize = ref.current.offsetWidth - gap;
         var totalSteps = max - min;
         setStepSize(railSize / totalSteps);
       }
     };
     resizeHandler();
-  }, [labelPlacement, rangeValuesPlacement, gap, isVertical,
-  // для перерасчета размеров
-  size, sliderAlign]);
+  }, [labelPlacement, rangeValuesPlacement]);
   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,
-      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);
+      width = _e$currentTarget$getB.width;
+    var lastX = e.clientX - x;
+    var position = min + lastX / (width - gap) * (max - min);
     var result = Math.max(min, Math.min(max, position));
-    var data = isVertical ? {
-      lastY: lastPos
-    } : {
-      lastX: lastPos
-    };
-    onChange(result, data);
+    onChange(result, {
+      lastX: lastX
+    });
   };
   useIsomorphicLayoutEffect(function () {
     var resizeHandler = function resizeHandler() {
       if (ref.current) {
-        var railSize = isVertical ? ref.current.offsetHeight - gap : ref.current.offsetWidth - gap;
+        var railSize = ref.current.offsetWidth - gap;
         var totalSteps = max - min;
         setStepSize(railSize / totalSteps);
       }
@@ -72,18 +58,13 @@ export var SliderBase = function SliderBase(_ref) {
     return function () {
       return window.removeEventListener('resize', resizeHandler);
     };
-  }, [min, max, setStepSize, gap, labelPlacement, rangeValuesPlacement, isVertical]);
-  var fillStyle = isVertical ? {
-    top: "".concat(railFillXPosition, "px"),
-    height: "".concat(railFillWidth, "px"),
-    width: '100%'
-  } : {
+  }, [min, max, setStepSize, gap, labelPlacement, rangeValuesPlacement]);
+  var fillStyle = {
     left: "".concat(railFillXPosition, "px"),
     width: "".concat(railFillWidth, "px")
   };
   return /*#__PURE__*/React.createElement(Slider, {
-    ref: ref,
-    className: cx(orientation === 'vertical' && classes.verticalOrientation)
+    ref: ref
   }, /*#__PURE__*/React.createElement(RailWrap, {
     "aria-hidden": "true",
     onMouseDown: onHandleChange