react-native-scanbot-barcode-scanner-sdk 3.1.0-beta1 → 3.1.0-beta10

package/ios/ScanbotBarcodeSdk.m

@@ -24,6 +24,8 @@ void runInBackground(void (^function)(void)) {
 
 @implementation ScanbotBarcodeSdk
 
+static UIViewController* activeViewController = nil;
+
 RCT_EXPORT_MODULE()
 
 // Necessary so that the start* methods get called on the UI thread.
@@ -45,7 +47,17 @@ RCT_EXPORT_METHOD(initializeSdk:(NSDictionary *)configuration
         @"engineMode": @{
                 @"LEGACY": @(SBSDKBarcodeEngineModeLegacy),
                 @"NEXT_GEN": @(SBSDKBarcodeEngineModeNextGen)
-        }
+        },
+        @"allowedInterfaceOrientations": @{
+            @"NONE": @(UIInterfaceOrientationMaskAll),
+            @"PORTRAIT": @(UIInterfaceOrientationMaskPortrait),
+            @"PORTRAIT_UPSIDE_DOWN": @(UIInterfaceOrientationMaskPortraitUpsideDown),
+            @"LANDSCAPE_LEFT": @(UIInterfaceOrientationMaskLandscapeLeft),
+            @"LANDSCAPE_RIGHT": @(UIInterfaceOrientationMaskLandscapeRight),
+            @"LANDSCAPE": @(UIInterfaceOrientationMaskLandscape),
+            @"ALL": @(UIInterfaceOrientationMaskAll),
+            @"ALL_BUT_UPSIDE_DOWN": @(UIInterfaceOrientationMaskAllButUpsideDown)
+        },
     }];
 
     // map config parameters and normalize some fields
@@ -121,11 +133,11 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
         return;
     }
     
-    // Need to manully extract because of naming disparity between iOS and Android
-    // Also, it is nullable, 'true' by default, so wrap it in an NSNumber
+    // Need to manually extract because of naming disparity between iOS and Android
+    // Also, it is nullable, 'true' by default, so we wrap it in an NSNumber
     NSNumber* gs1Decoding = [configuration objectForKey:@"gs1DecodingEnabled"];
     if (gs1Decoding != nil) {
-       additionalParameters.enableGS1Decoding = gs1Decoding;
+       additionalParameters.enableGS1Decoding = [gs1Decoding boolValue];
     }
 
     additionalParameters.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
@@ -137,7 +149,10 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
 
     SBSDKUIBarcodeScannerConfiguration* config = [[SBSDKUIBarcodeScannerConfiguration alloc] initWithUIConfiguration:uiConfig textConfiguration:textConfig behaviorConfiguration:behaviorConfig];
 
-    uiConfig.allowedInterfaceOrientations = [ObjectMapper orientationLockModeToUIInterfaceOrientationMask:configuration];
+    SBSDKUICameraConfiguration* cameraConfiguration = extractCameraConfiguration(configuration);
+    if (cameraConfiguration) {
+        config.cameraConfiguration.camera = cameraConfiguration.camera;
+    }
 
     bool shouldWaitForGeneratedImage = behaviorConfig.barcodeImageGenerationType != SBSDKBarcodeImageGenerationTypeNone;
     BarcodeScannerPromiseProxy* delegate = [[BarcodeScannerPromiseProxy alloc] initWithResolver: resolve
@@ -151,9 +166,13 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
         viewController = [SBSDKUIBarcodeScannerViewController createNewWithAcceptedMachineCodeTypes:machineCodeTypes configuration:config andDelegate:delegate];
     }
 
-    [viewController setModalPresentationStyle:UIModalPresentationFullScreen];
-    UIViewController* rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
-    [rootViewController presentViewController:viewController animated:true completion:nil];
+    [self presentActiveViewController:viewController];
+}
+
+RCT_EXPORT_METHOD(closeBarcodeScanner:(RCTPromiseResolveBlock)resolve
+                  failure:(RCTPromiseRejectBlock)reject) {
+    [self dismissActiveViewController: [SBSDKUIBarcodeScannerViewController class]];
+    resolve(nil);
 }
 
 RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
