react-native-rectangle-doc-scanner 0.19.0 → 0.21.0

package/dist/DocScanner.js

@@ -43,26 +43,40 @@ const react_native_fast_opencv_1 = require("react-native-fast-opencv");
 const overlay_1 = require("./utils/overlay");
 const stability_1 = require("./utils/stability");
 const isConvexQuadrilateral = (points) => {
-    if (points.length !== 4) {
-        return false;
-    }
-    let previous = 0;
-    for (let i = 0; i < 4; i++) {
-        const p0 = points[i];
-        const p1 = points[(i + 1) % 4];
-        const p2 = points[(i + 2) % 4];
-        const cross = (p1.x - p0.x) * (p2.y - p1.y) - (p1.y - p0.y) * (p2.x - p1.x);
-        if (Math.abs(cross) < 1e-3) {
+    'worklet';
+    try {
+        if (points.length !== 4) {
             return false;
         }
-        if (i === 0) {
-            previous = cross;
+        // Validate all points have valid x and y
+        for (const p of points) {
+            if (typeof p.x !== 'number' || typeof p.y !== 'number' ||
+                !isFinite(p.x) || !isFinite(p.y)) {
+                return false;
+            }
         }
-        else if (previous * cross < 0) {
-            return false;
+        let previous = 0;
+        for (let i = 0; i < 4; i++) {
+            const p0 = points[i];
+            const p1 = points[(i + 1) % 4];
+            const p2 = points[(i + 2) % 4];
+            const cross = (p1.x - p0.x) * (p2.y - p1.y) - (p1.y - p0.y) * (p2.x - p1.x);
+            // Relax the collinearity check - allow very small cross products
+            if (Math.abs(cross) < 0.1) {
+                return false;
+            }
+            if (i === 0) {
+                previous = cross;
+            }
+            else if (previous * cross < 0) {
+                return false;
+            }
         }
+        return true;
+    }
+    catch (err) {
+        return false;
     }
-    return true;
 };
 const DocScanner = ({ onCapture, overlayColor = '#e7a649', autoCapture = true, minStableFrames = 8, cameraProps, children, }) => {
     const device = (0, react_native_vision_camera_1.useCameraDevice)('back');
@@ -77,11 +91,28 @@ const DocScanner = ({ onCapture, overlayColor = '#e7a649', autoCapture = true, m
     (0, react_1.useEffect)(() => {
         requestPermission();
     }, [requestPermission]);
+    const lastQuadRef = (0, react_1.useRef)(null);
+    const noQuadFramesRef = (0, react_1.useRef)(0);
     const updateQuad = (0, react_native_worklets_core_1.useRunOnJS)((value) => {
         if (__DEV__) {
             console.log('[DocScanner] quad', value);
         }
-        setQuad(value);
+        if (value) {
+            // Found a quad, reset counter and update
+            noQuadFramesRef.current = 0;
+            lastQuadRef.current = value;
+            setQuad(value);
+        }
+        else {
+            // No quad found, keep the last one for a few frames
+            noQuadFramesRef.current += 1;
+            // Keep the last quad for up to 3 frames
+            if (noQuadFramesRef.current > 3) {
+                lastQuadRef.current = null;
+                setQuad(null);
+            }
+            // Otherwise, keep showing the last quad
+        }
     }, []);
     const reportError = (0, react_native_worklets_core_1.useRunOnJS)((step, error) => {
         const message = error instanceof Error ? error.message : `${error}`;

package/dist/utils/overlay.js

@@ -39,8 +39,14 @@ const react_native_skia_1 = require("@shopify/react-native-skia");
 const Overlay = ({ quad, color = '#e7a649' }) => {
     const path = (0, react_1.useMemo)(() => {
         if (!quad) {
+            if (__DEV__) {
+                console.log('[Overlay] no quad');
+            }
             return null;
         }
+        if (__DEV__) {
+            console.log('[Overlay] drawing quad:', quad);
+        }
         const skPath = react_native_skia_1.Skia.Path.Make();
         skPath.moveTo(quad[0].x, quad[0].y);
         quad.slice(1).forEach((p) => skPath.lineTo(p.x, p.y));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {

package/src/DocScanner.tsx

@@ -17,30 +17,44 @@ import { checkStability } from './utils/stability';
 import type { Point } from './types';
 
 const isConvexQuadrilateral = (points: Point[]) => {
-  if (points.length !== 4) {
-    return false;
-  }
+  'worklet';
+  try {
+    if (points.length !== 4) {
+      return false;
+    }
 
-  let previous = 0;
+    // Validate all points have valid x and y
+    for (const p of points) {
+      if (typeof p.x !== 'number' || typeof p.y !== 'number' ||
+          !isFinite(p.x) || !isFinite(p.y)) {
+        return false;
+      }
+    }
 
-  for (let i = 0; i < 4; i++) {
-    const p0 = points[i];
-    const p1 = points[(i + 1) % 4];
-    const p2 = points[(i + 2) % 4];
-    const cross = (p1.x - p0.x) * (p2.y - p1.y) - (p1.y - p0.y) * (p2.x - p1.x);
+    let previous = 0;
 
-    if (Math.abs(cross) < 1e-3) {
-      return false;
-    }
+    for (let i = 0; i < 4; i++) {
+      const p0 = points[i];
+      const p1 = points[(i + 1) % 4];
+      const p2 = points[(i + 2) % 4];
+      const cross = (p1.x - p0.x) * (p2.y - p1.y) - (p1.y - p0.y) * (p2.x - p1.x);
 
-    if (i === 0) {
-      previous = cross;
-    } else if (previous * cross < 0) {
-      return false;
+      // Relax the collinearity check - allow very small cross products
+      if (Math.abs(cross) < 0.1) {
+        return false;
+      }
+
+      if (i === 0) {
+        previous = cross;
+      } else if (previous * cross < 0) {
+        return false;
+      }
     }
-  }
 
-  return true;
+    return true;
+  } catch (err) {
+    return false;
+  }
 };
 
 type CameraRef = {
@@ -82,11 +96,30 @@ export const DocScanner: React.FC<Props> = ({
     requestPermission();
   }, [requestPermission]);
 
+  const lastQuadRef = useRef<Point[] | null>(null);
+  const noQuadFramesRef = useRef(0);
+
   const updateQuad = useRunOnJS((value: Point[] | null) => {
     if (__DEV__) {
       console.log('[DocScanner] quad', value);
     }
-    setQuad(value);
+
+    if (value) {
+      // Found a quad, reset counter and update
+      noQuadFramesRef.current = 0;
+      lastQuadRef.current = value;
+      setQuad(value);
+    } else {
+      // No quad found, keep the last one for a few frames
+      noQuadFramesRef.current += 1;
+
+      // Keep the last quad for up to 3 frames
+      if (noQuadFramesRef.current > 3) {
+        lastQuadRef.current = null;
+        setQuad(null);
+      }
+      // Otherwise, keep showing the last quad
+    }
   }, []);
 
   const reportError = useRunOnJS((step: string, error: unknown) => {

package/src/utils/overlay.tsx

@@ -10,9 +10,16 @@ type OverlayProps = {
 export const Overlay: React.FC<OverlayProps> = ({ quad, color = '#e7a649' }) => {
   const path = useMemo(() => {
     if (!quad) {
+      if (__DEV__) {
+        console.log('[Overlay] no quad');
+      }
       return null;
     }
 
+    if (__DEV__) {
+      console.log('[Overlay] drawing quad:', quad);
+    }
+
     const skPath = Skia.Path.Make();
     skPath.moveTo(quad[0].x, quad[0].y);
     quad.slice(1).forEach((p) => skPath.lineTo(p.x, p.y));