iOS new arch (with old as fallback)

retyui · retyui · commit 643c8b676d50 · 2023-11-07T10:20:54.000+01:00
diff --git a/ios/RNCFileSystem.mm b/ios/RNCFileSystem.mm
diff --git a/ios/RNCImageEditor.h b/ios/RNCImageEditor.h
@@ -5,8 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNCImageEditorSpec.h"
+
+@interface RNCImageEditor : NSObject <NativeRNCImageEditorSpec>
+#else
 #import <React/RCTBridgeModule.h>
 
 @interface RNCImageEditor : NSObject <RCTBridgeModule>
+#endif
 
 @end
diff --git a/ios/RNCImageEditor.mm b/ios/RNCImageEditor.mm
@@ -40,15 +40,37 @@ @implementation RNCImageEditor
  *        be scaled down to `displaySize` rather than `size`.
  *        All units are in px (not points).
  */
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void) cropImage:(NSString *)uri
+         cropData:(JS::NativeRNCImageEditor::SpecCropImageCropData &)data
+         resolve:(RCTPromiseResolveBlock)resolve
+         reject:(RCTPromiseRejectBlock)reject
+{
+  CGSize size = [RCTConvert CGSize:@{ @"width": @(data.size().width()), @"height": @(data.size().height()) }];
+  CGPoint offset = [RCTConvert CGPoint:@{ @"x": @(data.offset().x()), @"y": @(data.offset().y()) }];
+  CGSize targetSize = size;
+  if (data.displaySize().has_value()) {
+    JS::NativeRNCImageEditor::SpecCropImageCropDataDisplaySize displaySize = *data.displaySize(); // Extract the value from the optional
+    // in pixels
+    targetSize = [RCTConvert CGSize:@{ @"width": @(displaySize.width()), @"height": @(displaySize.height()) }];
+  }
+  NSString *displaySize = data.resizeMode();
+  NSURLRequest *imageRequest = [NSURLRequest requestWithURL:[NSURL URLWithString: uri]];
+#else
 RCT_EXPORT_METHOD(cropImage:(NSURLRequest *)imageRequest
                   cropData:(NSDictionary *)cropData
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
-  CGRect rect = {
-    [RCTConvert CGPoint:cropData[@"offset"]],
-    [RCTConvert CGSize:cropData[@"size"]]
-  };
+  CGSize size = [RCTConvert CGSize:cropData[@"size"]];
+  CGPoint offset = [RCTConvert CGPoint:cropData[@"offset"]];
+  CGSize targetSize = size;
+  NSString *displaySize = cropData[@"resizeMode"];
+  if(displaySize){
+    targetSize = [RCTConvert CGSize:cropData[@"displaySize"]];
+  }
+#endif
+  CGRect rect = {offset,size};
   NSURL *url = [imageRequest URL];
   NSString *urlPath = [url path];
   NSString *extension = [urlPath pathExtension];
@@ -60,15 +82,13 @@ @implementation RNCImageEditor
     }
 
     // Crop image
-    CGSize targetSize = rect.size;
     CGRect targetRect = {{-rect.origin.x, -rect.origin.y}, image.size};
     CGAffineTransform transform = RCTTransformFromTargetRect(image.size, targetRect);
     UIImage *croppedImage = RCTTransformImage(image, targetSize, image.scale, transform);
 
     // Scale image
-    if (cropData[@"displaySize"]) {
-      targetSize = [RCTConvert CGSize:cropData[@"displaySize"]]; // in pixels
-      RCTResizeMode resizeMode = [RCTConvert RCTResizeMode:cropData[@"resizeMode"] ?: @"contain"];
+    if (displaySize) {
+      RCTResizeMode resizeMode = [RCTConvert RCTResizeMode:displaySize ?: @"contain"];
       targetRect = RCTTargetRect(croppedImage.size, targetSize, 1, resizeMode);
       transform = RCTTransformFromTargetRect(croppedImage.size, targetRect);
       croppedImage = RCTTransformImage(croppedImage, targetSize, image.scale, transform);
@@ -77,7 +97,7 @@ @implementation RNCImageEditor
     // Store image
     NSString *path = NULL;
     NSData *imageData = NULL;
-    
+
     if([extension isEqualToString:@"png"]){
       imageData = UIImagePNGRepresentation(croppedImage);
       path = [RNCFileSystem generatePathInDirectory:[[RNCFileSystem cacheDirectoryPath] stringByAppendingPathComponent:@"ReactNative_cropped_image_"] withExtension:@".png"];
@@ -90,14 +110,22 @@ @implementation RNCImageEditor
 
     NSError *writeError;
     NSString *uri = [RNCImageUtils writeImage:imageData toPath:path error:&writeError];
-      
+
     if (writeError != nil) {
       reject(@(writeError.code).stringValue, writeError.description, writeError);
       return;
     }
-      
+
     resolve(uri);
   }];
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeRNCImageEditorSpecJSI>(params);
+}
+#endif
+
 @end
diff --git a/ios/RNCImageEditor.xcodeproj/project.pbxproj b/ios/RNCImageEditor.xcodeproj/project.pbxproj
@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1478DE2B22A0403F00D818FA /* RNCFileSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 1478DE2A22A0403F00D818FA /* RNCFileSystem.m */; };
-		1478DE2E22A044E500D818FA /* RNCImageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 1478DE2D22A044E500D818FA /* RNCImageUtils.m */; };
-		B3E7B58A1CC2AC0600A0062D /* RNCImageEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNCImageEditor.m */; };
+		C8EA266C2AF7E7CA008069C8 /* RNCFileSystem.mm in Sources */ = {isa = PBXBuildFile; fileRef = C8EA266B2AF7E7CA008069C8 /* RNCFileSystem.mm */; };
+		C8EA266E2AF7E7D5008069C8 /* RNCImageEditor.mm in Sources */ = {isa = PBXBuildFile; fileRef = C8EA266D2AF7E7D5008069C8 /* RNCImageEditor.mm */; };
+		C8EA26702AF7E7DB008069C8 /* RNCImageUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = C8EA266F2AF7E7DB008069C8 /* RNCImageUtils.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -26,12 +26,12 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRNCImageEditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNCImageEditor.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		1478DE2A22A0403F00D818FA /* RNCFileSystem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNCFileSystem.m; sourceTree = "<group>"; };
 		1478DE2C22A0406800D818FA /* RNCFileSystem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNCFileSystem.h; sourceTree = "<group>"; };
-		1478DE2D22A044E500D818FA /* RNCImageUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNCImageUtils.m; sourceTree = "<group>"; };
 		1478DE2F22A0450800D818FA /* RNCImageUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNCImageUtils.h; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RNCImageEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNCImageEditor.h; sourceTree = "<group>"; };
-		B3E7B5891CC2AC0600A0062D /* RNCImageEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNCImageEditor.m; sourceTree = "<group>"; };
+		C8EA266B2AF7E7CA008069C8 /* RNCFileSystem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RNCFileSystem.mm; sourceTree = "<group>"; };
+		C8EA266D2AF7E7D5008069C8 /* RNCImageEditor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RNCImageEditor.mm; sourceTree = "<group>"; };
+		C8EA266F2AF7E7DB008069C8 /* RNCImageUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RNCImageUtils.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -56,12 +56,12 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				1478DE2A22A0403F00D818FA /* RNCFileSystem.m */,
-				1478DE2D22A044E500D818FA /* RNCImageUtils.m */,
 				1478DE2F22A0450800D818FA /* RNCImageUtils.h */,
