react-native-rectangle-doc-scanner 3.109.0 → 3.111.0

package/dist/FullDocScanner.js

@@ -44,45 +44,17 @@ const react_native_image_crop_picker_1 = __importDefault(require("react-native-i
 const react_native_fs_1 = __importDefault(require("react-native-fs"));
 const DocScanner_1 = require("./DocScanner");
 let ImageManipulator = null;
-let ImageRotate = null;
-const ImageStoreManager = react_native_1.NativeModules.ImageStoreManager;
 try {
     ImageManipulator = require('expo-image-manipulator');
 }
 catch (error) {
-    console.warn('[FullDocScanner] expo-image-manipulator module unavailable. Checking fallback options.', error);
-}
-try {
-    const rotateModule = require('react-native-image-rotate');
-    ImageRotate = (rotateModule?.default ?? rotateModule);
-}
-catch (error) {
-    console.warn('[FullDocScanner] react-native-image-rotate module unavailable. Image rotation fallback disabled.', error);
+    console.warn('[FullDocScanner] expo-image-manipulator module unavailable.', error);
 }
 let expoManipulatorUnavailable = false;
 const isExpoImageManipulatorAvailable = () => !!ImageManipulator?.manipulateAsync && !expoManipulatorUnavailable;
-const isImageRotateAvailable = !!ImageRotate?.rotateImage;
-const isImageRotationSupported = () => isExpoImageManipulatorAvailable() || isImageRotateAvailable;
+const isImageRotationSupported = () => isExpoImageManipulatorAvailable();
 const stripFileUri = (value) => value.replace(/^file:\/\//, '');
 const ensureFileUri = (value) => (value.startsWith('file://') ? value : `file://${value}`);
-const getBase64FromImageStore = async (uri) => {
-    const getBase64ForTag = ImageStoreManager?.getBase64ForTag?.bind(ImageStoreManager);
-    if (!getBase64ForTag) {
-        throw new Error('ImageStoreManager.getBase64ForTag unavailable');
-    }
-    return new Promise((resolve, reject) => {
-        getBase64ForTag(uri, (base64) => resolve(base64), (error) => {
-            const message = typeof error === 'string'
-                ? error
-                : error && typeof error === 'object' && 'message' in error
-                    ? String(error.message)
-                    : 'Failed to read from ImageStore';
-            reject(new Error(message));
-        });
-    }).finally(() => {
-        ImageStoreManager?.removeImageForTag?.(uri);
-    });
-};
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -382,22 +354,6 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const handleFlashToggle = (0, react_1.useCallback)(() => {
         setFlashEnabled(prev => !prev);
     }, []);
-    const rotateImageWithFallback = (0, react_1.useCallback)((uri, angle) => {
-        return new Promise((resolve, reject) => {
-            if (!ImageRotate?.rotateImage) {
-                reject(new Error('react-native-image-rotate unavailable'));
-                return;
-            }
-            ImageRotate.rotateImage(uri, angle, (rotatedUri) => resolve(rotatedUri), (error) => {
-                const message = typeof error === 'string'
-                    ? error
-                    : error && typeof error === 'object' && 'message' in error
-                        ? String(error.message)
-                        : 'Unknown rotation error';
-                reject(new Error(message));
-            });
-        });
-    }, []);
     const handleRotateImage = (0, react_1.useCallback)((degrees) => {
         if (!isImageRotationSupported()) {
             console.warn('[FullDocScanner] Image rotation requested but no rotation module is available.');
@@ -418,8 +374,9 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         if (!croppedImageData) {
             return;
         }
-        // 회전이 없거나 모듈을 사용할 수 없으면 기존 데이터 그대로 전달
+        // 회전이 없으면 기존 데이터 그대로 전달
         if (rotationDegrees === 0) {
+            console.log('[FullDocScanner] No rotation, returning original image');
             onResult({
                 path: croppedImageData.path,
                 base64: croppedImageData.base64,
@@ -430,76 +387,82 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             setProcessing(true);
             // 회전 각도 정규화 (0, 90, 180, 270)
             const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+            console.log('[FullDocScanner] Rotation degrees:', rotationDegrees, 'normalized:', rotationNormalized);
             if (rotationNormalized === 0) {
+                console.log('[FullDocScanner] Normalized to 0, returning original image');
                 onResult({
                     path: croppedImageData.path,
                     base64: croppedImageData.base64,
                 });
+                setProcessing(false);
                 return;
             }
+            // expo-image-manipulator 시도
             if (isExpoImageManipulatorAvailable() && ImageManipulator?.manipulateAsync) {
                 try {
-                    // expo-image-manipulator로 이미지 회전
-                    const result = await ImageManipulator.manipulateAsync(croppedImageData.path, [{ rotate: rotationNormalized }], {
+                    console.log('[FullDocScanner] Using expo-image-manipulator for rotation');
+                    const inputUri = ensureFileUri(croppedImageData.path);
+                    const result = await ImageManipulator.manipulateAsync(inputUri, [{ rotate: rotationNormalized }], {
                         compress: 0.9,
                         format: ImageManipulator.SaveFormat.JPEG,
                         base64: true,
                     });
-                    onResult({
+                    console.log('[FullDocScanner] Rotation complete via expo-image-manipulator:', {
                         path: result.uri,
+                        hasBase64: !!result.base64,
+                    });
+                    onResult({
+                        path: stripFileUri(result.uri),
                         base64: result.base64,
                     });
+                    setProcessing(false);
                     return;
                 }
                 catch (manipulatorError) {
                     const code = manipulatorError && typeof manipulatorError === 'object' && 'code' in manipulatorError
                         ? String(manipulatorError.code)
                         : undefined;
+                    console.error('[FullDocScanner] expo-image-manipulator error:', manipulatorError);
                     if (code === 'ERR_UNAVAILABLE') {
                         expoManipulatorUnavailable = true;
-                        console.warn('[FullDocScanner] expo-image-manipulator unavailable at runtime. Falling back to react-native-image-rotate if possible.');
+                        console.warn('[FullDocScanner] expo-image-manipulator unavailable at runtime. Trying react-native-image-rotate.');
                     }
                     else {
                         throw manipulatorError;
                     }
                 }
             }
-            if (isImageRotateAvailable && ImageRotate?.rotateImage) {
-                const sourceUri = ensureFileUri(croppedImageData.path);
-                const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
-                let finalPath = croppedImageData.path;
-                let base64Result = croppedImageData.base64;
-                try {
-                    const base64FromStore = await getBase64FromImageStore(rotatedUri);
-                    const destinationPath = `${react_native_fs_1.default.CachesDirectoryPath}/full-doc-scanner-rotated-${Date.now()}-${Math.floor(Math.random() * 10000)}.jpg`;
-                    await react_native_fs_1.default.writeFile(destinationPath, base64FromStore, 'base64');
-                    finalPath = destinationPath;
-                    base64Result = base64FromStore;
-                }
-                catch (readError) {
-                    console.warn('[FullDocScanner] Failed to persist rotated image from ImageStore:', readError);
-                }
-                onResult({
-                    path: finalPath,
-                    base64: base64Result,
-                });
-                return;
-            }
-            console.warn('[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.');
-            onResult({
-                path: croppedImageData.path,
-                base64: croppedImageData.base64,
-            });
+            // expo-image-manipulator를 사용할 수 없는 경우 에러 처리
+            console.error('[FullDocScanner] Rotation requested but expo-image-manipulator is not available.');
+            setProcessing(false);
+            react_native_1.Alert.alert('회전 불가', 'expo-image-manipulator가 설치되지 않아 이미지 회전을 수행할 수 없습니다.\n\n패키지를 설치해주세요:\nnpm install expo-image-manipulator', [
+                {
+                    text: '원본 사용',
+                    onPress: () => {
+                        onResult({
+                            path: croppedImageData.path,
+                            base64: croppedImageData.base64,
+                        });
+                    },
+                },
+                {
+                    text: '취소',
+                    style: 'cancel',
+                },
+            ]);
         }
         catch (error) {
             console.error('[FullDocScanner] Image rotation error on confirm:', error);
-            const errorMessage = error && typeof error === 'object' && 'message' in error ? error.message : '';
-            react_native_1.Alert.alert('회전 실패', '이미지 회전 중 오류가 발생했습니다: ' + errorMessage);
-        }
-        finally {
             setProcessing(false);
+            const errorMessage = error && typeof error === 'object' && 'message' in error ? error.message : String(error);
+            react_native_1.Alert.alert('회전 실패', `이미지 회전 중 오류가 발생했습니다.\n원본 이미지를 사용합니다.\n\n오류: ${errorMessage}`);
+            // 에러 발생 시 원본 이미지 반환
+            onResult({
+                path: croppedImageData.path,
+                base64: croppedImageData.base64,
+            });
         }
-    }, [croppedImageData, rotationDegrees, onResult, rotateImageWithFallback]);
+    }, [croppedImageData, rotationDegrees, onResult]);
     const handleRetake = (0, react_1.useCallback)(() => {
         console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');
         setCroppedImageData(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "3.109.0",
+  "version": "3.111.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",

package/src/FullDocScanner.tsx

@@ -8,7 +8,6 @@ import {
   Text,
   TouchableOpacity,
   View,
-  NativeModules,
 } from 'react-native';
 import { launchImageLibrary } from 'react-native-image-picker';
 import ImageCropPicker from 'react-native-image-crop-picker';
@@ -23,43 +22,14 @@ import type {
 } from './DocScanner';
 
 type ImageManipulatorModule = typeof import('expo-image-manipulator');
-type ImageRotateModule = {
-  rotateImage: (
-    uri: string,
-    angle: number,
-    onSuccess: (uri: string) => void,
-    onError: (error: unknown) => void,
-  ) => void;
-} | null;
-
-type ImageStoreModule = {
-  getBase64ForTag?: (
-    uri: string,
-    success: (base64: string) => void,
-    failure: (error: unknown) => void,
-  ) => void;
-  removeImageForTag?: (uri: string) => void;
-} | undefined;
 
 let ImageManipulator: ImageManipulatorModule | null = null;
-let ImageRotate: ImageRotateModule = null;
-const ImageStoreManager: ImageStoreModule = NativeModules.ImageStoreManager;
 
 try {
   ImageManipulator = require('expo-image-manipulator') as ImageManipulatorModule;
 } catch (error) {
   console.warn(
-    '[FullDocScanner] expo-image-manipulator module unavailable. Checking fallback options.',
-    error,
-  );
-}
-
-try {
-  const rotateModule = require('react-native-image-rotate');
-  ImageRotate = (rotateModule?.default ?? rotateModule) as ImageRotateModule;
-} catch (error) {
-  console.warn(
-    '[FullDocScanner] react-native-image-rotate module unavailable. Image rotation fallback disabled.',
+    '[FullDocScanner] expo-image-manipulator module unavailable.',
     error,
   );
 }
@@ -67,38 +37,11 @@ try {
 let expoManipulatorUnavailable = false;
 const isExpoImageManipulatorAvailable = () =>
   !!ImageManipulator?.manipulateAsync && !expoManipulatorUnavailable;
-const isImageRotateAvailable = !!ImageRotate?.rotateImage;
-const isImageRotationSupported = () => isExpoImageManipulatorAvailable() || isImageRotateAvailable;
+const isImageRotationSupported = () => isExpoImageManipulatorAvailable();
 
 const stripFileUri = (value: string) => value.replace(/^file:\/\//, '');
 const ensureFileUri = (value: string) => (value.startsWith('file://') ? value : `file://${value}`);
 
-const getBase64FromImageStore = async (uri: string): Promise<string> => {
-  const getBase64ForTag = ImageStoreManager?.getBase64ForTag?.bind(ImageStoreManager);
-
-  if (!getBase64ForTag) {
-    throw new Error('ImageStoreManager.getBase64ForTag unavailable');
-  }
-
-  return new Promise<string>((resolve, reject) => {
-    getBase64ForTag(
-      uri,
-      (base64: string) => resolve(base64),
-      (error: unknown) => {
-        const message =
-          typeof error === 'string'
-            ? error
-            : error && typeof error === 'object' && 'message' in error
-              ? String((error as any).message)
-              : 'Failed to read from ImageStore';
-        reject(new Error(message));
-      },
-    );
-  }).finally(() => {
-    ImageStoreManager?.removeImageForTag?.(uri);
-  });
-};
-
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
 
@@ -531,30 +474,6 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     setFlashEnabled(prev => !prev);
   }, []);
 
-  const rotateImageWithFallback = useCallback((uri: string, angle: number) => {
-    return new Promise<string>((resolve, reject) => {
-      if (!ImageRotate?.rotateImage) {
-        reject(new Error('react-native-image-rotate unavailable'));
-        return;
-      }
-
-      ImageRotate.rotateImage(
-        uri,
-        angle,
-        (rotatedUri) => resolve(rotatedUri),
-        (error) => {
-          const message =
-            typeof error === 'string'
-              ? error
-              : error && typeof error === 'object' && 'message' in error
-                ? String((error as any).message)
-                : 'Unknown rotation error';
-          reject(new Error(message));
-        },
-      );
-    });
-  }, []);
-
   const handleRotateImage = useCallback(
     (degrees: -90 | 90) => {
       if (!isImageRotationSupported()) {
@@ -581,8 +500,9 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       return;
     }
 
-    // 회전이 없거나 모듈을 사용할 수 없으면 기존 데이터 그대로 전달
+    // 회전이 없으면 기존 데이터 그대로 전달
     if (rotationDegrees === 0) {
+      console.log('[FullDocScanner] No rotation, returning original image');
       onResult({
         path: croppedImageData.path,
         base64: croppedImageData.base64,
@@ -595,20 +515,26 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
 
       // 회전 각도 정규화 (0, 90, 180, 270)
       const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+      console.log('[FullDocScanner] Rotation degrees:', rotationDegrees, 'normalized:', rotationNormalized);
 
       if (rotationNormalized === 0) {
+        console.log('[FullDocScanner] Normalized to 0, returning original image');
         onResult({
           path: croppedImageData.path,
           base64: croppedImageData.base64,
         });
+        setProcessing(false);
         return;
       }
 
+      // expo-image-manipulator 시도
       if (isExpoImageManipulatorAvailable() && ImageManipulator?.manipulateAsync) {
         try {
-          // expo-image-manipulator로 이미지 회전
+          console.log('[FullDocScanner] Using expo-image-manipulator for rotation');
+          const inputUri = ensureFileUri(croppedImageData.path);
+
           const result = await ImageManipulator.manipulateAsync(
-            croppedImageData.path,
+            inputUri,
             [{ rotate: rotationNormalized }],
             {
               compress: 0.9,
@@ -617,10 +543,16 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             },
           );
 
-          onResult({
+          console.log('[FullDocScanner] Rotation complete via expo-image-manipulator:', {
             path: result.uri,
+            hasBase64: !!result.base64,
+          });
+
+          onResult({
+            path: stripFileUri(result.uri),
             base64: result.base64,
           });
+          setProcessing(false);
           return;
         } catch (manipulatorError) {
           const code =
@@ -628,10 +560,12 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
               ? String((manipulatorError as any).code)
               : undefined;
 
+          console.error('[FullDocScanner] expo-image-manipulator error:', manipulatorError);
+
           if (code === 'ERR_UNAVAILABLE') {
             expoManipulatorUnavailable = true;
             console.warn(
-              '[FullDocScanner] expo-image-manipulator unavailable at runtime. Falling back to react-native-image-rotate if possible.',
+              '[FullDocScanner] expo-image-manipulator unavailable at runtime. Trying react-native-image-rotate.',
             );
           } else {
             throw manipulatorError;
@@ -639,48 +573,45 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         }
       }
 
-      if (isImageRotateAvailable && ImageRotate?.rotateImage) {
-        const sourceUri = ensureFileUri(croppedImageData.path);
-        const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
-
-        let finalPath = croppedImageData.path;
-        let base64Result: string | undefined = croppedImageData.base64;
-
-        try {
-          const base64FromStore = await getBase64FromImageStore(rotatedUri);
-          const destinationPath = `${RNFS.CachesDirectoryPath}/full-doc-scanner-rotated-${Date.now()}-${Math.floor(Math.random() * 10000)}.jpg`;
-
-          await RNFS.writeFile(destinationPath, base64FromStore, 'base64');
-          finalPath = destinationPath;
-          base64Result = base64FromStore;
-        } catch (readError) {
-          console.warn('[FullDocScanner] Failed to persist rotated image from ImageStore:', readError);
-        }
+      // expo-image-manipulator를 사용할 수 없는 경우 에러 처리
+      console.error(
+        '[FullDocScanner] Rotation requested but expo-image-manipulator is not available.',
+      );
+      setProcessing(false);
+      Alert.alert(
+        '회전 불가',
+        'expo-image-manipulator가 설치되지 않아 이미지 회전을 수행할 수 없습니다.\n\n패키지를 설치해주세요:\nnpm install expo-image-manipulator',
+        [
+          {
+            text: '원본 사용',
+            onPress: () => {
+              onResult({
+                path: croppedImageData.path,
+                base64: croppedImageData.base64,
+              });
+            },
+          },
+          {
+            text: '취소',
+            style: 'cancel',
+          },
+        ],
+      );
+    } catch (error) {
+      console.error('[FullDocScanner] Image rotation error on confirm:', error);
+      setProcessing(false);
 
-        onResult({
-          path: finalPath,
-          base64: base64Result,
-        });
-        return;
-      }
+      const errorMessage =
+        error && typeof error === 'object' && 'message' in error ? (error as Error).message : String(error);
+      Alert.alert('회전 실패', `이미지 회전 중 오류가 발생했습니다.\n원본 이미지를 사용합니다.\n\n오류: ${errorMessage}`);
 
-      console.warn(
-        '[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.',
-      );
+      // 에러 발생 시 원본 이미지 반환
       onResult({
         path: croppedImageData.path,
         base64: croppedImageData.base64,
       });
-    } catch (error) {
-      console.error('[FullDocScanner] Image rotation error on confirm:', error);
-
-      const errorMessage =
-        error && typeof error === 'object' && 'message' in error ? (error as Error).message : '';
-      Alert.alert('회전 실패', '이미지 회전 중 오류가 발생했습니다: ' + errorMessage);
-    } finally {
-      setProcessing(false);
     }
-  }, [croppedImageData, rotationDegrees, onResult, rotateImageWithFallback]);
+  }, [croppedImageData, rotationDegrees, onResult]);
 
   const handleRetake = useCallback(() => {
     console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');