intelicoreact 1.2.40 → 1.2.42

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

@@ -9,6 +9,8 @@ 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"));
@@ -27,6 +29,10 @@ 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;
@@ -105,43 +111,57 @@ function RangeSlider(_ref) {
       frezeedValues = _useState12[0],
       setFrezeedValues = _useState12[1];
 
+  var _useState13 = (0, _react.useState)({
+    from: false,
+    to: false
+  }),
+      _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+      isInputsFocused = _useState14[0],
+      setIsInputsFocused = _useState14[1];
+
+  var setIsInputFocused = function setIsInputFocused(input, value) {
+    return setIsInputsFocused(function (state) {
+      return _objectSpread(_objectSpread({}, state), {}, (0, _defineProperty2.default)({}, input, value));
+    });
+  };
+
   var fromValue = frezeedValues ? frezeedValues === null || frezeedValues === void 0 ? void 0 : frezeedValues.from : from;
   var toValue = frezeedValues ? frezeedValues === null || frezeedValues === void 0 ? void 0 : frezeedValues.to : to;
 
-  var _useState13 = (0, _react.useState)(null),
-      _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      movingController = _useState14[0],
-      setMovingController = _useState14[1];
-
   var _useState15 = (0, _react.useState)(null),
       _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-      movingTrigger = _useState16[0],
-      setMovingTrigger = _useState16[1];
+      movingController = _useState16[0],
+      setMovingController = _useState16[1];
 
   var _useState17 = (0, _react.useState)(null),
       _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-      movingTriggerType = _useState18[0],
-      setMovingTriggerType = _useState18[1];
+      movingTrigger = _useState18[0],
+      setMovingTrigger = _useState18[1];
 
-  var _useState19 = (0, _react.useState)(false),
+  var _useState19 = (0, _react.useState)(null),
       _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
-      isTriggerMoved = _useState20[0],
-      setIsTriggerMoved = _useState20[1];
+      movingTriggerType = _useState20[0],
+      setMovingTriggerType = _useState20[1];
 
-  var _useState21 = (0, _react.useState)(0),
+  var _useState21 = (0, _react.useState)(false),
       _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
-      pointsPerPx = _useState22[0],
-      setPointsPerPx = _useState22[1];
+      isTriggerMoved = _useState22[0],
+      setIsTriggerMoved = _useState22[1];
 
   var _useState23 = (0, _react.useState)(0),
       _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
-      extremumRange = _useState24[0],
-      setExtremumRange = _useState24[1];
+      pointsPerPx = _useState24[0],
+      setPointsPerPx = _useState24[1];
 
   var _useState25 = (0, _react.useState)(0),
       _useState26 = (0, _slicedToArray2.default)(_useState25, 2),
-      extremumWidth = _useState26[0],
-      setExtremumWidth = _useState26[1];
+      extremumRange = _useState26[0],
+      setExtremumRange = _useState26[1];
+
+  var _useState27 = (0, _react.useState)(0),
+      _useState28 = (0, _slicedToArray2.default)(_useState27, 2),
+      extremumWidth = _useState28[0],
+      setExtremumWidth = _useState28[1];
 
   var countPointsPerPx = function countPointsPerPx(width) {
     return (max - min) / width;
@@ -235,15 +255,12 @@ function RangeSlider(_ref) {
 
   var onRangeInputFocus = function onRangeInputFocus(e, type) {
     setTimeout(function () {
-      return setFrezeedValues({
-        from: from,
-        to: to
-      });
+      return setIsInputFocused(type, true);
     }, 1);
   };
 
   var onRangeInputBlur = function onRangeInputBlur(e, type) {
-    setFrezeedValues(null);
+    setIsInputFocused(type, false);
     onRangeChange(type, type === 'from' ? from : to);
   };
 
@@ -291,7 +308,9 @@ function RangeSlider(_ref) {
     setFrezeedValues(null);
   }, [isTriggerMoved]);
   (0, _react.useEffect)(function () {
-    onChange({
+    if (Object.values(isInputsFocused).every(function (v) {
+      return !v;
+    }) && !isTriggerMoved) onChange({
       from: from,
       to: to
     });
@@ -299,7 +318,7 @@ function RangeSlider(_ref) {
       from: from,
       to: to
     });
-  }, [from, to]);
+  }, [from, to, isInputsFocused, isTriggerMoved]);
   (0, _react.useLayoutEffect)(function () {
     setFrom(value.from);
     setTo(value.to);
@@ -316,6 +335,18 @@ function RangeSlider(_ref) {
     setTrackWidth(width);
     setTrackPosition(x);
   }, [trackRef]);
+  (0, _react.useEffect)(function () {
+    if (Object.values(isInputsFocused).every(function (v) {
+      return !v;
+    })) {
+      setFrezeedValues(false);
+    } else {
+      setFrezeedValues({
+        from: from,
+        to: to
+      });
+    }
+  }, [isInputsFocused]);
 
   var renderLabel = function renderLabel() {
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -339,7 +370,7 @@ function RangeSlider(_ref) {
   var renderHeader = function renderHeader() {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "range-slider__header"
-    }, renderLabel(), min !== from || max !== to ? renderSelectedRange() : null);
+    }, renderLabel(), min !== fromValue || max !== toValue ? renderSelectedRange() : null);
   };
 
   var renderInputs = function renderInputs() {

package/package.json

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