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

package/styled-components/cjs/components/Slider/components/Single/Single.js

@@ -13,7 +13,7 @@ var _utils2 = /*#__PURE__*/require("../../../../utils");
 var _Slider = /*#__PURE__*/require("../../Slider.tokens");
 var _SliderBase2 = /*#__PURE__*/require("../SliderBase/SliderBase.styles");
 var _Single = /*#__PURE__*/require("./Single.styles");
-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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -41,35 +41,23 @@ var SingleSlider = exports.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 = (0, _react.useState)({
-      handlePosition: 0,
+      xHandle: 0,
       stepSize: 0,
       railFillWidth: 0
     }),
@@ -85,28 +73,23 @@ var SingleSlider = exports.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 = (0, _react.useState)(innerValue),
+  var _useState7 = (0, _react.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') ? _Slider.classes.labelPlacementOuter : _Slider.classes.labelPlacementInner;
-  var rangeValuesPlacement = rangeValuesPlacementOld === 'outer' || scaleAlign === 'bottom' ? 'outer' : 'inner';
-  var scaleAlignClass = rangeValuesPlacement === 'outer' ? _Slider.classes.rangeValuesPlacementOuter : _Slider.classes.rangeValuesPlacementInner;
+  var hasLabelContent = label || labelContentLeft;
+  var labelPlacementClass = labelPlacement === 'outer' ? _Slider.classes.labelPlacementOuter : _Slider.classes.labelPlacementInner;
+  var rangeValuesPlacementClass = rangeValuesPlacement === 'outer' ? _Slider.classes.rangeValuesPlacementOuter : _Slider.classes.rangeValuesPlacementInner;
   var hideMinValueDiffClass = hideMinValueDiff && dragValue - min <= hideMinValueDiff ? _Slider.classes.hideMinValue : '';
   var hideMaxValueDiffClass = hideMaxValueDiff && max - dragValue <= hideMaxValueDiff ? _Slider.classes.hideMaxValue : '';
-  var verticalOrientationClass = orientation === 'vertical' ? _Slider.classes.verticalOrientation : '';
   var startLabelRef = (0, _react.useRef)(null);
   var endLabelRef = (0, _react.useRef)(null);
   var activeFirstValue = dragValue === min ? _Slider.classes.activeRangeValue : undefined;
   var activeSecondValue = dragValue === max ? _Slider.classes.activeRangeValue : undefined;
   (0, _react.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 ((0, _utils2.isNumber)(startWidth)) {
@@ -116,35 +99,30 @@ var SingleSlider = exports.SingleSlider = function SingleSlider(_ref) {
       if ((0, _utils2.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 = (0, _react.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) {
@@ -162,49 +140,41 @@ var SingleSlider = exports.SingleSlider = function SingleSlider(_ref) {
     }
     setDragValue(newValue);
   };
-  var onHandleChangeCommitted = (0, _react.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 = _utils.sizeData[size][pointerSize === 'large' ? 'large' : 'small'];
+  };
   return /*#__PURE__*/_react["default"].createElement(_Single.SingleWrapper, {
-    className: (0, _utils2.cx)(labelPlacementClass, scaleAlignClass, verticalOrientationClass, sliderAlign === 'right' && _Slider.classes.labelAlignLeft, (sliderAlign === 'center' || sliderAlign === 'none') && _Slider.classes.labelAlignCenter, sliderAlign === 'left' && _Slider.classes.labelAlignRight, labelVerticalPlacement === 'bottom' && _Slider.classes.labelPlacementBottom, labelReversed && _Slider.classes.labelContentReversed)
-  }, hasLabelContent && /*#__PURE__*/_react["default"].createElement(_Single.LabelWrapper, null, (labelContentLeft || labelContent) && /*#__PURE__*/_react["default"].createElement(_Single.LabelContent, null, labelContent), label && /*#__PURE__*/_react["default"].createElement(_Single.Label, null, label)), /*#__PURE__*/_react["default"].createElement(_Single.SliderBaseWrapper, {
-    className: (0, _utils2.cx)(!isVertical && rangeValuesPlacement === 'outer' && _Slider.classes.rangeValuesPlacementOuter, !isVertical && rangeValuesPlacement !== 'outer' && _Slider.classes.rangeValuesPlacementInner, verticalOrientationClass)
-  }, innerShowScale && /*#__PURE__*/_react["default"].createElement(_Single.StyledRangeValue, {
+    className: labelPlacementClass
+  }, hasLabelContent && /*#__PURE__*/_react["default"].createElement(_Single.LabelWrapper, null, labelContentLeft && /*#__PURE__*/_react["default"].createElement(_Single.LabelContentLeft, null, labelContentLeft), label && /*#__PURE__*/_react["default"].createElement(_Single.Label, null, label)), /*#__PURE__*/_react["default"].createElement(_Single.SliderBaseWrapper, {
+    className: rangeValuesPlacementClass
+  }, showRangeValues && /*#__PURE__*/_react["default"].createElement(_Single.StyledRangeValue, {
     ref: startLabelRef,
     className: (0, _utils2.cx)(hideMinValueDiffClass, activeFirstValue)
-  }, reversed ? max : min), /*#__PURE__*/_react["default"].createElement(_SliderBase.SliderBase, _extends({
+  }, min), /*#__PURE__*/_react["default"].createElement(_SliderBase.SliderBase, _extends({
     min: min,
     max: max,
     disabled: disabled,
-    size: size,
-    sliderAlign: sliderAlign,
     setStepSize: setStepSize,
     onChange: onHandleChangeCommitted,
     railFillWidth: state.railFillWidth,
-    settings: settings,
+    settings: _utils.sizeData[size],
     labelPlacement: labelPlacement,
-    rangeValuesPlacement: rangeValuesPlacement,
-    orientation: orientation
+    rangeValuesPlacement: rangeValuesPlacement
   }, rest), /*#__PURE__*/_react["default"].createElement(_ui.Handler, {
-    size: pointerSize,
-    orientation: orientation,
     stepSize: state.stepSize,
     onChangeCommitted: onHandleChangeCommitted,
     onChange: onHandleChange,
-    position: state.handlePosition,
+    xPosition: state.xHandle,
     min: min,
     max: max,
     startOffset: startOffset,
@@ -213,12 +183,11 @@ var SingleSlider = exports.SingleSlider = function SingleSlider(_ref) {
     disabled: disabled,
     ariaLabel: ariaLabel,
     multipleStepSize: multipleStepSize,
-    showCurrentValue: showCurrentValue,
-    valuePlacement: valuePlacement
-  })), innerShowScale && /*#__PURE__*/_react["default"].createElement(_Single.StyledRangeValue, {
+    showCurrentValue: showCurrentValue
+  })), showRangeValues && /*#__PURE__*/_react["default"].createElement(_Single.StyledRangeValue, {
     ref: endLabelRef,
     className: (0, _utils2.cx)(_Slider.classes.maxRangeValue, hideMaxValueDiffClass, activeSecondValue)
-  }, reversed ? min : max)), /*#__PURE__*/_react["default"].createElement(_SliderBase2.InputHidden, _extends({
+  }, max)), /*#__PURE__*/_react["default"].createElement(_SliderBase2.InputHidden, _extends({
     name: name,
     type: "number",
     datatype: "slider-single",

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

@@ -3,25 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.StyledRangeValue = exports.SliderBaseWrapper = exports.SingleWrapper = exports.LabelWrapper = exports.LabelContent = exports.Label = void 0;
+exports.StyledRangeValue = exports.SliderBaseWrapper = exports.SingleWrapper = exports.LabelWrapper = exports.LabelContentLeft = exports.Label = void 0;
 var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
 var _Slider = /*#__PURE__*/require("../../Slider.tokens");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var LabelWrapper = exports.LabelWrapper = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-0"
 })(["color:var(", ");display:flex;gap:var(", ");"], _Slider.tokens.labelColor, _Slider.tokens.labelWrapperGap);
-var LabelContent = exports.LabelContent = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+var LabelContentLeft = exports.LabelContentLeft = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-1qm4elt-1"
-})(["display:inline-flex;"]);
+})([""]);
 var Label = exports.Label = /*#__PURE__*/_styledComponents["default"].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(", ");"], _Slider.tokens.labelFontFamily, _Slider.tokens.labelFontSize, _Slider.tokens.labelFontStyle, _Slider.tokens.labelFontWeight, _Slider.tokens.labelLetterSpacing, _Slider.tokens.labelLineHeight);
 var StyledRangeValue = exports.StyledRangeValue = /*#__PURE__*/_styledComponents["default"].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(", ");}"], _Slider.tokens.rangeValueColor, _Slider.tokens.valueFontFamily, _Slider.tokens.valueFontSize, _Slider.tokens.valueFontStyle, _Slider.tokens.valueFontWeight, _Slider.tokens.valueLetterSpacing, _Slider.tokens.valueLineHeight, _Slider.classes.hideMinValue, _Slider.classes.hideMaxValue, _Slider.classes.activeRangeValue, _Slider.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(", ");}"], _Slider.tokens.rangeValueColor, _Slider.tokens.rangeValueFontFamily, _Slider.tokens.rangeValueFontSize, _Slider.tokens.rangeValueFontStyle, _Slider.tokens.rangeValueFontWeight, _Slider.tokens.rangeValueLetterSpacing, _Slider.tokens.rangeValueLineHeight, _Slider.classes.hideMinValue, _Slider.classes.hideMaxValue, _Slider.classes.activeRangeValue, _Slider.tokens.labelColor);
 var SliderBaseWrapper = exports.SliderBaseWrapper = /*#__PURE__*/_styledComponents["default"].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(", ");}}}"], _Slider.classes.rangeValuesPlacementOuter, StyledRangeValue, _Slider.tokens.railThickness, _Slider.tokens.rangeValueBottomOffset, _Slider.classes.maxRangeValue, _Slider.classes.rangeValuesPlacementInner, StyledRangeValue, _Slider.tokens.rangeValueHorizontalMargin, _Slider.classes.maxRangeValue, _Slider.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(", ");}}}"], _Slider.classes.rangeValuesPlacementOuter, StyledRangeValue, _Slider.tokens.rangeValueBottomOffset, _Slider.classes.maxRangeValue, _Slider.classes.rangeValuesPlacementInner, StyledRangeValue, _Slider.tokens.rangeMinValueMargin, _Slider.classes.maxRangeValue, _Slider.tokens.rangeMaxValueMargin);
 var SingleWrapper = exports.SingleWrapper = /*#__PURE__*/_styledComponents["default"].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(", "));}}}"], _Slider.tokens.disabledOpacity, _Slider.classes.labelPlacementOuter, LabelWrapper, _Slider.tokens.labelWrapperMarginBottom, _Slider.classes.labelPlacementInner, LabelWrapper, _Slider.tokens.labelWrapperMarginRight, _Slider.classes.verticalOrientation, _Slider.classes.labelAlignCenter, LabelWrapper, _Slider.classes.labelPlacementBottom, LabelWrapper, _Slider.classes.labelContentReversed, LabelWrapper, _Slider.classes.labelContentReversed, LabelWrapper, LabelWrapper, SliderBaseWrapper, _Slider.tokens.size, _Slider.classes.labelPlacementInner, LabelWrapper, _Slider.tokens.labelWrapperVerticalMargin, _Slider.classes.labelAlignLeft, LabelWrapper, _Slider.classes.labelAlignRight, _Slider.classes.labelPlacementBottom, LabelWrapper, _Slider.tokens.labelWrapperVerticalMargin, _Slider.classes.verticalOrientation, SliderBaseWrapper, _Slider.classes.labelAlignCenter, StyledRangeValue, _Slider.tokens.rangeValueVerticalMargin, _Slider.classes.maxRangeValue, _Slider.tokens.rangeValueVerticalMargin, _Slider.classes.labelAlignLeft, _Slider.classes.labelAlignRight, StyledRangeValue, _Slider.tokens.railThickness, _Slider.tokens.size, _Slider.tokens.rangeValueHorizontalOffset, _Slider.classes.maxRangeValue, _Slider.classes.labelAlignRight, StyledRangeValue, _Slider.tokens.size, _Slider.tokens.railThickness);
