react-native-rectangle-doc-scanner 1.4.0 → 1.6.0

package/ios/RNRDocScannerView.swift

@@ -165,36 +165,41 @@ class RNRDocScannerView: UIView, AVCaptureVideoDataOutputSampleBufferDelegate, A
       isProcessingFrame = false
     }
 
-      let request = VNDetectRectanglesRequest { [weak self] request, error in
-        guard let self else { return }
-
-        if let error {
-          NSLog("[RNRDocScanner] detection error: \(error)")
-          self.lastObservation = nil
-          self.handleDetectedRectangle(nil, frameSize: frameSize)
-          return
-        }
+    let requestHandler: VNRequestCompletionHandler = { [weak self] request, error in
+      guard let self = self else { return }
 
-        guard let observations = request.results as? [VNRectangleObservation], !observations.isEmpty else {
-          self.lastObservation = nil
-          self.handleDetectedRectangle(nil, frameSize: frameSize)
-          return
-        }
+      if let error = error {
+        NSLog("[RNRDocScanner] detection error: \(error)")
+        self.lastObservation = nil
+        self.handleDetectedRectangle(nil, frameSize: frameSize)
+        return
+      }
 
-        let weighted = observations.sorted { lhs, rhs in
-          lhs.confidence * lhs.boundingBox.area > rhs.confidence * rhs.boundingBox.area
-        }
+      guard let observations = request.results as? [VNRectangleObservation], !observations.isEmpty else {
+        self.lastObservation = nil
+        self.handleDetectedRectangle(nil, frameSize: frameSize)
+        return
+      }
 
-        guard let best = weighted.first else {
-          self.lastObservation = nil
-          self.handleDetectedRectangle(nil, frameSize: frameSize)
-          return
-        }
-        self.lastObservation = best
-        self.missedDetectionFrames = 0
-        self.handleDetectedRectangle(best, frameSize: frameSize)
+      let weighted: [VNRectangleObservation] = observations.sorted { (lhs: VNRectangleObservation, rhs: VNRectangleObservation) -> Bool in
+        let lhsScore: CGFloat = CGFloat(lhs.confidence) * lhs.boundingBox.area
+        let rhsScore: CGFloat = CGFloat(rhs.confidence) * rhs.boundingBox.area
+        return lhsScore > rhsScore
+      }
+
+      guard let best = weighted.first else {
+        self.lastObservation = nil
+        self.handleDetectedRectangle(nil, frameSize: frameSize)
+        return
       }
 
+      self.lastObservation = best
+      self.missedDetectionFrames = 0
+      self.handleDetectedRectangle(best, frameSize: frameSize)
+    }
+
+    let request = VNDetectRectanglesRequest(completionHandler: requestHandler)
+
       request.maximumObservations = 2
       request.minimumConfidence = 0.4
       request.minimumAspectRatio = 0.08

package/ios/RNRDocScannerViewManager.m

@@ -2,7 +2,8 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTViewManager.h>
 
-#import "react-native-rectangle-doc-scanner-Swift.h"
+// Swift bridging header not needed with @objc annotations in Swift files
+// #import "react-native-rectangle-doc-scanner-Swift.h"
 
 @interface RCT_EXTERN_MODULE(RNRDocScannerViewManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(detectionCountBeforeCapture, NSNumber)

package/package.json

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