react-native-rectangle-doc-scanner 3.110.0 → 3.112.0

package/dist/FullDocScanner.d.ts

@@ -8,6 +8,8 @@ export interface FullDocScannerResult {
     base64?: string;
     /** Original captured document info */
     original?: CapturedDocument;
+    /** Rotation angle applied by user (0, 90, 180, 270) */
+    rotationDegrees?: number;
 }
 export interface FullDocScannerStrings {
     captureHint?: string;

package/dist/FullDocScanner.js

@@ -44,26 +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;
 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;
+// 회전은 항상 지원됨 (회전 각도를 반환하고 tdb 앱에서 처리)
+const isImageRotationSupported = () => true;
 const stripFileUri = (value) => value.replace(/^file:\/\//, '');
-const ensureFileUri = (value) => (value.startsWith('file://') ? value : `file://${value}`);
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -363,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.');
@@ -399,118 +374,17 @@ 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,
-            });
-            return;
-        }
-        try {
-            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 {
-                    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,
-                    });
-                    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. Trying react-native-image-rotate.');
-                    }
-                    else {
-                        throw manipulatorError;
-                    }
-                }
-            }
-            // react-native-image-rotate 시도 (ImageStore 사용 안 함)
-            if (isImageRotateAvailable && ImageRotate?.rotateImage) {
-                console.log('[FullDocScanner] Using react-native-image-rotate for rotation');
-                const sourceUri = ensureFileUri(croppedImageData.path);
-                try {
-                    const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
-                    console.log('[FullDocScanner] Image rotated via react-native-image-rotate:', rotatedUri);
-                    // rotatedUri를 파일로 저장하고 base64 생성
-                    const destinationPath = `${react_native_fs_1.default.CachesDirectoryPath}/rotated_img_${Date.now()}.jpeg`;
-                    // rotatedUri는 이미 file://로 시작하므로 stripFileUri로 정리
-                    const cleanRotatedUri = stripFileUri(rotatedUri);
-                    // 파일 복사
-                    await react_native_fs_1.default.copyFile(cleanRotatedUri, destinationPath);
-                    console.log('[FullDocScanner] Copied rotated file to:', destinationPath);
-                    // Base64 생성
-                    const base64Data = await react_native_fs_1.default.readFile(destinationPath, 'base64');
-                    console.log('[FullDocScanner] Got result:', {
-                        path: destinationPath,
-                        hasBase64: true,
-                        base64Length: base64Data.length,
-                    });
-                    onResult({
-                        path: destinationPath,
-                        base64: base64Data,
-                    });
-                    setProcessing(false);
-                    return;
-                }
-                catch (rotateError) {
-                    console.error('[FullDocScanner] react-native-image-rotate error:', rotateError);
-                    throw rotateError;
-                }
-            }
-            // 회전 불가능한 경우 경고 후 원본 반환
-            console.warn('[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.');
-            react_native_1.Alert.alert('알림', '이미지 회전 기능을 사용할 수 없습니다. 원본 이미지를 사용합니다.');
-            onResult({
-                path: croppedImageData.path,
-                base64: croppedImageData.base64,
-            });
-            setProcessing(false);
-        }
-        catch (error) {
-            console.error('[FullDocScanner] Image rotation error on confirm:', error);
-            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]);
+        // 회전 각도 정규화 (0, 90, 180, 270)
+        const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+        console.log('[FullDocScanner] Confirm - rotation degrees:', rotationDegrees, 'normalized:', rotationNormalized);
+        // 원본 이미지와 회전 각도를 함께 반환
+        // tdb 앱에서 expo-image-manipulator를 사용해서 회전 처리
+        onResult({
+            path: croppedImageData.path,
+            base64: croppedImageData.base64,
+            rotationDegrees: rotationNormalized,
+        });
+    }, [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.110.0",
+  "version": "3.112.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",

package/src/FullDocScanner.tsx

@@ -22,33 +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;
 
 let ImageManipulator: ImageManipulatorModule | null = null;
-let ImageRotate: ImageRotateModule = null;
 
 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,
   );
 }