+})(["display:flex;opacity:var(", ");&.", "{flex-direction:column;", "{margin-bottom:var(", ");}}&.", "{", "{margin-right:var(", ");}}"], _Slider.tokens.disabledOpacity, _Slider.classes.labelPlacementOuter, LabelWrapper, _Slider.tokens.labelWrapperMarginBottom, _Slider.classes.labelPlacementInner, LabelWrapper, _Slider.tokens.labelWrapperMarginRight);

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

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.SliderBase = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
 var _hooks = /*#__PURE__*/require("../../../../hooks");
-var _Slider = /*#__PURE__*/require("../../Slider.tokens");
-var _utils = /*#__PURE__*/require("../../../../utils");
 var _SliderBase = /*#__PURE__*/require("./SliderBase.styles");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -24,9 +22,6 @@ var SliderBase = exports.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,
@@ -35,43 +30,34 @@ var SliderBase = exports.SliderBase = function SliderBase(_ref) {
     fontSizeMultiplier = _settings$fontSizeMul === void 0 ? 16 : _settings$fontSizeMul;
   var ref = (0, _react.useRef)(null);
   var gap = indent * fontSizeMultiplier * 2;
-  var isVertical = orientation === 'vertical';
   (0, _react.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
+    });
   };
   (0, _hooks.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);
       }
