react-native-rectangle-doc-scanner 0.41.0 → 0.43.0

package/dist/DocScanner.js

@@ -95,7 +95,8 @@ const DocScanner = ({ onCapture, overlayColor = '#e7a649', autoCapture = true, m
     const lastQuadRef = (0, react_1.useRef)(null);
     const smoothingBufferRef = (0, react_1.useRef)([]);
     const anchorQuadRef = (0, react_1.useRef)(null);
-    const missingFrameCountRef = (0, react_1.useRef)(0);
+    const anchorMissesRef = (0, react_1.useRef)(0);
+    const anchorConfidenceRef = (0, react_1.useRef)(0);
     const lastMeasurementRef = (0, react_1.useRef)(null);
     const frameSizeRef = (0, react_1.useRef)(null);
     const MAX_HISTORY = 5;
@@ -103,28 +104,50 @@ const DocScanner = ({ onCapture, overlayColor = '#e7a649', autoCapture = true, m
     const SNAP_CENTER_DISTANCE = 12;
     const BLEND_DISTANCE = 65; // pixels; softly ease between similar shapes
     const MAX_CENTER_DELTA = 85;
+    const REJECT_CENTER_DELTA = 145;
     const MAX_AREA_SHIFT = 0.45;
     const HISTORY_RESET_DISTANCE = 70;
     const MIN_AREA_RATIO = 0.0035;
     const MAX_AREA_RATIO = 0.9;
     const MIN_EDGE_RATIO = 0.025;
+    const MAX_ANCHOR_MISSES = 12;
+    const MIN_CONFIDENCE_TO_HOLD = 2;
+    const MAX_ANCHOR_CONFIDENCE = 20;
     const updateQuad = (0, react_native_worklets_core_1.useRunOnJS)((value) => {
         if (__DEV__) {
             console.log('[DocScanner] quad', value);
         }
-        if (!(0, quad_1.isValidQuad)(value)) {
-            missingFrameCountRef.current += 1;
-            if (lastQuadRef.current && missingFrameCountRef.current <= 2) {
-                setQuad(lastQuadRef.current);
-                return;
+        const fallbackToAnchor = (resetHistory) => {
+            if (resetHistory) {
+                smoothingBufferRef.current = [];
+                lastMeasurementRef.current = null;
+            }
+            const anchor = anchorQuadRef.current;
+            const anchorConfidence = anchorConfidenceRef.current;
+            if (anchor && anchorConfidence >= MIN_CONFIDENCE_TO_HOLD) {
+                anchorMissesRef.current += 1;
+                if (anchorMissesRef.current <= MAX_ANCHOR_MISSES) {
+                    anchorConfidenceRef.current = Math.max(1, anchorConfidence - 1);
+                    lastQuadRef.current = anchor;
+                    setQuad(anchor);
+                    return true;
+                }
             }
-            smoothingBufferRef.current = [];
+            anchorMissesRef.current = 0;
+            anchorConfidenceRef.current = 0;
             anchorQuadRef.current = null;
             lastQuadRef.current = null;
             setQuad(null);
+            return false;
+        };
+        if (!(0, quad_1.isValidQuad)(value)) {
+            const handled = fallbackToAnchor(false);
+            if (handled) {
+                return;
+            }
             return;
         }
-        missingFrameCountRef.current = 0;
+        anchorMissesRef.current = 0;
         const ordered = (0, quad_1.orderQuadPoints)(value);
         const sanitized = (0, quad_1.sanitizeQuad)(ordered);
         const frameSize = frameSizeRef.current;
@@ -142,29 +165,20 @@ const DocScanner = ({ onCapture, overlayColor = '#e7a649', autoCapture = true, m
         const edgesTooShort = minEdge < minEdgeThreshold;
         const aspectTooExtreme = aspectRatio > 7;
         if (areaTooSmall || areaTooLarge || edgesTooShort || aspectTooExtreme) {
-            missingFrameCountRef.current += 1;
-            if (lastQuadRef.current && missingFrameCountRef.current <= 2) {
-                setQuad(lastQuadRef.current);
+            const handled = fallbackToAnchor(true);
+            if (handled) {
                 return;
             }
-            smoothingBufferRef.current = [];
-            anchorQuadRef.current = null;
-            lastQuadRef.current = null;
-            setQuad(null);
             return;
         }
         const lastMeasurement = lastMeasurementRef.current;
-        if (lastMeasurement && (0, quad_1.quadDistance)(lastMeasurement, sanitized) > HISTORY_RESET_DISTANCE) {
-            smoothingBufferRef.current = [];
-        }
-        lastMeasurementRef.current = sanitized;
-        smoothingBufferRef.current.push(sanitized);
-        if (smoothingBufferRef.current.length > MAX_HISTORY) {
-            smoothingBufferRef.current.shift();
-        }
-        const history = smoothingBufferRef.current;
-        const hasHistory = history.length >= 2;
-        let candidate = hasHistory ? (0, quad_1.weightedAverageQuad)(history) : sanitized;
+        const shouldResetHistory = lastMeasurement && (0, quad_1.quadDistance)(lastMeasurement, sanitized) > HISTORY_RESET_DISTANCE;
+        const existingHistory = shouldResetHistory ? [] : smoothingBufferRef.current;
+        const nextHistory = existingHistory.length >= MAX_HISTORY
+            ? [...existingHistory.slice(existingHistory.length - (MAX_HISTORY - 1)), sanitized]
+            : [...existingHistory, sanitized];
+        const hasHistory = nextHistory.length >= 2;
+        let candidate = hasHistory ? (0, quad_1.weightedAverageQuad)(nextHistory) : sanitized;
         const anchor = anchorQuadRef.current;
         if (anchor && (0, quad_1.isValidQuad)(anchor)) {
             const delta = (0, quad_1.quadDistance)(candidate, anchor);
@@ -174,22 +188,45 @@ const DocScanner = ({ onCapture, overlayColor = '#e7a649', autoCapture = true, m
             const candidateArea = (0, quad_1.quadArea)(candidate);
             const centerDelta = Math.hypot(candidateCenter.x - anchorCenter.x, candidateCenter.y - anchorCenter.y);
             const areaShift = anchorArea > 0 ? Math.abs(anchorArea - candidateArea) / anchorArea : 0;
+            if (centerDelta >= REJECT_CENTER_DELTA || areaShift > 1.2) {
+                const handled = fallbackToAnchor(true);
+                if (handled) {
+                    return;
+                }
+                return;
+            }
             if (delta <= SNAP_DISTANCE && centerDelta <= SNAP_CENTER_DISTANCE && areaShift <= 0.08) {
                 candidate = anchor;
+                smoothingBufferRef.current = nextHistory;
+                lastMeasurementRef.current = sanitized;
+                anchorConfidenceRef.current = Math.min(anchorConfidenceRef.current + 1, MAX_ANCHOR_CONFIDENCE);
             }
             else if (delta <= BLEND_DISTANCE && centerDelta <= MAX_CENTER_DELTA && areaShift <= MAX_AREA_SHIFT) {
                 const normalizedDelta = Math.min(1, delta / BLEND_DISTANCE);
                 const adaptiveAlpha = 0.25 + normalizedDelta * 0.45; // 0.25..0.7 range
                 candidate = (0, quad_1.blendQuads)(anchor, candidate, adaptiveAlpha);
+                smoothingBufferRef.current = nextHistory;
+                lastMeasurementRef.current = sanitized;
+                anchorConfidenceRef.current = Math.min(anchorConfidenceRef.current + 1, MAX_ANCHOR_CONFIDENCE);
             }
             else {
-                smoothingBufferRef.current = [sanitized];
+                const handled = fallbackToAnchor(true);
+                if (handled) {
+                    return;
+                }
+                return;
             }
         }
+        else {
+            smoothingBufferRef.current = nextHistory;
+            lastMeasurementRef.current = sanitized;
+            anchorConfidenceRef.current = Math.min(anchorConfidenceRef.current + 1, MAX_ANCHOR_CONFIDENCE);
+        }
         candidate = (0, quad_1.orderQuadPoints)(candidate);
         anchorQuadRef.current = candidate;
         lastQuadRef.current = candidate;
         setQuad(candidate);
+        anchorMissesRef.current = 0;
     }, []);
     const reportError = (0, react_native_worklets_core_1.useRunOnJS)((step, error) => {
         const message = error instanceof Error ? error.message : `${error}`;

package/package.json

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

package/src/DocScanner.tsx

@@ -110,7 +110,8 @@ export const DocScanner: React.FC<Props> = ({
   const lastQuadRef = useRef<Point[] | null>(null);
   const smoothingBufferRef = useRef<Point[][]>([]);
   const anchorQuadRef = useRef<Point[] | null>(null);
-  const missingFrameCountRef = useRef(0);
+  const anchorMissesRef = useRef(0);
+  const anchorConfidenceRef = useRef(0);
   const lastMeasurementRef = useRef<Point[] | null>(null);
   const frameSizeRef = useRef<{ width: number; height: number } | null>(null);
 
@@ -119,33 +120,58 @@ export const DocScanner: React.FC<Props> = ({
   const SNAP_CENTER_DISTANCE = 12;
   const BLEND_DISTANCE = 65; // pixels; softly ease between similar shapes
   const MAX_CENTER_DELTA = 85;
+  const REJECT_CENTER_DELTA = 145;
   const MAX_AREA_SHIFT = 0.45;
   const HISTORY_RESET_DISTANCE = 70;
   const MIN_AREA_RATIO = 0.0035;
   const MAX_AREA_RATIO = 0.9;
   const MIN_EDGE_RATIO = 0.025;
+  const MAX_ANCHOR_MISSES = 12;
+  const MIN_CONFIDENCE_TO_HOLD = 2;
+  const MAX_ANCHOR_CONFIDENCE = 20;
 
   const updateQuad = useRunOnJS((value: Point[] | null) => {
     if (__DEV__) {
       console.log('[DocScanner] quad', value);
     }
 
-    if (!isValidQuad(value)) {
-      missingFrameCountRef.current += 1;
+    const fallbackToAnchor = (resetHistory: boolean) => {
+      if (resetHistory) {
+        smoothingBufferRef.current = [];
+        lastMeasurementRef.current = null;
+      }
 
-      if (lastQuadRef.current && missingFrameCountRef.current <= 2) {
-        setQuad(lastQuadRef.current);
-        return;
+      const anchor = anchorQuadRef.current;
+      const anchorConfidence = anchorConfidenceRef.current;
+
+      if (anchor && anchorConfidence >= MIN_CONFIDENCE_TO_HOLD) {
+        anchorMissesRef.current += 1;
+
+        if (anchorMissesRef.current <= MAX_ANCHOR_MISSES) {
+          anchorConfidenceRef.current = Math.max(1, anchorConfidence - 1);
+          lastQuadRef.current = anchor;
+          setQuad(anchor);
+          return true;
+        }
       }
 
-      smoothingBufferRef.current = [];
+      anchorMissesRef.current = 0;
+      anchorConfidenceRef.current = 0;
       anchorQuadRef.current = null;
       lastQuadRef.current = null;
       setQuad(null);
+      return false;
+    };
+
+    if (!isValidQuad(value)) {
+      const handled = fallbackToAnchor(false);
+      if (handled) {
+        return;
+      }
       return;
     }
 
-    missingFrameCountRef.current = 0;
+    anchorMissesRef.current = 0;
 
     const ordered = orderQuadPoints(value);
     const sanitized = sanitizeQuad(ordered);
@@ -168,34 +194,24 @@ export const DocScanner: React.FC<Props> = ({
     const aspectTooExtreme = aspectRatio > 7;
 
     if (areaTooSmall || areaTooLarge || edgesTooShort || aspectTooExtreme) {
-      missingFrameCountRef.current += 1;
-
-      if (lastQuadRef.current && missingFrameCountRef.current <= 2) {
-        setQuad(lastQuadRef.current);
+      const handled = fallbackToAnchor(true);
+      if (handled) {
         return;
       }
-
-      smoothingBufferRef.current = [];
-      anchorQuadRef.current = null;
-      lastQuadRef.current = null;
-      setQuad(null);
       return;
     }
 
     const lastMeasurement = lastMeasurementRef.current;
-    if (lastMeasurement && quadDistance(lastMeasurement, sanitized) > HISTORY_RESET_DISTANCE) {
-      smoothingBufferRef.current = [];
-    }
-    lastMeasurementRef.current = sanitized;
+    const shouldResetHistory =
+      lastMeasurement && quadDistance(lastMeasurement, sanitized) > HISTORY_RESET_DISTANCE;
 
-    smoothingBufferRef.current.push(sanitized);
-    if (smoothingBufferRef.current.length > MAX_HISTORY) {
-      smoothingBufferRef.current.shift();
-    }
+    const existingHistory = shouldResetHistory ? [] : smoothingBufferRef.current;
+    const nextHistory = existingHistory.length >= MAX_HISTORY
+      ? [...existingHistory.slice(existingHistory.length - (MAX_HISTORY - 1)), sanitized]
+      : [...existingHistory, sanitized];
 
-    const history = smoothingBufferRef.current;
-    const hasHistory = history.length >= 2;
-    let candidate = hasHistory ? weightedAverageQuad(history) : sanitized;
+    const hasHistory = nextHistory.length >= 2;
+    let candidate = hasHistory ? weightedAverageQuad(nextHistory) : sanitized;
 
     const anchor = anchorQuadRef.current;
     if (anchor && isValidQuad(anchor)) {
@@ -207,21 +223,44 @@ export const DocScanner: React.FC<Props> = ({
       const centerDelta = Math.hypot(candidateCenter.x - anchorCenter.x, candidateCenter.y - anchorCenter.y);
       const areaShift = anchorArea > 0 ? Math.abs(anchorArea - candidateArea) / anchorArea : 0;
 
+      if (centerDelta >= REJECT_CENTER_DELTA || areaShift > 1.2) {
+        const handled = fallbackToAnchor(true);
+        if (handled) {
+          return;
+        }
+        return;
+      }
+
       if (delta <= SNAP_DISTANCE && centerDelta <= SNAP_CENTER_DISTANCE && areaShift <= 0.08) {
         candidate = anchor;
+        smoothingBufferRef.current = nextHistory;
+        lastMeasurementRef.current = sanitized;
+        anchorConfidenceRef.current = Math.min(anchorConfidenceRef.current + 1, MAX_ANCHOR_CONFIDENCE);
       } else if (delta <= BLEND_DISTANCE && centerDelta <= MAX_CENTER_DELTA && areaShift <= MAX_AREA_SHIFT) {
         const normalizedDelta = Math.min(1, delta / BLEND_DISTANCE);
         const adaptiveAlpha = 0.25 + normalizedDelta * 0.45; // 0.25..0.7 range
         candidate = blendQuads(anchor, candidate, adaptiveAlpha);
+        smoothingBufferRef.current = nextHistory;
+        lastMeasurementRef.current = sanitized;
+        anchorConfidenceRef.current = Math.min(anchorConfidenceRef.current + 1, MAX_ANCHOR_CONFIDENCE);
       } else {
-        smoothingBufferRef.current = [sanitized];
+        const handled = fallbackToAnchor(true);
+        if (handled) {
+          return;
+        }
+        return;
       }
+    } else {
+      smoothingBufferRef.current = nextHistory;
+      lastMeasurementRef.current = sanitized;
+      anchorConfidenceRef.current = Math.min(anchorConfidenceRef.current + 1, MAX_ANCHOR_CONFIDENCE);
     }
 
     candidate = orderQuadPoints(candidate);
     anchorQuadRef.current = candidate;
     lastQuadRef.current = candidate;
     setQuad(candidate);
+    anchorMissesRef.current = 0;
   }, []);
 
   const reportError = useRunOnJS((step: string, error: unknown) => {