react-native-rectangle-doc-scanner 3.114.0 → 3.117.0

package/dist/FullDocScanner.d.ts

@@ -23,6 +23,7 @@ export interface FullDocScannerStrings {
     first?: string;
     second?: string;
     secondBtn?: string;
+    secondPrompt?: string;
 }
 export interface FullDocScannerProps {
     onResult: (results: FullDocScannerResult[]) => void;

package/dist/FullDocScanner.js

@@ -145,6 +145,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         first: strings?.first ?? 'Front',
         second: strings?.second ?? 'Back',
         secondBtn: strings?.secondBtn ?? 'Capture Back Side?',
+        secondPrompt: strings?.secondPrompt ?? strings?.secondBtn ?? 'Capture Back Side?',
     }), [strings]);
     const emitError = (0, react_1.useCallback)((error, fallbackMessage) => {
         console.error('[FullDocScanner] error', error);
@@ -392,20 +393,24 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         };
         const updatedPhotos = [...capturedPhotos, currentPhoto];
         console.log('[FullDocScanner] Photos captured:', updatedPhotos.length, 'of', maxPhotos);
-        // Business 모드이고 아직 첫 번째 사진만 찍은 경우
-        if (isBusinessMode && updatedPhotos.length === 1) {
-            // 두 번째 사진 촬영 여부를 물어봄 (UI에서 버튼으로 표시)
-            setCapturedPhotos(updatedPhotos);
-            setCurrentPhotoIndex(1);
-            // 확인 화면을 유지하고 "뒷면 촬영" 버튼을 표시
-            return;
-        }
         // 모든 사진 촬영 완료 - 결과 반환
         console.log('[FullDocScanner] All photos captured, returning results');
         onResult(updatedPhotos);
-    }, [croppedImageData, rotationDegrees, capturedPhotos, isBusinessMode, maxPhotos, onResult]);
+    }, [croppedImageData, rotationDegrees, capturedPhotos, onResult]);
     const handleCaptureSecondPhoto = (0, react_1.useCallback)(() => {
         console.log('[FullDocScanner] Capturing second photo');
+        if (!croppedImageData) {
+            return;
+        }
+        // 현재 사진(앞면)을 먼저 저장
+        const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+        const currentPhoto = {
+            path: croppedImageData.path,
+            base64: croppedImageData.base64,
+            rotationDegrees: rotationNormalized,
+        };
+        setCapturedPhotos([currentPhoto]);
+        setCurrentPhotoIndex(1);
         // 확인 화면을 닫고 카메라로 돌아감
         setCroppedImageData(null);
         setRotationDegrees(0);
@@ -425,14 +430,34 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         if (docScannerRef.current?.reset) {
             docScannerRef.current.reset();
         }
-    }, []);
+    }, [croppedImageData, rotationDegrees]);
     const handleSkipSecondPhoto = (0, react_1.useCallback)(() => {
-        console.log('[FullDocScanner] Skipping second photo');
-        // 첫 번째 사진만 반환
-        onResult(capturedPhotos);
-    }, [capturedPhotos, onResult]);
+        console.log('[FullDocScanner] Skipping second photo - saving current photo only');
+        if (!croppedImageData) {
+            return;
+        }
+        // 현재 사진만 저장하고 완료
+        const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+        const currentPhoto = {
+            path: croppedImageData.path,
+            base64: croppedImageData.base64,
+            rotationDegrees: rotationNormalized,
+        };
+        onResult([currentPhoto]);
+    }, [croppedImageData, rotationDegrees, onResult]);
     const handleRetake = (0, react_1.useCallback)(() => {
         console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');
+        // Business 모드에서 두 번째 사진을 다시 찍는 경우, 첫 번째 사진 유지
+        if (isBusinessMode && capturedPhotos.length === 1) {
+            console.log('[FullDocScanner] Retake detected on back photo - keeping front photo');
+            setCurrentPhotoIndex(1);
+        }
+        else {
+            // 첫 번째 사진 또는 일반 모드: 모든 상태 초기화
+            console.log('[FullDocScanner] Retake detected - resetting all photos');
+            setCapturedPhotos([]);
+            setCurrentPhotoIndex(0);
+        }
         setCroppedImageData(null);
         setRotationDegrees(0);
         setProcessing(false);
@@ -452,7 +477,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         if (docScannerRef.current?.reset) {
             docScannerRef.current.reset();
         }
-    }, []);
+    }, [capturedPhotos.length, isBusinessMode]);
     const handleRectangleDetect = (0, react_1.useCallback)((event) => {
         const stableCounter = event.stableCounter ?? 0;
         const rectangleCoordinates = event.rectangleOnScreen ?? event.rectangleCoordinates;
@@ -521,7 +546,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             react_1.default.createElement(react_native_1.View, { style: styles.confirmationButtons },
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.retakeButton], onPress: handleRetake, accessibilityLabel: mergedStrings.retake, accessibilityRole: "button" },
                     react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.retake)),