@@ -81,18 +67,13 @@ var SliderBase = exports.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["default"].createElement(_SliderBase.Slider, {
-    ref: ref,
-    className: (0, _utils.cx)(orientation === 'vertical' && _Slider.classes.verticalOrientation)
+    ref: ref
   }, /*#__PURE__*/_react["default"].createElement(_SliderBase.RailWrap, {
     "aria-hidden": "true",
     onMouseDown: onHandleChange

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

@@ -8,15 +8,15 @@ var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/requir
 var _mixins = /*#__PURE__*/require("../../../../mixins");
 var _Slider = /*#__PURE__*/require("../../Slider.tokens");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-var Rail = exports.Rail = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-ik0bjb-0"
-})(["position:relative;top:50%;height:var(", ");border-radius:var(", ");background-color:var(", ");overflow:hidden;transform:translateY(-50%);"], _Slider.tokens.railThickness, _Slider.tokens.railBorderRadius, _Slider.tokens.railBackgroundColor);
 var Slider = exports.Slider = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-ik0bjb-1"
-})(["flex:1;position:relative;user-select:none;height:var(", ");&.", "{width:var(", ");height:auto;", "{top:0;left:50%;transform:translateX(-50%);width:var(", ");height:100%;}}"], _Slider.tokens.size, _Slider.classes.verticalOrientation, _Slider.tokens.size, Rail, _Slider.tokens.railThickness);
+  componentId: "plasma-new-hope__sc-ik0bjb-0"
+})(["flex:1;position:relative;user-select:none;height:var(", ");"], _Slider.tokens.height);
 var RailWrap = exports.RailWrap = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-ik0bjb-2"