@@ -56,11 +37,10 @@ try {
 let expoManipulatorUnavailable = false;
 const isExpoImageManipulatorAvailable = () =>
   !!ImageManipulator?.manipulateAsync && !expoManipulatorUnavailable;
-const isImageRotateAvailable = !!ImageRotate?.rotateImage;
-const isImageRotationSupported = () => isExpoImageManipulatorAvailable() || isImageRotateAvailable;
+// 회전은 항상 지원됨 (회전 각도를 반환하고 tdb 앱에서 처리)
+const isImageRotationSupported = () => true;
 
 const stripFileUri = (value: string) => value.replace(/^file:\/\//, '');
-const ensureFileUri = (value: string) => (value.startsWith('file://') ? value : `file://${value}`);
 
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
@@ -142,6 +122,8 @@ export interface FullDocScannerResult {
   base64?: string;
   /** Original captured document info */
   original?: CapturedDocument;
+  /** Rotation angle applied by user (0, 90, 180, 270) */
+  rotationDegrees?: number;
 }
 
 export interface FullDocScannerStrings {
@@ -494,30 +476,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()) {
@@ -544,143 +502,18 @@ 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,
-      });
-      return;
-    }
-
-    try {
-      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 {
-          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,
-            },
-          );
+    // 회전 각도 정규화 (0, 90, 180, 270)
+    const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+    console.log('[FullDocScanner] Confirm - rotation degrees:', rotationDegrees, 'normalized:', rotationNormalized);
 
-          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 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. Trying react-native-image-rotate.',
-            );
-          } else {
-            throw manipulatorError;
-          }
-        }
-      }
-
-      // react-native-image-rotate 시도 (ImageStore 사용 안 함)
-      if (isImageRotateAvailable && ImageRotate?.rotateImage) {
-        console.log('[FullDocScanner] Using react-native-image-rotate for rotation');
-        const sourceUri = ensureFileUri(croppedImageData.path);
-
-        try {
-          const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
-          console.log('[FullDocScanner] Image rotated via react-native-image-rotate:', rotatedUri);
-
-          // rotatedUri를 파일로 저장하고 base64 생성
-          const destinationPath = `${RNFS.CachesDirectoryPath}/rotated_img_${Date.now()}.jpeg`;
-
-          // rotatedUri는 이미 file://로 시작하므로 stripFileUri로 정리
-          const cleanRotatedUri = stripFileUri(rotatedUri);
-
-          // 파일 복사
-          await RNFS.copyFile(cleanRotatedUri, destinationPath);
-          console.log('[FullDocScanner] Copied rotated file to:', destinationPath);
-
-          // Base64 생성
-          const base64Data = await RNFS.readFile(destinationPath, 'base64');
-          console.log('[FullDocScanner] Got result:', {
-            path: destinationPath,
-            hasBase64: true,
-            base64Length: base64Data.length,
-          });
-
-          onResult({
-            path: destinationPath,
-            base64: base64Data,
-          });
-          setProcessing(false);
-          return;
-        } catch (rotateError) {
-          console.error('[FullDocScanner] react-native-image-rotate error:', rotateError);
-          throw rotateError;
-        }
-      }
-
-      // 회전 불가능한 경우 경고 후 원본 반환
-      console.warn(
-        '[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.',
-      );
-      Alert.alert('알림', '이미지 회전 기능을 사용할 수 없습니다. 원본 이미지를 사용합니다.');
-      onResult({
-        path: croppedImageData.path,
-        base64: croppedImageData.base64,
-      });
-      setProcessing(false);
-    } catch (error) {
-      console.error('[FullDocScanner] Image rotation error on confirm:', error);
-      setProcessing(false);
-
-      const errorMessage =
-        error && typeof error === 'object' && 'message' in error ? (error as Error).message : String(error);
-      Alert.alert('회전 실패', `이미지 회전 중 오류가 발생했습니다.\n원본 이미지를 사용합니다.\n\n오류: ${errorMessage}`);
-
-      // 에러 발생 시 원본 이미지 반환
-      onResult({
-        path: croppedImageData.path,
-        base64: croppedImageData.base64,
-      });
-    }
-  }, [croppedImageData, rotationDegrees, onResult, rotateImageWithFallback]);
+    // 원본 이미지와 회전 각도를 함께 반환
+    // tdb 앱에서 expo-image-manipulator를 사용해서 회전 처리
+    onResult({
+      path: croppedImageData.path,
+      base64: croppedImageData.base64,
+      rotationDegrees: rotationNormalized,
+    });
+  }, [croppedImageData, rotationDegrees, onResult]);
 
   const handleRetake = useCallback(() => {
     console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');