@megafon/ui-core 5.11.0 → 5.12.1

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.12.1](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/compare/@megafon/ui-core@5.12.0...@megafon/ui-core@5.12.1) (2024-05-14)
+
+
+### Bug Fixes
+
+* **selector:** fix file name ([b8b3d26](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/b8b3d26616889bb750db71819be57632555778b8))
+
+
+
+
+
+# [5.12.0](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/compare/@megafon/ui-core@5.11.0...@megafon/ui-core@5.12.0) (2024-05-14)
+
+
+### Features
+
+* **sliders:** add support for non-multiple min value ([51ed0cf](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/51ed0cfa3829bb4fab446086729a3b1ea1dcff61))
+
+
+
+
+
 # [5.11.0](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/compare/@megafon/ui-core@5.10.1...@megafon/ui-core@5.11.0) (2024-05-06)
 
 

package/dist/es/components/Selector/Selector.js

@@ -1,6 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _extends from "@babel/runtime/helpers/extends";
 import "core-js/modules/es.function.name.js";
 import "core-js/modules/es.array.includes.js";
 import "core-js/modules/es.string.includes.js";
@@ -9,8 +9,16 @@ import "core-js/modules/es.array.concat.js";
 import * as React from 'react';
 import { cnCreate, filterDataAttrs } from '@megafon/ui-helpers';
 import * as PropTypes from 'prop-types';
-import CheckedIcon from "./i/\u0441heck.svg";
 import "./Selector.css";
+
+var CheckedIcon = function CheckedIcon(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    viewBox: "0 0 14 12"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    d: "M4.523 8.368L12.386 0 14 1.914 4.523 12 0 7.187l1.614-1.914 2.909 3.095z"
+  }));
+};
+
 var cn = cnCreate('mfui-selector');
 
 var Selector = function Selector(_ref) {

package/dist/es/components/Sliders/Slider/Slider.css

@@ -23,6 +23,7 @@
   margin-left: auto;
 }
 .mfui-slider__range-input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   height: 12px;
   margin: 6px 0;
   border-radius: 100px;

package/dist/es/components/Sliders/Slider/Slider.js