+  componentId: "plasma-new-hope__sc-ik0bjb-1"
 })(["height:100%;"]);
+var Rail = exports.Rail = /*#__PURE__*/_styledComponents["default"].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%);"], _Slider.tokens.railHeight, _Slider.tokens.railBorderRadius, _Slider.tokens.railBackgroundColor);
 var Fill = exports.Fill = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-ik0bjb-3"
 })(["position:absolute;height:100%;top:0;left:0;background:var(", ");width:0;"], _Slider.tokens.fillColor);

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

@@ -7,20 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.Handler = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
 var _reactDraggable = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("react-draggable"));
-var _utils = /*#__PURE__*/require("../../../../utils");
-var _utils2 = /*#__PURE__*/require("../../utils");
+var _utils = /*#__PURE__*/require("../../utils");
 var _Thumb = /*#__PURE__*/require("../Thumb/Thumb");
-var _Slider = /*#__PURE__*/require("../../Slider.tokens");
 var _Handler = /*#__PURE__*/require("./Handler.styles");
-var _computeKeyPressData = /*#__PURE__*/require("./computeKeyPressData");
-var _excluded = ["size", "orientation", "stepSize", "onChangeCommitted", "onChange", "position", "min", "max", "bounds", "zIndex", "disabled", "side", "showCurrentValue", "startOffset", "endOffset", "value", "valuePlacement"];
+var _excluded = ["stepSize", "onChangeCommitted", "onChange", "xPosition", "min", "max", "bounds", "zIndex", "disabled", "side", "showCurrentValue", "startOffset", "endOffset", "value"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-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); }
@@ -31,14 +25,22 @@ 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; }
 // TODO: PLASMA-1707
 
