@deepnoid/canvas 0.1.28 → 0.1.29

package/dist/hooks/useImageLoader.js

@@ -11,11 +11,18 @@ export const useImageLoader = (src, imageRef, timeout = 10000, onLoadSuccess, on
             setError(null);
             return;
         }
-        const controller = new AbortController();
-        const { signal } = controller;
+        if (imageRef.current && imageRef.current.src === src) {
+            setImage(imageRef.current);
+            setIsLoading(false);
+            setError(null);
+            onLoadSuccess?.();
+            return;
+        }
         setIsLoading(true);
         setError(null);
         setImage(null);
+        const controller = new AbortController();
+        const { signal } = controller;
         const img = new Image();
         img.crossOrigin = 'anonymous';
         img.src = src;
@@ -28,44 +35,37 @@ export const useImageLoader = (src, imageRef, timeout = 10000, onLoadSuccess, on
                 onLoadError?.(e);
             }
         }, timeout);
-        const load = async () => {
-            try {
-                await img.decode();
-                if (signal.aborted)
-                    return;
-                if (img.naturalWidth === 0 || img.naturalHeight === 0) {
-                    throw new Error(`Invalid image dimensions: ${src}`);
-                }
-                try {
-                    imageRef.current = img;
-                }
-                catch { }
-                setImage(img);
-                setIsLoading(false);
-                setError(null);
-                onLoadSuccess?.();
-            }
-            catch (err) {
-                if (signal.aborted)
-                    return;
-                const e = new Error(`Failed to load image: ${src}`);
-                setError(e.message);
-                setIsLoading(false);
-                onLoadError?.(err instanceof Error ? err : e);
-            }
-            finally {
-                clearTimeout(timeoutId);
-            }
+        const handleLoad = () => {
+            if (signal.aborted)
+                return;
+            clearTimeout(timeoutId);
+            imageRef.current = img;
+            setImage(img);
+            setIsLoading(false);
+            setError(null);
+            onLoadSuccess?.();
         };
-        load();
+        const handleError = (e) => {
+            if (signal.aborted)
+                return;
+            clearTimeout(timeoutId);
+            const err = e instanceof Error ? e : new Error(`Failed to load image: ${src}`);
+            setError(err.message);
+            setIsLoading(false);
+            onLoadError?.(err);
+        };
+        img.onload = handleLoad;
+        img.onerror = handleError;
         return () => {
-            controller.abort();
             clearTimeout(timeoutId);
+            controller.abort();
+            img.onload = null;
+            img.onerror = null;
             try {
                 img.src = '';
             }
             catch { }
         };
-    }, [src, timeout, onLoadError, onLoadSuccess, imageRef]);
+    }, [src, imageRef, timeout, onLoadSuccess, onLoadError]);
     return { image, isLoading, error };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepnoid/canvas",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "type": "module",
   "license": "MIT",
   "main": "./dist/index.cjs",