react-native-scanbot-barcode-scanner-sdk 7.1.2-rc.2 → 8.0.0-rc.1

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerLegacyView.m

@@ -1,30 +1,31 @@
-
 #if !defined(RCT_NEW_ARCH_ENABLED)
 #import "RNScanbotBarcodeScannerLegacyView.h"
 
-@interface RNScanbotBarcodeScannerLegacyView()
-@property (strong, nonatomic) SBSDKBarcodeScannerViewController *scannerViewController;
-@property (nonatomic) BOOL scanningEnabled;
+#import <ScanbotBarcodeScannerSDK/ScanbotBarcodeScannerSDK-Swift.h>
+#import <ScanbotBarcodeSDKWrapper/ScanbotBarcodeSDKWrapper-Swift.h>
+
+#if __has_include(<RNScanbotBarcodeSDK/RNScanbotBarcodeSDK-Swift.h>)
+#import <RNScanbotBarcodeSDK/RNScanbotBarcodeSDK-Swift.h>
+#else
+#import "RNScanbotBarcodeSDK-Swift.h"
+#endif
+
+@interface RNScanbotBarcodeScannerLegacyView() <RNScanbotBarcodeScannerEventDelegate>
+@property (strong, nonatomic) RNScanbotBarcodeScannerViewController *scannerViewController;
 @property (nonatomic) BOOL attached;
-@property (nonatomic) NSString* _Nullable barcodeItemOverlayViewLoadingText;
-@property (atomic) NSMutableDictionary* _Nullable barcodeItemOverlayViewBinders;
 @end
 
 @implementation RNScanbotBarcodeScannerLegacyView
 
-
 - (instancetype)initWithFrame:(CGRect)frame
 {
 
     if (self = [super initWithFrame:frame]) {
-        _scanningEnabled = true;
-        _barcodeItemOverlayViewLoadingText = nil;
-        _barcodeItemOverlayViewBinders = nil;
         self.attached = false;
-        
-        self.scannerViewController = [RNScanbotBarcodeScannerViewControllerWrapper initController];
+
+        self.scannerViewController = [[RNScanbotBarcodeScannerViewController alloc] init];
+        [self.scannerViewController setDefaults];
         self.scannerViewController.delegate = self;
-        self.scannerViewController.trackingOverlayController.delegate = self;
     }
 
     return self;
@@ -32,314 +33,184 @@
 
 - (void)didMoveToWindow {
     [super didMoveToWindow];
-    
+
     if(self.window && !self.attached){
-        [[self reactViewController] sbsdk_attachViewController:self.scannerViewController inView:self];
+        [self.scannerViewController attachControllerWithParentViewController:[self reactViewController] inView:self];
         self.attached = true;
     }
 }
 
 - (void)removeFromSuperview {
-    
+
     self.scannerViewController.delegate = nil;
-    self.scannerViewController.trackingOverlayController.delegate = nil;
-    
-    [self.scannerViewController sbsdk_detachViewController:self.scannerViewController];
+    [self.scannerViewController detachController];
     self.scannerViewController = nil;
-    
-    self.barcodeItemOverlayViewLoadingText = nil;
-    self.barcodeItemOverlayViewBinders = nil;
-    
+
     [super removeFromSuperview];
 }
 
+//MARK: General Configuration
+
+- (void) setFlashEnabled:(BOOL)value {
+    [self.scannerViewController flashEnabled:value];
+}
+
 - (void) setScanningEnabled:(BOOL)value {
-    _scanningEnabled = value;
+    [self.scannerViewController scanningEnabled:value];
 }
 
-- (void) setFlashEnabled:(BOOL)value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setFlashEnabled:self.scannerViewController value:value];
+- (void) setHardwareButtonsEnabled:(BOOL) value {
+    [self.scannerViewController hardwareButtonsEnabled:value];
 }
 
+// MARK: Finder Configuration
+
 - (void) setFinderEnabled:(BOOL)value {
-    SBSDKBaseScannerViewFinderConfiguration *finderConfig = self.scannerViewController.viewFinderConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setFinderEnabled:finderConfig value:value];
-    self.scannerViewController.viewFinderConfiguration = finderConfig;
+    [self.scannerViewController finderEnabled:value];
 }
 