+				C8EA266F2AF7E7DB008069C8 /* RNCImageUtils.mm */,
 				1478DE2C22A0406800D818FA /* RNCFileSystem.h */,
+				C8EA266B2AF7E7CA008069C8 /* RNCFileSystem.mm */,
 				B3E7B5881CC2AC0600A0062D /* RNCImageEditor.h */,
-				B3E7B5891CC2AC0600A0062D /* RNCImageEditor.m */,
+				C8EA266D2AF7E7D5008069C8 /* RNCImageEditor.mm */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -105,6 +105,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 58B511D21A9E6C8500147676;
@@ -122,9 +123,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1478DE2E22A044E500D818FA /* RNCImageUtils.m in Sources */,
-				1478DE2B22A0403F00D818FA /* RNCFileSystem.m in Sources */,
-				B3E7B58A1CC2AC0600A0062D /* RNCImageEditor.m in Sources */,
+				C8EA266C2AF7E7CA008069C8 /* RNCFileSystem.mm in Sources */,
+				C8EA266E2AF7E7D5008069C8 /* RNCImageEditor.mm in Sources */,
+				C8EA26702AF7E7DB008069C8 /* RNCImageUtils.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/ios/RNCImageUtils.mm b/ios/RNCImageUtils.mm
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "codegenConfig": {
-    "name": "RNImageEditorSpec",
+    "name": "RNCImageEditorSpec",
     "type": "modules",
     "jsSrcsDir": "src"
   },
diff --git a/react-native-image-editor.podspec b/react-native-image-editor.podspec
@@ -1,6 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "react-native-image-editor"
@@ -13,8 +14,30 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "9.0"
 
   s.source       = { :git => "https://github.com/callstack/react-native-image-editor.git", :tag => "#{s.version}" }
-  s.source_files  = "ios/**/*.{h,m}"
+  s.source_files  = "ios/**/*.{h,m,mm}"
 
   s.dependency 'React'
