fix: maxPhotoQualityPrioritization and add barcode prop on new arch

Author: WoLewicki

android/src/paper/java/com/facebook/react/viewmanagers/CKCameraManagerDelegate.java

@@ -13,11 +13,10 @@
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
 
-public class CKCameraManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & CKCameraManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class CKCameraManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & CKCameraManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public CKCameraManagerDelegate(U viewManager) {
     super(viewManager);
   }
@@ -60,9 +59,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "frameColor":
         mViewManager.setFrameColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
-      case "barcodeFrameSize":
-        mViewManager.setBarcodeFrameSize(view, value == null ? null : (ReadableMap) value);
-        break;
       case "ratioOverlay":
         mViewManager.setRatioOverlay(view, value == null ? null : (String) value);
         break;
@@ -81,6 +77,9 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "scanThrottleDelay":
         mViewManager.setScanThrottleDelay(view, value == null ? 0 : ((Double) value).intValue());
         break;
+      case "barcodeFrameSize":
+        mViewManager.setBarcodeFrameSize(view, (ReadableMap) value);
+        break;
       case "shutterPhotoSound":
         mViewManager.setShutterPhotoSound(view, value == null ? false : (boolean) value);
         break;

android/src/paper/java/com/facebook/react/viewmanagers/CKCameraManagerInterface.java

@@ -26,13 +26,13 @@ public interface CKCameraManagerInterface<T extends View> {
   void setShowFrame(T view, boolean value);
   void setLaserColor(T view, @Nullable Integer value);
   void setFrameColor(T view, @Nullable Integer value);
-  void setBarcodeFrameSize(T view, @Nullable ReadableMap value);
   void setRatioOverlay(T view, @Nullable String value);
   void setRatioOverlayColor(T view, @Nullable Integer value);
   void setResetFocusTimeout(T view, int value);
   void setResetFocusWhenMotionDetected(T view, boolean value);
   void setResizeMode(T view, @Nullable String value);
   void setScanThrottleDelay(T view, int value);
+  void setBarcodeFrameSize(T view, @Nullable ReadableMap value);
   void setShutterPhotoSound(T view, boolean value);
   void setShutterAnimationDuration(T view, int value);
   void setOutputPath(T view, @Nullable String value);

example/ios/Podfile.lock

@@ -1509,7 +1509,7 @@ PODS:
     - React-logger (= 0.76.3)
     - React-perflogger (= 0.76.3)
     - React-utils (= 0.76.3)
-  - ReactNativeCameraKit (14.1.0):
+  - ReactNativeCameraKit (14.2.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1799,7 +1799,7 @@ SPEC CHECKSUMS:
   React-utils: ee370a52b08a000963af1a60c31e6c87a70620a5
   ReactCodegen: 5148a0102fc8f0a1f9b05d955da886b44447679d
   ReactCommon: b8485556b596ef2f44f59bc586113bda138fb804
-  ReactNativeCameraKit: e72b838dac4ea2da19b7eb5d00b23125072790fd
+  ReactNativeCameraKit: 72cc60b69ae192fe55a3e3f294ed46833308bb22
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: 3deb2471faa9916c8a82dda2a22d3fba2620ad37
 

ios/ReactNativeCameraKit/CKCameraViewComponentView.mm

@@ -167,7 +167,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
     }
     id maxPhotoQualityPrioritization = CKConvertFollyDynamicToId(newProps.maxPhotoQualityPrioritization);
     if (maxPhotoQualityPrioritization != nil && [maxPhotoQualityPrioritization isKindOfClass:NSString.class]) {
-        _view.maxPhotoQualityPrioritization = [flashMode isEqualToString:@"balanced"] ? CKMaxPhotoQualityPrioritizationBalanced :  [flashMode isEqualToString:@"quality"] ? CKMaxPhotoQualityPrioritizationQuality : CKMaxPhotoQualityPrioritizationSpeed;
+        _view.maxPhotoQualityPrioritization = [maxPhotoQualityPrioritization isEqualToString:@"balanced"] ? CKMaxPhotoQualityPrioritizationBalanced :  [maxPhotoQualityPrioritization isEqualToString:@"quality"] ? CKMaxPhotoQualityPrioritizationQuality : CKMaxPhotoQualityPrioritizationSpeed;
         [changedProps addObject:@"maxPhotoQualityPrioritization"];
     }
     id torchMode = CKConvertFollyDynamicToId(newProps.torchMode);
@@ -237,6 +237,13 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
         _view.maxZoom = maxZoom;
         [changedProps addObject:@"maxZoom"];
     }
+    float barcodeWidth = newProps.barcodeFrameSize.width;
+    float barcodeHeight = newProps.barcodeFrameSize.height;
+    if (barcodeWidth != [_view.barcodeFrameSize[@"width"] floatValue] || barcodeHeight != [_view.barcodeFrameSize[@"height"] floatValue]) {
+        _view.barcodeFrameSize = @{@"width": @(barcodeWidth), @"height": @(barcodeHeight)};
+        [changedProps addObject:@"barcodeFrameSize"];
+    }
+    
 
     [super updateProps:props oldProps:oldProps];
     [_view didSetProps:changedProps];

src/specs/CameraNativeComponent.ts

@@ -4,6 +4,8 @@ import type {
   DirectEventHandler,
   Int32,
   Double,
+  WithDefault,
+  Float,
 } from 'react-native/Libraries/Types/CodegenTypes';
 
 type OnReadCodeData = {
@@ -42,6 +44,7 @@ export interface NativeProps extends ViewProps {
   resetFocusWhenMotionDetected?: boolean;
   resizeMode?: string;
   scanThrottleDelay?: Int32;
+  barcodeFrameSize?: { width?: WithDefault<Float, 300>; height?: WithDefault<Float, 150> };
   shutterPhotoSound?: boolean;
   onCaptureButtonPressIn?: DirectEventHandler<{}>;
   onCaptureButtonPressOut?: DirectEventHandler<{}>;