-- (void) setFinderStrokeWidth:(int)value {
-    SBSDKBaseScannerViewFinderConfiguration *finderConfig = self.scannerViewController.viewFinderConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setFinderStrokeWidth:finderConfig value:value];
-    self.scannerViewController.viewFinderConfiguration = finderConfig;
+- (void) setFinderStrokeWidth:(NSNumber * _Nullable)value {
+    [self.scannerViewController finderStrokeWidth:value];
 }
 
 - (void) setFinderStrokeColor:(UIColor * _Nullable)value {
-    SBSDKBaseScannerViewFinderConfiguration *finderConfig = self.scannerViewController.viewFinderConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setFinderStrokeColor:finderConfig value:value];
-    self.scannerViewController.viewFinderConfiguration = finderConfig;
+    [self.scannerViewController finderStrokeColor:value];
 }
 
 - (void) setFinderOverlayColor:(UIColor * _Nullable)value {
-    SBSDKBaseScannerViewFinderConfiguration *finderConfig = self.scannerViewController.viewFinderConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setFinderOverlayColor:finderConfig value:value];
-    self.scannerViewController.viewFinderConfiguration = finderConfig;
+    [self.scannerViewController finderOverlayColor:value];
 }
 
 - (void) setFinderInset:(NSDictionary * _Nullable)value {
-    NSNumber *top = [value valueForKey:@"top"];
-    NSNumber *left = [value valueForKey:@"left"];
-    NSNumber *bottom = [value valueForKey:@"bottom"];
-    NSNumber *right = [value valueForKey:@"right"];
-
-    SBSDKBaseScannerViewFinderConfiguration *finderConfig = self.scannerViewController.viewFinderConfiguration;
-
-    [RNScanbotBarcodeScannerViewControllerWrapper setFinderInset:finderConfig
-                                                             top:top != nil ? [top floatValue] : 10
-                                                            left:left != nil ? [left floatValue]: 10
-                                                          bottom:bottom != nil ? [bottom floatValue] : 10
-                                                           right:right != nil ? [right floatValue] : 10];
-
-    self.scannerViewController.viewFinderConfiguration = finderConfig;
+    [self.scannerViewController finderInsets:value];
 }
 
 - (void) setFinderRequiredAspectRatios:(NSDictionary * _Nullable)value {
-    NSNumber *width = [value valueForKey:@"width"];
-    NSNumber *height = [value valueForKey:@"height"];
-
-    SBSDKBaseScannerViewFinderConfiguration *finderConfig = self.scannerViewController.viewFinderConfiguration;
-
-    [RNScanbotBarcodeScannerViewControllerWrapper setFinderRequiredAspectRatios:finderConfig
-                                                                          width:width != nil ? [width doubleValue] : 4
-                                                                         height:height != nil ? [height doubleValue] : 3];
-
-    self.scannerViewController.viewFinderConfiguration = finderConfig;
+    [self.scannerViewController finderRequiredAspectRatios:value];
 }
 
-- (void) setCameraZoomFactor:(float)value {
-    SBSDKBaseScannerZoomConfiguration *zoomConfig = self.scannerViewController.zoomConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setCameraZoomFactor:zoomConfig value:value];
-    self.scannerViewController.zoomConfiguration = zoomConfig;
+// MARK: Camera Configuration
+
+- (void) setCameraZoomFactor:(NSNumber * _Nullable)value {
+    [self.scannerViewController cameraZoomFactor:value];
 }
 
 - (void) setCameraZoomRange:(NSDictionary * _Nullable)value {
-    NSNumber *minZoom = [value valueForKey:@"minZoom"];
-    NSNumber *maxZoom = [value valueForKey:@"maxZoom"];
-
-    SBSDKBaseScannerZoomConfiguration *zoomConfig = self.scannerViewController.zoomConfiguration;
-
-    [RNScanbotBarcodeScannerViewControllerWrapper setCameraZoomRange:zoomConfig
-                                                             minZoom: minZoom != nil ? [minZoom floatValue] : 1
-                                                             maxZoom: maxZoom != nil ? [maxZoom floatValue] : 12];
-
-    self.scannerViewController.zoomConfiguration = zoomConfig;
+    [self.scannerViewController cameraZoomRange:value];
 }
 
 - (void) setMinFocusDistanceLock:(BOOL)value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setMinFocusDistanceLock:self.scannerViewController value:value];
+    [self.scannerViewController minFocusDistanceLock:value];
 }
 
 - (void) setCameraModule:(NSString * _Nullable)value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setCameraDevice:self.scannerViewController value:value];
+    [self.scannerViewController cameraDevice:value];
 }
 