@@ -179,28 +198,52 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
     }
     
     // Need to manully extract because of naming disparity between iOS and Android
-    // Also, it is nullable, 'true' by default, so wrap it in an NSNumber
+    // Also, it is nullable, 'true' by default, so we wrap it in an NSNumber
     NSNumber* gs1Decoding = [configuration objectForKey:@"gs1DecodingEnabled"];
     if (gs1Decoding != nil) {
-       additionalParameters.enableGS1Decoding = gs1Decoding;
+       additionalParameters.enableGS1Decoding = [gs1Decoding boolValue];
     }
 
     additionalParameters.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
     
     behavior.additionalDetectionParameters = additionalParameters;
     
-    SBSDKUIBarcodesBatchScannerConfiguration *config = [[SBSDKUIBarcodesBatchScannerConfiguration alloc] initWithUIConfiguration:ui textConfiguration:text behaviorConfiguration:behavior];
+    SBSDKUIBarcodesBatchScannerConfiguration *config = [[SBSDKUIBarcodesBatchScannerConfiguration alloc]
+                                                        initWithUIConfiguration:ui
+                                                        textConfiguration:text
+                                                        behaviorConfiguration:behavior];
     
     NSArray* machineCodeTypes = extractBarcodeTypesFromConfiguration(configuration);
+    NSArray* acceptedDocumentTypes = extractBarcodeDocumentTypesFromConfiguration(configuration);
+
+    SBSDKUICameraConfiguration* cameraConfiguration = extractCameraConfiguration(configuration);
+    if (cameraConfiguration) {
+        config.cameraConfiguration.camera = cameraConfiguration.camera;
+    }
+
     BatchBarcodeScannerPromiseProxy* delegate = [[BatchBarcodeScannerPromiseProxy alloc] initWithResolver:resolve];
-    SBSDKUIBarcodesBatchScannerViewController* controller =
-            [SBSDKUIBarcodesBatchScannerViewController createNewWithAcceptedMachineCodeTypes: machineCodeTypes configuration:config andDelegate:delegate];
+
+    SBSDKUIBarcodesBatchScannerViewController* viewController = NULL;
+
+    if (acceptedDocumentTypes && acceptedDocumentTypes.count > 0) {
+        viewController = [SBSDKUIBarcodesBatchScannerViewController createNewWithAcceptedMachineCodeTypes:machineCodeTypes
+                                                                          withAcceptedDocumentTypes:acceptedDocumentTypes
+                                                                                      configuration:config
+                                                                                        andDelegate:delegate];
+    } else {
+        viewController = [SBSDKUIBarcodesBatchScannerViewController createNewWithAcceptedMachineCodeTypes:machineCodeTypes
+                                                                                      configuration:config
+                                                                                        andDelegate:delegate];
+    }
     
-    [controller setModalPresentationStyle:UIModalPresentationFullScreen];
-    UIViewController* rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
-    [rootViewController presentViewController:controller animated:true completion:nil];
+    [self presentActiveViewController:viewController];
 }
 
