react-native-scanbot-barcode-scanner-sdk 4.3.0-beta.1 → 4.3.0-beta.2

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcode_scanner_view/ScanbotBarcodeScannerViewManager.kt

@@ -3,6 +3,7 @@ package io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view
 import android.content.res.Resources
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
@@ -41,11 +42,13 @@ class ScanbotBarcodeScannerViewManager :
     return ScanbotBarcodeScannerView(context)
   }
 
-  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any>? {
-    return mutableMapOf(
-      BarcodeScannerResultEvent.NAME to mapOf("registrationName" to "onBarcodeScannerResult")
-    )
-  }
+  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any>?  =
+    MapBuilder.builder<String, Any>()
+      .put(
+        BarcodeScannerResultEvent.NAME,
+        MapBuilder.of("registrationName", "onBarcodeScannerResult")
+      )
+      .build()
 
   //region Commands
 

package/dist/components/barcode-camera-view/ScanbotBarcodeCameraView.js

@@ -94,12 +94,11 @@ exports.ScanbotBarcodeCameraView = (0, react_1.forwardRef)(function (_a, forward
         };
     }, []);
     var _onBarcodeScannerResult = (0, react_1.useCallback)(function (event) {
-        var result = react_native_1.Platform.select({
-            ios: JSON.parse(event.nativeEvent.result),
-            android: event.nativeEvent.result
-        });
+        var result = event.nativeEvent.result;
         if (props.onBarcodeScannerResult && result) {
-            props.onBarcodeScannerResult(result);
+            react_native_1.Platform.OS === 'ios' ?
+                props.onBarcodeScannerResult(JSON.parse(result)) :
+                props.onBarcodeScannerResult(result);
         }
     }, [props.onBarcodeScannerResult]);
     return <ScanbotBarcodeScannerViewNativeComponent_1.default 

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerLegacyView.h

@@ -1,9 +1,3 @@
-//
-//  RNScanbotBarcodeScannerPaperView.h
-//  RNScanbotBarcodeSDK
-//
-//  Created by Stefan Krzhovski on 27.05.24.
-//
 
 #if !defined(RCT_NEW_ARCH_ENABLED)
 

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerLegacyView.m

@@ -1,9 +1,4 @@
-//
-//  RNScanbotBarcodeScannerPaperView.m
-//  RNScanbotBarcodeSDK
-//
-//  Created by Stefan Krzhovski on 27.05.24.
-//
+
 #if !defined(RCT_NEW_ARCH_ENABLED)
 #import "RNScanbotBarcodeScannerLegacyView.h"
 #import "RCTComponent.h"
@@ -22,7 +17,7 @@
         _scannerViewController = [RNScanbotBarcodeScannerViewControllerWrapper initController];
         _scannerViewController.delegate = self;
     }
-    
+
     return self;
 }
 

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerView.h

@@ -1,8 +1,4 @@
-//
-//  RNScanbotBarcodeScannerView.h
-//
-//  Created by Stefan Krzhovski on 21.05.24.
-//
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
@@ -14,6 +10,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RNScanbotBarcodeScannerView : RCTViewComponentView<SBSDKBarcodeScannerViewControllerDelegate>
+- (void) freezeCamera;
+- (void) unfreezeCamera;
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerView.mm

@@ -1,9 +1,4 @@
-//
-//  RNScanbotBarcodeScannerView.m
-//  RNScanbotBarcodeSDK
-//
-//  Created by Stefan Krzhovski on 21.05.24.
-//
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RNScanbotBarcodeScannerView.h"
 
@@ -38,7 +33,7 @@ using namespace facebook::react;
         _scannerViewController = [RNScanbotBarcodeScannerViewControllerWrapper initController];
         _scannerViewController.delegate = self;
     }
-    
+
     return self;
 }
 
@@ -58,7 +53,7 @@ using namespace facebook::react;
 {
     const auto &oldViewProps = *std::static_pointer_cast<ScanbotBarcodeScannerViewProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<ScanbotBarcodeScannerViewProps const>(props);
-    
+
     SBSDKBaseScannerViewFinderConfiguration *finderConfig = self.scannerViewController.viewFinderConfiguration;
     SBSDKBaseScannerZoomConfiguration *zoomConfig = self.scannerViewController.zoomConfiguration;
     SBSDKBarcodeAdditionalParameters *additionalConfig = self.scannerViewController.additionalDetectionParameters;
@@ -70,7 +65,7 @@ using namespace facebook::react;
         @"gs1HandlingMode": toNSString(newViewProps.detectorConfig.gs1HandlingMode),
         @"msiPlesseyChecksumAlgorithm": toNSString(newViewProps.detectorConfig.msiPlesseyChecksumAlgorithm),
     }];
-    
+
     if(oldViewProps.flashEnabled != newViewProps.flashEnabled){
         [RNScanbotBarcodeScannerViewControllerWrapper setFlashEnabled:self.scannerViewController value:newViewProps.flashEnabled];
     }