-- (void) setConfigFormatConfigurations: (NSArray<NSDictionary<NSString *, id> *> * _Nullable)containerConfigurations {
-    SBSDKBarcodeScannerConfiguration *configuration = self.scannerViewController.copyCurrentConfiguration;
-    NSMutableArray<SBSDKBarcodeFormatConfigurationBase *> *configs = [[NSMutableArray alloc] init];
-    for(NSDictionary<NSString *, id> * container in containerConfigurations){
-        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:container
-                                                           options:NSJSONWritingSortedKeys
-                                                             error:nil];
-        if(jsonData != nil){
-            NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-            [configs addObject:[SBSDKBarcodeFormatConfigurationBase fromJsonWithJson:jsonString]];
-        }
-    }
+// MARK: Overlay Configuration
 
-    configuration.barcodeFormatConfigurations = configs;
-    self.scannerViewController.configuration = configuration;
+- (void) setOverlayEnabled:(BOOL) value {
+    [self.scannerViewController overlayEnabled:value];
 }
 
-- (void) setConfigExtractedDocumentFormats: (NSArray<NSString *> * _Nullable)formats {
-    SBSDKBarcodeScannerConfiguration *configuration = self.scannerViewController.copyCurrentConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setConfigExtractedDocumentFormats:configuration formats:formats];
-    self.scannerViewController.configuration = configuration;
+- (void) setOverlayPolygonColor:(UIColor * _Nullable) value {
+    [self.scannerViewController overlayPolygonColor:value];
 }
 
-- (void) setConfigOnlyAcceptDocuments: (BOOL)value {
-    SBSDKBarcodeScannerConfiguration *configuration = self.scannerViewController.copyCurrentConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setConfigOnlyAcceptDocuments:configuration value:value];
-    self.scannerViewController.configuration = configuration;
+- (void) setOverlayStrokeColor:(UIColor * _Nullable) value {
+    [self.scannerViewController overlayStrokeColor:value];
 }
 
-- (void) setConfigReturnBarcodeImage: (BOOL)value {
-    SBSDKBarcodeScannerConfiguration *configuration = self.scannerViewController.copyCurrentConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setConfigReturnBarcodeImage:configuration value:value];
-    self.scannerViewController.configuration = configuration;
+- (void) setOverlayTextColor:(UIColor * _Nullable) value {
+    [self.scannerViewController overlayTextColor:value];
 }
 
-- (void) setConfigEngineMode: (NSString * _Nullable)value {
-    SBSDKBarcodeScannerConfiguration *configuration = self.scannerViewController.copyCurrentConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setConfigEngineMode:configuration value:value];
-    self.scannerViewController.configuration = configuration;
+- (void) setOverlayTextContainerColor:(UIColor * _Nullable) value {
+    [self.scannerViewController overlayTextContainerColor:value];
 }
 
-- (void) setConfigOptimizedForOverlays: (BOOL)value {
-    SBSDKBarcodeScannerConfiguration *configuration = self.scannerViewController.copyCurrentConfiguration;
-    [RNScanbotBarcodeScannerViewControllerWrapper setConfigOptimizedForOverlays:configuration value:value];
-    self.scannerViewController.configuration = configuration;
+- (void) setOverlayTextFormat:(NSString * _Nullable) value {
+    [self.scannerViewController overlayTextFormat:value];
 }
 
-- (void) setConfigAccumulation: (NSDictionary *)value {
-    SBSDKBarcodeScannerConfiguration *configuration = self.scannerViewController.copyCurrentConfiguration;
-    NSNumber* _Nullable accumulationTime = [value valueForKey:@"accumulationTime"];
-    BOOL removeUnconnectedResults = [value valueForKey:@"removeUnconnectedResults"];
-    NSString* _Nullable method = [value valueForKey:@"method"];
-    
-    
-    [RNScanbotBarcodeScannerViewControllerWrapper setConfigAccumulation:configuration
-                                                       accumulationTime:accumulationTime != nil ? [accumulationTime intValue] : 500
-                                               removeUnconnectedResults:removeUnconnectedResults
-                                                                 method:method];
-    self.scannerViewController.configuration = configuration;
+- (void) setOverlayLoadingTextValue:(NSString * _Nullable) value {
+    [self.scannerViewController overlayLoadingTextValue:value];
 }
 
-- (void) setOverlayEnabled:(BOOL) value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setOverlayEnabled:self.scannerViewController value:value];
+- (void) setOverlayBarcodeItemOverlayViewBinder:(BOOL) value {
+    [self.scannerViewController overlayViewBinder:value];
 }
 
-- (void) setOverlayPolygonColor:(UIColor * _Nullable) value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setOverlayPolygonColor:self.scannerViewController value:value];
-}
+// MARK: Barcode Configuration
 