+RCT_EXPORT_METHOD(closeBatchBarcodeScanner:(RCTPromiseResolveBlock)resolve
+                  failure:(RCTPromiseRejectBlock)reject) {
+    [self dismissActiveViewController: [SBSDKUIBarcodesBatchScannerViewController class]];
+    resolve(nil);
+}
 
 RCT_EXPORT_METHOD(detectBarcodesOnImage:(NSDictionary *)configuration
     resolve:(RCTPromiseResolveBlock)resolve
@@ -334,6 +377,33 @@ RCT_EXPORT_METHOD(cleanup:(RCTPromiseResolveBlock)resolve
     return nil;
 }
 
+- (void) presentActiveViewController:(UIViewController*) viewController {
+    if (!viewController) {
+        return;
+    }
+
+    UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
+    [viewController setModalPresentationStyle:UIModalPresentationFullScreen];
+    [rootViewController presentViewController:viewController animated:YES completion:nil];
+
+    activeViewController = viewController;
+}
+
+- (_Bool) dismissActiveViewController:(Class _Nullable)vcClass {
+    if (!activeViewController) {
+        return false;
+    }
+
+    if (vcClass && ![activeViewController isKindOfClass:vcClass]) {
+        return false;
+    }
+
+    [activeViewController dismissViewControllerAnimated:true completion:nil];
+    activeViewController = nil;
+
+    return true;
+}
+
 @end
 
 /// Barcode Scanner Delegate

package/ios/Utils/BarcodeMapping.h

@@ -128,9 +128,9 @@ static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractPlesseyChecksumAlgo
     if (algorithm != nil) {
         if ([algorithm isEqualToString:@"None"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmNone;
         if ([algorithm isEqualToString:@"Mod10"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod10;
+        if ([algorithm isEqualToString:@"Mod1010"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1010;
         if ([algorithm isEqualToString:@"Mod11IBM"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod11IBM;
         if ([algorithm isEqualToString:@"Mod11NCR"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod11NCR;
-        if ([algorithm isEqualToString:@"Mod1010"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1010;
         if ([algorithm isEqualToString:@"Mod1110IBM"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1110IBM;
         if ([algorithm isEqualToString:@"Mod1110NCR"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1110NCR;
     }
@@ -138,4 +138,21 @@ static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractPlesseyChecksumAlgo
     return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod10;
 }
 
+static inline SBSDKUICameraConfiguration* extractCameraConfiguration(NSDictionary* configuration) {
+    SBSDKUICameraConfiguration* cameraConfiguration = [[SBSDKUICameraConfiguration alloc] init];
+    
+    NSString* cameraModule = [configuration objectForKey:@"cameraModule"];
+    if(!cameraModule) {
+        return nil;
+    }
+    
+    if ([cameraModule isEqualToString:@"FRONT"]) {
+        cameraConfiguration.camera = SBSDKCameraDevice.defaultFrontFacingCamera;
+    } else if ([cameraModule isEqualToString:@"BACK"]) {
+        cameraConfiguration.camera = SBSDKCameraDevice.defaultBackFacingCamera;
+    }
+    
+    return cameraConfiguration;
+}
+
 #endif /* BarcodeMapping_h */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "3.1.0-beta1",
+  "version": "3.1.0-beta10",
   "description": "React Native plugin for the Scanbot Barcode Scanner SDK on Android and iOS",
   "main": "index.js",
   "files": [
@@ -46,8 +46,8 @@
     "react-native": ">=0.60 <1.0.x"
   },
   "devDependencies": {
-    "react": "^16.8.3",
-    "react-native": "^0.60"
+    "react": "^17.0.2",
+    "react-native": "^0.65"
   },
   "contributors": [
     {

package/src/components/barcode-camera-view/scanbot-barcode-camera-view-types.tsx

@@ -1,11 +1,11 @@
-import {StyleProp, ViewStyle} from 'react-native';
+import { StyleProp, ViewStyle } from 'react-native';
 import {
   BarcodeDocumentFormat,
   BarcodeFormat,
   EngineMode,
   MSIPlesseyChecksumAlgorithm,
 } from '../../enum';
-import {FinderAspectRatio} from '../../model';
+import { FinderAspectRatio } from '../../model';
 
 export interface ScanbotBarcodeCameraViewProperties {
   onBarcodeScannerResult?: (result: ScanbotBarcodeCameraViewResult) => void;
@@ -112,4 +112,10 @@ export interface ScanbotBarcodeCameraViewConfiguration {
    * NOTE: This feature works on ITF barcodes only.
    */
   maximumTextLength?: number;
+  /**
+   * With this option enabled, the scanner removes checks digits for UPC, EAN and MSI Plessey codes.
+   * Has no effect if both single and double digit MSI Plessey checksums are enabled.
+   * The default is `false`
+   */
+  stripCheckDigits?: boolean;
 }