+  s.dependency "React-Core"
   s.dependency 'React-RCTImage'
+
+  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  end
+
+  # Don't install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+   end
 end
diff --git a/src/NativeRNCImageEditor.ts b/src/NativeRNCImageEditor.ts
@@ -2,39 +2,41 @@ import type { TurboModule } from 'react-native';
 import type { Double } from 'react-native/Libraries/Types/CodegenTypes';
 import { TurboModuleRegistry } from 'react-native';
 
-export interface ImageCropData {
-  /**
-   * The top-left corner of the cropped image, specified in the original
-   * image's coordinate space.
-   */
-  offset: {
-    x: Double;
-    y: Double;
-  };
-  /**
-   * The size (dimensions) of the cropped image, specified in the original
-   * image's coordinate space.
-   */
-  size: {
-    width: Double;
-    height: Double;
-  };
-  /**
-   * (Optional) size to scale the cropped image to.
-   */
-  displaySize?: {
-    width: Double;
-    height: Double;
-  };
-  /**
-   * (Optional) the resizing mode to use when scaling the image. If the
-   * `displaySize` param is not specified, this has no effect.
-   */
-  resizeMode?: string;
-}
-
 export interface Spec extends TurboModule {
-  cropImage(uri: string, cropData: ImageCropData): Promise<string>;
+  cropImage(
+    uri: string,
+    cropData: {
+      // inlined `ImageCropData` type (for older RN versions 71 and below)
+      /**
+       * The top-left corner of the cropped image, specified in the original
+       * image's coordinate space.
+       */
+      offset: {
+        x: Double;
+        y: Double;
+      };
+      /**
+       * The size (dimensions) of the cropped image, specified in the original
+       * image's coordinate space.
+       */
+      size: {
+        width: Double;
+        height: Double;
+      };
+      /**
+       * (Optional) size to scale the cropped image to.
+       */
+      displaySize?: {
+        width: Double;
+        height: Double;
+      };
+      /**
+       * (Optional) the resizing mode to use when scaling the image. If the
+       * `displaySize` param is not specified, this has no effect.
+       */
+      resizeMode?: string;
+    }
+  ): Promise<string>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNCImageEditor');
diff --git a/src/index.ts b/src/index.ts
@@ -6,10 +6,7 @@
  *
  */
 import { NativeModules, Platform } from 'react-native';
-import type {
-  ImageCropData as ImageCropDataSpec,
-  Spec,
-} from './NativeRNCImageEditor';
+import type { Spec } from './NativeRNCImageEditor';
 
 const LINKING_ERROR =
   `The package '@react-native-community/image-editor' doesn't seem to be linked. Make sure: \n\n` +
@@ -35,8 +32,10 @@ const RNCImageEditor: Spec = RNCImageEditorModule
       }
     );
 
+type ImageCropDataFromSpec = Parameters<Spec['cropImage']>[1];
+
 export interface ImageCropData
-  extends Pick<ImageCropDataSpec, 'offset' | 'size' | 'displaySize'> {
+  extends Pick<ImageCropDataFromSpec, 'offset' | 'size' | 'displaySize'> {
   resizeMode?: 'contain' | 'cover' | 'stretch';
   // ^^^ codegen doesn't support union types yet
   // so to provide more type safety we override the type here