@@ -84,7 +84,6 @@ var Slider = function Slider(_ref) {
     value: rangeValue,
     min: minValue,
     max: maxValue,
-    step: step,
     onChange: handleInputChange(true),
     disabled: disabled,
     style: {

package/dist/es/components/Sliders/SliderRange/SliderRange.css

@@ -27,8 +27,10 @@
   position: relative;
   height: 12px;
   margin: 6px 0;
+  cursor: pointer;
 }
 .mfui-slider-range__range-input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   position: absolute;
   top: 50%;
   width: 100%;

package/dist/es/components/Sliders/SliderRange/SliderRange.js

@@ -19,10 +19,8 @@ var SliderRange = function SliderRange(_ref) {
       displayLeftValuePrefix = _ref.displayLeftValuePrefix,
       displayRightValuePrefix = _ref.displayRightValuePrefix,
       displayValueUnit = _ref.displayValueUnit,
-      _ref$leftValue = _ref.leftValue,
-      outerLeftValue = _ref$leftValue === void 0 ? 0 : _ref$leftValue,
-      _ref$rightValue = _ref.rightValue,
-      outerRightValue = _ref$rightValue === void 0 ? 0 : _ref$rightValue,
+      outerLeftValue = _ref.leftValue,
+      outerRightValue = _ref.rightValue,
       minValue = _ref.minValue,
       maxValue = _ref.maxValue,
       _ref$isControlled = _ref.isControlled,
@@ -35,8 +33,8 @@ var SliderRange = function SliderRange(_ref) {
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
       dataAttrs = _ref.dataAttrs,
       onChange = _ref.onChange;
-  var defaultLeftRangeValue = outerLeftValue || minValue;
-  var defaultRightRangeValue = outerRightValue || maxValue;
+  var outerLeftRangeValue = getRangeValue(outerLeftValue !== null && outerLeftValue !== void 0 ? outerLeftValue : minValue, minValue, maxValue, step);
+  var outerRightRangeValue = getRangeValue(outerRightValue !== null && outerRightValue !== void 0 ? outerRightValue : maxValue, minValue, maxValue, step);
   var rangeTrackInnerRef = React.useRef(null);
 
   var _React$useState = React.useState(null),
@@ -49,18 +47,18 @@ var SliderRange = function SliderRange(_ref) {
       rawRightInputValue = _React$useState4[0],
       setRawRightInputValue = _React$useState4[1];
 
-  var _React$useState5 = React.useState(defaultLeftRangeValue),
+  var _React$useState5 = React.useState(outerLeftRangeValue),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
       innerLeftRangeValue = _React$useState6[0],
       setInnerLeftRangeValue = _React$useState6[1];
 
-  var _React$useState7 = React.useState(defaultRightRangeValue),
+  var _React$useState7 = React.useState(outerRightRangeValue),
       _React$useState8 = _slicedToArray(_React$useState7, 2),
       innerRightRangeValue = _React$useState8[0],
       setInnerRightRangeValue = _React$useState8[1];
 
-  var leftRangeValue = isControlled ? outerLeftValue : innerLeftRangeValue;
-  var rightRangeValue = isControlled ? outerRightValue : innerRightRangeValue;
+  var leftRangeValue = isControlled ? outerLeftRangeValue : innerLeftRangeValue;
+  var rightRangeValue = isControlled ? outerRightRangeValue : innerRightRangeValue;
   var trackSize = getTrackSize(leftRangeValue, rightRangeValue, minValue, maxValue);
   var isThumbAtEndOfTrack = checkForThumbAtEndOfTrack(leftRangeValue, minValue, maxValue, THUMB_SIZE);
   var showHead = !!label || !!displayValueType;
@@ -160,7 +158,6 @@ var SliderRange = function SliderRange(_ref) {
     value: leftRangeValue,
     min: minValue,
     max: maxValue,
-    step: step,
     onChange: handleLeftInputChange(true),
     disabled: disabled
   }, filterDataAttrs(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.leftRangeInput))), /*#__PURE__*/React.createElement("input", _extends({
@@ -171,7 +168,6 @@ var SliderRange = function SliderRange(_ref) {
     value: rightRangeValue,
     min: minValue,
     max: maxValue,
-    step: step,
     onChange: handleRightInputChange(true),
     disabled: disabled
   }, filterDataAttrs(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.rightRangeInput))), /*#__PURE__*/React.createElement("div", {

package/dist/es/components/Sliders/SliderRatio/SliderRatio.css

@@ -28,6 +28,7 @@
   width: 100%;
 }
 .mfui-slider-ratio__range-input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   position: relative;
   z-index: 1;
   display: block;

package/dist/es/components/Sliders/components/SliderDisplayValue/SliderDisplayValue.css

@@ -50,6 +50,7 @@
   color: var(--spbSky3);
 }
 .mfui-slider-display-value__input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   display: block;
   width: 10px;
   min-width: 100%;

package/dist/es/components/Sliders/helpers.js

@@ -1,21 +1,22 @@
 import "core-js/modules/es.number.constructor.js";
 import "core-js/modules/es.number.to-fixed.js";
 export var getRangeValue = function getRangeValue(value, minValue, maxValue, step) {
-  var numberValue = Number(value);
+  var sourceValue = Number(value);
 
-  if (numberValue < minValue) {
+  if (minValue === maxValue || sourceValue < minValue) {
     return minValue;
   }
 
-  if (numberValue > maxValue) {
+  if (sourceValue > maxValue) {
     return maxValue;
   }
 
   var valueDifference = maxValue - minValue;
   var expectedStepCount = valueDifference / step;
-  var receivedStepCount = valueDifference / numberValue;
+  var receivedStepCount = valueDifference / sourceValue;
   var stepPosition = Math.round(expectedStepCount / receivedStepCount);
-  return step * stepPosition;
+  var valueWithStep = step * stepPosition;
+  return valueWithStep < minValue ? minValue : valueWithStep;
 };
 export var getTrackSize = function getTrackSize() {
   var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;

package/dist/lib/components/Selector/Selector.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 require("core-js/modules/es.function.name.js");
 
 require("core-js/modules/es.array.includes.js");
@@ -29,14 +29,20 @@ var _uiHelpers = require("@megafon/ui-helpers");
 
 var PropTypes = _interopRequireWildcard(require("prop-types"));
 
-var _сheck = _interopRequireDefault(require("./i/\u0441heck.svg"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+var CheckedIcon = function CheckedIcon(props) {
+  return /*#__PURE__*/React.createElement("svg", (0, _extends2["default"])({
+    viewBox: "0 0 14 12"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    d: "M4.523 8.368L12.386 0 14 1.914 4.523 12 0 7.187l1.614-1.914 2.909 3.095z"
+  }));
+};
+
 var cn = (0, _uiHelpers.cnCreate)('mfui-selector');
 
 var Selector = function Selector(_ref) {
@@ -89,7 +95,7 @@ var Selector = function Selector(_ref) {
     ref: inputRef
   }, (0, _uiHelpers.filterDataAttrs)(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.input))), /*#__PURE__*/React.createElement("div", (0, _extends2["default"])({
     className: cn('custom-input', classes.customInput)
-  }, (0, _uiHelpers.filterDataAttrs)(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.customInput)), /*#__PURE__*/React.createElement(_сheck["default"], {
+  }, (0, _uiHelpers.filterDataAttrs)(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.customInput)), /*#__PURE__*/React.createElement(CheckedIcon, {
     className: cn('icon')
   })), children));
 };

package/dist/lib/components/Sliders/Slider/Slider.css

@@ -23,6 +23,7 @@
   margin-left: auto;
 }
 .mfui-slider__range-input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   height: 12px;
   margin: 6px 0;
   border-radius: 100px;

package/dist/lib/components/Sliders/Slider/Slider.js

@@ -107,7 +107,6 @@ var Slider = function Slider(_ref) {
     value: rangeValue,
     min: minValue,
     max: maxValue,
-    step: step,
     onChange: handleInputChange(true),
     disabled: disabled,
     style: {

package/dist/lib/components/Sliders/SliderRange/SliderRange.css

@@ -27,8 +27,10 @@
   position: relative;
   height: 12px;
   margin: 6px 0;
+  cursor: pointer;
 }
 .mfui-slider-range__range-input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   position: absolute;
   top: 50%;
   width: 100%;

package/dist/lib/components/Sliders/SliderRange/SliderRange.js

@@ -43,10 +43,8 @@ var SliderRange = function SliderRange(_ref) {
       displayLeftValuePrefix = _ref.displayLeftValuePrefix,
       displayRightValuePrefix = _ref.displayRightValuePrefix,
       displayValueUnit = _ref.displayValueUnit,
-      _ref$leftValue = _ref.leftValue,
-      outerLeftValue = _ref$leftValue === void 0 ? 0 : _ref$leftValue,
-      _ref$rightValue = _ref.rightValue,
-      outerRightValue = _ref$rightValue === void 0 ? 0 : _ref$rightValue,
+      outerLeftValue = _ref.leftValue,
+      outerRightValue = _ref.rightValue,
       minValue = _ref.minValue,
       maxValue = _ref.maxValue,
       _ref$isControlled = _ref.isControlled,
@@ -59,8 +57,8 @@ var SliderRange = function SliderRange(_ref) {
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
       dataAttrs = _ref.dataAttrs,
       onChange = _ref.onChange;
-  var defaultLeftRangeValue = outerLeftValue || minValue;
-  var defaultRightRangeValue = outerRightValue || maxValue;
+  var outerLeftRangeValue = (0, _helpers.getRangeValue)(outerLeftValue !== null && outerLeftValue !== void 0 ? outerLeftValue : minValue, minValue, maxValue, step);
+  var outerRightRangeValue = (0, _helpers.getRangeValue)(outerRightValue !== null && outerRightValue !== void 0 ? outerRightValue : maxValue, minValue, maxValue, step);
   var rangeTrackInnerRef = React.useRef(null);
 
   var _React$useState = React.useState(null),
@@ -73,18 +71,18 @@ var SliderRange = function SliderRange(_ref) {
       rawRightInputValue = _React$useState4[0],
       setRawRightInputValue = _React$useState4[1];
 
-  var _React$useState5 = React.useState(defaultLeftRangeValue),
+  var _React$useState5 = React.useState(outerLeftRangeValue),
       _React$useState6 = (0, _slicedToArray2["default"])(_React$useState5, 2),
       innerLeftRangeValue = _React$useState6[0],
       setInnerLeftRangeValue = _React$useState6[1];
 
-  var _React$useState7 = React.useState(defaultRightRangeValue),
+  var _React$useState7 = React.useState(outerRightRangeValue),
       _React$useState8 = (0, _slicedToArray2["default"])(_React$useState7, 2),
       innerRightRangeValue = _React$useState8[0],
       setInnerRightRangeValue = _React$useState8[1];
 
-  var leftRangeValue = isControlled ? outerLeftValue : innerLeftRangeValue;
-  var rightRangeValue = isControlled ? outerRightValue : innerRightRangeValue;
+  var leftRangeValue = isControlled ? outerLeftRangeValue : innerLeftRangeValue;
+  var rightRangeValue = isControlled ? outerRightRangeValue : innerRightRangeValue;
   var trackSize = (0, _helpers2.getTrackSize)(leftRangeValue, rightRangeValue, minValue, maxValue);
   var isThumbAtEndOfTrack = (0, _helpers2.checkForThumbAtEndOfTrack)(leftRangeValue, minValue, maxValue, THUMB_SIZE);
   var showHead = !!label || !!displayValueType;
@@ -184,7 +182,6 @@ var SliderRange = function SliderRange(_ref) {
     value: leftRangeValue,
     min: minValue,
     max: maxValue,
-    step: step,
     onChange: handleLeftInputChange(true),
     disabled: disabled
   }, (0, _uiHelpers.filterDataAttrs)(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.leftRangeInput))), /*#__PURE__*/React.createElement("input", (0, _extends2["default"])({
@@ -195,7 +192,6 @@ var SliderRange = function SliderRange(_ref) {
     value: rightRangeValue,
     min: minValue,
     max: maxValue,
-    step: step,
     onChange: handleRightInputChange(true),
     disabled: disabled
   }, (0, _uiHelpers.filterDataAttrs)(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.rightRangeInput))), /*#__PURE__*/React.createElement("div", {

package/dist/lib/components/Sliders/SliderRatio/SliderRatio.css

@@ -28,6 +28,7 @@
   width: 100%;
 }
 .mfui-slider-ratio__range-input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   position: relative;
   z-index: 1;
   display: block;

package/dist/lib/components/Sliders/components/SliderDisplayValue/SliderDisplayValue.css

@@ -50,6 +50,7 @@
   color: var(--spbSky3);
 }
 .mfui-slider-display-value__input {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   display: block;
   width: 10px;
   min-width: 100%;

package/dist/lib/components/Sliders/helpers.js

@@ -10,21 +10,22 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.number.to-fixed.js");
 
 var getRangeValue = function getRangeValue(value, minValue, maxValue, step) {
-  var numberValue = Number(value);
+  var sourceValue = Number(value);
 
-  if (numberValue < minValue) {
+  if (minValue === maxValue || sourceValue < minValue) {
     return minValue;
   }
 
-  if (numberValue > maxValue) {
+  if (sourceValue > maxValue) {
     return maxValue;
   }
 
   var valueDifference = maxValue - minValue;
   var expectedStepCount = valueDifference / step;
-  var receivedStepCount = valueDifference / numberValue;
+  var receivedStepCount = valueDifference / sourceValue;
   var stepPosition = Math.round(expectedStepCount / receivedStepCount);
-  return step * stepPosition;
+  var valueWithStep = step * stepPosition;
+  return valueWithStep < minValue ? minValue : valueWithStep;
 };
 
 exports.getRangeValue = getRangeValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@megafon/ui-core",
-  "version": "5.11.0",
+  "version": "5.12.1",
   "files": [
     "dist",
     "styles"
@@ -97,5 +97,5 @@
     "react-popper": "^2.2.3",
     "swiper": "^6.5.6"
   },
-  "gitHead": "3450c82e4358cc0decaa76da57c8fb37c774391f"
+  "gitHead": "d95bc298dd37b493fc9dac65cfe624fa1fdd6ea7"
 }