intelicoreact 1.1.75 → 1.1.77

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

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = RangeSlider;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -29,10 +27,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-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;
@@ -187,30 +181,12 @@ function RangeSlider(_ref) {
       case 'from':
         if (validate) {
           if (value < min) {
-            setFrom(min);
-            setFrezeedValues(function (v) {
-              return _objectSpread(_objectSpread({}, v), {}, {
-                from: min
-              });
-            });
-            return;
+            value = min;
           }
 
           if (value > to - minRange) {
-            setFrom(to - minRange);
-            setFrezeedValues(function (v) {
-              return _objectSpread(_objectSpread({}, v), {}, {
-                from: to - minRange
-              });
-            });
-            return;
+            value = to - minRange;
           }
-
-          setFrezeedValues(function (v) {
-            return _objectSpread(_objectSpread({}, v), {}, {
-              from: value
-            });
-          });
         }
 
         setFrom(value);
@@ -219,40 +195,26 @@ function RangeSlider(_ref) {
       case 'to':
         if (validate) {
           if (value > max) {
-            setTo(max);
-            setFrezeedValues(function (v) {
-              return _objectSpread(_objectSpread({}, v), {}, {
-                to: max
-              });
-            });
-            return;
+            value = max;
           }
 
           if (value < from + minRange) {
-            setTo(from + minRange);
-            setFrezeedValues(function (v) {
-              return _objectSpread(_objectSpread({}, v), {}, {
-                to: from + minRange
-              });
-            });
-            return;
+            value = from + minRange;
           }
-
-          setFrezeedValues(function (v) {
-            return _objectSpread(_objectSpread({}, v), {}, {
-              to: value
-            });
-          });
         }
 
         setTo(value);
         break;
     }
-  };
+  }; // MouseDown Event Controller
+
 
   var onTriggerMouseDown = function onTriggerMouseDown(e, type) {
+    if (e.button !== 0) return; // Отменить обработку, если нажата не левая кнопка мыши
+
     setMovingTrigger(e.target);
     setMovingTriggerType(type);
+    setIsTriggerMoved(true); // Установить флаг движения в true при клике
   };
 
   var onTriggerMove = function onTriggerMove(e) {
@@ -287,12 +249,13 @@ function RangeSlider(_ref) {
 
     onRangeChange('from', (_value$from2 = value === null || value === void 0 ? void 0 : value.from) !== null && _value$from2 !== void 0 ? _value$from2 : max);
     onRangeChange('to', (_value$to2 = value === null || value === void 0 ? void 0 : value.to) !== null && _value$to2 !== void 0 ? _value$to2 : min);
-  }, []); // MouseUp Event Controller
+  }, []); /// MouseUp Event Controller
 
   (0, _react.useEffect)(function () {
     var resetMovingTrigger = function resetMovingTrigger() {
       setMovingTrigger(null);
       setMovingTriggerType(null);
+      setIsTriggerMoved(false); // Сбросить флаг движения при отпускании кнопки
     };
 
     document.addEventListener('mouseup', resetMovingTrigger);
@@ -302,19 +265,18 @@ function RangeSlider(_ref) {
   }, []); // MouseMove Event Controller
 
   (0, _react.useEffect)(function () {
-    var _body$classList;
-
-    if (!movingTrigger && isTriggerMoved) {
-      movingController === null || movingController === void 0 ? void 0 : movingController.abort();
-      setIsTriggerMoved(false);
-      setMovingController(null);
-    } else if (movingTrigger && !isTriggerMoved) {
-      setMovingController(new AbortController());
-    }
+    // Прекратить обработку, если нет активного триггера или не было движения
+    if (!movingTrigger || !isTriggerMoved) return;
+
+    var handleMouseMove = function handleMouseMove(e) {
+      onTriggerMove(e);
+    };
 
-    var body = document.getElementsByTagName('body')[0];
-    (_body$classList = body.classList) === null || _body$classList === void 0 ? void 0 : _body$classList[movingTrigger ? 'add' : 'remove']('moving-cursor');
-  }, [movingTrigger]);
+    document.addEventListener('mousemove', handleMouseMove);
+    return function () {
+      document.removeEventListener('mousemove', handleMouseMove);
+    };
+  }, [movingTrigger, isTriggerMoved]);
   (0, _react.useEffect)(function () {
     if (movingController) {
       document.addEventListener('mousemove', onTriggerMove, {
@@ -325,6 +287,9 @@ function RangeSlider(_ref) {
   (0, _react.useEffect)(function () {
     setFrezeedValues(null);
   }, [isTriggerMoved]);
+  (0, _react.useEffect)(function () {
+    setFrezeedValues(null);
+  }, [isTriggerMoved]);
   (0, _react.useEffect)(function () {
     onChange({
       from: from,
@@ -427,8 +392,8 @@ function RangeSlider(_ref) {
 
   var renderTrackRange = function renderTrackRange() {
     var style = {
-      width: getRangeWidth().toString().concat('px'),
-      left: getRangeOffset().toString().concat('px')
+      width: "".concat(getRangeWidth(), "px"),
+      left: "".concat(getRangeOffset(), "px")
     };
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "range-slider__track__range",
@@ -438,11 +403,23 @@ function RangeSlider(_ref) {
 
   var renderTrackTriggers = function renderTrackTriggers() {
     var fromStyle = {
-      left: getTrackXByPoints(fromValue).toString().concat('px')
+      left: "".concat(getTrackXByPoints(fromValue), "px")
     };
     var toStyle = {
-      left: getTrackXByPoints(toValue).toString().concat('px')
+      left: "".concat(getTrackXByPoints(toValue), "px")
     };
+
+    var renderTrack = function renderTrack() {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: (0, _classnames.default)('range-slider__track', {
+          hidden: noTrack
+        }),
+        ref: trackRef
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        className: "range-slider__track__line"
+      }), renderTrackRange(), renderTrackTriggers());
+    };
+
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "range-slider__track__range-triggers"
     }, /*#__PURE__*/_react.default.createElement("div", {
@@ -475,11 +452,7 @@ function RangeSlider(_ref) {
     }), renderTrackRange(), renderTrackTriggers());
   };
 
-  var render = function render() {
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: "range-slider"
-    }, renderHeader(), renderInputs(), renderTrack());
-  };
-
-  return render();
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "range-slider"
+  }, renderHeader(), renderInputs(), renderTrack());
 }

package/dist/Atomic/UI/Modal/Modal.js

@@ -50,6 +50,7 @@ var Modal = function Modal(_ref2) {
       zIndex = _ref2$zIndex === void 0 ? 100 : _ref2$zIndex,
       isOpen = _ref2.isOpen,
       onConfirm = _ref2.onConfirm,
+      onDecline = _ref2.onDecline,
       closeModal = _ref2.closeModal,
       children = _ref2.children,
       className = _ref2.className,
@@ -91,6 +92,11 @@ var Modal = function Modal(_ref2) {
     confirm: function confirm() {
       onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
     },
+    decline: function decline() {
+      //? closeModal используется для ESC и оверлея, давно хотелось иметь возможность разделить
+      //? Теперь можно не передавать closeModal, а для cancel-кнопки передать отдельный обработчик
+      if (typeof onDecline === 'function') onDecline();else closeModal === null || closeModal === void 0 ? void 0 : closeModal();
+    },
     pressEnter: function pressEnter(event) {
       if (event.keyCode === KEY_CODE.ENTER && !event.repeat) handle.confirm();
     },
@@ -142,7 +148,9 @@ var Modal = function Modal(_ref2) {
     testId: "modal",
     className: (0, _classnames.default)(closeBtnClassName, btnClassNames),
     variant: closeBtnVariant || 'dark-outline',
-    onClick: closeModal,
+    onClick: function onClick() {
+      return handle.decline();
+    },
     label: closeBtnText || 'Cancel',
     disabled: closeBtnDisable,
     icon: closeBtnIcon,

package/package.json

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