@@ -167,7 +162,7 @@ using namespace facebook::react;
     self.scannerViewController.viewFinderConfiguration = finderConfig;
     self.scannerViewController.zoomConfiguration = zoomConfig;
     self.scannerViewController.additionalDetectionParameters = additionalConfig;
-    
+
     [super updateProps:props oldProps:oldProps];
 }
 
@@ -189,7 +184,7 @@ using namespace facebook::react;
 - (void)barcodeScannerController:(SBSDKBarcodeScannerViewController *)controller
                didDetectBarcodes:(NSArray<SBSDKBarcodeScannerResult *> *)codes {
     if (_eventEmitter == nullptr) return;
-    
+
     NSString *result = [RNScanbotBarcodeScannerViewControllerWrapper jsonFromResultOrNil:codes];
     if(result != nil){
         const auto &eventEmitter = std::dynamic_pointer_cast<const facebook::react::ScanbotBarcodeScannerViewEventEmitter>(_eventEmitter);
@@ -214,17 +209,17 @@ bool operator!=(ScanbotBarcodeScannerViewCameraZoomRangeStruct const &i, Scanbot
 }
 
 bool operator!=(std::vector<std::string> const &v1, std::vector<std::string> const &v2) {
-    
+
     bool differentItems = false;
     if(v1.size() != v2.size()) return true;
-    
+
     for(int i = 0; i< v1.size(); i++){
         if(!(v1[i] != v2[i])){
             differentItems = true;
             break;
         }
     }
-    
+
     return differentItems;
 }
 
@@ -234,11 +229,11 @@ NSString* toNSString(std::string value) {
 
 - (NSArray*)vectorStringToNSArray:(std::vector<std::string>) vector {
     NSMutableArray* nsArray = [NSMutableArray array];
-    
+
     for (auto const& value : vector) {
         [nsArray addObject: toNSString(value)];
     }
-    
+
     return nsArray;
 }
 

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerViewControllerWrapper.h

@@ -1,9 +1,3 @@
-//
-//  RNScanbotBarcodeScannerViewHandler.h
-//  RNScanbotBarcodeSDK
-//
-//  Created by Stefan Krzhovski on 27.05.24.
-//
 
 #ifndef RNScanbotBarcodeScannerViewControllerWrapper_h
 #define RNScanbotBarcodeScannerViewControllerWrapper_h

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerViewControllerWrapper.m

@@ -1,9 +1,3 @@
-//
-//  RNScanbotBarcodeScannerViewHandler.m
-//  RNScanbotBarcodeSDK
-//
-//  Created by Stefan Krzhovski on 27.05.24.
-//
 
 #import <Foundation/Foundation.h>
 #import "RNScanbotBarcodeScannerViewControllerWrapper.h"
@@ -13,32 +7,32 @@
 
 + hexStringToColor:(NSString *)hexString
 {
-    
+
     if ([hexString hasPrefix:@"#"]) {
         hexString = [hexString substringFromIndex:1];
     } else {
         return nil;
     }
-    
+
     NSUInteger length = [hexString length];
     if (length != 6 && length != 8) {
         return nil;
     }
-    
+
     unsigned int red, green, blue, alpha = 255;
     NSString *redString = [hexString substringWithRange:NSMakeRange(0, 2)];
     NSString *greenString = [hexString substringWithRange:NSMakeRange(2, 2)];
     NSString *blueString = [hexString substringWithRange:NSMakeRange(4, 2)];
-    
+
     if (length == 8) {
         NSString *alphaString = [hexString substringWithRange:NSMakeRange(6, 2)];
         [[NSScanner scannerWithString:alphaString] scanHexInt:&alpha];
     }
-    
+
     [[NSScanner scannerWithString:redString] scanHexInt:&red];
     [[NSScanner scannerWithString:greenString] scanHexInt:&green];
     [[NSScanner scannerWithString:blueString] scanHexInt:&blue];
-    
+
     return [UIColor colorWithRed:(CGFloat)red/255.0
                            green:(CGFloat)green/255.0
                             blue:(CGFloat)blue/255.0
@@ -46,13 +40,13 @@
 }
 
 + (SBSDKBarcodeScannerViewController *)initController {
-    
+
     SBSDKBarcodeScannerViewController *scannerViewController = [[SBSDKBarcodeScannerViewController alloc] init];
     scannerViewController.viewFinderConfiguration = [SBSDKBaseScannerViewFinderConfiguration defaultConfiguration];
     scannerViewController.generalConfiguration = [SBSDKBaseScannerGeneralConfiguration defaultConfiguration];
     scannerViewController.zoomConfiguration = [SBSDKBaseScannerZoomConfiguration defaultConfiguration];
     scannerViewController.energyConfiguration = [SBSDKBaseScannerEnergyConfiguration defaultConfiguration];
-    
+
     return scannerViewController;
 }
 
@@ -70,7 +64,7 @@
 
 + (void)setFinderStrokeColor:(SBSDKBaseScannerViewFinderConfiguration *)config value:(UIColor *)value {
     config.lineColor = value;
-    
+
 }
 
 + (void)setFinderOverlayColor:(SBSDKBaseScannerViewFinderConfiguration *)config value:(UIColor *)value {
@@ -181,13 +175,13 @@
 
 + (NSString *) jsonFromResultOrNil:(NSArray<SBSDKBarcodeScannerResult *> *)codes {
     if(!codes || codes.count == 0) return nil;
-    
+
     NSDictionary* _Nullable result = [SBBWrapperBarcodeScannerResult nativeResultsToDictionary:codes];
     if(result != NULL) {
         NSData *data = [NSJSONSerialization dataWithJSONObject:result options:NSJSONWritingFragmentsAllowed error:nil];
         return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
     }
-    
+
     return nil;
 }
 

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerViewManager.mm

@@ -1,19 +1,18 @@
-//
-//  RNScanbotBarcodeScannerViewManager.m
-//  RNScanbotBarcodeSDK
-//
-//  Created by Stefan Krzhovski on 21.05.24.
-//
 
-#if !defined(RCT_NEW_ARCH_ENABLED)
 #import <Foundation/Foundation.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTViewManager.h>
 #import <UIKit/UIKit.h>
-#import "RNScanbotBarcodeScannerLegacyView.h"
 
+
+#if !defined(RCT_NEW_ARCH_ENABLED)
+#import "RNScanbotBarcodeScannerLegacyView.h"
 typedef void (^NativeViewBlock)(RNScanbotBarcodeScannerLegacyView* _Nonnull);
+#else
+#import "RNScanbotBarcodeScannerView.h"
+#endif
+
 
 @interface RNScanbotBarcodeScannerViewManager: RCTViewManager
 @end
@@ -23,7 +22,11 @@ typedef void (^NativeViewBlock)(RNScanbotBarcodeScannerLegacyView* _Nonnull);
 RCT_EXPORT_MODULE(ScanbotBarcodeScannerView)
 
 - (UIView *)view {
+#if !defined(RCT_NEW_ARCH_ENABLED)
     return [[RNScanbotBarcodeScannerLegacyView alloc] init];
+#else
+    return [[RNScanbotBarcodeScannerView alloc] init];
+#endif
 }
 
 RCT_EXPORT_VIEW_PROPERTY(onBarcodeScannerResult, RCTDirectEventBlock)
@@ -44,7 +47,7 @@ RCT_EXPORT_VIEW_PROPERTY(detectorConfig, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(scanningEnabled, BOOL)
 
 //Commands
-
+#if !defined(RCT_NEW_ARCH_ENABLED)
 RCT_EXPORT_METHOD(freezeCamera:(nonnull NSNumber*) reactTag) {
     [self callNativeMethodWithReactTag: reactTag andBlock: ^void (RNScanbotBarcodeScannerLegacyView *nativeView) {
         [nativeView freezeCamera];
@@ -67,7 +70,7 @@ RCT_EXPORT_METHOD(unfreezeCamera:(nonnull NSNumber*) reactTag) {
         block(view);
     }];
 }
+#endif
 
-@end
 
-#endif
+@end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "4.3.0-beta.1",
+  "version": "4.3.0-beta.2",
   "packageManager": "yarn@3.8.1",
   "react-native": "src/index.ts",
   "main": "dist/index.js",

package/src/components/barcode-camera-view/ScanbotBarcodeCameraView.tsx

@@ -1,6 +1,9 @@
 import React, { forwardRef, useCallback, useImperativeHandle, useRef } from 'react';
-import NativeBarcodeCameraView, {Commands} from '../spec/ScanbotBarcodeScannerViewNativeComponent';
-import { ScanbotBarcodeCameraViewHandle, ScanbotBarcodeCameraViewProperties } from './ScanbotBarcodeCameraViewProperties';
+import NativeBarcodeCameraView, { Commands } from '../spec/ScanbotBarcodeScannerViewNativeComponent';
+import {
+  ScanbotBarcodeCameraViewHandle,
+  ScanbotBarcodeCameraViewProperties,
+} from './ScanbotBarcodeCameraViewProperties';
 import { NativeSyntheticEvent, Platform } from 'react-native';
 import { BarcodeScannerResult } from '../../results';
 
@@ -65,12 +68,11 @@ export const ScanbotBarcodeCameraView = forwardRef<ScanbotBarcodeCameraViewHandl
     }, []);
 
     const _onBarcodeScannerResult = useCallback((event: NativeSyntheticEvent<any>) => {
-      const result = Platform.select({
-        ios: JSON.parse(event.nativeEvent.result),
-        android: event.nativeEvent.result
-      }) as (BarcodeScannerResult | undefined)
-      if(props.onBarcodeScannerResult && result){
-        props.onBarcodeScannerResult(result);
+      const result = event.nativeEvent.result;
+      if (props.onBarcodeScannerResult && result) {
+        Platform.OS === 'ios' ?
+          props.onBarcodeScannerResult(JSON.parse(result) as BarcodeScannerResult) :
+          props.onBarcodeScannerResult(result as BarcodeScannerResult);
       }
     }, [props.onBarcodeScannerResult]);