-                isBusinessMode && capturedPhotos.length === 1 && currentPhotoIndex === 1 ? (react_1.default.createElement(react_1.default.Fragment, null,
+                isBusinessMode && capturedPhotos.length === 0 ? (react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.confirmButtonPrimary], onPress: handleCaptureSecondPhoto, accessibilityLabel: mergedStrings.secondBtn, accessibilityRole: "button" },
                         react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.secondBtn)),
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.skipButton], onPress: handleSkipSecondPhoto, accessibilityLabel: mergedStrings.confirm, accessibilityRole: "button" },
@@ -718,6 +743,14 @@ const styles = react_native_1.StyleSheet.create({
         width: '100%',
         height: '80%',
     },
+    confirmationPromptText: {
+        color: '#fff',
+        fontSize: 18,
+        fontWeight: '600',
+        textAlign: 'center',
+        paddingHorizontal: 32,
+        marginTop: 24,
+    },
     confirmationButtons: {
         flexDirection: 'row',
         justifyContent: 'center',

package/package.json

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

package/src/FullDocScanner.tsx

@@ -138,6 +138,7 @@ export interface FullDocScannerStrings {
   first?: string;
   second?: string;
   secondBtn?: string;
+  secondPrompt?: string;
 }
 
 export interface FullDocScannerProps {
@@ -205,6 +206,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       first: strings?.first ?? 'Front',
       second: strings?.second ?? 'Back',
       secondBtn: strings?.secondBtn ?? 'Capture Back Side?',
+      secondPrompt: strings?.secondPrompt ?? strings?.secondBtn ?? 'Capture Back Side?',
     }),
     [strings],
   );
@@ -529,22 +531,29 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     const updatedPhotos = [...capturedPhotos, currentPhoto];
     console.log('[FullDocScanner] Photos captured:', updatedPhotos.length, 'of', maxPhotos);
 
-    // Business 모드이고 아직 첫 번째 사진만 찍은 경우
-    if (isBusinessMode && updatedPhotos.length === 1) {
-      // 두 번째 사진 촬영 여부를 물어봄 (UI에서 버튼으로 표시)
-      setCapturedPhotos(updatedPhotos);
-      setCurrentPhotoIndex(1);
-      // 확인 화면을 유지하고 "뒷면 촬영" 버튼을 표시
-      return;
-    }
-
     // 모든 사진 촬영 완료 - 결과 반환
     console.log('[FullDocScanner] All photos captured, returning results');
     onResult(updatedPhotos);
-  }, [croppedImageData, rotationDegrees, capturedPhotos, isBusinessMode, maxPhotos, onResult]);
+  }, [croppedImageData, rotationDegrees, capturedPhotos, onResult]);
 
   const handleCaptureSecondPhoto = useCallback(() => {
     console.log('[FullDocScanner] Capturing second photo');
+
+    if (!croppedImageData) {
+      return;
+    }
+
+    // 현재 사진(앞면)을 먼저 저장
+    const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+    const currentPhoto: FullDocScannerResult = {
+      path: croppedImageData.path,
+      base64: croppedImageData.base64,
+      rotationDegrees: rotationNormalized,
+    };
+
+    setCapturedPhotos([currentPhoto]);
+    setCurrentPhotoIndex(1);
+
     // 확인 화면을 닫고 카메라로 돌아감
     setCroppedImageData(null);
     setRotationDegrees(0);
@@ -564,16 +573,40 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     if (docScannerRef.current?.reset) {
       docScannerRef.current.reset();
     }
-  }, []);
+  }, [croppedImageData, rotationDegrees]);
 
   const handleSkipSecondPhoto = useCallback(() => {
-    console.log('[FullDocScanner] Skipping second photo');
-    // 첫 번째 사진만 반환
-    onResult(capturedPhotos);
-  }, [capturedPhotos, onResult]);
+    console.log('[FullDocScanner] Skipping second photo - saving current photo only');
+
+    if (!croppedImageData) {
+      return;
+    }
+
+    // 현재 사진만 저장하고 완료
+    const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+    const currentPhoto: FullDocScannerResult = {
+      path: croppedImageData.path,
+      base64: croppedImageData.base64,
+      rotationDegrees: rotationNormalized,
+    };
+
+    onResult([currentPhoto]);
+  }, [croppedImageData, rotationDegrees, onResult]);
 
   const handleRetake = useCallback(() => {
     console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');
+
+    // Business 모드에서 두 번째 사진을 다시 찍는 경우, 첫 번째 사진 유지
+    if (isBusinessMode && capturedPhotos.length === 1) {
+      console.log('[FullDocScanner] Retake detected on back photo - keeping front photo');
+      setCurrentPhotoIndex(1);
+    } else {
+      // 첫 번째 사진 또는 일반 모드: 모든 상태 초기화
+      console.log('[FullDocScanner] Retake detected - resetting all photos');
+      setCapturedPhotos([]);
+      setCurrentPhotoIndex(0);
+    }
+
     setCroppedImageData(null);
     setRotationDegrees(0);
     setProcessing(false);
@@ -593,7 +626,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     if (docScannerRef.current?.reset) {
       docScannerRef.current.reset();
     }
-  }, []);
+  }, [capturedPhotos.length, isBusinessMode]);
 
   const handleRectangleDetect = useCallback((event: RectangleDetectEvent) => {
     const stableCounter = event.stableCounter ?? 0;
@@ -707,8 +740,8 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
               <Text style={styles.confirmButtonText}>{mergedStrings.retake}</Text>
             </TouchableOpacity>
 
-            {/* Business 모드이고 첫 번째 사진을 찍은 후: 뒷면 촬영 버튼 또는 확인 버튼 */}
-            {isBusinessMode && capturedPhotos.length === 1 && currentPhotoIndex === 1 ? (
+            {/* Business 모드이고 첫 번째 사진일 때: 뒷면 촬영 버튼과 확인 버튼 동시 표시 */}
+            {isBusinessMode && capturedPhotos.length === 0 ? (
               <>
                 <TouchableOpacity
                   style={[styles.confirmButton, styles.confirmButtonPrimary]}
@@ -1008,6 +1041,14 @@ const styles = StyleSheet.create({
     width: '100%',
     height: '80%',
   },
+  confirmationPromptText: {
+    color: '#fff',
+    fontSize: 18,
+    fontWeight: '600',
+    textAlign: 'center',
+    paddingHorizontal: 32,
+    marginTop: 24,
+  },
   confirmationButtons: {
     flexDirection: 'row',
     justifyContent: 'center',