react-native-rectangle-doc-scanner 3.85.0 → 3.87.0

package/dist/FullDocScanner.js

@@ -109,6 +109,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const [isGalleryOpen, setIsGalleryOpen] = (0, react_1.useState)(false);
     const [rectangleDetected, setRectangleDetected] = (0, react_1.useState)(false);
     const [rectangleHint, setRectangleHint] = (0, react_1.useState)(false);
+    const [flashEnabled, setFlashEnabled] = (0, react_1.useState)(false);
     const resolvedGridColor = gridColor ?? overlayColor;
     const docScannerRef = (0, react_1.useRef)(null);
     const captureModeRef = (0, react_1.useRef)(null);
@@ -171,6 +172,9 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         catch (error) {
             console.error('[FullDocScanner] openCropper error:', error);
             setProcessing(false);
+            // Reset capture state when cropper fails or is cancelled
+            captureInProgressRef.current = false;
+            captureModeRef.current = null;
             const errorCode = error?.code;
             const errorMessage = error?.message || String(error);
             if (errorCode === CROPPER_TIMEOUT_CODE || errorMessage === CROPPER_TIMEOUT_CODE) {
@@ -315,6 +319,9 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const handleClose = (0, react_1.useCallback)(() => {
         onClose?.();
     }, [onClose]);
+    const handleFlashToggle = (0, react_1.useCallback)(() => {
+        setFlashEnabled(prev => !prev);
+    }, []);
     const handleConfirm = (0, react_1.useCallback)(() => {
         if (croppedImageData) {
             onResult({
@@ -414,7 +421,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                     react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.retake)),
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.confirmButtonPrimary], onPress: handleConfirm, accessibilityLabel: mergedStrings.confirm, accessibilityRole: "button" },
                     react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.confirm))))) : (react_1.default.createElement(react_native_1.View, { style: styles.flex },
-            react_1.default.createElement(DocScanner_1.DocScanner, { ref: docScannerRef, autoCapture: false, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, onRectangleDetect: handleRectangleDetect, showManualCaptureButton: false },
+            react_1.default.createElement(DocScanner_1.DocScanner, { ref: docScannerRef, autoCapture: false, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, onRectangleDetect: handleRectangleDetect, showManualCaptureButton: false, enableTorch: flashEnabled },
                 react_1.default.createElement(react_native_1.View, { style: styles.overlayTop, pointerEvents: "box-none" },
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.closeButton, onPress: handleClose, accessibilityLabel: mergedStrings.cancel, accessibilityRole: "button" },
                         react_1.default.createElement(react_native_1.Text, { style: styles.closeButtonLabel }, "\u00D7"))),
@@ -423,13 +430,17 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                         mergedStrings.captureHint && (react_1.default.createElement(react_native_1.Text, { style: styles.captureText }, mergedStrings.captureHint)),
                         mergedStrings.manualHint && (react_1.default.createElement(react_native_1.Text, { style: styles.captureText }, mergedStrings.manualHint))))),
                 react_1.default.createElement(react_native_1.View, { style: styles.shutterContainer, pointerEvents: "box-none" },
-                    enableGallery && (react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.galleryButton, processing && styles.buttonDisabled], onPress: handleGalleryPick, disabled: processing, accessibilityLabel: mergedStrings.galleryButton, accessibilityRole: "button" },
-                        react_1.default.createElement(react_native_1.Text, { style: styles.galleryButtonText }, "\uD83D\uDCC1"))),
+                    react_1.default.createElement(react_native_1.View, { style: styles.leftButtonsContainer },
+                        enableGallery && (react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.galleryButton, processing && styles.buttonDisabled], onPress: handleGalleryPick, disabled: processing, accessibilityLabel: mergedStrings.galleryButton, accessibilityRole: "button" },
+                            react_1.default.createElement(react_native_1.Text, { style: styles.galleryButtonText }, "\uD83D\uDCC1"))),
+                        react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.flashButton, processing && styles.buttonDisabled], onPress: handleFlashToggle, disabled: processing, accessibilityLabel: "Toggle flash", accessibilityRole: "button" },
+                            react_1.default.createElement(react_native_1.Text, { style: styles.flashButtonText }, flashEnabled ? '⚡' : '⚡️'))),
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.shutterButton, processing && styles.buttonDisabled], onPress: triggerManualCapture, disabled: processing, accessibilityLabel: mergedStrings.manualHint, accessibilityRole: "button" },
                         react_1.default.createElement(react_native_1.View, { style: [
                                 styles.shutterInner,
                                 rectangleHint && { backgroundColor: overlayColor }
-                            ] })))))),
+                            ] })),
+                    react_1.default.createElement(react_native_1.View, { style: styles.rightButtonsPlaceholder }))))),
         processing && (react_1.default.createElement(react_native_1.View, { style: styles.processingOverlay },
             react_1.default.createElement(react_native_1.ActivityIndicator, { size: "large", color: overlayColor }),
             mergedStrings.processing && (react_1.default.createElement(react_native_1.Text, { style: styles.processingText }, mergedStrings.processing))))));
