uplofile 2.2.0 → 2.2.2

package/README.md

@@ -7,11 +7,11 @@ Accessible, unstyled primitives for building your own upload UI — with drag‑
 
 ## Features
 
-- React 16+ compatible  
-- Drag‑and‑drop or click‑to‑upload  
-- Upload progress, plus cancel/retry/remove actions  
+- React 16+ compatible
+- Drag‑and‑drop or click‑to‑upload
+- Upload progress, plus cancel/retry/remove actions
 - **Custom Validation:** Use `beforeUpload` to validate files before they start uploading
-- Hidden input for form submissions  
+- Hidden input for form submissions
 - Unstyled — bring your own design
 
 ---
@@ -36,25 +36,25 @@ Import and use the components in your React component:
 "use client";
 
 import {
-    UplofileDropzone,
-    UplofilePreview,
-    UplofileRoot,
-    UplofileTrigger,
+  UplofileDropzone,
+  UplofilePreview,
+  UplofileRoot,
+  UplofileTrigger,
 } from "uplofile";
 
 export default function Basic() {
   return (
-      <UplofileRoot onRemove={onRemove} upload={upload} removeMode={"strict"}>
-          <UplofileDropzone className={"border p-2 rounded"}>
-              <span>Drop your files here or</span>{" "}
-              <UplofileTrigger className={"underline text-blue-500"}>
-                  Select file
-              </UplofileTrigger>
-              <div className={"border-t my-6 py-6"}>
-                  <UplofilePreview />
-              </div>
-          </UplofileDropzone>
-      </UplofileRoot>
+    <UplofileRoot onRemove={onRemove} upload={upload} removeMode={"strict"}>
+      <UplofileDropzone className={"border p-2 rounded"}>
+        <span>Drop your files here or</span>{" "}
+        <UplofileTrigger className={"underline text-blue-500"}>
+          Select file
+        </UplofileTrigger>
+        <div className={"border-t my-6 py-6"}>
+          <UplofilePreview />
+        </div>
+      </UplofileDropzone>
+    </UplofileRoot>
   );
 }
 ```

package/dist/index.d.ts

@@ -29,10 +29,12 @@ type UploadResult<TMeta = any> = {
 type UplofileRootRef<TMeta = any> = {
     setItems: (items: UploadFileItem<TMeta>[] | ((prev: UploadFileItem<TMeta>[]) => UploadFileItem<TMeta>[])) => void;
     getItems: () => UploadFileItem<TMeta>[];
+    isLoading: boolean;
     onDrop: (e: DragEvent) => void;
     onDragOver: (e: DragEvent) => void;
     openFileDialog: () => void;
     actions: ItemActions;
+    onLoadingChange?: (isLoading: boolean) => void;
 };
 type BeforeUploadResult<TMeta = any> = boolean | Array<{
     valid: boolean;
@@ -55,6 +57,7 @@ type RootProps<TMeta = any> = PropsWithChildren<{
     accept?: string;
     beforeUpload?: (items: UploadFileItem<TMeta>[]) => BeforeUploadResult<TMeta> | Promise<BeforeUploadResult<TMeta>>;
     onChange?: (items: UploadFileItem<TMeta>[]) => Promise<void> | void;
+    onLoadingChange?: (isLoading: boolean) => void;
     upload: (file: File, signal: AbortSignal, setProgress?: (pct: number) => void) => Promise<UploadResult<TMeta>>;
     onRemove?: (item: UploadFileItem<TMeta>, signal: AbortSignal) => Promise<void | any>;
 }>;
@@ -66,6 +69,7 @@ type ItemActions = {
 type ImageUploaderContextValue<TMeta = any> = {
     items: UploadFileItem<TMeta>[];
     setItems: (items: UploadFileItem<TMeta>[]) => void;
+    isLoading: boolean;
     disabled?: boolean;
     multiple: boolean;
     accept: string;
@@ -92,6 +96,7 @@ type ImageUploaderContextValue<TMeta = any> = {
 };
 type TriggerRenderProps<TMeta = any> = {
     items: UploadFileItem<TMeta>[];
+    isLoading: boolean;
     isUploading: boolean;
     uploadingCount: number;
     doneCount: number;
@@ -101,14 +106,16 @@ type TriggerRenderProps<TMeta = any> = {
 };
 type PreviewRenderProps<TMeta = any> = {
     items: UploadFileItem<TMeta>[];
+    isLoading: boolean;
     setItems: (items: UploadFileItem<TMeta>[]) => void;
     actions: ItemActions;
 };
 
 type Props<TMeta = any> = {
     render?: (api: PreviewRenderProps<TMeta>) => React.ReactNode;
+    className?: string;
 };
-declare const Preview: <TMeta = any>({ render }: Props<TMeta>) => string | number | boolean | react_jsx_runtime.JSX.Element | Iterable<React.ReactNode> | null | undefined;
+declare const Preview: <TMeta = any>({ render, className, }: Props<TMeta>) => string | number | boolean | react_jsx_runtime.JSX.Element | Iterable<React.ReactNode> | null | undefined;
 declare const HiddenInput: ({ name }: {
     name?: string;
 }) => react_jsx_runtime.JSX.Element;
@@ -131,13 +138,14 @@ declare const Root: React.ForwardRefExoticComponent<{
     accept?: string;
     beforeUpload?: ((items: UploadFileItem<unknown>[]) => BeforeUploadResult<unknown> | Promise<BeforeUploadResult<unknown>>) | undefined;
     onChange?: ((items: UploadFileItem<unknown>[]) => Promise<void> | void) | undefined;
+    onLoadingChange?: (isLoading: boolean) => void;
     upload: (file: File, signal: AbortSignal, setProgress?: (pct: number) => void) => Promise<UploadResult<unknown>>;
     onRemove?: ((item: UploadFileItem<unknown>, signal: AbortSignal) => Promise<void | any>) | undefined;
 } & {
     children?: React.ReactNode | undefined;
 } & React.RefAttributes<UplofileRootRef<unknown>>>;
 
-declare const Trigger: <TMeta = any>({ asChild, children, render, ...rest }: PropsWithChildren<{
+declare const Trigger: <TMeta = any>({ asChild, children, render, onClick, ...rest }: PropsWithChildren<{
     asChild?: boolean;
     render?: (api: TriggerRenderProps<TMeta>) => React.ReactNode;
     children?: React.ReactNode | ((api: TriggerRenderProps<TMeta>) => React.ReactNode);

package/dist/index.mjs

@@ -115,31 +115,56 @@ const acceptsFile = (file, accept)=>{
 };
 
 const UploaderCtx = /*#__PURE__*/ createContext(null);
-const Root = /*#__PURE__*/ forwardRef(({ multiple = true, initial = [], onChange, upload, removeMode = "optimistic", onRemove, accept = "image/*", beforeUpload, name = "image", maxCount, disabled, children }, ref)=>{
+const Root = /*#__PURE__*/ forwardRef(({ multiple = true, initial = [], onChange, onLoadingChange, upload, removeMode = "optimistic", onRemove, accept = "image/*", beforeUpload, name = "image", maxCount, disabled, children }, ref)=>{
     const [items, setItems] = useState([]);
+    const [isLoading, setIsLoading] = useState(Array.isArray(initial) ? initial.length > 0 : !!initial);
     const controllers = useRef(new Map());
     const removeControllers = useRef(new Map());
     const inputRef = useRef(null);
     const hasHydratedInitialRef = useRef(false);
+    const onLoadingChangeRef = useRef(onLoadingChange);
+    useEffect(()=>{
+        onLoadingChangeRef.current = onLoadingChange;
+    }, [
+        onLoadingChange
+    ]);
+    useEffect(()=>{
+        onLoadingChangeRef.current?.(isLoading);
+    }, [
+        isLoading
+    ]);
     // Hydrate initial items from the server and keep them marked as done
     useEffect(()=>{
         if (hasHydratedInitialRef.current) return;
         const hydrate = async ()=>{
-            const arr = await initial;
-            if (!Array.isArray(arr) || arr.length === 0) return;
-            const mapped = arr.map((it)=>{
-                return {
-                    uid: it.uid || it.id,
-                    id: it.id,
-                    name: it.name,
-                    url: it.url,
-                    status: "done",
-                    meta: it.meta
-                };
-            });
-            // Only hydrate if the user hasn't already added/modified items locally
-            setItems((prev)=>prev.length === 0 ? mapped : prev);
-            hasHydratedInitialRef.current = true;
+            try {
+                const arr = await initial;
+                if (!Array.isArray(arr) || arr.length === 0) return;
+                const mapped = arr.map((it)=>{
+                    return {
+                        uid: it.uid || it.id,
+                        id: it.id,
+                        name: it.name,
+                        url: it.url,
+                        status: "done",
+                        meta: it.meta
+                    };
+                });
+                // Append server items if user already added files while loading; avoid replacing
+                setItems((prev)=>{
+                    if (prev.length === 0) return mapped;
+                    const existing = new Set(prev.map((i)=>i.uid));
+                    const toAppend = mapped.filter((m)=>!existing.has(m.uid));
+                    if (toAppend.length === 0) return prev;
+                    return [
+                        ...prev,
+                        ...toAppend
+                    ];
+                });
+                hasHydratedInitialRef.current = true;
+            } finally{
+                setIsLoading(false);
+            }
         };
         void hydrate();
     }, [
@@ -377,6 +402,7 @@ const Root = /*#__PURE__*/ forwardRef(({ multiple = true, initial = [], onChange
         }, []);
     const ctx = {
         items,
+        isLoading,
         disabled,
         multiple,
         accept,
@@ -409,13 +435,21 @@ const Root = /*#__PURE__*/ forwardRef(({ multiple = true, initial = [], onChange
     useImperativeHandle(ref, ()=>({
             setItems: emitChange,
             getItems: ()=>items,
+            isLoading,
             onDrop,
             onDragOver,
             openFileDialog: ()=>inputRef.current?.click(),
-            actions
+            actions,
+            get onLoadingChange () {
+                return onLoadingChangeRef.current;
+            },
+            set onLoadingChange (callback){
+                onLoadingChangeRef.current = callback;
+            }
         }), [
         emitChange,
         items,
+        isLoading,
         onDrop,
         onDragOver,
         actions
@@ -452,19 +486,23 @@ const Dropzone = ({ asChild, ...rest })=>{
     });
 };
 
-const Preview = ({ render })=>{
-    const { items, actions, setItems } = useUplofile();
+const Preview = ({ render, className = "" })=>{
+    const { items, actions, setItems, isLoading } = useUplofile();
     if (render && typeof render === "function") return render({
         items,
         setItems,
-        actions
+        actions,
+        isLoading
     });
     if (items.length === 0) return null;
     return /*#__PURE__*/ jsx("div", {
         "data-part": "preview",
         className: "uplofile-preview",
         children: /*#__PURE__*/ jsx("div", {
-            className: "uplofile-preview__wrapper grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5",
+            className: [
+                "uplofile-preview__wrapper grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5",
+                className
+            ].join(" ").trim(),
             children: items.map((item)=>/*#__PURE__*/ jsxs("div", {
                     onClick: (e)=>e.stopPropagation(),
                     className: `uplofile-preview__item group relative aspect-square overflow-hidden rounded-xl border bg-muted/5 transition-all ${item.status === "error" ? "border-red-200 bg-red-50/30 hover:shadow-md" : "hover:shadow-md hover:ring-2 hover:ring-primary/20"}`,
@@ -764,8 +802,8 @@ const Remove = ({ uid, asChild, ...rest })=>{
     });
 };
 
-const Trigger = ({ asChild, children, render, ...rest })=>{
-    const { openFileDialog, disabled, items } = useUplofile();
+const Trigger = ({ asChild, children, render, onClick, ...rest })=>{
+    const { openFileDialog, disabled, items, isLoading } = useUplofile();
     const Comp = asChild ? Slot : "button";
     const uploading = items.filter((i)=>i.status === "uploading");
     const uploadingCount = uploading.length;
@@ -774,6 +812,7 @@ const Trigger = ({ asChild, children, render, ...rest })=>{
     const totalProgress = uploadingCount ? Math.round(uploading.reduce((acc, it)=>acc + (typeof it.progress === "number" ? it.progress : 0), 0) / uploadingCount) : undefined;
     const api = {
         items,
+        isLoading,
         isUploading: uploadingCount > 0,
         uploadingCount,
         doneCount,
@@ -785,12 +824,13 @@ const Trigger = ({ asChild, children, render, ...rest })=>{
         type: asChild ? undefined : "button",
         "aria-disabled": disabled,
         "data-part": "trigger",
+        ...rest,
         onClick: (e)=>{
             if (disabled) return;
-            rest.onClick?.(e);
+            onClick?.(e);
+            if (e.defaultPrevented) return;
             openFileDialog();
         },
-        ...rest,
         children: render ? render(api) : children
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uplofile",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Composable file‑upload components for React.",
   "license": "MIT",
   "author": "Chris Josh <KristofaJosh>",
@@ -41,7 +41,8 @@
     "clean": "rm -rf dist",
     "prepare": "pnpm run build",
     "prepublishOnly": "pnpm run build",
-    "test": "vitest"
+    "test": "vitest",
+    "format": "prettier --write ."
   },
   "dependencies": {
     "@radix-ui/react-slot": "1.1.0"