intelicoreact 0.1.24 → 0.1.25

package/dist/Atomic/FormElements/RangeList/RangeList.js

@@ -11,8 +11,6 @@ exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -21,6 +19,8 @@ var _react = require("react");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _operations = require("../../../Functions/operations");
+
 var _Button = _interopRequireDefault(require("./../../UI/Button/Button"));
 
 var _Input = _interopRequireDefault(require("../Input/Input"));
@@ -45,11 +45,11 @@ var DEFAULT_STATE = {
 
 var RangeList = function RangeList(props) {
   var className = props.className,
-      value = props.value,
+      _props$value = props.value,
+      value = _props$value === void 0 ? [] : _props$value,
       disabled = props.disabled,
-      _addRange = props.addRange,
+      validate = props.validate,
       onChange = props.onChange,
-      isAddRangeInTop = props.isAddRangeInTop,
       isFloatValues = props.isFloatValues,
       decimalPlaces = props.decimalPlaces,
       error = props.error,
@@ -75,21 +75,11 @@ var RangeList = function RangeList(props) {
       return setState(_objectSpread(_objectSpread({}, state), {}, (0, _defineProperty2.default)({}, prop, val)));
     },
     addRange: function addRange() {
-      if (isValidRange) {
-        var newValue;
-        if (_addRange) newValue = _addRange(state.from, state.to, value);else newValue = isAddRangeInTop ? [{
-          from: state.from,
-          to: state.to
-        }].concat((0, _toConsumableArray2.default)(value)) : [].concat((0, _toConsumableArray2.default)(value), [{
-          from: state.from,
-          to: state.to
-        }]);
-
-        if (newValue) {
-          setState(DEFAULT_STATE);
-          onChange(newValue);
-        }
+      var _validate;
 
+      if (isValidRange && ((_validate = validate === null || validate === void 0 ? void 0 : validate(+state.from, +state.to)) !== null && _validate !== void 0 ? _validate : true)) {
+        onChange((0, _operations.addRangeDefault)(+state.from, +state.to, value, isFloatValues ? decimalPlaces : null));
+        setState(DEFAULT_STATE);
         setInnerError('');
       } else setInnerError(defaultErrorText);
     },
@@ -186,7 +176,7 @@ var RangeList = function RangeList(props) {
     onClick: handle.addRange
   }, "Add"))), (innerError || error) && /*#__PURE__*/React.createElement("span", {
     className: "".concat(RC, "__error")
-  }, innerError || error), !(value !== null && value !== void 0 && value.length) && /*#__PURE__*/React.createElement("div", {
+  }, error || innerError), !(value !== null && value !== void 0 && value.length) && /*#__PURE__*/React.createElement("div", {
     className: (0, _classnames.default)("".concat(RC, "__row"), "".concat(RC, "__values"), "".concat(RC, "__null-value"))
   }, NULL_VALUE_TEXT), value.map(function (row, idx) {
     return /*#__PURE__*/React.createElement(_RangeListRow.default, (0, _extends2.default)({

package/dist/Atomic/FormElements/RangeList/RangeList.stories.js

@@ -11,8 +11,6 @@ exports.RangeListTemplate = exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -23,7 +21,7 @@ var _RangeList = _interopRequireDefault(require("./RangeList"));
 
 require("./partial/AnyOuterClass.scss");
 
-var _excluded = ["includeOuterStyles"];
+var _excluded = ["includeOuterStyles", "isAddValidateForExamle", "isUseInitialValues", "initialValues"];
 
 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); }
 
@@ -43,9 +41,12 @@ var rootStyles = {
 
 var Template = function Template(args) {
   var includeOuterStyles = args.includeOuterStyles,
+      isAddValidateForExamle = args.isAddValidateForExamle,
+      isUseInitialValues = args.isUseInitialValues,
+      initialValues = args.initialValues,
       restArgs = (0, _objectWithoutProperties2.default)(args, _excluded);
 
-  var _useState = (0, _react.useState)(args.initialValues || []),
+  var _useState = (0, _react.useState)(),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       value = _useState2[0],
       setValue = _useState2[1];
@@ -55,19 +56,19 @@ var Template = function Template(args) {
       error = _useState4[0],
       setError = _useState4[1];
 
-  var addRangeForExample = function addRangeForExample(from, to, currentValues) {
+  var validateForExample = function validateForExample(from, to) {
     if (+from < 18) {
       setError('18 is the minimum allowed value');
-      return null;
+      return false;
     } else {
       setError('');
-      return [].concat((0, _toConsumableArray2.default)(currentValues), [{
-        from: from,
-        to: to
-      }]);
+      return true;
     }
   };
 
+  (0, _react.useEffect)(function () {
+    if (isUseInitialValues) setValue(initialValues);else setValue([]);
+  }, [isUseInitialValues, restArgs.isFloatValues]);
   return /*#__PURE__*/_react.default.createElement("div", {
     style: rootStyles
   }, /*#__PURE__*/_react.default.createElement(_RangeList.default, (0, _extends2.default)({}, restArgs, {
@@ -76,21 +77,30 @@ var Template = function Template(args) {
     onChange: function onChange(val) {
       return setValue(val);
     },
-    addRange: addRangeForExample,
-    error: error
+    error: error,
+    validate: isAddValidateForExamle ? validateForExample : null
   })));
-}; // const { fields, onChange, type, isInteger, id: filterId, label, className } = props;
-
+};
 
 var RangeListTemplate = Template.bind({});
 exports.RangeListTemplate = RangeListTemplate;
 RangeListTemplate.args = {
-  // initialValues: [{ from: 1, to: 2 }, { from: 5, to: 7 }, { from: 8, to: 9 }],
   includeOuterStyles: false,
+  isAddValidateForExamle: true,
   disabled: false,
-  isAddRangeInTop: false,
   isFloatValues: false,
   decimalPlaces: 2,
   defaultErrorText: 'Set a valid range',
-  nullValueText: 'Not set'
+  nullValueText: 'Not set',
+  isUseInitialValues: true,
+  initialValues: [{
+    from: 15,
+    to: 17
+  }, {
+    from: 19,
+    to: 23
+  }, {
+    from: 25,
+    to: 30
+  }]
 };

package/dist/Functions/operations.js

@@ -0,0 +1,128 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addRangeDefault = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+// Взято из https://developer.mozilla.org/ru/docs/Web/JavaScript/Reference/Global_Objects/Math/round
+// При импорте любой ф-и из этого файла отработает самовызывающаяся ф-я и расширит объект Math 3-мя ф-ми: round10, floor10, ceil10
+(function () {
+  /**
+   * Корректировка округления десятичных дробей.
+   *
+   * @param {String}  type  Тип корректировки.
+   * @param {Number}  value Число.
+   * @param {Integer} exp   Показатель степени (десятичный логарифм основания корректировки).
+   * @returns {Number} Скорректированное значение.
+   */
+  function decimalAdjust(type, value, exp) {
+    // Если степень не определена, либо равна нулю...
+    if (typeof exp === 'undefined' || +exp === 0) {
+      return Math[type](value);
+    }
+
+    value = +value;
+    exp = +exp; // Если значение не является числом, либо степень не является целым числом...
+
+    if (isNaN(value) || !(typeof exp === 'number' && exp % 1 === 0)) {
+      return NaN;
+    } // Сдвиг разрядов
+
+
+    value = value.toString().split('e');
+    value = Math[type](+(value[0] + 'e' + (value[1] ? +value[1] - exp : -exp))); // Обратный сдвиг
+
+    value = value.toString().split('e');
+    return +(value[0] + 'e' + (value[1] ? +value[1] + exp : exp));
+  } // Десятичное округление к ближайшему
+
+
+  if (!Math.round10) {
+    Math.round10 = function (value, exp) {
+      return decimalAdjust('round', value, exp);
+    };
+  } // Десятичное округление вниз
+
+
+  if (!Math.floor10) {
+    Math.floor10 = function (value, exp) {
+      return decimalAdjust('floor', value, exp);
+    };
+  } // Десятичное округление вверх
+
+
+  if (!Math.ceil10) {
+    Math.ceil10 = function (value, exp) {
+      return decimalAdjust('ceil', value, exp);
+    };
+  }
+})();
+
+var addRangeDefault = function addRangeDefault(from, to, currentValues, decimalPlaces) {
+  if (!(currentValues !== null && currentValues !== void 0 && currentValues.length)) return [{
+    from: from,
+    to: to
+  }];
+  var step = decimalPlaces ? Math.pow(10, -1 * decimalPlaces) : 1;
+  var resultOfProcessAddingRange = currentValues.reduce(function (acc, range) {
+    var isIncludesFrom = !!acc.from && range.from < acc.from && range.to >= acc.from;
+    var isIncludesTo = !!acc.to && range.from <= acc.to && range.to > acc.to;
+    var isRangeMustBeIncludet = !!acc.from && !!acc.to && acc.from <= range.from && acc.to >= range.to;
+
+    var processTo = function processTo() {
+      var lastAccRange = acc.result[acc.result.length - 1];
+
+      if (acc.to < range.from) {
+        lastAccRange.to = acc.to;
+        acc.to = null;
+        acc.result = [].concat((0, _toConsumableArray2.default)(acc.result), [range]);
+      } else if (isIncludesTo) {
+        lastAccRange.to = acc.to;
+        acc.result = [].concat((0, _toConsumableArray2.default)(acc.result), [{
+          from: Math.round10(acc.to + step, -1 * decimalPlaces),
+          to: range.to
+        }]);
+        acc.to = null;
+      } else if (acc.to === range.to) {
+        lastAccRange.to = acc.to;
+        acc.to = null;
+      }
+    };
+
+    if (!acc.from && !acc.to) acc.result = [].concat((0, _toConsumableArray2.default)(acc.result), [range]);else if (!acc.from && acc.to) processTo();else if (acc.from && acc.to) {
+      if (acc.from <= range.from) {
+        acc.result = [].concat((0, _toConsumableArray2.default)(acc.result), [{
+          from: acc.from
+        }]);
+        acc.from = null;
+        processTo();
+      } else if (isIncludesFrom) {
+        acc.result = [].concat((0, _toConsumableArray2.default)(acc.result), [{
+          from: range.from,
+          to: Math.round10(acc.from - step, -1 * decimalPlaces)
+        }, {
+          from: acc.from
+        }]);
+        acc.from = null;
+        processTo();
+      } else {
+        acc.result = [].concat((0, _toConsumableArray2.default)(acc.result), (0, _toConsumableArray2.default)(!isRangeMustBeIncludet ? [range] : []));
+      }
+    }
+    return acc;
+  }, {
+    from: from,
+    to: to,
+    result: []
+  });
+  var result = resultOfProcessAddingRange.result;
+  if (!result[result.length - 1].to) result[result.length - 1].to = to;
+  return result;
+};
+
+exports.addRangeDefault = addRangeDefault;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "fixes",
   "main": "dist/index.js",
   "files": ["dist/*", "node_modules/anme/*", "node_modules/moment/*", "node_modules/moment-timezone/*"],

package/dist/Functions/inputExecutor.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.formatInput = void 0;
-
-var _fieldValueFormatters = require("../Functions/fieldValueFormatters");
-
-var formatInput = {
-  priceInput: {
-    addCommas: _fieldValueFormatters.formatToAddBitDepthPoints,
-    removeComma: function removeComma(value) {
-      return parseInt(value.toString().replace(/\,/g, ''));
-    }
-  },
-  // onlyNumbers: (value, isDot = false) => {
-  //   const val = value.slice(0, 1) !== '0' && value.slice(0, 1) !== '.' ? value : value.slice(1);
-  //   if (isDot) return twoDigitAfterDot(val.replace(/[^0-9.]/g, ''));
-  //   else return +val.toString().replace(/\D/g, '');
-  // },
-  formatToOnlyNumbers: function formatToOnlyNumbers(value, settings) {
-    var _ref = settings || {},
-        _ref$type = _ref.type,
-        type = _ref$type === void 0 ? 'float' : _ref$type,
-        decimalPlaces = _ref.decimalPlaces;
-
-    var executor = type === 'float' ? _fieldValueFormatters.filterFloat : _fieldValueFormatters.formatOnlyNumbers;
-    return executor(value, decimalPlaces);
-  },
-  formatToOnlyString: function formatToOnlyString(value) {
-    var soft = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
-    if (soft) {
-      return value.toString().replace(/[^a-z- ]/gi, '');
-    } else {
-      return value.toString().replace(/[^a-z]/gi, '');
-    }
-  }
-}; //обрезает числа после точки до 2х
-// 342.23423432 -> 342.23
-
-exports.formatInput = formatInput;
-
-var twoDigitAfterDot = function twoDigitAfterDot(value) {
-  if (value.includes('.')) {
-    var valueAfterDot = value.slice(0, value.indexOf('.') + 3);
-    var rest = value.slice(value.indexOf('.') + 1, value.indexOf('.') + 3);
-    return allButTheFirstDotCutter(valueAfterDot);
-  } else {
-    return value;
-  }
-}; //обрезает все точки кроме первой.
-//для фомата "2 цифры после точки"
-// нельзя = 123...
-// можно 123.99
-
-
-function allButTheFirstDotCutter(str) {
-  return str.replace(/^([^.]*\.)(.*)$/, function (a, b, c) {
-    return b + c.replace(/\./g, '');
-  });
-}