intelicoreact 1.2.64 → 1.2.65

package/dist/Atomic/FormElements/RangeSlider/RangeSlider.js

@@ -21,6 +21,8 @@ var _reactFeather = require("react-feather");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _useIsMobile2 = _interopRequireDefault(require("../../../Functions/useIsMobile"));
+
 var _mobileKeyboardTypesPresets = require("../../../Functions/presets/mobileKeyboardTypesPresets");
 
 var _fieldValueFormatters = require("../../../Functions/fieldValueFormatters");
@@ -37,7 +39,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-// require('./lib/customEventListener.js');
 function RangeSlider(_ref) {
   var _value$from, _value$to;
 
@@ -68,6 +69,10 @@ function RangeSlider(_ref) {
       isUseBitPoints = _ref$isUseBitPoints === void 0 ? true : _ref$isUseBitPoints,
       _ref$onChange = _ref.onChange,
       onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
+
+  var _useIsMobile = (0, _useIsMobile2.default)(),
+      isMobile = _useIsMobile.isMobile;
+
   var trackRef = (0, _react.useRef)(0);
 
   var _useState = (0, _react.useState)(0),
@@ -234,7 +239,7 @@ function RangeSlider(_ref) {
 
 
   var onTriggerMouseDown = function onTriggerMouseDown(e, type) {
-    if (e.button !== 0) return; // Отменить обработку, если нажата не левая кнопка мыши
+    if (e.button !== 0 && !isMobile) return; // Отменить обработку, если нажата не левая кнопка мыши
 
     setMovingTrigger(e.target);
     setMovingTriggerType(type);
@@ -242,21 +247,34 @@ function RangeSlider(_ref) {
   };
 
   var onTriggerMove = function onTriggerMove(e) {
-    e.preventDefault();
-    e.stopPropagation();
+    var _e$touches;
+
+    if (!isMobile) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+
     if (!isTriggerMoved) setIsTriggerMoved(true);
     if (!movingTrigger) return false;
-    var x = e.clientX;
 
-    var _ref2 = (movingTrigger === null || movingTrigger === void 0 ? void 0 : movingTrigger.getBoundingClientRect()) || {},
-        _ref2$width = _ref2.width,
-        triggerWidth = _ref2$width === void 0 ? 16 : _ref2$width;
+    var _ref2 = isMobile ? e === null || e === void 0 ? void 0 : (_e$touches = e.touches) === null || _e$touches === void 0 ? void 0 : _e$touches[0] : e,
+        x = _ref2.clientX;
+
+    var _ref3 = (movingTrigger === null || movingTrigger === void 0 ? void 0 : movingTrigger.getBoundingClientRect()) || {},
+        _ref3$width = _ref3.width,
+        triggerWidth = _ref3$width === void 0 ? 16 : _ref3$width;
 
     if (x < trackPosition || x > trackPosition + trackWidth + triggerWidth) return false;
     x -= triggerWidth / 2;
     onRangeChange(movingTriggerType, getPointsByX(x));
   };
 
+  var onTriggerMoveEnd = function onTriggerMoveEnd() {
+    setMovingTrigger(null);
+    setMovingTriggerType(null);
+    setIsTriggerMoved(false);
+  };
+
   var onRangeInputFocus = function onRangeInputFocus(e, type) {
     setTimeout(function () {
       return setIsInputFocused(type, true);
@@ -276,15 +294,9 @@ function RangeSlider(_ref) {
   }, []); /// MouseUp Event Controller
 
   (0, _react.useEffect)(function () {
-    var resetMovingTrigger = function resetMovingTrigger() {
-      setMovingTrigger(null);
-      setMovingTriggerType(null);
-      setIsTriggerMoved(false); // Сбросить флаг движения при отпускании кнопки
-    };
-
-    document.addEventListener('mouseup', resetMovingTrigger);
+    document.addEventListener('mouseup', onTriggerMoveEnd);
     return function () {
-      document.removeEventListener('mouseup', resetMovingTrigger);
+      document.removeEventListener('mouseup', onTriggerMoveEnd);
     };
   }, []); // MouseMove Event Controller
 
@@ -330,9 +342,9 @@ function RangeSlider(_ref) {
   (0, _react.useLayoutEffect)(function () {
     var _trackRef$current, _fromTriggerRef$curre, _fromTriggerRef$curre2, _toTriggerRef$current, _toTriggerRef$current2;
 
-    var _ref3 = (trackRef === null || trackRef === void 0 ? void 0 : (_trackRef$current = trackRef.current) === null || _trackRef$current === void 0 ? void 0 : _trackRef$current.getBoundingClientRect()) || {},
-        width = _ref3.width,
-        x = _ref3.x;
+    var _ref4 = (trackRef === null || trackRef === void 0 ? void 0 : (_trackRef$current = trackRef.current) === null || _trackRef$current === void 0 ? void 0 : _trackRef$current.getBoundingClientRect()) || {},
+        width = _ref4.width,
+        x = _ref4.x;
 
     width -= (fromTriggerRef === null || fromTriggerRef === void 0 ? void 0 : (_fromTriggerRef$curre = fromTriggerRef.current) === null || _fromTriggerRef$curre === void 0 ? void 0 : (_fromTriggerRef$curre2 = _fromTriggerRef$curre.getBoundingClientRect()) === null || _fromTriggerRef$curre2 === void 0 ? void 0 : _fromTriggerRef$curre2.width) || (toTriggerRef === null || toTriggerRef === void 0 ? void 0 : (_toTriggerRef$current = toTriggerRef.current) === null || _toTriggerRef$current === void 0 ? void 0 : (_toTriggerRef$current2 = _toTriggerRef$current.getBoundingClientRect()) === null || _toTriggerRef$current2 === void 0 ? void 0 : _toTriggerRef$current2.width);
     setPointsPerPx(countPointsPerPx(width));
@@ -462,17 +474,28 @@ function RangeSlider(_ref) {
       ref: fromTriggerRef,
       style: fromStyle,
       className: "range-slider__track__range-triggers--trigger range-slider__track__range-triggers--trigger-left",
-      onMouseDown: function onMouseDown(e) {
+      onTouchStart: function onTouchStart(e) {
         return onTriggerMouseDown(e, 'from');
-      }
+      },
+      onTouchMove: onTriggerMove,
+      onTouchEnd: onTriggerMoveEnd,
+      onClick: function onClick() {} // DONT REMOVE! MOBILE WILL NOT WORK WITHOUT IT
+
     }), /*#__PURE__*/_react.default.createElement("div", {
       "data-testid": "rangeSlider--track--".concat(testId, "--type-to"),
       ref: toTriggerRef,
       style: toStyle,
       className: "range-slider__track__range-triggers--trigger range-slider__track__range-triggers--trigger-right",
       onMouseDown: function onMouseDown(e) {
+        return !isMobile ? onTriggerMouseDown(e, 'to') : {};
+      },
+      onTouchStart: function onTouchStart(e) {
         return onTriggerMouseDown(e, 'to');
-      }
+      },
+      onTouchMove: onTriggerMove,
+      onTouchEnd: onTriggerMoveEnd,
+      onClick: function onClick() {} // DONT REMOVE! MOBILE WILL NOT WORK WITHOUT IT
+
     }));
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "1.2.64",
+  "version": "1.2.65",
   "description": "",
   "main": "dist/index.js",
   "files": [