react-native-rectangle-doc-scanner 3.99.0 → 3.101.0

package/dist/FullDocScanner.js

@@ -41,8 +41,8 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const react_native_image_picker_1 = require("react-native-image-picker");
 const react_native_image_crop_picker_1 = __importDefault(require("react-native-image-crop-picker"));
-const react_native_image_rotate_1 = __importDefault(require("react-native-image-rotate"));
 const react_native_fs_1 = __importDefault(require("react-native-fs"));
+const react_native_fast_opencv_1 = require("react-native-fast-opencv");
 const DocScanner_1 = require("./DocScanner");
 const stripFileUri = (value) => value.replace(/^file:\/\//, '');
 const CROPPER_TIMEOUT_MS = 8000;
@@ -344,75 +344,75 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const handleFlashToggle = (0, react_1.useCallback)(() => {
         setFlashEnabled(prev => !prev);
     }, []);
-    const handleRotateImage = (0, react_1.useCallback)(async (degrees) => {
-        if (!croppedImageData)
-            return;
-        // UI 회전 상태 먼저 업데이트 (즉각 반응)
+    const handleRotateImage = (0, react_1.useCallback)((degrees) => {
+        // UI만 회전 (실제 파일 회전은 confirm 시 처리)
         setRotationDegrees(prev => {
-            const newRotation = (prev + degrees + 360) % 360;
+            const newRotation = prev + degrees;
+            // -360 ~ 360 범위로 정규화
+            if (newRotation <= -360)
+                return newRotation + 360;
+            if (newRotation >= 360)
+                return newRotation - 360;
             return newRotation;
         });
-        console.log('[FullDocScanner] Starting image rotation...', {
-            path: croppedImageData.path,
-            hasBase64: !!croppedImageData.base64,
-        });
+    }, []);
+    const handleConfirm = (0, react_1.useCallback)(async () => {
+        if (!croppedImageData)
+            return;
+        // 회전이 없으면 기존 데이터 그대로 전달
+        if (rotationDegrees === 0) {
+            onResult({
+                path: croppedImageData.path,
+                base64: croppedImageData.base64,
+            });
+            return;
+        }
+        // 회전이 있으면 실제 파일 회전 처리
         try {
-            // file:// prefix 제거
-            const cleanPath = croppedImageData.path.replace(/^file:\/\//, '');
-            // ImageRotate를 사용해서 이미지 회전
-            react_native_image_rotate_1.default.rotateImage(cleanPath, degrees, async (rotatedImageUri) => {
-                console.log('[FullDocScanner] Image rotated, URI:', rotatedImageUri);
-                try {
-                    // 회전된 이미지를 실제 파일로 저장하기 위해 ImageCropPicker 사용
-                    // cropping: true이지만 전체 이미지를 선택하면 됨
-                    const savedImage = await react_native_image_crop_picker_1.default.openCropper({
-                        path: rotatedImageUri,
-                        mediaType: 'photo',
-                        cropping: true,
-                        freeStyleCropEnabled: true,
-                        includeBase64: true,
-                        compressImageQuality: 0.9,
-                        cropperToolbarTitle: '회전 완료 - 확인을 눌러주세요',
-                        cropperChooseText: '확인',
-                        cropperCancelText: '취소',
-                        cropperRotateButtonsHidden: true,
-                    });
-                    console.log('[FullDocScanner] Rotated image saved with base64');
-                    // 회전된 이미지로 교체
-                    setCroppedImageData({
-                        path: savedImage.path,
-                        base64: savedImage.data ?? undefined,
-                    });
-                    // rotation degrees는 0으로 리셋
-                    setRotationDegrees(0);
-                }
-                catch (cropError) {
-                    console.error('[FullDocScanner] Failed to save rotated image:', cropError);
-                    // 사용자가 취소한 경우 rotation 원복
-                    setRotationDegrees(prev => (prev - degrees + 360) % 360);
-                }
-            }, (error) => {
-                console.error('[FullDocScanner] Image rotation error:', error);
-                // 에러 발생 시 UI rotation 원복
-                setRotationDegrees(prev => {
-                    const revertRotation = (prev - degrees + 360) % 360;
-                    return revertRotation;
+            setProcessing(true);
+            // 회전 각도 정규화 (0, 90, 180, 270)
+            const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+            // OpenCV 회전 코드 매핑
+            // ROTATE_90_CLOCKWISE = 0
+            // ROTATE_180 = 1
+            // ROTATE_90_COUNTERCLOCKWISE = 2
+            let rotateCode;
+            if (rotationNormalized === 90) {
+                rotateCode = 0; // ROTATE_90_CLOCKWISE
+            }
+            else if (rotationNormalized === 180) {
+                rotateCode = 1; // ROTATE_180
+            }
+            else if (rotationNormalized === 270 || rotationNormalized === -90) {
+                rotateCode = 2; // ROTATE_90_COUNTERCLOCKWISE
+            }
+            else {
+                // 회전 없음
+                onResult({
+                    path: croppedImageData.path,
+                    base64: croppedImageData.base64,
                 });
+                setProcessing(false);
+                return;
+            }
+            // OpenCV로 이미지 회전
+            const rotatedPath = await react_native_fast_opencv_1.Cv2.rotate(croppedImageData.path, rotateCode);
+            // 회전된 이미지를 base64로 변환
+            const base64Data = await react_native_fs_1.default.readFile(rotatedPath, 'base64');
+            setProcessing(false);
+            // 회전된 이미지로 결과 전달
+            onResult({
+                path: rotatedPath,
+                base64: base64Data,
             });
         }
         catch (error) {
-            console.error('[FullDocScanner] Rotation setup error:', error);
-            setRotationDegrees(prev => (prev - degrees + 360) % 360);
+            console.error('[FullDocScanner] Image rotation error on confirm:', error);
+            setProcessing(false);
+            const errorMessage = error && typeof error === 'object' && 'message' in error ? error.message : '';
+            react_native_1.Alert.alert('회전 실패', '이미지 회전 중 오류가 발생했습니다: ' + errorMessage);
         }
-    }, [croppedImageData]);
-    const handleConfirm = (0, react_1.useCallback)(() => {
-        if (!croppedImageData)
-            return;
-        onResult({
-            path: croppedImageData.path,
-            base64: croppedImageData.base64,
-        });
-    }, [croppedImageData, onResult]);
+    }, [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.99.0",
+  "version": "3.101.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -33,10 +33,10 @@
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
+    "react-native-fast-opencv": "*",
     "react-native-fs": "*",
     "react-native-image-crop-picker": "*",
     "react-native-image-picker": "*",
-    "react-native-image-rotate": "*",
     "react-native-svg": "*"
   },
   "devDependencies": {
@@ -47,7 +47,5 @@
     "react-native-image-picker": "^7.1.2",
     "typescript": "^5.3.3"
   },
-  "dependencies": {
-    "react-native-image-rotate": "*"
-  }
+  "dependencies": {}
 }

package/src/FullDocScanner.tsx

@@ -11,8 +11,8 @@ import {
 } from 'react-native';
 import { launchImageLibrary } from 'react-native-image-picker';
 import ImageCropPicker from 'react-native-image-crop-picker';
-import ImageRotate from 'react-native-image-rotate';
 import RNFS from 'react-native-fs';
+import { Cv2 } from 'react-native-fast-opencv';
 import { DocScanner } from './DocScanner';
 import type { CapturedDocument } from './types';
 import type {
@@ -456,86 +456,78 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     setFlashEnabled(prev => !prev);
   }, []);
 
-  const handleRotateImage = useCallback(async (degrees: -90 | 90) => {
-    if (!croppedImageData) return;
-
-    // UI 회전 상태 먼저 업데이트 (즉각 반응)
+  const handleRotateImage = useCallback((degrees: -90 | 90) => {
+    // UI만 회전 (실제 파일 회전은 confirm 시 처리)
     setRotationDegrees(prev => {
-      const newRotation = (prev + degrees + 360) % 360;
+      const newRotation = prev + degrees;
+      // -360 ~ 360 범위로 정규화
+      if (newRotation <= -360) return newRotation + 360;
+      if (newRotation >= 360) return newRotation - 360;
       return newRotation;
     });
+  }, []);
 
-    console.log('[FullDocScanner] Starting image rotation...', {
-      path: croppedImageData.path,
-      hasBase64: !!croppedImageData.base64,
-    });
+  const handleConfirm = useCallback(async () => {
+    if (!croppedImageData) return;
 
-    try {
-      // file:// prefix 제거
-      const cleanPath = croppedImageData.path.replace(/^file:\/\//, '');
-
-      // ImageRotate를 사용해서 이미지 회전
-      ImageRotate.rotateImage(
-        cleanPath,
-        degrees,
-        async (rotatedImageUri: string) => {
-          console.log('[FullDocScanner] Image rotated, URI:', rotatedImageUri);
-
-          try {
-            // 회전된 이미지를 실제 파일로 저장하기 위해 ImageCropPicker 사용
-            // cropping: true이지만 전체 이미지를 선택하면 됨
-            const savedImage = await ImageCropPicker.openCropper({
-              path: rotatedImageUri,
-              mediaType: 'photo',
-              cropping: true,
-              freeStyleCropEnabled: true,
-              includeBase64: true,
-              compressImageQuality: 0.9,
-              cropperToolbarTitle: '회전 완료 - 확인을 눌러주세요',
-              cropperChooseText: '확인',
-              cropperCancelText: '취소',
-              cropperRotateButtonsHidden: true,
-            });
-
-            console.log('[FullDocScanner] Rotated image saved with base64');
-
-            // 회전된 이미지로 교체
-            setCroppedImageData({
-              path: savedImage.path,
-              base64: savedImage.data ?? undefined,
-            });
-
-            // rotation degrees는 0으로 리셋
-            setRotationDegrees(0);
-          } catch (cropError) {
-            console.error('[FullDocScanner] Failed to save rotated image:', cropError);
-            // 사용자가 취소한 경우 rotation 원복
-            setRotationDegrees(prev => (prev - degrees + 360) % 360);
-          }
-        },
-        (error: Error) => {
-          console.error('[FullDocScanner] Image rotation error:', error);
-          // 에러 발생 시 UI rotation 원복
-          setRotationDegrees(prev => {
-            const revertRotation = (prev - degrees + 360) % 360;
-            return revertRotation;
-          });
-        }
-      );
-    } catch (error) {
-      console.error('[FullDocScanner] Rotation setup error:', error);
-      setRotationDegrees(prev => (prev - degrees + 360) % 360);
+    // 회전이 없으면 기존 데이터 그대로 전달
+    if (rotationDegrees === 0) {
+      onResult({
+        path: croppedImageData.path,
+        base64: croppedImageData.base64,
+      });
+      return;
     }
-  }, [croppedImageData]);
 
-  const handleConfirm = useCallback(() => {
-    if (!croppedImageData) return;
+    // 회전이 있으면 실제 파일 회전 처리
+    try {
+      setProcessing(true);
+
+      // 회전 각도 정규화 (0, 90, 180, 270)
+      const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+
+      // OpenCV 회전 코드 매핑
+      // ROTATE_90_CLOCKWISE = 0
+      // ROTATE_180 = 1
+      // ROTATE_90_COUNTERCLOCKWISE = 2
+      let rotateCode: number;
+      if (rotationNormalized === 90) {
+        rotateCode = 0; // ROTATE_90_CLOCKWISE
+      } else if (rotationNormalized === 180) {
+        rotateCode = 1; // ROTATE_180
+      } else if (rotationNormalized === 270 || rotationNormalized === -90) {
+        rotateCode = 2; // ROTATE_90_COUNTERCLOCKWISE
+      } else {
+        // 회전 없음
+        onResult({
+          path: croppedImageData.path,
+          base64: croppedImageData.base64,
+        });
+        setProcessing(false);
+        return;
+      }
 
-    onResult({
-      path: croppedImageData.path,
-      base64: croppedImageData.base64,
-    });
-  }, [croppedImageData, onResult]);
+      // OpenCV로 이미지 회전
+      const rotatedPath = await Cv2.rotate(croppedImageData.path, rotateCode);
+
+      // 회전된 이미지를 base64로 변환
+      const base64Data = await RNFS.readFile(rotatedPath, 'base64');
+
+      setProcessing(false);
+
+      // 회전된 이미지로 결과 전달
+      onResult({
+        path: rotatedPath,
+        base64: base64Data,
+      });
+    } 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 : '';
+      Alert.alert('회전 실패', '이미지 회전 중 오류가 발생했습니다: ' + errorMessage);
+    }
+  }, [croppedImageData, rotationDegrees, onResult]);
 
   const handleRetake = useCallback(() => {
     console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');

package/src/types/react-native-fast-opencv.d.ts

@@ -0,0 +1,5 @@
+declare module 'react-native-fast-opencv' {
+  export class Cv2 {
+    static rotate(imagePath: string, rotateCode: number): Promise<string>;
+  }
+}

package/src/types/react-native-image-rotate.d.ts

@@ -1,10 +0,0 @@
-declare module 'react-native-image-rotate' {
-  export default class ImageRotate {
-    static rotateImage(
-      imagePath: string,
-      degrees: number,
-      successCallback: (rotatedImagePath: string) => void,
-      errorCallback: (error: Error) => void,
-    ): void;
-  }
-}