react-native-rectangle-doc-scanner 3.105.0 → 3.107.0

package/README.md

@@ -120,7 +120,7 @@ Manual capture exposes an imperative `capture()` method via `ref`. Children rend
 ## Convenience APIs
 
 - `CropEditor` – wraps `react-native-perspective-image-cropper` for manual corner adjustment.
-- `FullDocScanner` – puts the scanner and crop editor into a single modal-like flow.
+- `FullDocScanner` – puts the scanner and crop editor into a single modal-like flow. If the host app links either `expo-image-manipulator` or `react-native-image-rotate`, the confirmation screen exposes 90° rotation buttons; otherwise rotation controls remain hidden.
 
 ## License
 

package/SETUP.md

@@ -117,6 +117,8 @@ function MyComponent() {
 }
 ```
 
+> 참고: 최종 확인 화면의 회전 버튼은 프로젝트에 `expo-image-manipulator` 또는 `react-native-image-rotate` 네이티브 모듈이 연결되어 있을 때만 노출됩니다. 둘 중 하나라도 없으면 버튼이 자동으로 숨겨지고 원본 각도로 결과가 반환됩니다.
+
 ## API 변경사항
 
 ### FullDocScannerResult (변경됨)

package/dist/FullDocScanner.js

@@ -42,9 +42,27 @@ 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_fs_1 = __importDefault(require("react-native-fs"));
-const ImageManipulator = __importStar(require("expo-image-manipulator"));
 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);
+}
+const isExpoImageManipulatorAvailable = !!ImageManipulator?.manipulateAsync;
+const isImageRotateAvailable = !!ImageRotate?.rotateImage;
+const isImageRotationSupported = isExpoImageManipulatorAvailable || isImageRotateAvailable;
 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));
@@ -344,9 +362,29 @@ 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.');
+            return;
+        }
         // UI만 회전 (실제 파일 회전은 confirm 시 처리)
-        setRotationDegrees(prev => {
+        setRotationDegrees((prev) => {
             const newRotation = prev + degrees;
             // -360 ~ 360 범위로 정규화
             if (newRotation <= -360)
@@ -357,9 +395,10 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         });
     }, []);
     const handleConfirm = (0, react_1.useCallback)(async () => {
-        if (!croppedImageData)
+        if (!croppedImageData) {
             return;
-        // 회전이 없으면 기존 데이터 그대로 전달
+        }
+        // 회전이 없거나 모듈을 사용할 수 없으면 기존 데이터 그대로 전달
         if (rotationDegrees === 0) {
             onResult({
                 path: croppedImageData.path,
@@ -367,31 +406,62 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             });
             return;
         }
-        // 회전이 있으면 실제 파일 회전 처리
         try {
             setProcessing(true);
             // 회전 각도 정규화 (0, 90, 180, 270)
             const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
-            // expo-image-manipulator로 이미지 회전
-            const result = await ImageManipulator.manipulateAsync(croppedImageData.path, [{ rotate: rotationNormalized }], {
-                compress: 0.9,
-                format: ImageManipulator.SaveFormat.JPEG,
-                base64: true,
-            });
-            setProcessing(false);
-            // 회전된 이미지로 결과 전달
+            if (rotationNormalized === 0) {
+                onResult({
+                    path: croppedImageData.path,
+                    base64: croppedImageData.base64,
+                });
+                return;
+            }
+            if (isExpoImageManipulatorAvailable && ImageManipulator?.manipulateAsync) {
+                // expo-image-manipulator로 이미지 회전
+                const result = await ImageManipulator.manipulateAsync(croppedImageData.path, [{ rotate: rotationNormalized }], {
+                    compress: 0.9,
+                    format: ImageManipulator.SaveFormat.JPEG,
+                    base64: true,
+                });
+                onResult({
+                    path: result.uri,
+                    base64: result.base64,
+                });
+                return;
+            }
+            if (isImageRotateAvailable && ImageRotate?.rotateImage) {
+                const sourceUri = ensureFileUri(croppedImageData.path);
+                const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
+                let base64Result = croppedImageData.base64;
+                try {
+                    base64Result = await react_native_fs_1.default.readFile(stripFileUri(rotatedUri), 'base64');
+                }
+                catch (readError) {
+                    console.warn('[FullDocScanner] Failed to generate base64 for rotated image:', readError);
+                    base64Result = undefined;
+                }
+                onResult({
+                    path: rotatedUri,
+                    base64: base64Result,
+                });
+                return;
+            }
+            console.warn('[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.');
             onResult({
-                path: result.uri,
-                base64: result.base64,
+                path: croppedImageData.path,
+                base64: croppedImageData.base64,
             });
         }
         catch (error) {
             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, rotationDegrees, onResult]);
+        finally {
+            setProcessing(false);
+        }
+    }, [croppedImageData, rotationDegrees, onResult, rotateImageWithFallback]);
     const handleRetake = (0, react_1.useCallback)(() => {
         console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');
         setCroppedImageData(null);
@@ -466,13 +536,13 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         croppedImageData ? (
         // check_DP: Show confirmation screen
         react_1.default.createElement(react_native_1.View, { style: styles.confirmationContainer },
-            react_1.default.createElement(react_native_1.View, { style: styles.rotateButtonsCenter },
+            isImageRotationSupported ? (react_1.default.createElement(react_native_1.View, { style: styles.rotateButtonsCenter },
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.rotateButtonTop, onPress: () => handleRotateImage(-90), accessibilityLabel: "\uC67C\uCABD\uC73C\uB85C 90\uB3C4 \uD68C\uC804", accessibilityRole: "button" },
                     react_1.default.createElement(react_native_1.Text, { style: styles.rotateIconText }, "\u21BA"),
                     react_1.default.createElement(react_native_1.Text, { style: styles.rotateButtonLabel }, "\uC88C\uB85C 90\u00B0")),
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.rotateButtonTop, onPress: () => handleRotateImage(90), accessibilityLabel: "\uC624\uB978\uCABD\uC73C\uB85C 90\uB3C4 \uD68C\uC804", accessibilityRole: "button" },
                     react_1.default.createElement(react_native_1.Text, { style: styles.rotateIconText }, "\u21BB"),
-                    react_1.default.createElement(react_native_1.Text, { style: styles.rotateButtonLabel }, "\uC6B0\uB85C 90\u00B0"))),
+                    react_1.default.createElement(react_native_1.Text, { style: styles.rotateButtonLabel }, "\uC6B0\uB85C 90\u00B0")))) : null,
             react_1.default.createElement(react_native_1.Image, { source: { uri: croppedImageData.path }, style: [
                     styles.previewImage,
                     { transform: [{ rotate: `${rotationDegrees}deg` }] }

package/package.json

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

package/src/FullDocScanner.tsx

@@ -12,7 +12,6 @@ import {
 import { launchImageLibrary } from 'react-native-image-picker';
 import ImageCropPicker from 'react-native-image-crop-picker';
 import RNFS from 'react-native-fs';
-import * as ImageManipulator from 'expo-image-manipulator';
 import { DocScanner } from './DocScanner';
 import type { CapturedDocument } from './types';
 import type {
@@ -22,7 +21,44 @@ import type {
   RectangleDetectEvent,
 } 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.',
+    error,
+  );
+}
+
+const isExpoImageManipulatorAvailable = !!ImageManipulator?.manipulateAsync;
+const isImageRotateAvailable = !!ImageRotate?.rotateImage;
+const isImageRotationSupported = isExpoImageManipulatorAvailable || isImageRotateAvailable;
+
 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';
@@ -456,21 +492,57 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     setFlashEnabled(prev => !prev);
   }, []);
 
-  const handleRotateImage = useCallback((degrees: -90 | 90) => {
-    // UI만 회전 (실제 파일 회전은 confirm 시 처리)
-    setRotationDegrees(prev => {
-      const newRotation = prev + degrees;
-      // -360 ~ 360 범위로 정규화
-      if (newRotation <= -360) return newRotation + 360;
-      if (newRotation >= 360) return newRotation - 360;
-      return newRotation;
+  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) {
+        console.warn(
+          '[FullDocScanner] Image rotation requested but no rotation module is available.',
+        );
+        return;
+      }
+
+      // UI만 회전 (실제 파일 회전은 confirm 시 처리)
+      setRotationDegrees((prev) => {
+        const newRotation = prev + degrees;
+        // -360 ~ 360 범위로 정규화
+        if (newRotation <= -360) return newRotation + 360;
+        if (newRotation >= 360) return newRotation - 360;
+        return newRotation;
+      });
+    },
+    [],
+  );
+
   const handleConfirm = useCallback(async () => {
-    if (!croppedImageData) return;
+    if (!croppedImageData) {
+      return;
+    }
 
-    // 회전이 없으면 기존 데이터 그대로 전달
+    // 회전이 없거나 모듈을 사용할 수 없으면 기존 데이터 그대로 전달
     if (rotationDegrees === 0) {
       onResult({
         path: croppedImageData.path,
@@ -479,39 +551,75 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       return;
     }
 
-    // 회전이 있으면 실제 파일 회전 처리
     try {
       setProcessing(true);
 
       // 회전 각도 정규화 (0, 90, 180, 270)
       const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
 
-      // expo-image-manipulator로 이미지 회전
-      const result = await ImageManipulator.manipulateAsync(
-        croppedImageData.path,
-        [{ rotate: rotationNormalized }],
-        {
-          compress: 0.9,
-          format: ImageManipulator.SaveFormat.JPEG,
-          base64: true,
+      if (rotationNormalized === 0) {
+        onResult({
+          path: croppedImageData.path,
+          base64: croppedImageData.base64,
+        });
+        return;
+      }
+
+      if (isExpoImageManipulatorAvailable && ImageManipulator?.manipulateAsync) {
+        // expo-image-manipulator로 이미지 회전
+        const result = await ImageManipulator.manipulateAsync(
+          croppedImageData.path,
+          [{ rotate: rotationNormalized }],
+          {
+            compress: 0.9,
+            format: ImageManipulator.SaveFormat.JPEG,
+            base64: true,
+          },
+        );
+
+        onResult({
+          path: result.uri,
+          base64: result.base64,
+        });
+        return;
+      }
+
+      if (isImageRotateAvailable && ImageRotate?.rotateImage) {
+        const sourceUri = ensureFileUri(croppedImageData.path);
+        const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
+        let base64Result = croppedImageData.base64;
+
+        try {
+          base64Result = await RNFS.readFile(stripFileUri(rotatedUri), 'base64');
+        } catch (readError) {
+          console.warn('[FullDocScanner] Failed to generate base64 for rotated image:', readError);
+          base64Result = undefined;
         }
-      );
 
-      setProcessing(false);
+        onResult({
+          path: rotatedUri,
+          base64: base64Result,
+        });
+        return;
+      }
 
-      // 회전된 이미지로 결과 전달
+      console.warn(
+        '[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.',
+      );
       onResult({
-        path: result.uri,
-        base64: result.base64,
+        path: croppedImageData.path,
+        base64: croppedImageData.base64,
       });
     } 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 : '';
+      const errorMessage =
+        error && typeof error === 'object' && 'message' in error ? (error as Error).message : '';
       Alert.alert('회전 실패', '이미지 회전 중 오류가 발생했습니다: ' + errorMessage);
+    } finally {
+      setProcessing(false);
     }
-  }, [croppedImageData, rotationDegrees, onResult]);
+  }, [croppedImageData, rotationDegrees, onResult, rotateImageWithFallback]);
 
   const handleRetake = useCallback(() => {
     console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');
@@ -599,26 +707,28 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         // check_DP: Show confirmation screen
         <View style={styles.confirmationContainer}>
           {/* 회전 버튼들 - 가운데 정렬 */}
-          <View style={styles.rotateButtonsCenter}>
-            <TouchableOpacity
-              style={styles.rotateButtonTop}
-              onPress={() => handleRotateImage(-90)}
-              accessibilityLabel="왼쪽으로 90도 회전"
-              accessibilityRole="button"
-            >
-              <Text style={styles.rotateIconText}>↺</Text>
-              <Text style={styles.rotateButtonLabel}>좌로 90°</Text>
-            </TouchableOpacity>
-            <TouchableOpacity
-              style={styles.rotateButtonTop}
-              onPress={() => handleRotateImage(90)}
-              accessibilityLabel="오른쪽으로 90도 회전"
-              accessibilityRole="button"
-            >
-              <Text style={styles.rotateIconText}>↻</Text>
-              <Text style={styles.rotateButtonLabel}>우로 90°</Text>
-            </TouchableOpacity>
-          </View>
+          {isImageRotationSupported ? (
+            <View style={styles.rotateButtonsCenter}>
+              <TouchableOpacity
+                style={styles.rotateButtonTop}
+                onPress={() => handleRotateImage(-90)}
+                accessibilityLabel="왼쪽으로 90도 회전"
+                accessibilityRole="button"
+              >
+                <Text style={styles.rotateIconText}>↺</Text>
+                <Text style={styles.rotateButtonLabel}>좌로 90°</Text>
+              </TouchableOpacity>
+              <TouchableOpacity
+                style={styles.rotateButtonTop}
+                onPress={() => handleRotateImage(90)}
+                accessibilityLabel="오른쪽으로 90도 회전"
+                accessibilityRole="button"
+              >
+                <Text style={styles.rotateIconText}>↻</Text>
+                <Text style={styles.rotateButtonLabel}>우로 90°</Text>
+              </TouchableOpacity>
+            </View>
+          ) : null}
           <Image
             source={{ uri: croppedImageData.path }}
             style={[