scandit-react-native-datacapture-id 7.6.0 → 8.0.0-beta.1

package/ios/Sources/ScanditDataCaptureId.m

@@ -2,18 +2,26 @@
 #import <React/RCTEventEmitter.h>
 
 @interface RCT_EXTERN_MODULE (ScanditDataCaptureId, RCTEventEmitter)
-RCT_EXTERN_METHOD(finishDidCaptureCallback : (BOOL)enabled)
-RCT_EXTERN_METHOD(finishDidRejectCallback : (BOOL)enabled)
-RCT_EXTERN_METHOD(reset : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(createContextForBarcodeVerification
-                  : (NSString *)context context
+RCT_EXTERN_METHOD(finishDidCaptureCallback
+                  : (NSDictionary *)data resolve
                   : (RCTPromiseResolveBlock)resolve reject
                   : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(verifyCapturedIdAsync
-                  : (NSString *)capturedIdJSON capturedIdJSON
+
+RCT_EXTERN_METHOD(finishDidRejectCallback
+                  : (NSDictionary *)data resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(resetIdCaptureMode : (NSDictionary *)data)
+
+RCT_EXTERN_METHOD(addIdCaptureListener : (NSDictionary *)data)
+
+RCT_EXTERN_METHOD(removeIdCaptureListener : (NSDictionary *)data)
+
+RCT_EXTERN_METHOD(setModeEnabledState
+                  : (NSDictionary *)data resolve
                   : (RCTPromiseResolveBlock)resolve reject
                   : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(setModeEnabledState : (BOOL)enabled)
 
 RCT_EXTERN_METHOD(updateIdCaptureOverlay
                   : (NSDictionary *)data resolve
@@ -21,17 +29,17 @@ RCT_EXTERN_METHOD(updateIdCaptureOverlay
                   : (RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(updateIdCaptureMode
-                  : (NSString *)modeJson resolve
+                  : (NSDictionary *)data resolve
                   : (RCTPromiseResolveBlock)resolve reject
                   : (RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(applyIdCaptureModeSettings
-                  : (NSString *)modeSettingsJson resolve
+                  : (NSDictionary *)data resolve
                   : (RCTPromiseResolveBlock)resolve reject
                   : (RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(updateIdCaptureFeedback
-                  : (NSString *)feedbackJson resolve
+                  : (NSDictionary *)data resolve
                   : (RCTPromiseResolveBlock)resolve reject
                   : (RCTPromiseRejectBlock)reject)
 @end

package/ios/Sources/ScanditDataCaptureId.swift

@@ -16,21 +16,10 @@ class ScanditDataCaptureId: RCTEventEmitter {
     override init() {
         super.init()
         let emitter = ReactNativeEmitter(emitter: self)
-        let idCaptureListener = FrameworksIdCaptureListener(emitter: emitter)
-        idModule = IdCaptureModule(idCaptureListener: idCaptureListener)
+        idModule = IdCaptureModule(emitter: emitter)
         idModule.didStart()
     }
 
-    override func startObserving() {
-        super.startObserving()
-        idModule.addListener()
-    }
-
-    override func stopObserving() {
-        idModule.removeListener()
-        super.stopObserving()
-    }
-
     override func supportedEvents() -> [String]! {
         FrameworksIdCaptureEvent.allCases.map { $0.rawValue }
     }
@@ -58,40 +47,50 @@ class ScanditDataCaptureId: RCTEventEmitter {
         invalidate()
     }
 
-    @objc(finishDidCaptureCallback:)
-    func finishDidCaptureCallback(enabled: Bool) {
-        idModule.finishDidCaptureId(enabled: enabled)
-    }
-
-    @objc(finishDidRejectCallback:)
-    func finishDidRejectCallback(enabled: Bool) {
-        idModule.finishDidRejectId(enabled: enabled)
+    @objc(finishDidCaptureCallback:resolve:reject:)
+    func finishDidCaptureCallback(data: [String: Any], resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        guard let enabled = data["enabled"] as? Bool else {
+            reject("-1", "Missing enabled parameter", nil)
+            return
+        }
+        idModule.finishDidCaptureId(modeId: data.modeId, enabled: enabled)
+        resolve(nil)
     }
 
-    @objc(reset:reject:)
-    func reset(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-        idModule.resetMode()
+    @objc(finishDidRejectCallback:resolve:reject:)
+    func finishDidRejectCallback(data: [String: Any], resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        guard let enabled = data["enabled"] as? Bool else {
+            reject("-1", "Missing enabled parameter", nil)
+            return
+        }
+        idModule.finishDidRejectId(modeId: data.modeId, enabled: enabled)
         resolve(nil)
     }
 
-    @objc(createContextForBarcodeVerification:context:reject:)
-    func createContextForBarcodeVerification(context: String,
-                                             resolve: @escaping RCTPromiseResolveBlock,
-                                             reject: @escaping RCTPromiseRejectBlock) {
-        idModule.createAamvaBarcodeVerifier(result: ReactNativeResult(resolve, reject))
+    @objc(resetIdCaptureMode:)
+    func resetIdCaptureMode(data: [String: Any]) {
+        idModule.resetMode(modeId: data.modeId)
     }
+    
 
-    @objc(verifyCapturedIdAsync:capturedIdJSON:reject:)
-    func verifyCapturedIdAsync(capturedIdJSON: String,
-                               resolve: @escaping RCTPromiseResolveBlock,
-                               reject: @escaping RCTPromiseRejectBlock) {
-        idModule.verifyCapturedIdWithCloud(jsonString: capturedIdJSON,
-                                           result: ReactNativeResult(resolve, reject))
+    @objc(addIdCaptureListener:)
+    func addIdCaptureListener(data: [String: Any]) {
+        idModule.addListener(modeId: data.modeId)
+    }
+    
+    @objc(removeIdCaptureListener:)
+    func removeIdCaptureListener(data: [String: Any]) {
+        idModule.removeListener(modeId: data.modeId)
     }
 
-    @objc(setModeEnabledState:)
-    func setModeEnabledState(enabled: Bool) {
-        idModule.setModeEnabled(enabled: enabled)
+    @objc(setModeEnabledState:resolve:reject:)
+    func setModeEnabledState(data: [String: Any], resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
+        guard let enabled = data["enabled"] as? Bool else {
+            reject("-1", "Missing enabled parameter", nil)
+            return
+        }
+        idModule.setModeEnabled(modeId: data.modeId, enabled: enabled)
+        resolve(nil)
     }
 
     @objc(updateIdCaptureOverlay:resolve:reject:)
@@ -104,17 +103,29 @@ class ScanditDataCaptureId: RCTEventEmitter {
     }
 
     @objc(updateIdCaptureMode:resolve:reject:)
-    func updateIdCaptureMode(modeJson: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        idModule.updateModeFromJson(modeJson: modeJson, result: ReactNativeResult(resolve, reject))
+    func updateIdCaptureMode(data: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let modeJson = data["modeJson"] as? String else {
+            reject("-1", "Missing modeJson parameter", nil)
+            return
+        }
+        idModule.updateModeFromJson(modeId: data.modeId, modeJson: modeJson, result: ReactNativeResult(resolve, reject))
     }
 
     @objc(applyIdCaptureModeSettings:resolve:reject:)
-    func applyIdCaptureModeSettings(modeSettingsJson: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        idModule.applyModeSettings(modeSettingsJson: modeSettingsJson, result: ReactNativeResult(resolve, reject))
+    func applyIdCaptureModeSettings(data: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let settingsJson = data["settingsJson"] as? String else {
+            reject("-1", "Missing settingsJson parameter", nil)
+            return
+        }
+        idModule.applyModeSettings(modeId: data.modeId, modeSettingsJson: settingsJson, result: ReactNativeResult(resolve, reject))
     }
 
     @objc(updateIdCaptureFeedback:resolve:reject:)
-    func updateIdCaptureFeedback(feedbackJson: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        idModule.updateFeedback(feedbackJson: feedbackJson, result: ReactNativeResult(resolve, reject))
+    func updateIdCaptureFeedback(data: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let feedbackJson = data["feedbackJson"] as? String else {
+            reject("-1", "Missing feedbackJson parameter", nil)
+            return
+        }
+        idModule.updateFeedback(modeId: data.modeId, feedbackJson: feedbackJson, result: ReactNativeResult(resolve, reject))
     }
 }

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "scandit-react-native-datacapture-id",
-  "version": "7.6.0",
+  "version": "8.0.0-beta.1",
   "description": "Scandit Data Capture SDK for React Native",
   "homepage": "https://github.com/Scandit/scandit-react-native-datacapture-id",
   "main": "dist/index.js",
   "types": "dist/dts/index.d.ts",
   "scripts": {
     "jest": "jest",
-    "coverage": "jest --coverage",
-    "test": "yarn lint",
+    "coverage": "jest --coverage --passWithNoTests",
+    "test": "pnpm run lint",
     "lint": "tslint --project .",
-    "build": "npm run rollup",
+    "build": "pnpm run rollup",
     "rollup": "rollup -c rollup.config.js --bundleConfigAsCjs",
-    "start": "yarn build -- --watch",
-    "clean": "../scripts/clean_package.py id"
+    "start": "pnpm build -- --watch"
   },
   "keywords": [
     "scandit",
@@ -50,8 +49,9 @@
     "typescript": "4.9.5"
   },
   "dependencies": {
-    "scandit-react-native-datacapture-core": "7.6.0",
-    "scandit-datacapture-frameworks-core": "7.6.0",
-    "scandit-datacapture-frameworks-id": "7.6.0"
-  }
+    "scandit-react-native-datacapture-core": "8.0.0-beta.1",
+    "scandit-datacapture-frameworks-core": "8.0.0-beta.1",
+    "scandit-datacapture-frameworks-id": "8.0.0-beta.1"
+  },
+  "packageManager": "pnpm@10.15.0"
 }

package/scandit-react-native-datacapture-id.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage                = package["homepage"]
   s.license                 = package["license"]
   s.authors                 = { package["author"]["name"] => package["author"]["email"] }
-  s.platforms               = { :ios => "14.0" }
+  s.platforms               = { :ios => "15.0" }
   s.source                  = { :git => package["homepage"] + ".git", :tag => "#{s.version}" }
   s.swift_version           = '5.0'
   s.source_files            = "ios/Sources/**/*.{h,m,swift}"
@@ -20,5 +20,5 @@ Pod::Spec.new do |s|
 
   s.dependency "React"
   s.dependency "scandit-react-native-datacapture-core", "= #{version}"
-  s.dependency "scandit-datacapture-frameworks-id", '= 7.6.0'
+  s.dependency "scandit-datacapture-frameworks-id", '= 8.0.0-beta.1'
 end

package/dist/dts/native/IdCaptureListenerProxy.d.ts

@@ -1,14 +0,0 @@
-import { IdCaptureListenerProxy } from 'scandit-datacapture-frameworks-id';
-export declare class NativeIdCaptureListenerProxy implements IdCaptureListenerProxy {
-    private nativeListeners;
-    private eventEmitter;
-    constructor();
-    isModeEnabled: () => boolean;
-    subscribeDidCaptureListener(): void;
-    subscribeDidRejectListener(): void;
-    unregisterListenerForEvents(): void;
-    finishDidCaptureCallback(isEnabled: boolean): void;
-    finishDidLocalizeCallback(isEnabled: boolean): void;
-    finishDidRejectCallback(isEnabled: boolean): void;
-    finishDidTimeOutCallback(isEnabled: boolean): void;
-}

package/dist/dts/native/IdCaptureProxy.d.ts

@@ -1,11 +0,0 @@
-import { NativeCallResult } from 'scandit-datacapture-frameworks-core';
-import { IdCaptureProxy } from 'scandit-datacapture-frameworks-id';
-export declare class NativeIdCaptureProxy implements IdCaptureProxy {
-    resetMode(): Promise<void>;
-    createContextForBarcodeVerification(contextJSON: string): Promise<void>;
-    verifyCapturedIdAsync(capturedId: string): Promise<NativeCallResult | null>;
-    setModeEnabledState(enabled: boolean): void;
-    updateIdCaptureMode(modeJson: string): Promise<void>;
-    applyIdCaptureModeSettings(newSettingsJson: string): Promise<void>;
-    updateFeedback(feedbackJson: string): Promise<void>;
-}