intelicoreact 0.1.33 → 0.1.34

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

@@ -48,7 +48,7 @@ var RangeList = function RangeList(props) {
       _props$value = props.value,
       value = _props$value === void 0 ? [] : _props$value,
       disabled = props.disabled,
-      validate = props.validate,
+      validateErrors = props.validateErrors,
       onChange = props.onChange,
       isFloatValues = props.isFloatValues,
       decimalPlaces = props.decimalPlaces,
@@ -67,6 +67,11 @@ var RangeList = function RangeList(props) {
       innerError = _useState4[0],
       setInnerError = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(''),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      outerError = _useState6[0],
+      setOuterError = _useState6[1];
+
   var inputFromRef = (0, _react.useRef)(null);
   var inputToRef = (0, _react.useRef)(null);
   var isValidRange = !!(state !== null && state !== void 0 && state.from && state !== null && state !== void 0 && state.to && +(state === null || state === void 0 ? void 0 : state.from) <= +(state === null || state === void 0 ? void 0 : state.to));
@@ -75,13 +80,14 @@ var RangeList = function RangeList(props) {
       return setState(_objectSpread(_objectSpread({}, state), {}, (0, _defineProperty2.default)({}, prop, val)));
     },
     addRange: function addRange() {
-      var _validate;
+      var _validateErrors;
 
-      if (isValidRange && ((_validate = validate === null || validate === void 0 ? void 0 : validate(+state.from, +state.to)) !== null && _validate !== void 0 ? _validate : true)) {
+      if (isValidRange && ((_validateErrors = !(validateErrors !== null && validateErrors !== void 0 && validateErrors(+state.from, +state.to))) !== null && _validateErrors !== void 0 ? _validateErrors : true)) {
         onChange((0, _operations.addRangeDefault)(+state.from, +state.to, value, isFloatValues ? decimalPlaces : null));
         setState(DEFAULT_STATE);
         setInnerError('');
-      } else setInnerError(defaultErrorText);
+        setOuterError('');
+      } else if (!isValidRange) setInnerError(defaultErrorText);else if (validateErrors) setOuterError(validateErrors(+state.from, +state.to));
     },
     removeRange: function removeRange(index) {
       return onChange(value.filter(function (item, idx) {
@@ -93,18 +99,19 @@ var RangeList = function RangeList(props) {
 
       if (!(state !== null && state !== void 0 && state.from) && !(state !== null && state !== void 0 && state.to)) {
         setInnerError('');
+        setOuterError('');
         return e;
       } else if (!state[oppositeKey]) {
         var mustToFocus = key === 'from' ? inputToRef.current : inputFromRef.current;
         mustToFocus.focus();
-      } else if (!isValidRange) setInnerError(defaultErrorText);else {
+      } else if (!isValidRange) {
+        setInnerError(defaultErrorText);
+        if (validateErrors) setOuterError(validateErrors(+state.from, +state.to));
+      } else {
         setInnerError('');
-        return e;
+        if (validateErrors) setOuterError(validateErrors(+state.from, +state.to));
       }
     },
-    onFocus: function onFocus() {
-      return setInnerError('');
-    },
     onKeyUpFromInput: function onKeyUpFromInput(code) {
       if (code === 13) {
         if (isValidRange) inputFromRef.current.blur();else if (!state.to) inputToRef.current.focus();else if (state.from) inputFromRef.current.select();
@@ -135,9 +142,6 @@ var RangeList = function RangeList(props) {
       type: 'int'
     },
     value: state.from,
-    onFocus: function onFocus() {
-      return handle.onFocus();
-    },
     onBlur: function onBlur(e) {
       return handle.rangeValidation(e, 'from');
     },
@@ -158,9 +162,6 @@ var RangeList = function RangeList(props) {
       type: 'int'
     },
     value: state.to,
-    onFocus: function onFocus() {
-      return handle.onFocus();
-    },
     onBlur: function onBlur(e) {
       return handle.rangeValidation(e, 'to');
     },
@@ -174,9 +175,9 @@ var RangeList = function RangeList(props) {
     className: "".concat(RC, "__cell-button")
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     onClick: handle.addRange
-  }, "Add"))), (innerError || error) && /*#__PURE__*/_react.default.createElement("span", {
+  }, "Add"))), (innerError || outerError || error) && /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(RC, "__error")
-  }, error || innerError), !(value !== null && value !== void 0 && value.length) && /*#__PURE__*/_react.default.createElement("div", {
+  }, innerError || error || outerError), !(value !== null && value !== void 0 && value.length) && /*#__PURE__*/_react.default.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.default.createElement(_RangeListRow.default, (0, _extends2.default)({

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

@@ -21,7 +21,7 @@ var _RangeList = _interopRequireDefault(require("./RangeList"));
 
 require("./partial/AnyOuterClass.scss");
 
-var _excluded = ["includeOuterStyles", "isAddValidateForExamle", "isUseInitialValues", "initialValues"];
+var _excluded = ["includeOuterStyles", "isAddValidateErrorsForExamle", "isUseErrorsState", "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); }
 
@@ -41,7 +41,8 @@ var rootStyles = {
 
 var Template = function Template(args) {
   var includeOuterStyles = args.includeOuterStyles,
-      isAddValidateForExamle = args.isAddValidateForExamle,
+      isAddValidateErrorsForExamle = args.isAddValidateErrorsForExamle,
+      isUseErrorsState = args.isUseErrorsState,
       isUseInitialValues = args.isUseInitialValues,
       initialValues = args.initialValues,
       restArgs = (0, _objectWithoutProperties2.default)(args, _excluded);
@@ -56,14 +57,18 @@ var Template = function Template(args) {
       error = _useState4[0],
       setError = _useState4[1];
 
-  var validateForExample = function validateForExample(from, to) {
-    if (+from < 18) {
-      setError('18 is the minimum allowed value');
-      return false;
-    } else {
-      setError('');
-      return true;
-    }
+  var getValidate = function getValidate(isUseState) {
+    return function (from, to) {
+      var errorText = '18 is the minimum allowed value';
+
+      if (+from < 18) {
+        if (isUseState) setError(errorText);
+        return errorText;
+      } else {
+        if (isUseState) setError('');
+        return '';
+      }
+    };
   };
 
   (0, _react.useEffect)(function () {
@@ -79,7 +84,7 @@ var Template = function Template(args) {
       return setValue(val);
     },
     error: error,
-    validate: isAddValidateForExamle ? validateForExample : null
+    validateErrors: isAddValidateErrorsForExamle ? getValidate(isUseErrorsState) : null
   })));
 };
 
@@ -87,7 +92,8 @@ var RangeListTemplate = Template.bind({});
 exports.RangeListTemplate = RangeListTemplate;
 RangeListTemplate.args = {
   includeOuterStyles: false,
-  isAddValidateForExamle: true,
+  isAddValidateErrorsForExamle: true,
+  isUseErrorsState: false,
   disabled: false,
   isFloatValues: false,
   decimalPlaces: 2,

package/dist/Molecular/SwitcherRangeList/SwitcherRangeList.js

@@ -28,7 +28,7 @@ var SwitcherRangeList = function SwitcherRangeList(props) {
       disabled = props.disabled,
       isActive = props.isActive,
       value = props.value,
-      validate = props.validate,
+      validateErrors = props.validateErrors,
       isFloatValues = props.isFloatValues,
       decimalPlaces = props.decimalPlaces,
       error = props.error,
@@ -53,7 +53,7 @@ var SwitcherRangeList = function SwitcherRangeList(props) {
     className: "".concat(RC, "__range-list"),
     value: value,
     onChange: onChange,
-    validate: validate,
+    validateErrors: validateErrors,
     isFloatValues: isFloatValues,
     decimalPlaces: decimalPlaces,
     error: error,

package/dist/Molecular/SwitcherRangeList/SwitcherRangeList.stories.js

@@ -23,7 +23,7 @@ var _SwitcherRangeList = _interopRequireDefault(require("./SwitcherRangeList"));
 
 require("./partial/AnyOuterClass.scss");
 
-var _excluded = ["includeOuterStyles", "isAddValidateForExamle", "isUseInitialValues", "initialValues"];
+var _excluded = ["includeOuterStyles", "isAddValidateErrorsForExamle", "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); }
 
@@ -46,7 +46,7 @@ var DEFAULT_STATE = {
 
 var Template = function Template(args) {
   var includeOuterStyles = args.includeOuterStyles,
-      isAddValidateForExamle = args.isAddValidateForExamle,
+      isAddValidateErrorsForExamle = args.isAddValidateErrorsForExamle,
       isUseInitialValues = args.isUseInitialValues,
       initialValues = args.initialValues,
       restArgs = (0, _objectWithoutProperties2.default)(args, _excluded);
@@ -89,7 +89,7 @@ var Template = function Template(args) {
       return handleChange(val, 'value');
     },
     className: includeOuterStyles ? 'any-outer-class__switcher-range-list' : null,
-    validate: isAddValidateForExamle ? validateForExample : null,
+    validateErrors: isAddValidateErrorsForExamle ? validateForExample : null,
     error: error
   }));
 };
@@ -98,7 +98,7 @@ var SwitcherRangeListTemplate = Template.bind({});
 exports.SwitcherRangeListTemplate = SwitcherRangeListTemplate;
 SwitcherRangeListTemplate.args = {
   includeOuterStyles: false,
-  isAddValidateForExamle: true,
+  isAddValidateErrorsForExamle: true,
   disabled: false,
   label: 'Test label',
   isLabelBold: true,

package/package.json

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

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

@@ -1,150 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = addRange;
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-function addRange(inputFrom, inputTo, currentValues, setError) {
-  var _getFilter;
-
-  var rounded = function rounded(val, soft) {
-    if (!val) return soft ? '' : 0;
-    if (!soft || val.toString().split('.')[1] && val.toString().split('.')[1].length > 2) return Number(val).toFixed(2);
-    return val;
-  };
-
-  var removeFiltersDots = function removeFiltersDots(value) {
-    if (filterId) return numberFilterWithoutDots(value);
-    return value;
-  };
-
-  function getFilter(data) {
-    var _data$slice;
-
-    return data === null || data === void 0 ? void 0 : (_data$slice = data.slice()) === null || _data$slice === void 0 ? void 0 : _data$slice.filter(function (_ref) {
-      var from = _ref.from,
-          to = _ref.to;
-      return !([0, null].includes(from) && [0, null].includes(to));
-    });
-  }
-
-  ;
-  var from = parseFloat(rounded(inputFrom));
-  var to = parseFloat(inputTo);
-  if (isNaN(to)) to = '';
-
-  if (isNaN(from) || isNaN(to)) {
-    setError('All fields required');
-    return false;
-  } else if (to !== '' && to <= from) {
-    setError('Set a valid range');
-    return false;
-  } else if (isNaN(from) || !from && isNaN(to) || from < 0 || !from && to <= 0) {
-    setError('Only numbers >=0 are allowed');
-    return false;
-  } else if (to && to - from < 0.05) {
-    setError('range must be more than 0.05');
-    return false;
-  } // else if (form[2]?.unit === '%') {
-  //   setError(`${form[2]?.label} max 100`);
-  //   return false;
-  // } 
-  else if (from > 999999 || !!to && to > 999999) {
-    setError('You need to set a smaller number!');
-    return false;
-  } else if (from === to) {
-    setError('You need to set a range');
-    return false;
-  } else if (!to) {
-    setError('Set a valid range');
-    return false;
-  } else if (!!to && from > to) {
-    setError('You need to set a valid range');
-    return false;
-  } // else if (filterId && label === 'Age' && to > 99) {
-  //   setError('99 is the maximum allowed value');
-  //   return false;
-  // } 
-  // else if (filterId && label === 'Age' && from < 18) {
-  //   setError('18 is the minimum allowed value');
-  //   return false;
-  // }
-
-
-  var duplicate = currentValues === null || currentValues === void 0 ? void 0 : currentValues.filter(function (e) {
-    return Number(e[keyFrom]) === from && Number(e[keyTo]) === to;
-  });
-
-  if (duplicate.length) {
-    setError('This range was already added');
-    return false;
-  }
-
-  var newRanges = [];
-  var prevItems = [];
-  var postItems = [];
-
-  var getRangeObject = function getRangeObject(nFrom, nTo) {
-    var _ref2;
-
-    return _ref2 = {}, (0, _defineProperty2.default)(_ref2, keyFrom, parseFloat(nFrom === null || nFrom === void 0 ? void 0 : nFrom.toFixed(3))), (0, _defineProperty2.default)(_ref2, keyTo, nTo.toFixed ? parseFloat(nTo === null || nTo === void 0 ? void 0 : nTo.toFixed(3)) : nTo || ''), _ref2;
-  };
-
-  var _getFilter$reduce = (_getFilter = getFilter(value)) === null || _getFilter === void 0 ? void 0 : _getFilter.reduce(function (res, data) {
-    if (data[keyFrom] === from) data[keyFrom] = from + additive;
-    if (data[keyTo] === to) data[keyTo] = to - additive;
-    if (isNaN(data[keyFrom])) data[keyFrom] = 0;
-
-    if (data[keyTo] > 0 && from > data[keyTo]) {
-      prevItems.push(data);
-    } else if (to && data[keyFrom] > to) {
-      postItems.push(data);
-    } else if (!(from < data[keyFrom] && (!to || data[keyTo] < to))) {
-      res.push(data);
-    }
-
-    return res;
-  }, []),
-      _getFilter$reduce2 = (0, _slicedToArray2.default)(_getFilter$reduce, 2),
-      crossFrom = _getFilter$reduce2[0],
-      crossTo = _getFilter$reduce2[1];
-
-  if (crossFrom && crossTo) {
-    if (to === crossTo.from) {
-      newRanges.push.apply(newRanges, [getRangeObject(crossFrom[keyFrom], from), getRangeObject(to, crossTo[keyTo])]);
-    } else {
-      newRanges.push.apply(newRanges, [getRangeObject(crossFrom[keyFrom], from), getRangeObject(from + additive, to)]);
-
-      if (to) {
-        newRanges.push(getRangeObject(to + additive, crossTo[keyTo]));
-      }
-    }
-  } else if (crossFrom) {
-    if (crossFrom[keyFrom] < from && crossFrom[keyTo] > to) {
-      newRanges.push(getRangeObject(crossFrom[keyFrom], from));
-
-      if (to) {
-        newRanges.push.apply(newRanges, [getRangeObject(from + additive, to), getRangeObject(to + additive, crossFrom[keyTo])]);
-      } else {
-        newRanges.push(getRangeObject(from + additive, ''));
-      }
-    } else if (crossFrom[keyFrom] > from) {
-      newRanges.push.apply(newRanges, [getRangeObject(from, to), getRangeObject(to + additive, crossFrom[keyTo])]);
-    } else if (crossFrom && to - from > 1) {
-      newRanges.push.apply(newRanges, [getRangeObject(crossFrom[keyFrom], from), getRangeObject(from + additive, to)]);
-    } else newRanges.push(getRangeObject(crossFrom[keyFrom], to));
-  } else {
-    newRanges.push(getRangeObject(from, to));
-  }
-
-  newRanges.unshift.apply(newRanges, prevItems);
-  newRanges.push.apply(newRanges, postItems);
-  return newRanges;
-}