react-native-rectangle-doc-scanner 3.31.0 → 3.33.0

package/dist/CropEditor.js

@@ -92,11 +92,8 @@ const CropEditor = ({ document, overlayColor = 'rgba(0,0,0,0.5)', overlayStrokeC
             ? document.rectangle
             : document.quad && document.quad.length === 4
                 ? (0, coordinate_1.quadToRectangle)(document.quad)
-                : null;
-        if (!sourceRectangle) {
-            return undefined;
-        }
-        const scaled = (0, coordinate_1.scaleRectangle)(sourceRectangle, baseWidth, baseHeight, imageSize.width, imageSize.height);
+                : (0, coordinate_1.createFullImageRectangle)(baseWidth, baseHeight);
+        const scaled = (0, coordinate_1.scaleRectangle)(sourceRectangle ?? (0, coordinate_1.createFullImageRectangle)(baseWidth, baseHeight), baseWidth, baseHeight, imageSize.width, imageSize.height);
         return scaled;
     }, [document.rectangle, document.quad, document.width, document.height, imageSize]);
     const handleImageLoad = (0, react_1.useCallback)((event) => {

package/dist/DocScanner.js

@@ -140,7 +140,12 @@ exports.DocScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAUL
             return Promise.reject(error);
         }
         if (result && typeof result.then === 'function') {
-            return result.catch((error) => {
+            return result
+                .then((payload) => {
+                handlePictureTaken(payload);
+                return payload;
+            })
+                .catch((error) => {
                 captureOriginRef.current = 'auto';
                 throw error;
             });
@@ -157,7 +162,7 @@ exports.DocScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAUL
                 },
             };
         });
