intelicoreact 1.4.84 → 1.4.86

package/dist/Atomic/FormElements/FileLoaderDescription/FileLoaderDescription.js

@@ -68,6 +68,7 @@ const FileLoaderDescription = _ref => {
     accordionListContent = [],
     maxFilesCount = 10,
     isWithoutAccordion,
+    error: outerError,
     ...props
   } = _ref;
   const uniqueFileLoaderDescriptionId = "".concat(id || testId || fieldKey || "component-".concat(_utils.uuid === null || _utils.uuid === void 0 ? void 0 : (0, _utils.uuid)()));
@@ -85,9 +86,11 @@ const FileLoaderDescription = _ref => {
   const handle = {
     checkOverflow: function (fields) {
       let error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+      let outerError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
       return fields.length < maxFilesCount ? [...fields, {
         ...(0, _utils.clone)(uploadTriggerStucture),
-        error
+        error,
+        outerError
       }] : fields;
     },
     applyFields: newFields => {
@@ -136,6 +139,9 @@ const FileLoaderDescription = _ref => {
       }
     }
   };
+  (0, _react.useEffect)(() => {
+    setFields(handle.checkOverflow(fields.filter(item => item.id !== UPLOAD_TRIGGER_KEY), null, outerError));
+  }, [outerError]);
   return /*#__PURE__*/_react.default.createElement("div", {
     id: uniqueFileLoaderDescriptionId,
     testId: uniqueFileLoaderDescriptionId,
@@ -156,12 +162,9 @@ const FileLoaderDescription = _ref => {
     return /*#__PURE__*/_react.default.createElement(_FileLoaderLocal.default, {
       className: "".concat(RC, "__list-item"),
       key: field.id,
-      id: "loader-".concat(uniqueFileLoaderDescriptionId, "-field-").concat(field.id)
-      // key={`${fieldKey ?? Date.now()}/${field.id}`}
-      // fieldKey={`${fieldKey ?? Date.now()}/${field.id}`}
-      // id={field.id}
-      ,
+      id: "loader-".concat(uniqueFileLoaderDescriptionId, "-field-").concat(field.id),
       error: field.error,
+      outerError: field.outerError,
       label: "Upload document",
       accept: field.accept,
       value: field.value,

package/dist/Atomic/FormElements/FileLoaderLocal/FileLoaderLocal.js

@@ -19,6 +19,7 @@ const FileLoaderLocal = _ref => {
     fieldKey,
     label,
     error,
+    outerError,
     isRequired,
     accept,
     onChange,
@@ -90,7 +91,9 @@ const FileLoaderLocal = _ref => {
   };
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": "input--file-loader-local--key-".concat(testId),
-    className: (0, _classnames.default)("file-loader-local", className)
+    className: (0, _classnames.default)("file-loader-local", className, {
+      ['file-loader-local_outer-error']: !!outerError
+    })
   }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
     onChange: handle.change,
     className: "file-loader-local__file-input",
@@ -117,7 +120,9 @@ const FileLoaderLocal = _ref => {
     className: "file-loader-local__label-text"
   }, value || label), error && /*#__PURE__*/_react.default.createElement("span", {
     className: "file-loader-local__error"
-  }, error))), value && !isNoTrashIcon && /*#__PURE__*/_react.default.createElement(_reactFeather.Trash2, {
+  }, error), typeof outerError === 'string' && /*#__PURE__*/_react.default.createElement("span", {
+    className: "file-loader-local__error"
+  }, outerError))), value && !isNoTrashIcon && /*#__PURE__*/_react.default.createElement(_reactFeather.Trash2, {
     className: "file-loader-local__trash-icon",
     onClick: () => onChange({
       id,

package/dist/Atomic/FormElements/FileLoaderLocal/FileLoaderLocal.scss

@@ -11,6 +11,10 @@
   background-color: #ffffff;
   box-shadow: 0px 2px 8px rgb(39 73 113 / 15%);
 
+  &_outer-error {
+    border: 1px solid #fa564c;
+  }
+
   &__top-label {
     margin-bottom: 16px;
 

package/dist/Functions/fieldValueFormatters.js

@@ -292,48 +292,47 @@ function formatToReplaceAllWhiteSpace(str) {
 // ****************************
 // filter
 // ****************************
+//? Намерянно выпилил определение дефолтного значение на уровне параметров, чтобы сделать null рабочим значением
+//? decimalPlaces === null теперь точно определяет режим ввода БЕЗ ограничей десятичных знаков
+const filterFloat = (inputValue, decimalPlaces) => {
+  var _ref2;
+  const replaser = input => ('' + input).replace(/[^\.\d]/g, '');
+  const value = getSafelyValue(inputValue);
 
-// export const filterFloat = (inputValue, decimalPlaces = null) => {
-//   const value = getSafelyValue(inputValue);
-//   const replaser = input => ('' + input).replace(/[^\.\d]/g, '');
-//
-//   if (value.length === 1 && (value[0] === '.' || value[0] === ',')) return '0.';
-//   let output = ('' + value)?.replace(/,/g, '.');
-//   if (value.length > 1 && value[0] === '0' && value[1] !== '.' && value[0] !== ',') output = value.slice(1);
-//
-//   const previousValue = '' + output.slice(0, -1);
-//   const lastSym = '' + output.slice(-1);
-//
-//   if (
-//     decimalPlaces &&
-//     typeof decimalPlaces === 'number' &&
-//     previousValue.includes('.') &&
-//     previousValue.indexOf('.') + 1 + decimalPlaces === previousValue.length
-//   )
-//     return replaser(previousValue);
-//   return replaser(lastSym === '.' && previousValue.includes('.') ? previousValue : output);
-// };
+  //? safelyDecimalPlaces ТОЧНО либо null, либо целое число
+  const safelyDecimalPlaces = (() => {
+    if (decimalPlaces === null) return decimalPlaces;
+    const DEFAULT_VALUE = 2;
+    const isNumber = typeof decimalPlaces === 'number' || typeof decimalPlaces === 'string' && !Number.isNaN(+decimalPlaces);
 
-const filterFloat = function (inputValue) {
-  var _output, _output2, _output3, _output4;
-  let decimalPlaces = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  const value = getSafelyValue(inputValue);
-  const replacer = input => {
-    var _String;
-    return (_String = String(input)) === null || _String === void 0 ? void 0 : _String.replace(/[^\.\d,]/g, "");
-  };
-  if (value.length === 1 && (value[0] === "." || value[0] === ",")) return "0.";
-  let output = value;
-  const previousValue = String((_output = output) === null || _output === void 0 ? void 0 : _output.slice(0, -1));
-  const lastSym = String((_output2 = output) === null || _output2 === void 0 ? void 0 : _output2.slice(-1));
-  if (decimalPlaces && typeof decimalPlaces === "number" && previousValue !== null && previousValue !== void 0 && previousValue.includes(".") && (previousValue === null || previousValue === void 0 ? void 0 : previousValue.indexOf(".")) + 1 + decimalPlaces === (previousValue === null || previousValue === void 0 ? void 0 : previousValue.length)) {
-    return replacer(previousValue);
-  }
-  if ((_output3 = output) !== null && _output3 !== void 0 && _output3.includes(".") && output[((_output4 = output) === null || _output4 === void 0 ? void 0 : _output4.indexOf(".")) + 3] !== undefined && Number(output)) {
-    var _Number;
-    output = (_Number = Number(output)) === null || _Number === void 0 ? void 0 : _Number.toFixed(decimalPlaces);
+    //? защита от дробного значения decimalPlaces
+    return isNumber ? Number((+decimalPlaces).toFixed()) : DEFAULT_VALUE;
+  })();
+
+  // Обработка кейса если первым символом нажата точка
+  if (value.length === 1 && (value[0] === '.' || value[0] === ',')) return '0.';
+
+  // Приводим запятые к корректному разделителю, но не выпиливаем
+  let output = (_ref2 = '' + value) === null || _ref2 === void 0 ? void 0 : _ref2.replace(/,/g, '.');
+
+  // Выпилить первый ноль, если это не дробь
+  if (value.length > 1 && value[0] === '0' && value[1] !== '.' && value[0] !== ',') output = value.slice(1);
+  const previousValue = '' + output.slice(0, -1);
+  const lastSym = '' + output.slice(-1);
+
+  // Обработка кейса второй точки в дроби
+  if (lastSym === '.' && previousValue.includes('.')) output = previousValue;
+
+  // if (localStorage.getItem('useDeb')) debugger;
+
+  // Логика ограничения по decimalPlaces
+  if (typeof safelyDecimalPlaces === 'number') {
+    if (!safelyDecimalPlaces && lastSym === '.') return replaser(previousValue);
+    if (previousValue.includes('.') && previousValue.indexOf('.') + 1 + safelyDecimalPlaces === (previousValue === null || previousValue === void 0 ? void 0 : previousValue.length)) {
+      return replaser(previousValue);
+    }
   }
-  return replacer(lastSym === "." && previousValue !== null && previousValue !== void 0 && previousValue.includes(".") ? previousValue : output);
+  return replaser(output);
 };
 exports.filterFloat = filterFloat;
 const filterNumeric = (value, settings) => {

package/package.json

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