intelicoreact 1.4.94 → 1.4.95

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

@@ -55,6 +55,7 @@ const accordionData = (accordionTitle, accordionListContent) => {
   })));
 };
 const FileLoaderDescription = _ref => {
+  var _files$map;
   let {
     //? Для корректности работы стоит пробрасывать какой-то из id
     id,
@@ -73,7 +74,7 @@ const FileLoaderDescription = _ref => {
     ...props
   } = _ref;
   const uniqueFileLoaderDescriptionId = "".concat(id || testId || fieldKey || "component-".concat(_utils.uuid === null || _utils.uuid === void 0 ? void 0 : (0, _utils.uuid)()));
-  const [fields, setFields] = (0, _react.useState)(files !== null && files !== void 0 ? files : [(0, _utils.clone)(uploadTriggerStucture)]);
+  const [fields, setFields] = (0, _react.useState)((_files$map = files === null || files === void 0 ? void 0 : files.map(getStructure)) !== null && _files$map !== void 0 ? _files$map : [(0, _utils.clone)(uploadTriggerStucture)]);
   const generateUniqueFileName = (files, name) => {
     let fileName = name;
     const [nameWithoutExtension, extension] = name.split(/(?=\.[^.]+$)/);
@@ -110,7 +111,7 @@ const FileLoaderDescription = _ref => {
         ...item,
         error: ""
       }));
-      const changedField = output.find(item => id.includes(item.id));
+      const changedField = output.find(item => id === item.id);
       if (!file) {
         //? Нет файла - значит это экшн удаления
         handle.applyFields(output.filter(item => item.id !== (changedField === null || changedField === void 0 ? void 0 : changedField.id)));
@@ -159,10 +160,11 @@ const FileLoaderDescription = _ref => {
   }), /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(RC, "__file-descr"),
     title: filesDescription
-  }, filesDescription), fields.map(field => {
+  }, filesDescription), fields.map((field, i) => {
     return /*#__PURE__*/_react.default.createElement(_FileLoaderLocal.default, {
       className: "".concat(RC, "__list-item"),
-      key: field.id,
+      key: "".concat(field.id, "-").concat(i),
+      fieldId: field.id,
       id: "loader-".concat(uniqueFileLoaderDescriptionId, "-field-").concat(field.id),
       error: field.error,
       outerError: field.outerError,

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

@@ -16,6 +16,7 @@ const FileLoaderLocal = _ref => {
   let {
     groupId,
     id,
+    fieldId,
     fieldKey,
     label,
     error,
@@ -55,7 +56,7 @@ const FileLoaderLocal = _ref => {
       var _name$match, _name$split, _e$target, _e$target2;
       const name = getFileName(e.target.value);
       const valueExtension = name === null || name === void 0 || (_name$match = name.match(/[^\.]+$/)) === null || _name$match === void 0 ? void 0 : _name$match[0];
-      const fileName = (_name$split = name.split('.')) === null || _name$split === void 0 ? void 0 : _name$split[0];
+      const fileName = (_name$split = name.split(".")) === null || _name$split === void 0 ? void 0 : _name$split[0];
       const latinRegex = /^[A-Za-z\u00C0-\u00FF0-9!@#\$%\^\&*\)\(+=._-\s]+$/;
       const file = (_e$target = e.target) === null || _e$target === void 0 || (_e$target = _e$target.files) === null || _e$target === void 0 ? void 0 : _e$target[0];
       if (isFileSizeOutOfLimit((_e$target2 = e.target) === null || _e$target2 === void 0 || (_e$target2 = _e$target2.files) === null || _e$target2 === void 0 ? void 0 : _e$target2[0])) {
@@ -104,9 +105,10 @@ 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, {
-      ['file-loader-local_outer-error']: !!outerError
+      ["file-loader-local_outer-error"]: Boolean(outerError)
     })
-  }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
+  }, (fieldId === "uploadTrigger" || !value) && /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
+    key: id,
     onChange: handle.change,
     className: "file-loader-local__file-input",
     id: fieldKey || "file-input-".concat(id).concat(groupId ? "-".concat(groupId) : ""),
@@ -115,7 +117,9 @@ const FileLoaderLocal = _ref => {
     required: isRequired,
     accept: accept
   }, attributesOfNativeInput)), /*#__PURE__*/_react.default.createElement("label", {
-    className: "file-loader-local__label-box",
+    className: (0, _classnames.default)("file-loader-local__label-box", {
+      "file-loader-local__label-box--upload-trigger": fieldId === "uploadTrigger" || !value
+    }),
     htmlFor: fieldKey || "file-input-".concat(id).concat(groupId ? "-".concat(groupId) : "")
   }, !value && /*#__PURE__*/_react.default.createElement(_reactFeather.Download, {
     className: "file-loader-local__upload-icon"
@@ -132,12 +136,12 @@ const FileLoaderLocal = _ref => {
     className: "file-loader-local__label-text"
   }, value || label), error && /*#__PURE__*/_react.default.createElement("span", {
     className: "file-loader-local__error"
-  }, error), typeof outerError === 'string' && /*#__PURE__*/_react.default.createElement("span", {
+  }, 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,
+      id: fieldId,
       groupId
     })
   }), renderRequiredLabel()));

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

@@ -52,9 +52,12 @@
     font-size: 14px;
     font-weight: 400;
     line-height: 20px;
-    cursor: pointer;
 
     color: #1f7499;
+
+    &--upload-trigger {
+      cursor: pointer;
+    }
   }
 
   &__upload-icon {
@@ -77,6 +80,7 @@
     max-height: 16px;
 
     color: #f06d8d;
+    cursor: pointer;
   }
 
   &__label-wrapper {

package/package.json

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