@pnkx-lib/ui 1.9.465 → 1.9.467

package/es/ui/GenericUploadModal.js

@@ -1,4 +1,4 @@
-import { jsxs, jsx } from 'react/jsx-runtime';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import { Modal, Spin } from 'antd';
 import * as React from 'react';
 import React__default, { isValidElement, version as version$1, useRef, useLayoutEffect, useEffect, Component, useContext, forwardRef, useMemo as useMemo$1, useState, Children, useImperativeHandle } from 'react';
@@ -13,7 +13,7 @@ import { R as RefIcon$7 } from '../chunks/LoadingOutlined-C5-PNVpb.js';
 import { R as RefIcon$8, a as RefIcon$a } from '../chunks/CloseCircleFilled-4jnV3XJV.js';
 import { R as RefIcon$9 } from '../chunks/CloseOutlined-DdLJZQvZ.js';
 import { C as Controller } from '../chunks/index.esm-Dr5ZHcf7.js';
-import { ViewPdf } from './ViewPdf.js';
+import { toast } from '@pnkx-lib/core';
 import { R as RefIcon$b } from '../chunks/InboxOutlined-W7xl_mLq.js';
 
 // This icon file is generated automatically.
@@ -11480,13 +11480,11 @@ function GenericUploadModal({
   control,
   setFileList,
   record,
-  fileList,
   allowedExtensions,
   maxSize = 5,
   texts
 }) {
   const [displayFileList, setDisplayFileList] = useState([]);
-  const [previewPdf, setPreviewPdf] = useState(null);
   useEffect(() => {
     if (open) {
       const recordFiles = record?.map((item) => ({
@@ -11505,17 +11503,17 @@ function GenericUploadModal({
     showUploadList: true,
     fileList: displayFileList,
     beforeUpload: async (file) => {
-      const isLtMax = file.size / 1024 / 1024 < maxSize;
+      const isLtMax = file.size / 1024 / 1024 <= maxSize;
       const fileExtension = file.name.split(".").pop()?.toLowerCase() || "";
-      if (!allowedExtensions.includes(fileExtension)) {
-        Modal.error({
-          content: texts?.fileTypeError ?? "File type not allowed"
-        });
-        return false;
+      if (allowedExtensions.includes(fileExtension) && texts?.fileTypeError) {
+        toast.warning(texts?.fileTypeError);
+        return;
       }
       if (!isLtMax) {
-        Modal.error({ content: texts?.fileSizeError ?? "File too large" });
-        return false;
+        toast.warning(
+          texts?.fileSizeError ?? `File must be smaller than ${maxSize}MB`
+        );
+        return;
       }
       const newFile = {
         uid: file.uid,
@@ -11524,25 +11522,25 @@ function GenericUploadModal({
         originFileObj: file
       };
       const newList = [...displayFileList, newFile];
-      setDisplayFileList(newList);
+      setDisplayFileList((prev) => {
+        const newList2 = [...prev, newFile];
+        setFileList(newList2);
+        onChange(newList2);
+        return newList2;
+      });
       setFileList(newList);
       onChange(newList);
       return false;
     },
     onPreview: (file) => {
       const fileUrl = file.url || (file.originFileObj ? URL.createObjectURL(file.originFileObj) : "");
-      const extension = file.name?.split(".").pop()?.toLowerCase();
-      if (extension === "pdf") {
-        setPreviewPdf(fileUrl);
-      } else {
-        const link = document.createElement("a");
-        link.href = fileUrl;
-        link.download = file.name || "download";
-        link.target = "_blank";
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
-      }
+      const link = document.createElement("a");
+      link.href = fileUrl;
+      link.download = file.name || "download";
+      link.target = "_blank";
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
     },
     onRemove: (file) => {
       const newList = displayFileList.filter((item) => item.uid !== file.uid);
@@ -11552,7 +11550,7 @@ function GenericUploadModal({
       return true;
     }
   });
-  return /* @__PURE__ */ jsxs(
+  return /* @__PURE__ */ jsx(
     Modal,
     {
       open,
@@ -11563,39 +11561,23 @@ function GenericUploadModal({
       onOk: onCancel,
       width: 800,
       centered: true,
-      children: [
-        previewPdf && /* @__PURE__ */ jsx(
-          ViewPdf,
-          {
-            workerUrl: "https://unpkg.com/pdfjs-dist@3.4.120/build/pdf.worker.min.js",
-            fileUrl: previewPdf
-          }
-        ),
-        /* @__PURE__ */ jsx("div", { className: "p-4", children: /* @__PURE__ */ jsx(
-          Controller,
-          {
-            name: "file",
-            control,
-            render: ({ field }) => {
-              const { onChange } = field;
-              const props = createUploadProps(onChange);
-              return /* @__PURE__ */ jsx(Spin, { spinning: false, tip: texts?.uploading ?? "Uploading...", children: /* @__PURE__ */ jsxs(
-                Dragger,
-                {
-                  ...props,
-                  accept: allowedExtensions.map((ext) => `.${ext}`).join(","),
-                  children: [
-                    /* @__PURE__ */ jsx("p", { className: "ant-upload-drag-icon", children: /* @__PURE__ */ jsx(RefIcon$b, {}) }),
-                    /* @__PURE__ */ jsx("p", { className: "ant-upload-text", children: texts?.dragText ?? "Click or drag files to this area to upload" }),
-                    /* @__PURE__ */ jsx("p", { className: "ant-upload-hint", children: texts?.hint1 ?? "Max size 5MB" }),
-                    /* @__PURE__ */ jsx("p", { className: "ant-upload-hint", children: texts?.hint2 ?? "Supported formats: " + allowedExtensions.join(", ") })
-                  ]
-                }
-              ) });
-            }
+      children: /* @__PURE__ */ jsx("div", { className: "p-4", children: /* @__PURE__ */ jsx(
+        Controller,
+        {
+          name: "file",
+          control,
+          render: ({ field }) => {
+            const { onChange } = field;
+            const props = createUploadProps(onChange);
+            return /* @__PURE__ */ jsx(Spin, { spinning: false, tip: texts?.uploading ?? "Uploading...", children: /* @__PURE__ */ jsxs(Dragger, { ...props, accept: ".pdf,.docx,image/*", children: [
+              /* @__PURE__ */ jsx("p", { className: "ant-upload-drag-icon", children: /* @__PURE__ */ jsx(RefIcon$b, {}) }),
+              /* @__PURE__ */ jsx("p", { className: "ant-upload-text", children: texts?.dragText ?? "Click or drag files to this area to upload" }),
+              /* @__PURE__ */ jsx("p", { className: "ant-upload-hint", children: texts?.hint1 ?? "Max size 5MB" }),
+              /* @__PURE__ */ jsx("p", { className: "ant-upload-hint", children: texts?.hint2 })
+            ] }) });
           }
-        ) })
-      ]
+        }
+      ) })
     }
   );
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pnkx-lib/ui",
   "private": false,
-  "version": "1.9.465",
+  "version": "1.9.467",
   "type": "module",
   "main": "./es/index.js",
   "module": "./es/index.js",

package/types/components/ui/GenericUploadModal.d.ts

@@ -5,7 +5,6 @@ export interface GenericUploadModalProps {
     onCancel: () => void;
     control: Control<any>;
     setFileList(fileList: UploadFile[]): void;
-    fileList: UploadFile[];
     /** danh sách file từ API để hiển thị */
     record?: Array<{
         filePath: string;
@@ -29,4 +28,4 @@ export interface GenericUploadModalProps {
         uploading?: string;
     };
 }
-export declare function GenericUploadModal({ open, onCancel, control, setFileList, record, fileList, allowedExtensions, maxSize, texts, }: GenericUploadModalProps): import("react/jsx-runtime").JSX.Element;
+export declare function GenericUploadModal({ open, onCancel, control, setFileList, record, allowedExtensions, maxSize, texts, }: GenericUploadModalProps): import("react/jsx-runtime").JSX.Element;