mimir-ui-kit 1.63.0 → 1.64.0

package/dist/components/UniversalUploader/UniversalUploader.js

@@ -1,56 +1,56 @@
-import { jsxs as F, jsx as n, Fragment as k } from "react/jsx-runtime";
+import { jsxs as x, jsx as p, Fragment as k } from "react/jsx-runtime";
 import { c as q } from "../../index-DIxK0V-G.js";
 import { forwardRef as G, useState as H, useEffect as J, useMemo as K } from "react";
-import { imageTypes as g } from "./constants.js";
 import "../Button/Button.js";
 import { EButtonVariantDefault as Q } from "../Button/constants.js";
 import { ListFiles as W } from "../ListFiles/ListFiles.js";
 import { EFileItemVariant as X } from "../ListFiles/constants.js";
 import { ListPhotos as Y } from "../ListPhotos/ListPhotos.js";
 import { Uploader as Z } from "../Uploader/Uploader.js";
-import '../../assets/UploaderPhotos.css';const w = {
+import '../../assets/UploaderPhotos.css';const g = {
   "upload-file-wrapper": "_upload-file-wrapper_1a115_2"
-}, c = (r) => "file" in r && r.file instanceof File ? g.includes(r.file.type) : "type" in r && typeof r.type == "string" ? g.includes(r.type) : !1, le = G(
-  (r, x) => {
+}, y = (r, d) => "file" in r && r.file instanceof File ? d.includes(r.file.type) : "type" in r && typeof r.type == "string" ? d.includes(r.type) : !1, le = G(
+  (r, d) => {
     const {
       type: s,
-      filesType: z,
-      arrayName: P,
-      maxSize: U,
-      onChange: o,
-      value: p,
-      maxFiles: d,
-      titleUploader: b,
-      buttonText: D = "Выберите файлы",
-      showOnlyUploadButton: h = !1,
-      uploadButtonVariant: E = Q.SecondaryAsphalt,
-      buttonSize: S = "m",
-      buttonClassName: V,
-      variantListFiles: L = X.white,
-      onMaxFilesExceeded: N,
-      onMaxSizeExceeded: B,
-      onInvalidFileType: _,
-      loadImage: j,
-      isDownloadingImage: A,
-      dataTestIdReactMap: i
-    } = r, [a, m] = H(
-      p || []
-    ), y = !!d && a.length >= d;
+      filesType: a,
+      arrayName: z,
+      maxSize: P,
+      onChange: l,
+      value: f,
+      maxFiles: m,
+      titleUploader: U,
+      buttonText: b = "Выберите файлы",
+      showOnlyUploadButton: v = !1,
+      uploadButtonVariant: D = Q.SecondaryAsphalt,
+      buttonSize: E = "m",
+      buttonClassName: S,
+      variantListFiles: V = X.white,
+      onMaxFilesExceeded: L,
+      onMaxSizeExceeded: N,
+      onInvalidFileType: B,
+      loadImage: _,
+      isDownloadingImage: j,
+      dataTestIdReactMap: t,
+      accept: A
+    } = r, [n, u] = H(
+      f || []
+    ), F = !!m && n.length >= m;
     J(() => {
-      p && m(p);
-    }, [p]);
-    const C = (t) => {
-      const l = t.value.map((e) => c(e.file) ? new Promise((f) => {
-        const u = new FileReader();
-        u.onload = () => {
-          f({
+      f && u(f);
+    }, [f]);
+    const C = (i) => {
+      const o = i.value.map((e) => y(e.file, a) ? new Promise((c) => {
+        const h = new FileReader();
+        h.onload = () => {
+          c({
             id: e.id,
-            url: u.result,
+            url: h.result,
             type: e.file.type,
             name: e.file.name,
             size: e.file.size
           });
-        }, u.readAsDataURL(e.file);
+        }, h.readAsDataURL(e.file);
       }) : Promise.resolve({
         id: e.id,
         url: "",
@@ -58,63 +58,64 @@ import '../../assets/UploaderPhotos.css';const w = {
         name: e.file.name,
         type: e.file.type
       }));
-      Promise.all(l).then((e) => {
-        m((f) => [...f, ...e]), o == null || o({ type: "add", data: t.value });
+      Promise.all(o).then((e) => {
+        u((c) => [...c, ...e]), l == null || l({ type: "add", data: i.value });
       });
-    }, v = (t) => {
-      m((l) => l.filter((e) => e.id !== t)), o == null || o({ type: "delete", data: t });
+    }, w = (i) => {
+      u((o) => o.filter((e) => e.id !== i)), l == null || l({ type: "delete", data: i });
     }, { photos: I, files: O } = K(() => {
-      const t = () => a.filter((e) => !c(e)), l = () => a.filter(c);
-      return s === "all" ? { files: t(), photos: l() } : s === "files" ? { photos: [], files: t() } : s === "photos" ? { files: [], photos: l() } : { files: [], photos: [] };
-    }, [a, s]);
-    return /* @__PURE__ */ F(
+      const i = () => n.filter((e) => !y(e, a)), o = () => n.filter((e) => y(e, a));
+      return s === "all" ? { files: i(), photos: o() } : s === "files" ? { photos: [], files: i() } : s === "photos" ? { files: [], photos: o() } : { files: [], photos: [] };
+    }, [n, a, s]);
+    return /* @__PURE__ */ x(
       "div",
       {
         "data-testid": "universal-uploader",
-        "data-testid-react": i == null ? void 0 : i.wrapper,
+        "data-testid-react": t == null ? void 0 : t.wrapper,
         className: q(
-          w["upload-file-wrapper"],
-          y && w.disabled
+          g["upload-file-wrapper"],
+          F && g.disabled
         ),
         children: [
-          /* @__PURE__ */ n(
+          /* @__PURE__ */ p(
             Z,
             {
-              dataTestIdReactMap: { wrapper: i == null ? void 0 : i.uploader },
-              filesType: z,
-              arrayName: P,
-              maxSize: U,
+              dataTestIdReactMap: { wrapper: t == null ? void 0 : t.uploader },
+              filesType: a,
+              arrayName: z,
+              maxSize: P,
               onChangeValue: C,
-              ref: x,
-              maxFiles: d && d - a.length,
-              isDisabled: y,
-              titleUploader: b,
-              showOnlyUploadButton: h,
-              buttonText: D,
-              uploadButtonVariant: E,
-              buttonSize: S,
-              buttonClassName: V,
-              onMaxFilesExceeded: N,
-              onMaxSizeExceeded: B,
-              onInvalidFileType: _
+              ref: d,
+              maxFiles: m && m - n.length,
+              isDisabled: F,
+              titleUploader: U,
+              showOnlyUploadButton: v,
+              buttonText: b,
+              uploadButtonVariant: D,
+              buttonSize: E,
+              buttonClassName: S,
+              onMaxFilesExceeded: L,
+              onMaxSizeExceeded: N,
+              onInvalidFileType: B,
+              accept: A
             }
           ),
-          !h && /* @__PURE__ */ F(k, { children: [
-            (s === "files" || s === "all") && /* @__PURE__ */ n("div", { "data-testid-react": i == null ? void 0 : i.listFiles, children: /* @__PURE__ */ n(
+          !v && /* @__PURE__ */ x(k, { children: [
+            (s === "files" || s === "all") && /* @__PURE__ */ p("div", { "data-testid-react": t == null ? void 0 : t.listFiles, children: /* @__PURE__ */ p(
               W,
               {
                 value: O,
-                onChange: (t) => v(t.deleteId),
-                variant: L
+                onChange: (i) => w(i.deleteId),
+                variant: V
               }
             ) }),
-            (s === "photos" || s === "all") && /* @__PURE__ */ n("div", { "data-testid-react": i == null ? void 0 : i.listPhotos, children: /* @__PURE__ */ n(
+            (s === "photos" || s === "all") && /* @__PURE__ */ p("div", { "data-testid-react": t == null ? void 0 : t.listPhotos, children: /* @__PURE__ */ p(
               Y,
               {
                 value: I,
-                onChange: (t) => v(t.deleteId),
-                loadImage: j,
-                isDownloadingImage: A
+                onChange: (i) => w(i.deleteId),
+                loadImage: _,
+                isDownloadingImage: j
               }
             ) })
           ] })

package/dist/components/Uploader/Uploader.d.ts

@@ -1,5 +1,4 @@
 import { default as React } from 'react';
-import { imageTypesArr } from './constants';
 import { TDataTestIdReactMap } from '../../types';
 import { EButtonSize } from '../Button';
 import { TButtonDefaultFormProps } from '../Button/types';
@@ -9,7 +8,7 @@ export type TUploader = {
      * Массив разрешенных типов файлов для настройки валидации
      * 'jpeg' | 'jpg' | 'png' | 'tiff' | 'gif' | 'heic' | 'doc' | 'xls' | 'pdf' | 'docx' | 'txt' | 'xlsx'
      */
-    filesType: imageTypesArr[];
+    filesType: string[];
     /**
      * Наименование передаваемого массива файлов
      */
@@ -70,6 +69,7 @@ export type TUploader = {
      * Объект, для передачи в компонент и его элементы data-testid-react, для автоматизированного тестирования
      */
     dataTestIdReactMap?: TDataTestIdReactMap<'wrapper' | 'input' | 'label' | 'button' | 'buttonIcon' | 'title' | 'description'>;
+    accept?: Record<string, string>;
 };
 export type TUploadValue = {
     value: TFileItem[];

package/dist/components/Uploader/Uploader.js

@@ -1,13 +1,13 @@
-import { jsxs as r, jsx as l, Fragment as G } from "react/jsx-runtime";
-import { forwardRef as O, useRef as L, useId as X } from "react";
-import { Icon as q } from "../../icons/Icon.js";
-import { Button as H } from "../Button/Button.js";
-import { EButtonVariantDefault as I } from "../Button/constants.js";
-import '../../assets/Uploader.css';const f = {
+import { jsxs as r, jsx as l, Fragment as L } from "react/jsx-runtime";
+import { forwardRef as G, useRef as O, useId as I } from "react";
+import { Icon as P } from "../../icons/Icon.js";
+import { Button as X } from "../Button/Button.js";
+import { EButtonVariantDefault as Y } from "../Button/constants.js";
+import '../../assets/Uploader.css';const m = {
   "upload-file-wrapper": "_upload-file-wrapper_bplvw_2",
   "upload-text": "_upload-text_bplvw_25",
   "upload-file-input": "_upload-file-input_bplvw_35"
-}, v = {
+}, $ = {
   jpeg: "image/jpeg",
   jpg: "image/jpg",
   png: "image/png",
@@ -21,50 +21,52 @@ import '../../assets/Uploader.css';const f = {
   xls: "application/excel",
   txt: "text/plain",
   xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-}, J = [
-  "jpeg",
-  "jpg",
-  "png",
-  "tiff",
-  "gif",
-  "heic"
-], K = () => {
+}, q = ["jpeg", "jpg", "png", "tiff", "gif", "heic"], H = () => {
   let n = 0;
   return () => (n = (n + 1) % Number.MAX_SAFE_INTEGER, n);
-}, P = K(), T = O(
-  (n, _) => {
+}, J = H(), R = G(
+  (n, v) => {
     const {
-      filesType: p = J,
-      onChangeValue: j,
-      arrayName: N,
-      maxSize: m = 15,
-      maxFiles: a,
-      isDisabled: u,
+      filesType: a = q,
+      onChangeValue: y,
+      arrayName: j,
+      maxSize: u = 15,
+      maxFiles: p,
+      isDisabled: f,
       titleUploader: d = "Или перетащите сюда",
-      buttonText: z = "Выберите файлы",
-      showOnlyUploadButton: S = !1,
-      uploadButtonVariant: B = I.SecondaryAsphalt,
-      buttonSize: C = "m",
-      buttonClassName: E,
+      buttonText: N = "Выберите файлы",
+      showOnlyUploadButton: E = !1,
+      uploadButtonVariant: S = Y.SecondaryAsphalt,
+      buttonSize: F = "m",
+      buttonClassName: z,
       onMaxFilesExceeded: s,
       onMaxSizeExceeded: g,
       onInvalidFileType: x,
-      dataTestIdReactMap: e
-    } = n, b = L(null), h = X(), F = (i) => {
+      dataTestIdReactMap: e,
+      accept: U = $
+    } = n, b = O(null), h = I(), A = (i) => {
       var o;
-      return i.type ? i.type : ((o = i.name.split(".").pop()) == null ? void 0 : o.toLowerCase()) === "heic" ? "image/heic" : "";
-    }, U = (i) => {
+      if (i.type) return i.type;
+      switch ((o = i.name.split(".").pop()) == null ? void 0 : o.toLowerCase()) {
+        case "heic":
+          return "image/heic";
+        case "msg":
+          return "application/vnd.ms-outlook";
+        default:
+          return "";
+      }
+    }, B = (i) => {
       var c;
       if (i.target.files && i.target.files[0]) {
         const o = Array.from(i.target.files);
-        a && o.length > a && (s == null || s());
-        const A = o.filter((t) => {
-          const k = F(t), w = p.map((D) => v[D]).includes(k), y = t.size / 1024 ** 2 <= m;
-          return !w && x && x(t.name), !y && g && g(t.name), w && y;
-        }).slice(0, a).map((t) => ({ file: t, id: P() }));
-        j({ arrayName: N, value: A }), (c = i.target) != null && c.value && (i.target.value = "");
+        p && o.length > p && (s == null || s());
+        const V = o.filter((t) => {
+          const k = A(t), w = a.map((D) => U[D]).includes(k), _ = t.size / 1024 ** 2 <= u;
+          return !w && x && x(t.name), !_ && g && g(t.name), w && _;
+        }).slice(0, p).map((t) => ({ file: t, id: J() }));
+        y({ arrayName: j, value: V }), (c = i.target) != null && c.value && (i.target.value = "");
       }
-    }, V = () => {
+    }, C = () => {
       var i;
       (i = b.current) == null || i.click();
     };
@@ -72,23 +74,23 @@ import '../../assets/Uploader.css';const f = {
       "div",
       {
         "data-testid-react": e == null ? void 0 : e.wrapper,
-        className: f["upload-file-wrapper"],
-        ref: _,
+        className: m["upload-file-wrapper"],
+        ref: v,
         children: [
           /* @__PURE__ */ l(
             "input",
             {
               "data-testid-react": e == null ? void 0 : e.input,
               type: "file",
-              className: f["upload-file-input"],
+              className: m["upload-file-input"],
               "aria-label": "Upload",
               name: "image[]",
               multiple: !0,
-              onChange: U,
+              onChange: B,
               title: "",
               id: h,
-              accept: p.map((i) => v[i]).join(),
-              disabled: u
+              accept: a.map((i) => `.${i}`).join(", "),
+              disabled: f
             }
           ),
           /* @__PURE__ */ r(
@@ -99,35 +101,35 @@ import '../../assets/Uploader.css';const f = {
               ref: b,
               children: [
                 /* @__PURE__ */ l(
-                  H,
+                  X,
                   {
                     dataTestIdReactMap: {
                       button: e == null ? void 0 : e.button,
                       isIconButton: e == null ? void 0 : e.buttonIcon
                     },
-                    size: C,
-                    variant: B,
-                    leftIcon: /* @__PURE__ */ l(q, { iconName: "UnionIcon16px" }),
-                    onClick: V,
-                    disabled: u,
-                    className: E,
-                    children: z
+                    size: F,
+                    variant: S,
+                    leftIcon: /* @__PURE__ */ l(P, { iconName: "UnionIcon16px" }),
+                    onClick: C,
+                    disabled: f,
+                    className: z,
+                    children: N
                   }
                 ),
-                !S && /* @__PURE__ */ r(G, { children: [
+                !E && /* @__PURE__ */ r(L, { children: [
                   d && /* @__PURE__ */ l("b", { "data-testid-react": e == null ? void 0 : e.title, children: d }),
                   /* @__PURE__ */ r(
                     "span",
                     {
                       "data-testid-react": e == null ? void 0 : e.description,
-                      className: f["upload-text"],
+                      className: m["upload-text"],
                       children: [
                         "Максимальный размер одного файла – ",
-                        m,
+                        u,
                         " Мб",
                         /* @__PURE__ */ l("br", {}),
                         "Загрузить можно файлы следующих форматов: ",
-                        p.join(", ")
+                        a.join(", ")
                       ]
                     }
                   )
@@ -141,5 +143,5 @@ import '../../assets/Uploader.css';const f = {
   }
 );
 export {
-  T as Uploader
+  R as Uploader
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mimir-ui-kit",
   "private": false,
-  "version": "1.63.0",
+  "version": "1.64.0",
   "type": "module",
   "exports": {
     ".": {