+var KeyboardSupport = {
+  PageUp: 33,
+  PageDown: 34,
+  End: 35,
+  Home: 36,
+  ArrowLeft: 37,
+  ArrowUp: 38,
+  ArrowRight: 39,
+  ArrowDown: 40
+};
 var Handler = exports.Handler = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var size = _ref.size,
-    orientation = _ref.orientation,
-    stepSize = _ref.stepSize,
+  var stepSize = _ref.stepSize,
     onChangeCommitted = _ref.onChangeCommitted,
     onChange = _ref.onChange,
-    _ref$position = _ref.position,
-    position = _ref$position === void 0 ? 0 : _ref$position,
+    _ref$xPosition = _ref.xPosition,
+    xPosition = _ref$xPosition === void 0 ? 0 : _ref$xPosition,
     min = _ref.min,
     max = _ref.max,
     _ref$bounds = _ref.bounds,
@@ -53,88 +55,122 @@ var Handler = exports.Handler = /*#__PURE__*/(0, _react.forwardRef)(function (_r
     _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 = (0, _react.useRef)();
-  var _getOffsets = (0, _utils2.getOffsets)(ref, side, isVertical),
+  var _getOffsets = (0, _utils.getOffsets)(ref, side),
     _getOffsets2 = _slicedToArray(_getOffsets, 2),
-    startClientOffset = _getOffsets2[0],
-    endClientOffset = _getOffsets2[1];
+    offsetLeft = _getOffsets2[0],
+    offsetRight = _getOffsets2[1];
   var _bounds = _slicedToArray(bounds, 2),
-    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
+    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
   } : undefined;
   var tabIndex = disabled ? -1 : 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 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 onDrag = function onDrag(_, data) {
-    var newValue = (0, _utils2.getSliderThumbValue)(isVertical ? data.y : data.x, stepSize, min, max);
+    var newValue = (0, _utils.getSliderThumbValue)(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 = (0, _utils2.getSliderThumbValue)(isVertical ? data.y : data.x, stepSize, min, max);
+    var newValue = (0, _utils.getSliderThumbValue)(data.x, stepSize, min, max);
     onChangeCommitted && onChangeCommitted(newValue, data);
   };
   var onKeyPress = function onKeyPress(event) {
     event.persist();
-    var computedMultipleSteps = stepSize * (rest.multipleStepSize / 100 * max);
-    var data = (0, _computeKeyPressData.computeKeyPressData)(event, {
-      isVertical: isVertical,
-      stepSize: stepSize,
-      position: position,
-      max: max,
-      computedMultipleSteps: computedMultipleSteps
-    });
-    if (!data) {
+    var keyCode = event.keyCode,
+      target = event.target;
+    if (!Object.values(KeyboardSupport).includes(keyCode)) {
       return;
     }
+    var ArrowUp = KeyboardSupport.ArrowUp,
+      ArrowRight = KeyboardSupport.ArrowRight,
+      ArrowDown = KeyboardSupport.ArrowDown,
+      ArrowLeft = KeyboardSupport.ArrowLeft,
+      Home = KeyboardSupport.Home,
+      End = KeyboardSupport.End,
+      PageDown = KeyboardSupport.PageDown,
+      PageUp = KeyboardSupport.PageUp;
+    var computedMultipleSteps = stepSize * (rest.multipleStepSize / 100 * max);
+    var data = {
+      x: 0,
+      deltaX: stepSize,
+      lastX: xPosition,
+      y: 0,
+      deltaY: 0,
+      lastY: 0,
+      node: target
+    };
+    switch (keyCode) {
+      case ArrowUp:
+      case ArrowRight:
+        data.x = xPosition + stepSize;
+        break;
+      case ArrowDown:
+      case ArrowLeft:
+        data.x = xPosition - stepSize;
+        data.deltaX = -stepSize;
+        break;
+      case PageUp:
+        data.x = xPosition + computedMultipleSteps;
+        data.deltaX = computedMultipleSteps;
+        break;
+      case PageDown:
+        data.x = xPosition - computedMultipleSteps;
+        data.deltaX = -computedMultipleSteps;
+        break;
+      case End:
+        data.x = max * stepSize;
+        break;
+      case Home:
+        data.x = 0;
+        break;
+      default:
+        data.x = 0;
+    }
     var left = computedBounds.left,
-      right = computedBounds.right,
-      top = computedBounds.top,
-      bottom = computedBounds.bottom;
+      right = computedBounds.right;
 
     /*
      * INFO: Находим значение в диапазоне между указанными левой и правой границами.
-     * Или между верхней и нижней
      * Необходимо для правильного расчета положения SliderThumb.
      * см. функция clamp
      */
-    var boundedValue = isVertical ? Math.max(Math.min(bottom, data.y), top) : Math.max(Math.min(right, data.x), left);
-    var computedValue = (0, _utils2.getSliderThumbValue)(boundedValue, stepSize, min, max);
+    var boundedValue = Math.max(Math.min(right, data.x), left);
+    var computedValue = (0, _utils.getSliderThumbValue)(boundedValue, stepSize, min, max);
     lastOnChangeValue.current = computedValue;
     onChangeCommitted && onChangeCommitted(computedValue, data);
   };
   return /*#__PURE__*/_react["default"].createElement(_reactDraggable["default"], {
-    axis: isVertical ? 'y' : 'x',
+    axis: "x",
     bounds: computedBounds,
-    grid: isVertical ? [1, stepSize] : [stepSize, 1],
+    grid: [stepSize, 1],
     onStop: onStop,
     onDrag: onDrag,
-    position: dragPosition,
+    position: position,
     disabled: disabled
   }, /*#__PURE__*/_react["default"].createElement(_Handler.HandlerStyled, {
     ref: ref,
     style: {
       zIndex: zIndex
     },
-    className: (0, _utils.cx)(isVertical && _Slider.classes.verticalOrientation, valuePlacement === 'left' && _Slider.classes.valuePlacementLeft),
-    isLarge: size === 'large',
     onKeyDown: onKeyPress
-  }, size !== 'none' && /*#__PURE__*/_react["default"].createElement(_Thumb.Thumb, _extends({
+  }, /*#__PURE__*/_react["default"].createElement(_Thumb.Thumb, _extends({
     tabIndex: tabIndex,
     min: min,
     max: max,
     value: value,
-    disabled: disabled,
-    orientation: orientation
+    disabled: disabled
   }, rest)), showCurrentValueCondition && /*#__PURE__*/_react["default"].createElement(_Handler.StyledValue, null, value)));
 });

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

@@ -7,12 +7,9 @@ exports.StyledValue = exports.HandlerStyled = void 0;
 var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
 var _Slider = /*#__PURE__*/require("../../Slider.tokens");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-var StyledValue = exports.StyledValue = /*#__PURE__*/_styledComponents["default"].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(", ");"], _Slider.tokens.currentValueTopOffset, _Slider.tokens.valueFontFamily, _Slider.tokens.valueFontSize, _Slider.tokens.valueFontStyle, _Slider.tokens.valueFontWeight, _Slider.tokens.valueLetterSpacing, _Slider.tokens.valueLineHeight);
 var HandlerStyled = exports.HandlerStyled = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  componentId: "plasma-new-hope__sc-a1py3c-0"
+})(["cursor:pointer;position:absolute;z-index:1;top:0;left:0;"]);
+var StyledValue = exports.StyledValue = /*#__PURE__*/_styledComponents["default"].span.withConfig({
   componentId: "plasma-new-hope__sc-a1py3c-1"
-})(["cursor:pointer;position:absolute;z-index:1;top:0;left:0;bottom:0;display:flex;align-items:center;justify-content:center;--thumb-size:", ";&.", "{right:0;bottom:auto;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(_Slider.tokens.thumbSizeLarge, ")") : "var(".concat(_Slider.tokens.thumbSize, ")");
-}, _Slider.classes.verticalOrientation, StyledValue, _Slider.tokens.size, _Slider.tokens.size, _Slider.classes.valuePlacementLeft, StyledValue, _Slider.tokens.size, _Slider.tokens.size);
+})(["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(", ");"], _Slider.tokens.currentValueTopOffset, _Slider.tokens.currentValueFontFamily, _Slider.tokens.currentValueFontSize, _Slider.tokens.currentValueFontStyle, _Slider.tokens.currentValueFontWeight, _Slider.tokens.currentValueLetterSpacing, _Slider.tokens.currentValueLineHeight);