@tecsinapse/cortex-react 1.15.0-beta.6 → 1.15.0-beta.7

package/dist/cjs/components/Uploader/Manager.js

@@ -64,7 +64,7 @@ const Manager = ({
                   showDelete: false
                 },
                 file.uid
-              )) : /* @__PURE__ */ jsxRuntime.jsx(Upload.Folder, { items: files })
+              )) : /* @__PURE__ */ jsxRuntime.jsx(Upload.FolderList, { files })
             }
           )
         ] })

package/dist/cjs/components/Uploader/Upload.js

@@ -63,33 +63,98 @@ const File = ({
     )
   ] }, index);
 };
-const Folder = ({ items }) => {
-  const paths = /* @__PURE__ */ new Set();
-  for (const file in items) {
-    const path = items[file].file.relativePath.slice(1).split("/");
-    path.map((item) => paths.add(item));
-  }
-  const intent = (items ?? []).some((item) => item.status === "success") ? "success" : (items ?? []).some((item) => item.status === "error") ? "error" : "info";
+const Folder = ({ name, size, intent, loading }) => {
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col w-full", children: [
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between border rounded-t-mili shadow p-mili", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-centi", children: [
       /* @__PURE__ */ jsxRuntime.jsx("span", { className: "border-2 text-kilo text-primary-medium w-tera h-tera flex items-center justify-center rounded-mili", children: /* @__PURE__ */ jsxRuntime.jsx(fa6.FaRegFolder, {}) }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-col", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "font-semibold truncate max-w-[200px]", children: Array.from(paths)[0] }),
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "font-semibold truncate max-w-[200px]", children: name }),
         /* @__PURE__ */ jsxRuntime.jsxs("p", { className: "text-sm text-gray-500", children: [
-          paths.size - 1,
-          " itens"
+          size,
+          " ",
+          size > 1 ? "itens" : "item"
         ] })
       ] })
     ] }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(
-      ProgressBar.ProgressBar,
-      {
-        intent,
-        infinite: (items ?? []).some((item) => item.status === "uploading")
-      }
-    )
+    /* @__PURE__ */ jsxRuntime.jsx(ProgressBar.ProgressBar, { intent, infinite: loading })
   ] });
 };
+const FolderList = ({ files }) => {
+  const paths = /* @__PURE__ */ new Set();
+  const buildTree = (files2) => {
+    const root = {
+      type: "root",
+      children: /* @__PURE__ */ new Map()
+    };
+    for (const file of files2) {
+      const parts = file.file.relativePath.slice(1).split("/");
+      parts.map((item) => paths.add(item));
+      let current = root;
+      parts.forEach((part, index) => {
+        const isLast = index === parts.length - 1;
+        if (isLast) {
+          current.children.set(part, {
+            type: "file",
+            file
+          });
+        } else {
+          if (!current.children.has(part)) {
+            current.children.set(part, {
+              type: "folder",
+              children: /* @__PURE__ */ new Map()
+            });
+          }
+          current = current.children.get(part);
+        }
+      });
+    }
+    return root;
+  };
+  const tree = buildTree(files);
+  const count = (node) => {
+    let total = 0;
+    const files2 = [];
+    for (const child of node.children.values()) {
+      if (child.type === "file") {
+        total += 1;
+        files2.push(child.file);
+      } else if (child.type === "folder") {
+        total += 1;
+        const nested = count(child);
+        total += nested.total;
+        files2.push(...nested.files);
+      }
+    }
+    return { total, files: files2 };
+  };
+  const children = [];
+  for (const [name, node] of tree.children) {
+    const size = count(node).total;
+    const files2 = count(node).files;
+    children.push({
+      name,
+      size,
+      files: files2
+    });
+  }
+  const folders = children.map((folder) => {
+    const intent = (folder.files ?? []).some((item) => item.status === "success") ? "success" : (files ?? []).some((item) => item.status === "error") ? "error" : "info";
+    return { ...folder, intent };
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: folders.map(({ intent, name, size, files: files2 }, index) => /* @__PURE__ */ jsxRuntime.jsx(
+    Folder,
+    {
+      name,
+      size,
+      intent,
+      loading: files2.some(
+        (file) => file.status === "uploading"
+      )
+    },
+    index
+  )) });
+};
 
 exports.File = File;
 exports.Folder = Folder;
+exports.FolderList = FolderList;

package/dist/esm/components/Uploader/Manager.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { createPortal } from 'react-dom';
-import { File, Folder } from './Upload.js';
+import { File, FolderList } from './Upload.js';
 import { Button } from '../Button.js';
 import { IoMdClose } from 'react-icons/io';
 import { useState } from 'react';
@@ -62,7 +62,7 @@ const Manager = ({
                   showDelete: false
                 },
                 file.uid
-              )) : /* @__PURE__ */ jsx(Folder, { items: files })
+              )) : /* @__PURE__ */ jsx(FolderList, { files })
             }
           )
         ] })

package/dist/esm/components/Uploader/Upload.js

@@ -1,4 +1,4 @@
-import { jsxs, jsx } from 'react/jsx-runtime';
+import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { button } from '@tecsinapse/cortex-core';
 import { FaRegFileLines, FaRegFolder } from 'react-icons/fa6';
 import { MdClose } from 'react-icons/md';
@@ -61,32 +61,96 @@ const File = ({
     )
   ] }, index);
 };