-    }, []);
+    }, [handlePictureTaken]);
     const handleManualCapture = (0, react_1.useCallback)(() => {
         captureOriginRef.current = 'manual';
         capture().catch((error) => {

package/dist/FullDocScanner.js

@@ -41,12 +41,6 @@ const CropEditor_1 = require("./CropEditor");
 const coordinate_1 = require("./utils/coordinate");
 const stripFileUri = (value) => value.replace(/^file:\/\//, '');
 const ensureFileUri = (value) => (value.startsWith('file://') ? value : `file://${value}`);
-const createFullImageRectangle = (width, height) => ({
-    topLeft: { x: 0, y: 0 },
-    topRight: { x: width, y: 0 },
-    bottomRight: { x: width, y: height },
-    bottomLeft: { x: 0, y: height },
-});
 const resolveImageSize = (path, fallbackWidth, fallbackHeight) => new Promise((resolve) => {
     react_native_1.Image.getSize(ensureFileUri(path), (width, height) => resolve({ width, height }), () => resolve({
         width: fallbackWidth > 0 ? fallbackWidth : 0,
@@ -54,9 +48,10 @@ const resolveImageSize = (path, fallbackWidth, fallbackHeight) => new Promise((r
     }));
 });
 const normalizeCapturedDocument = (document) => {
+    const { origin: _origin, ...rest } = document;
     const normalizedPath = stripFileUri(document.initialPath ?? document.path);
     return {
-        ...document,
+        ...rest,
         path: normalizedPath,
         initialPath: document.initialPath ? stripFileUri(document.initialPath) : normalizedPath,
         croppedPath: document.croppedPath ? stripFileUri(document.croppedPath) : null,
@@ -104,10 +99,8 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 initialRectangle = (0, coordinate_1.scaleRectangle)(quadRectangle, baseWidth, baseHeight, imageSize.width, imageSize.height);
             }
         }
-        if (initialRectangle) {
-            cropInitializedRef.current = true;
-            setCropRectangle(initialRectangle);
-        }
+        cropInitializedRef.current = true;
+        setCropRectangle(initialRectangle ?? (0, coordinate_1.createFullImageRectangle)(imageSize.width || 1, imageSize.height || 1));
     }, [capturedDoc, imageSize]);
     const resetState = (0, react_1.useCallback)(() => {
         setScreen('scanner');
@@ -150,7 +143,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             const scaledRectangle = rectangleBase
                 ? (0, coordinate_1.scaleRectangle)(rectangleBase, baseWidth || targetWidth, baseHeight || targetHeight, targetWidth, targetHeight)
                 : null;
-            const rectangleToUse = scaledRectangle ?? createFullImageRectangle(targetWidth, targetHeight);
+            const rectangleToUse = scaledRectangle ?? (0, coordinate_1.createFullImageRectangle)(targetWidth, targetHeight);
             const base64 = await new Promise((resolve, reject) => {
                 cropManager.crop({
                     topLeft: rectangleToUse.topLeft,
@@ -247,7 +240,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 fallbackRectangle = (0, coordinate_1.scaleRectangle)(quadRectangle, baseWidth || targetWidth, baseHeight || targetHeight, targetWidth, targetHeight);
             }
         }
-        const rectangleToUse = cropRectangle ?? fallbackRectangle ?? createFullImageRectangle(targetWidth, targetHeight);
+        const rectangleToUse = cropRectangle ?? fallbackRectangle ?? (0, coordinate_1.createFullImageRectangle)(targetWidth, targetHeight);
         const base64 = await new Promise((resolve, reject) => {
             cropManager.crop({
                 topLeft: rectangleToUse.topLeft,
@@ -299,7 +292,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     }, [onClose, resetState]);
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
         screen === 'scanner' && (react_1.default.createElement(react_native_1.View, { style: styles.flex },
-            react_1.default.createElement(DocScanner_1.DocScanner, { ref: docScannerRef, autoCapture: !manualCapture, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture },
+            react_1.default.createElement(DocScanner_1.DocScanner, { ref: docScannerRef, autoCapture: !manualCapture, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, showManualCaptureButton: true },
                 react_1.default.createElement(react_native_1.View, { style: styles.overlay, 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")),

package/dist/index.d.ts

@@ -4,4 +4,4 @@ export { FullDocScanner } from './FullDocScanner';
 export type { FullDocScannerResult, FullDocScannerProps, FullDocScannerStrings, } from './FullDocScanner';
 export type { Point, Quad, Rectangle, CapturedDocument } from './types';
 export type { DetectionConfig, DocScannerHandle, DocScannerCapture, RectangleDetectEvent, } from './DocScanner';
-export { quadToRectangle, rectangleToQuad, scaleCoordinates, scaleRectangle, } from './utils/coordinate';
+export { quadToRectangle, rectangleToQuad, scaleCoordinates, scaleRectangle, createFullImageRectangle, } from './utils/coordinate';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scaleRectangle = exports.scaleCoordinates = exports.rectangleToQuad = exports.quadToRectangle = exports.FullDocScanner = exports.CropEditor = exports.DocScanner = void 0;
+exports.createFullImageRectangle = exports.scaleRectangle = exports.scaleCoordinates = exports.rectangleToQuad = exports.quadToRectangle = exports.FullDocScanner = exports.CropEditor = exports.DocScanner = void 0;
 // Main components
 var DocScanner_1 = require("./DocScanner");
 Object.defineProperty(exports, "DocScanner", { enumerable: true, get: function () { return DocScanner_1.DocScanner; } });
@@ -14,3 +14,4 @@ Object.defineProperty(exports, "quadToRectangle", { enumerable: true, get: funct
 Object.defineProperty(exports, "rectangleToQuad", { enumerable: true, get: function () { return coordinate_1.rectangleToQuad; } });
 Object.defineProperty(exports, "scaleCoordinates", { enumerable: true, get: function () { return coordinate_1.scaleCoordinates; } });
 Object.defineProperty(exports, "scaleRectangle", { enumerable: true, get: function () { return coordinate_1.scaleRectangle; } });
+Object.defineProperty(exports, "createFullImageRectangle", { enumerable: true, get: function () { return coordinate_1.createFullImageRectangle; } });

package/dist/utils/coordinate.d.ts

@@ -8,6 +8,7 @@ export declare const quadToRectangle: (quad: Point[]) => Rectangle | null;
  * Convert Rectangle format back to quad points array
  */
 export declare const rectangleToQuad: (rect: Rectangle) => Point[];
+export declare const createFullImageRectangle: (width: number, height: number) => Rectangle;
 /**
  * Scale coordinates from one dimension to another
  * Useful when image dimensions differ from display dimensions

package/dist/utils/coordinate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scaleRectangle = exports.scaleCoordinates = exports.rectangleToQuad = exports.quadToRectangle = void 0;
+exports.scaleRectangle = exports.scaleCoordinates = exports.createFullImageRectangle = exports.rectangleToQuad = exports.quadToRectangle = void 0;
 /**
  * Convert quad points array to Rectangle format for perspective cropper
  * Assumes quad points are ordered: [topLeft, topRight, bottomRight, bottomLeft]
@@ -29,6 +29,13 @@ const rectangleToQuad = (rect) => {
     ];
 };
 exports.rectangleToQuad = rectangleToQuad;
+const createFullImageRectangle = (width, height) => ({
+    topLeft: { x: 0, y: 0 },
+    topRight: { x: width, y: 0 },
+    bottomRight: { x: width, y: height },
+    bottomLeft: { x: 0, y: height },
+});
+exports.createFullImageRectangle = createFullImageRectangle;
 /**
  * Scale coordinates from one dimension to another
  * Useful when image dimensions differ from display dimensions

package/package.json

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

package/src/CropEditor.tsx

@@ -3,7 +3,7 @@ import { View, StyleSheet, Image, Dimensions, ActivityIndicator, Text } from 're
 import CustomImageCropper from 'react-native-perspective-image-cropper';
 import type { Rectangle as CropperRectangle } from 'react-native-perspective-image-cropper';
 import type { Point, Rectangle, CapturedDocument } from './types';
-import { quadToRectangle, scaleRectangle } from './utils/coordinate';
+import { createFullImageRectangle, quadToRectangle, scaleRectangle } from './utils/coordinate';
 
 interface CropEditorProps {
   document: CapturedDocument;
@@ -81,14 +81,10 @@ export const CropEditor: React.FC<CropEditorProps> = ({
       ? document.rectangle
       : document.quad && document.quad.length === 4
       ? quadToRectangle(document.quad)
-      : null;
-
-    if (!sourceRectangle) {
-      return undefined;
-    }
+      : createFullImageRectangle(baseWidth, baseHeight);
 
     const scaled = scaleRectangle(
-      sourceRectangle,
+      sourceRectangle ?? createFullImageRectangle(baseWidth, baseHeight),
       baseWidth,
       baseHeight,
       imageSize.width,

package/src/DocScanner.tsx

@@ -212,10 +212,15 @@ export const DocScanner = forwardRef<DocScannerHandle, Props>(
         return Promise.reject(error);
       }
       if (result && typeof result.then === 'function') {
-        return result.catch((error: unknown) => {
-          captureOriginRef.current = 'auto';
-          throw error;
-        });
+        return result
+          .then((payload: PictureEvent) => {
+            handlePictureTaken(payload);
+            return payload;
+          })
+          .catch((error: unknown) => {
+            captureOriginRef.current = 'auto';
+            throw error;
+          });
       }
 
       return new Promise<PictureEvent>((resolve, reject) => {
@@ -230,7 +235,7 @@ export const DocScanner = forwardRef<DocScannerHandle, Props>(
           },
         };
       });
-    }, []);
+    }, [handlePictureTaken]);
 
     const handleManualCapture = useCallback(() => {
       captureOriginRef.current = 'manual';

package/src/FullDocScanner.tsx

@@ -13,7 +13,7 @@ import { DocScanner } from './DocScanner';
 import { CropEditor } from './CropEditor';
 import type { CapturedDocument, Point, Quad, Rectangle } from './types';
 import type { DetectionConfig, DocScannerHandle, DocScannerCapture } from './DocScanner';
-import { quadToRectangle, scaleRectangle } from './utils/coordinate';
+import { createFullImageRectangle, quadToRectangle, scaleRectangle } from './utils/coordinate';
 
 type CustomCropManagerType = {
   crop: (
@@ -34,13 +34,6 @@ const stripFileUri = (value: string) => value.replace(/^file:\/\//, '');
 
 const ensureFileUri = (value: string) => (value.startsWith('file://') ? value : `file://${value}`);
 
-const createFullImageRectangle = (width: number, height: number): Rectangle => ({
-  topLeft: { x: 0, y: 0 },
-  topRight: { x: width, y: 0 },
-  bottomRight: { x: width, y: height },
-  bottomLeft: { x: 0, y: height },
-});
-
 const resolveImageSize = (
   path: string,
   fallbackWidth: number,
@@ -58,9 +51,10 @@ const resolveImageSize = (
   });
 
 const normalizeCapturedDocument = (document: DocScannerCapture): CapturedDocument => {
+  const { origin: _origin, ...rest } = document;
   const normalizedPath = stripFileUri(document.initialPath ?? document.path);
   return {
-    ...document,
+    ...rest,
     path: normalizedPath,
     initialPath: document.initialPath ? stripFileUri(document.initialPath) : normalizedPath,
     croppedPath: document.croppedPath ? stripFileUri(document.croppedPath) : null,
@@ -184,10 +178,10 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       }
     }
 
-    if (initialRectangle) {
-      cropInitializedRef.current = true;
-      setCropRectangle(initialRectangle);
-    }
+    cropInitializedRef.current = true;
+    setCropRectangle(
+      initialRectangle ?? createFullImageRectangle(imageSize.width || 1, imageSize.height || 1),
+    );
   }, [capturedDoc, imageSize]);
 
   const resetState = useCallback(() => {
@@ -462,6 +456,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             minStableFrames={minStableFrames ?? 6}
             detectionConfig={detectionConfig}
             onCapture={handleCapture}
+            showManualCaptureButton
           >
             <View style={styles.overlay} pointerEvents="box-none">
               <TouchableOpacity

package/src/index.ts

@@ -24,4 +24,5 @@ export {
   rectangleToQuad,
   scaleCoordinates,
   scaleRectangle,
+  createFullImageRectangle,
 } from './utils/coordinate';

package/src/utils/coordinate.ts

@@ -29,6 +29,13 @@ export const rectangleToQuad = (rect: Rectangle): Point[] => {
   ];
 };
 
+export const createFullImageRectangle = (width: number, height: number): Rectangle => ({
+  topLeft: { x: 0, y: 0 },
+  topRight: { x: width, y: 0 },
+  bottomRight: { x: width, y: height },
+  bottomLeft: { x: 0, y: height },
+});
+
 /**
  * Scale coordinates from one dimension to another
  * Useful when image dimensions differ from display dimensions