@@ -463,11 +474,20 @@ const styles = react_native_1.StyleSheet.create({
         left: 0,
         right: 0,
         flexDirection: 'row',
-        justifyContent: 'center',
+        justifyContent: 'space-between',
         alignItems: 'center',
-        gap: 24,
+        paddingHorizontal: 40,
         zIndex: 10,
     },
+    leftButtonsContainer: {
+        flexDirection: 'row',
+        gap: 12,
+        alignItems: 'center',
+        flex: 1,
+    },
+    rightButtonsPlaceholder: {
+        flex: 1,
+    },
     closeButton: {
         width: 40,
         height: 40,
@@ -494,9 +514,9 @@ const styles = react_native_1.StyleSheet.create({
         textAlign: 'center',
     },
     galleryButton: {
-        width: 60,
-        height: 60,
-        borderRadius: 30,
+        width: 56,
+        height: 56,
+        borderRadius: 28,
         borderWidth: 3,
         borderColor: '#fff',
         justifyContent: 'center',
@@ -504,7 +524,20 @@ const styles = react_native_1.StyleSheet.create({
         backgroundColor: 'rgba(255,255,255,0.1)',
     },
     galleryButtonText: {
-        fontSize: 28,
+        fontSize: 24,
+    },
+    flashButton: {
+        width: 56,
+        height: 56,
+        borderRadius: 28,
+        borderWidth: 3,
+        borderColor: '#fff',
+        justifyContent: 'center',
+        alignItems: 'center',
+        backgroundColor: 'rgba(255,255,255,0.1)',
+    },
+    flashButtonText: {
+        fontSize: 24,
     },
     shutterButton: {
         width: 80,

package/package.json

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

package/src/FullDocScanner.tsx

@@ -150,6 +150,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const [isGalleryOpen, setIsGalleryOpen] = useState(false);
   const [rectangleDetected, setRectangleDetected] = useState(false);
   const [rectangleHint, setRectangleHint] = useState(false);
+  const [flashEnabled, setFlashEnabled] = useState(false);
   const resolvedGridColor = gridColor ?? overlayColor;
   const docScannerRef = useRef<DocScannerHandle | null>(null);
   const captureModeRef = useRef<'grid' | 'no-grid' | null>(null);
@@ -231,6 +232,10 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         console.error('[FullDocScanner] openCropper error:', error);
         setProcessing(false);
 
+        // Reset capture state when cropper fails or is cancelled
+        captureInProgressRef.current = false;
+        captureModeRef.current = null;
+
         const errorCode = (error as any)?.code;
         const errorMessage = (error as any)?.message || String(error);
 
@@ -422,6 +427,10 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     onClose?.();
   }, [onClose]);
 
+  const handleFlashToggle = useCallback(() => {
+    setFlashEnabled(prev => !prev);
+  }, []);
+
   const handleConfirm = useCallback(() => {
     if (croppedImageData) {
       onResult({
@@ -565,6 +574,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             onCapture={handleCapture}
             onRectangleDetect={handleRectangleDetect}
             showManualCaptureButton={false}
+            enableTorch={flashEnabled}
           >
           <View style={styles.overlayTop} pointerEvents="box-none">
             <TouchableOpacity
@@ -589,17 +599,28 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             </View>
           )}
           <View style={styles.shutterContainer} pointerEvents="box-none">
-            {enableGallery && (
+            <View style={styles.leftButtonsContainer}>
+              {enableGallery && (
+                <TouchableOpacity
+                  style={[styles.galleryButton, processing && styles.buttonDisabled]}
+                  onPress={handleGalleryPick}
+                  disabled={processing}
+                  accessibilityLabel={mergedStrings.galleryButton}
+                  accessibilityRole="button"
+                >
+                  <Text style={styles.galleryButtonText}>📁</Text>
+                </TouchableOpacity>
+              )}
               <TouchableOpacity
-                style={[styles.galleryButton, processing && styles.buttonDisabled]}
-                onPress={handleGalleryPick}
+                style={[styles.flashButton, processing && styles.buttonDisabled]}
+                onPress={handleFlashToggle}
                 disabled={processing}
-                accessibilityLabel={mergedStrings.galleryButton}
+                accessibilityLabel="Toggle flash"
                 accessibilityRole="button"
               >
-                <Text style={styles.galleryButtonText}>📁</Text>
+                <Text style={styles.flashButtonText}>{flashEnabled ? '⚡' : '⚡️'}</Text>
               </TouchableOpacity>
-            )}
+            </View>
             <TouchableOpacity
               style={[styles.shutterButton, processing && styles.buttonDisabled]}
               onPress={triggerManualCapture}
@@ -612,6 +633,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
                 rectangleHint && { backgroundColor: overlayColor }
               ]} />
             </TouchableOpacity>
+            <View style={styles.rightButtonsPlaceholder} />
           </View>
         </DocScanner>
         </View>
@@ -657,11 +679,20 @@ const styles = StyleSheet.create({
     left: 0,
     right: 0,
     flexDirection: 'row',
-    justifyContent: 'center',
+    justifyContent: 'space-between',
     alignItems: 'center',
-    gap: 24,
+    paddingHorizontal: 40,
     zIndex: 10,
   },
+  leftButtonsContainer: {
+    flexDirection: 'row',
+    gap: 12,
+    alignItems: 'center',
+    flex: 1,
+  },
+  rightButtonsPlaceholder: {
+    flex: 1,
+  },
   closeButton: {
     width: 40,
     height: 40,
@@ -688,9 +719,9 @@ const styles = StyleSheet.create({
     textAlign: 'center',
   },
   galleryButton: {
-    width: 60,
-    height: 60,
-    borderRadius: 30,
+    width: 56,
+    height: 56,
+    borderRadius: 28,
     borderWidth: 3,
     borderColor: '#fff',
     justifyContent: 'center',
@@ -698,7 +729,20 @@ const styles = StyleSheet.create({
     backgroundColor: 'rgba(255,255,255,0.1)',
   },
   galleryButtonText: {
-    fontSize: 28,
+    fontSize: 24,
+  },
+  flashButton: {
+    width: 56,
+    height: 56,
+    borderRadius: 28,
+    borderWidth: 3,
+    borderColor: '#fff',
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'rgba(255,255,255,0.1)',
+  },
+  flashButtonText: {
+    fontSize: 24,
   },
   shutterButton: {
     width: 80,

package/vendor/react-native-document-scanner/ios/DocumentScannerView.m

@@ -28,13 +28,28 @@
         [self setupCameraView];
         [self start];
         _hasSetupCamera = YES;
+    } else if (_hasSetupCamera && self.window && !CGRectIsEmpty(self.bounds)) {
+        // Check if camera session is running, restart if needed
+        if (self.captureSession && !self.captureSession.isRunning) {
+            NSLog(@"[DocumentScanner] Camera session not running, restarting...");
+            [self start];
+        }
     }
 }
 
 - (void)didMoveToWindow {
     [super didMoveToWindow];
-    if (!self.window && _hasSetupCamera) {
+    if (self.window && _hasSetupCamera) {
+        // Restart camera when view is added back to window
+        if (self.captureSession && !self.captureSession.isRunning) {
+            NSLog(@"[DocumentScanner] View added to window, restarting camera...");
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self start];
+            });
+        }
+    } else if (!self.window && _hasSetupCamera) {
         // Stop camera when view is removed from window
+        NSLog(@"[DocumentScanner] View removed from window, stopping camera");
         [self stop];
     }
 }