-const Folder = ({ items }) => {
-  const paths = /* @__PURE__ */ new Set();
-  for (const file in items) {
-    const path = items[file].file.relativePath.slice(1).split("/");
-    path.map((item) => paths.add(item));
-  }
-  const intent = (items ?? []).some((item) => item.status === "success") ? "success" : (items ?? []).some((item) => item.status === "error") ? "error" : "info";
+const Folder = ({ name, size, intent, loading }) => {
   return /* @__PURE__ */ jsxs("div", { className: "flex flex-col w-full", children: [
     /* @__PURE__ */ jsx("div", { className: "flex items-center justify-between border rounded-t-mili shadow p-mili", children: /* @__PURE__ */ jsxs("div", { className: "flex gap-centi", children: [
       /* @__PURE__ */ jsx("span", { className: "border-2 text-kilo text-primary-medium w-tera h-tera flex items-center justify-center rounded-mili", children: /* @__PURE__ */ jsx(FaRegFolder, {}) }),
       /* @__PURE__ */ jsxs("div", { className: "flex-col", children: [
-        /* @__PURE__ */ jsx("p", { className: "font-semibold truncate max-w-[200px]", children: Array.from(paths)[0] }),
+        /* @__PURE__ */ jsx("p", { className: "font-semibold truncate max-w-[200px]", children: name }),
         /* @__PURE__ */ jsxs("p", { className: "text-sm text-gray-500", children: [
-          paths.size - 1,
-          " itens"
+          size,
+          " ",
+          size > 1 ? "itens" : "item"
         ] })
       ] })
     ] }) }),
-    /* @__PURE__ */ jsx(
-      ProgressBar,
-      {
-        intent,
-        infinite: (items ?? []).some((item) => item.status === "uploading")
-      }
-    )
+    /* @__PURE__ */ jsx(ProgressBar, { intent, infinite: loading })
   ] });
 };
+const FolderList = ({ files }) => {
+  const paths = /* @__PURE__ */ new Set();
+  const buildTree = (files2) => {
+    const root = {
+      type: "root",
+      children: /* @__PURE__ */ new Map()
+    };
+    for (const file of files2) {
+      const parts = file.file.relativePath.slice(1).split("/");
+      parts.map((item) => paths.add(item));
+      let current = root;
+      parts.forEach((part, index) => {
+        const isLast = index === parts.length - 1;
+        if (isLast) {
+          current.children.set(part, {
+            type: "file",
+            file
+          });
+        } else {
+          if (!current.children.has(part)) {
+            current.children.set(part, {
+              type: "folder",
+              children: /* @__PURE__ */ new Map()
+            });
+          }
+          current = current.children.get(part);
+        }
+      });
+    }
+    return root;
+  };
+  const tree = buildTree(files);
+  const count = (node) => {
+    let total = 0;
+    const files2 = [];
+    for (const child of node.children.values()) {
+      if (child.type === "file") {
+        total += 1;
+        files2.push(child.file);
+      } else if (child.type === "folder") {
+        total += 1;
+        const nested = count(child);
+        total += nested.total;
+        files2.push(...nested.files);
+      }
+    }
+    return { total, files: files2 };
+  };
+  const children = [];
+  for (const [name, node] of tree.children) {
+    const size = count(node).total;
+    const files2 = count(node).files;
+    children.push({
+      name,
+      size,
+      files: files2
+    });
+  }
+  const folders = children.map((folder) => {
+    const intent = (folder.files ?? []).some((item) => item.status === "success") ? "success" : (files ?? []).some((item) => item.status === "error") ? "error" : "info";
+    return { ...folder, intent };
+  });
+  return /* @__PURE__ */ jsx(Fragment, { children: folders.map(({ intent, name, size, files: files2 }, index) => /* @__PURE__ */ jsx(
+    Folder,
+    {
+      name,
+      size,
+      intent,
+      loading: files2.some(
+        (file) => file.status === "uploading"
+      )
+    },
+    index
+  )) });
+};
 
-export { File, Folder };
+export { File, Folder, FolderList };

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

@@ -1,3 +1,4 @@
-import { FileProps, FolderProps } from './types';
+import { FileProps, FolderListProps, FolderProps } from './types';
 export declare const File: <T>({ file, index, onDelete, showDelete, }: FileProps<T>) => import("react/jsx-runtime").JSX.Element;
-export declare const Folder: <T>({ items }: FolderProps<T>) => import("react/jsx-runtime").JSX.Element;
+export declare const Folder: <T>({ name, size, intent, loading }: FolderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const FolderList: <T>({ files }: FolderListProps<T>) => import("react/jsx-runtime").JSX.Element;

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

@@ -9,8 +9,14 @@ export interface FileProps<T> {
     onDelete: (index: number) => void;
     showDelete?: boolean;
 }
-export interface FolderProps<T> {
-    items: FileUpload<T>[];
+export interface FolderProps {
+    name: string;
+    size: number;
+    intent: 'default' | 'success' | 'warning' | 'info' | 'error';
+    loading: boolean;
+}
+export interface FolderListProps<T> {
+    files: FileUpload<T>[];
 }
 export interface FilesProps<T> {
     files: FileUpload<T>[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tecsinapse/cortex-react",
-  "version": "1.15.0-beta.6",
+  "version": "1.15.0-beta.7",
   "description": "React components based in @tecsinapse/cortex-core",
   "license": "MIT",
   "main": "dist/esm/index.js",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@floating-ui/react": "^0.26.18",
     "@internationalized/date": "3.7.0",
-    "@tecsinapse/cortex-core": "1.2.0-beta.4",
+    "@tecsinapse/cortex-core": "1.2.0-beta.5",
     "clsx": "2.1.1",
     "currency.js": "2.0.4",
     "embla-carousel-autoplay": "^8.0.0",
@@ -48,5 +48,5 @@
     "react-icons": ">=5.2.0",
     "tailwind": ">=3.3.0"
   },
-  "gitHead": "4b3f865fef0e94a662c300ccd5173c9aecdd4fd7"
+  "gitHead": "2082dfbefdac0dc3a0773f8876885fdae29a8609"
 }