-- (void) setOverlayStrokeColor:(UIColor * _Nullable) value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setOverlayStrokeColor:self.scannerViewController value:value];
+- (void) setConfigFormatConfigurations: (NSArray<NSDictionary<NSString *, id> *> * _Nullable)containerConfigurations {
+    [self.scannerViewController configFormatConfigurations:containerConfigurations];
 }
 
-- (void) setOverlayTextColor:(UIColor * _Nullable) value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setOverlayTextColor:self.scannerViewController value:value];
+- (void) setConfigExtractedDocumentFormats: (NSArray<NSString *> * _Nullable)formats {
+    [self.scannerViewController configExtractedDocumentFormats:formats];
 }
 
-- (void) setOverlayTextContainerColor:(UIColor * _Nullable) value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setOverlayTextContainerColor:self.scannerViewController value:value];
+- (void) setConfigOnlyAcceptDocuments: (BOOL)value {
+    [self.scannerViewController configOnlyAcceptDocuments:value];
 }
 
-- (void) setOverlayTextFormat:(NSString * _Nullable) value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setOverlayTextFormat:self.scannerViewController value:value];
+- (void) setConfigReturnBarcodeImage: (BOOL)value {
+    [self.scannerViewController configReturnBarcodeImage:value];
 }
 
-- (void) setOverlayLoadingTextValue:(NSString * _Nullable) value {
-    self.barcodeItemOverlayViewLoadingText = value;
+- (void) setConfigEngineMode: (NSString * _Nullable)value {
+    [self.scannerViewController configEngineMode:value];
 }
 
-- (void) setOverlayBarcodeItemOverlayViewBinder:(BOOL) value {
-    
-    if(value){
-        if (self.barcodeItemOverlayViewBinders == nil) {
-            self.barcodeItemOverlayViewBinders = [[NSMutableDictionary alloc] init];
-        }
-    } else {
-        self.barcodeItemOverlayViewBinders = nil;
-    }
+- (void) setConfigOptimizedForOverlays: (BOOL)value {
+    [self.scannerViewController configOptimizedForOverlays:value];
 }
 
-- (void) setHardwareButtonsEnabled:(BOOL) value {
-    [RNScanbotBarcodeScannerViewControllerWrapper setHardwareButtonsEnabled:self.scannerViewController value:value];
+- (void) setConfigAccumulation: (NSDictionary *)value {
+    [self.scannerViewController configAccumulationConfiguration:value];
 }
 
+// MARK: Commands
+
 - (void) freezeCamera {
-    [RNScanbotBarcodeScannerViewControllerWrapper freezeCamera:self.scannerViewController];
+    [self.scannerViewController freezeCamera];
 }
 
 - (void) unfreezeCamera {
-    [RNScanbotBarcodeScannerViewControllerWrapper unfreezeCamera:self.scannerViewController];
+    [self.scannerViewController unfreezeCamera];
 }
 
 - (void)bindBarcodeItemOverlayView:(nonnull NSString *)barcodeItemUuid bindingConfig:(nonnull NSString *)bindingConfigJson {
-    [RNScanbotBarcodeScannerViewControllerWrapper updateBarcodeItemOverlayViewBinderInDictionary:self.barcodeItemOverlayViewBinders
-                                                                                 barcodeItemUuid:barcodeItemUuid
-                                                                    barcodeItemOverlayViewConfigJson:bindingConfigJson];
+    [self.scannerViewController bindBarcodeItemOverlayViewWithBarcodeID:barcodeItemUuid bindingConfigJson:bindingConfigJson];
 }
 
-- (void)barcodeScannerController:(SBSDKBarcodeScannerViewController *)controller
-                 didScanBarcodes:(NSArray<SBSDKBarcodeItem *> * _Nonnull)codes {
+//MARK: Delegate Events
 
-    if(!self.onBarcodeScannerResult) {
+- (void)onError:(NSString * _Nonnull)errorMessage errorCode:(NSInteger)errorCode {
+    if(!self.onError){
         return;
     }
-    if(codes.count == 0) {
-        return;
-    }
-
-    NSString *result = [RNScanbotBarcodeScannerViewControllerWrapper jsonFromResultOrNil:codes];
-    if(result != nil){
-        self.onBarcodeScannerResult(@{@"result":result});
-        
-        [RNScanbotBarcodeScannerViewControllerWrapper addBarcodeItemOverlayViewInitialBinderInDictionary:self.barcodeItemOverlayViewBinders
-                                                                                             loadingText:self.barcodeItemOverlayViewLoadingText
-                                                                                                barcodes:codes];
-    }
-}
 
-- (BOOL)barcodeScannerControllerShouldDetectBarcodes:(SBSDKBarcodeScannerViewController * _Nonnull)controller{
-    return _scanningEnabled;
+    self.onError(@{@"message": errorMessage, @"code": @(errorCode)});
 }
 
-- (void)barcodeTrackingOverlay:(SBSDKBarcodeTrackingOverlayController *)controller didTapOnBarcode:(SBSDKBarcodeItem * _Nonnull)barcode; {
-
-    if(!self.onSelectBarcodeResult){
+- (void)onScannedBarcode:(NSString * _Nonnull)barcode {
+    if(!self.onBarcodeScannerResult){
         return;
     }
 
-    NSString *result = [RNScanbotBarcodeScannerViewControllerWrapper jsonFromBarcodeOrNil:barcode];
-    if(result != nil){
-        self.onSelectBarcodeResult(@{@"result":result});
-    }
-
+    self.onBarcodeScannerResult(@{@"result":barcode});
 }
 
-- (SBSDKBarcodeTrackedViewPolygonStyle *)barcodeTrackingOverlay:(SBSDKBarcodeTrackingOverlayController *)controller
-                                                polygonStyleFor:(SBSDKBarcodeItem *)barcode
-                                                  proposedStyle:(SBSDKBarcodeTrackedViewPolygonStyle *)proposedStyle {
-    if (self.barcodeItemOverlayViewBinders != nil) {
-        NSDictionary *barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:[barcode uuid]];
-        
-        return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodePolygonStyle:barcode
-                                                          barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding
-                                                                          proposedStyle:proposedStyle];
-    } else {
-        return proposedStyle;
-    }
-}
-
-- (SBSDKBarcodeTrackedViewTextStyle *)barcodeTrackingOverlay:(SBSDKBarcodeTrackingOverlayController *)controller
-                                                textStyleFor:(SBSDKBarcodeItem *)barcode
-                                               proposedStyle:(SBSDKBarcodeTrackedViewTextStyle *)proposedStyle{
-    if (self.barcodeItemOverlayViewBinders != nil) {
-        NSDictionary *barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:[barcode uuid]];
-        
-        return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodeOverlayViewTextStyle:barcode
-                                                                  barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding
-                                                                                  proposedStyle:proposedStyle];
-    } else {
-        return proposedStyle;
+- (void)onSelectedBarcode:(NSString * _Nonnull)barcode {
+    if(!self.onSelectBarcodeResult){
+        return;
     }
-}
 
-- (NSString * _Nonnull)barcodeTrackingOverlay:(SBSDKBarcodeTrackingOverlayController * _Nonnull)controller overrideTextFor:(SBSDKBarcodeItem * _Nonnull)barcode proposedString:(NSString * _Nonnull)proposedString {
-    
-    NSString * _Nonnull barcodeItemUuid = [barcode uuid];
-    NSDictionary * _Nullable barcodeItemOverlayViewBinding = nil;
-    
-    if (self.barcodeItemOverlayViewBinders != nil) {
-        barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:barcodeItemUuid];
-    }
-    
-    return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodeOverlayViewText:barcodeItemUuid
-                                                                        proposedString:proposedString
-                                                         barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding];
+    self.onSelectBarcodeResult(@{@"result":barcode});
 }
 
 @end
 
-
 #endif

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerView.h

@@ -1,20 +1,24 @@
 
 #ifdef RCT_NEW_ARCH_ENABLED
+#import "RCTFabricComponentsPlugins.h"
 #import <React/RCTViewComponentView.h>
-#import <UIKit/UIKit.h>
-
 #import <React/UIView+React.h>
+#import <React/RCTConversions.h>
+
+#import <react/renderer/components/RNScanbotBarcodeScannerViewSpec/ComponentDescriptors.h>
+#import <react/renderer/components/RNScanbotBarcodeScannerViewSpec/EventEmitters.h>
+#import <react/renderer/components/RNScanbotBarcodeScannerViewSpec/Props.h>
+#import <react/renderer/components/RNScanbotBarcodeScannerViewSpec/RCTComponentViewHelpers.h>
 
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
-#import "RNScanbotBarcodeScannerViewControllerWrapper.h"
-#import <ScanbotBarcodeSDKWrapper/ScanbotBarcodeSDKWrapper-Swift.h>
+
+#import "RNScanbotBarcodeScannerViewOperators.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNScanbotBarcodeScannerView : RCTViewComponentView<
-    SBSDKBarcodeScannerViewControllerDelegate,
-    SBSDKBarcodeTrackingOverlayControllerDelegate
->
+@interface RNScanbotBarcodeScannerView : RCTViewComponentView
 
 @end