@phucprime/react-native-image-editor 1.0.3 → 1.0.4

package/README.md

@@ -1,34 +1,50 @@
 <h1 align="center">@phucprime/react-native-image-editor</h1>
 
 <p align="center">
-  Native image editor for React Native — crop, draw, text, stickers, and more.<br/>
-  Supports <strong>New Architecture</strong> (Fabric + TurboModules) and the classic bridge.
+  A high-performance, native image editing library for React Native — crop, draw, text, stickers, and more.<br/>
+  Fully supports the <strong>New Architecture</strong> (Fabric + TurboModules) and legacy bridge mode.
 </p>
 
 <p align="center">
   <a href="https://www.npmjs.com/package/@phucprime/react-native-image-editor"><img src="https://img.shields.io/npm/v/@phucprime/react-native-image-editor.svg?style=flat-square" alt="npm version" /></a>
   <a href="https://www.npmjs.com/package/@phucprime/react-native-image-editor"><img src="https://img.shields.io/npm/dm/@phucprime/react-native-image-editor.svg?style=flat-square" alt="npm downloads" /></a>
   <a href="https://github.com/phucprime/react-native-image-editor/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/@phucprime/react-native-image-editor.svg?style=flat-square" alt="license" /></a>
+  <a href="https://reactnative.dev/docs/the-new-architecture/landing-page"><img src="https://img.shields.io/badge/React%20Native-New%20Architecture-blue?style=flat-square" alt="New Architecture Ready" /></a>
 </p>
 
 ---
 
-| iOS | Android |
-| :-: | :-: |
+## ⚡ Features
+
+- ✂️ **Image Cropping**: Precision native cropping UI.
+- 🎨 **Freehand Drawing**: Brush tool with custom color choices.
+- ✍️ **Text Overlays**: Add, position, scale, and rotate text with custom colors.
+- 🎭 **Stickers**: Add customizable sticker overlays.
+- 🚀 **TurboModules Support**: Native performance on React Native New Architecture.
+
+## 📱 Screenshots
+
+|                   iOS                    |                   Android                    |
+| :--------------------------------------: | :------------------------------------------: |
 | <img src="assets/ios.gif" width="280" /> | <img src="assets/android.gif" width="280" /> |
 
-## Compatibility
+---
+
+## 📋 Compatibility
 
-| | Minimum | Tested |
-| --- | --- | --- |
-| React Native | 0.73 | **0.78.2** |
-| iOS | 13.0 | 18 |
-| Android | API 24 | API 35 |
-| Architecture | Old Arch ✅ | **New Arch ✅** |
+| Platform / Tool  | Minimum     | Tested          |
+| ---------------- | ----------- | --------------- |
+| **React Native** | `>= 0.73`   | **`0.78.2`**    |
+| **React**        | `>= 18.2.0` | **`19.0.0`**    |
+| **iOS**          | `13.0`      | `18.0`          |
+| **Android**      | API 24      | API 35          |
+| **Architecture** | Old Arch ✅ | **New Arch ✅** |
 
-> Requires **JDK 17** and **Gradle 8.x** for Android builds.
+> **Note:** Requires **JDK 17** and **Gradle 8.x** for Android builds.
 
-## Installation
+---
+
+## 📦 Installation
 
 ```bash
 npm install @phucprime/react-native-image-editor
@@ -75,7 +91,7 @@ Add activities to `AndroidManifest.xml`:
 <activity android:name="com.yalantis.ucrop.UCropActivity" />
 ```
 
-## Usage
+## 🛠️ Usage
 
 ### Promise API (recommended)
 
@@ -98,29 +114,33 @@ ImageEditor.open({
 });
 ```
 
-## Options
+## ⚙️ Configuration Options
+
+| Property         | Type       | Default         | Description                                                                                            |
+| ---------------- | ---------- | --------------- | ------------------------------------------------------------------------------------------------------ |
+| `path`           | `string`   | **Required**    | Local file URI/path of the image to edit.                                                              |
+| `colors`         | `string[]` | Default palette | Array of hex color strings for drawing and text.                                                       |
+| `stickers`       | `string[]` | `[]`            | List of sticker image names located in native resource folders.                                        |
+| `hiddenControls` | `string[]` | `[]`            | Array of controls to hide (`'text'`, `'clear'`, `'draw'`, `'save'`, `'share'`, `'sticker'`, `'crop'`). |
+| `languages`      | `object`   | English         | Object map for localized UI text strings.                                                              |
 
-| Property | Type | Description |
-| -------- | ---- | ----------- |
-| `path` | `string` | Path to the image file |
-| `colors` | `string[]` | Hex colors for draw/text palette |
-| `stickers` | `string[]` | Sticker image names from native resources |
-| `hiddenControls` | `string[]` | Hide: `'text'` `'clear'` `'draw'` `'save'` `'share'` `'sticker'` `'crop'` |
-| `languages` | `object` | UI localization strings |
+> **Tip:** Use [react-native-fs](https://github.com/itinance/react-native-fs) or `@react-native-camera-roll/camera-roll` to handle native file paths in sandbox directories before passing them to the editor.
 
-> **Tip:** Use [react-native-fs](https://github.com/itinance/react-native-fs) to copy images into the app sandbox before editing.
+---
 
-## Stickers
+## 🎨 Adding Custom Stickers
 
-- **iOS** — Add images to the Resources folder
-- **Android** — Add images to the `drawable` folder
+- **iOS**: Add image assets (`.png`) to your main Xcode Project's **Resources** bundle.
+- **Android**: Add image assets (`.png`) to `android/app/src/main/res/drawable/`.
 
-See the [Example](Example/) project for a working setup.
+##### Refer to the [Example](Example/) project for a ready-to-run demonstration setup.
 
-## Credits
+## 📄 License
 
-Based on [prscX/react-native-photo-editor](https://github.com/prscX/react-native-photo-editor), with photo editor SDKs by [eventtus](https://github.com/eventtus).
+Distributed under the [Apache 2.0 License](LICENSE).
+
+---
 
-## License
+## 🙏 Credits
 
-[Apache 2.0](LICENSE)
+Maintained by **[nguyenhoangphucvnm](https://github.com/nguyenhoangphucvnm)**. Based on [prscX/react-native-photo-editor](https://github.com/prscX/react-native-photo-editor), built upon native photo editor SDKs.

package/android/build.gradle

@@ -68,7 +68,11 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.facebook.react:react-native:+'
+    // Use compileOnly with the RN 0.71+ artifact name.
+    // 'react-native:+' open range risks version skew between codegen output
+    // and runtime; compileOnly ensures the host app's own react-android
+    // version is used at runtime without pulling in a second copy.
+    compileOnly 'com.facebook.react:react-android'
     implementation files('libs/photo-editor-android.jar')
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
     implementation 'com.google.android.material:material:1.9.0'

package/android/src/main/java/ui/photoeditor/RNPhotoEditorModule.java

@@ -3,105 +3,200 @@ package ui.photoeditor;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.ahmedadeltito.photoeditor.PhotoEditorActivity;
 import com.ahmedadeltito.photoeditor.TranslationService;
+
 import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.BaseActivityEventListener;
-import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+
 import java.util.ArrayList;
 
+/**
+ * Native module that opens a full-screen photo editor Activity and returns the
+ * saved image path (or a cancellation rejection) via a {@link Promise}.
+ *
+ * Promise vs Callback
+ * ───────────────────
+ * The previous implementation stored two {@code Callback} instances as instance
+ * fields and invoked them from {@code onActivityResult}. On New Architecture,
+ * {@code Callback} objects are backed by {@code CallbackHolder} references tied
+ * to the JS context. If the JS context reloads (Fast Refresh, error recovery)
+ * while the editor Activity is open, those stored callbacks become dangling
+ * references — invoking them is either a no-op or a crash.
+ *
+ * {@link Promise} has the same lifetime guarantee but is explicitly designed for
+ * single-shot async operations that span multiple native frames/events. It is
+ * also the only pattern fully validated by the New Architecture codegen.
+ *
+ * Thread safety
+ * ─────────────
+ * {@code mPendingPromise} is written on the JS thread (inside {@code edit()})
+ * and read/nulled on the UI thread (inside {@code onActivityResult}). Both
+ * accesses are guarded by synchronisation on {@code this}, and the field is
+ * marked {@code volatile} so the write is immediately visible across threads.
+ */
 public class RNPhotoEditorModule extends RNPhotoEditorSpec {
 
+    /** Module name as registered in JS — must match TurboModuleRegistry.getEnforcing('RNPhotoEditor'). */
+    public static final String NAME = "RNPhotoEditor";
+
+    /** startActivityForResult request code — arbitrary, just needs to be unique per Activity. */
     private static final int PHOTO_EDITOR_REQUEST = 1;
-    private static final String E_PHOTO_EDITOR_CANCELLED = "E_PHOTO_EDITOR_CANCELLED";
-
-    private Callback mDoneCallback;
-    private Callback mCancelCallback;
-
-    private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
-        @Override
-        public void onActivityResult(
-            Activity activity,
-            int requestCode,
-            int resultCode,
-            Intent intent
-        ) {
-            if (requestCode == PHOTO_EDITOR_REQUEST) {
-                if (mDoneCallback != null) {
+
+    /** Error code returned when the user cancels the editor. */
+    private static final String E_CANCELLED = "CANCELLED";
+
+    /** The in-flight Promise. Volatile for cross-thread visibility; guarded by synchronized(this). */
+    private volatile @Nullable Promise mPendingPromise;
+
+    // ─── Activity result listener ─────────────────────────────────────────────
+
+    private final ActivityEventListener mActivityEventListener =
+            new BaseActivityEventListener() {
+                @Override
+                public void onActivityResult(
+                        Activity activity,
+                        int requestCode,
+                        int resultCode,
+                        @Nullable Intent intent) {
+
+                    if (requestCode != PHOTO_EDITOR_REQUEST) return;
+
+                    Promise promise;
+                    synchronized (RNPhotoEditorModule.this) {
+                        promise = mPendingPromise;
+                        mPendingPromise = null;
+                    }
+
+                    if (promise == null) return; // JS context already gone — nothing to do
+
                     if (resultCode == Activity.RESULT_CANCELED) {
-                        mCancelCallback.invoke(resultCode);
-                    } else {
-                        mDoneCallback.invoke(intent.getExtras().getString("imagePath"));
+                        promise.reject(E_CANCELLED, "User cancelled the editor");
+                        return;
+                    }
+
+                    // RESULT_OK — extract the saved path from the result Intent
+                    if (intent == null || intent.getExtras() == null) {
+                        promise.reject("NO_RESULT", "Editor returned no data");
+                        return;
                     }
+
+                    String imagePath = intent.getExtras().getString("imagePath");
+                    if (imagePath == null) {
+                        promise.reject("NO_PATH", "Editor returned null image path");
+                        return;
+                    }
+
+                    promise.resolve(imagePath);
                 }
+            };
 
-                mCancelCallback = null;
-                mDoneCallback = null;
-            }
-        }
-    };
+    // ─── Constructor ──────────────────────────────────────────────────────────
 
     public RNPhotoEditorModule(ReactApplicationContext reactContext) {
         super(reactContext);
         reactContext.addActivityEventListener(mActivityEventListener);
     }
 
+    // ─── TurboModule contract ─────────────────────────────────────────────────
+
     @Override
+    @NonNull
     public String getName() {
-        return "RNPhotoEditor";
+        return NAME;
     }
 
+    // ─── @ReactMethod ─────────────────────────────────────────────────────────
+
+    /**
+     * Open the photo editor.
+     *
+     * Codegen maps this to the {@code edit(props: UnsafeObject): Promise<string>}
+     * spec defined in {@code NativeRNPhotoEditor.ts}.
+     *
+     * @param props   Editor configuration (path, colors, stickers, hiddenControls, languages).
+     * @param promise Resolved with the saved image path; rejected with code
+     *                {@value E_CANCELLED} when the user dismisses.
+     */
     @ReactMethod
-    public void Edit(final ReadableMap props, final Callback onDone, final Callback onCancel) {
-        String path = props.getString("path");
-        // print all readable map
-        TranslationService.getInstance().init(props.getMap("languages").toHashMap());
-
-        //Process Stickers
-        ReadableArray stickers = props.getArray("stickers");
-        ArrayList<Integer> stickersIntent = new ArrayList<Integer>();
-
-        for (int i = 0; i < stickers.size(); i++) {
-            int drawableId = getReactApplicationContext()
-                .getResources()
-                .getIdentifier(
-                    stickers.getString(i),
-                    "drawable",
-                    getReactApplicationContext().getPackageName()
-                );
-
-            stickersIntent.add(drawableId);
+    public void edit(@NonNull ReadableMap props, @NonNull Promise promise) {
+
+        // ── Guard: reject immediately if there is already an editor open ──────
+        synchronized (this) {
+            if (mPendingPromise != null) {
+                promise.reject("ALREADY_OPEN", "An editor session is already in progress");
+                return;
+            }
+            mPendingPromise = promise;
+        }
+
+        // ── Guard: need a live Activity to start the editor ───────────────────
+        Activity activity = getCurrentActivity();
+        if (activity == null) {
+            synchronized (this) { mPendingPromise = null; }
+            promise.reject("NO_ACTIVITY", "No active Android Activity found");
+            return;
         }
 
-        //Process Hidden Controls
-        ReadableArray hiddenControls = props.getArray("hiddenControls");
-        ArrayList hiddenControlsIntent = new ArrayList<>();
+        // ── Translations ──────────────────────────────────────────────────────
+        ReadableMap languages = props.getMap("languages");
+        if (languages != null) {
+            TranslationService.getInstance().init(languages.toHashMap());
+        }
 
-        for (int i = 0; i < hiddenControls.size(); i++) {
-            hiddenControlsIntent.add(hiddenControls.getString(i));
+        // ── Stickers: string names → drawable resource IDs ────────────────────
+        ReadableArray stickersArr = props.getArray("stickers");
+        ArrayList<Integer> stickersIntent = new ArrayList<>();
+        if (stickersArr != null) {
+            for (int i = 0; i < stickersArr.size(); i++) {
+                int id = getReactApplicationContext()
+                        .getResources()
+                        .getIdentifier(
+                                stickersArr.getString(i),
+                                "drawable",
+                                getReactApplicationContext().getPackageName());
+                stickersIntent.add(id);
+            }
         }
 
-        //Process Colors
-        ReadableArray colors = props.getArray("colors");
-        ArrayList colorPickerColors = new ArrayList<>();
+        // ── Hidden controls ───────────────────────────────────────────────────
+        ReadableArray hiddenArr = props.getArray("hiddenControls");
+        ArrayList<String> hiddenControlsIntent = new ArrayList<>();
+        if (hiddenArr != null) {
+            for (int i = 0; i < hiddenArr.size(); i++) {
+                hiddenControlsIntent.add(hiddenArr.getString(i));
+            }
+        }
 
-        for (int i = 0; i < colors.size(); i++) {
-            colorPickerColors.add(Color.parseColor(colors.getString(i)));
+        // ── Colors: hex strings → android.graphics.Color ints ────────────────
+        ReadableArray colorsArr = props.getArray("colors");
+        ArrayList<Integer> colorPickerColors = new ArrayList<>();
+        if (colorsArr != null) {
+            for (int i = 0; i < colorsArr.size(); i++) {
+                try {
+                    colorPickerColors.add(Color.parseColor(colorsArr.getString(i)));
+                } catch (IllegalArgumentException ignored) {
+                    // Skip invalid color strings rather than crashing
+                }
+            }
         }
 
-        Intent intent = new Intent(getCurrentActivity(), PhotoEditorActivity.class);
-        intent.putExtra("selectedImagePath", path);
+        // ── Launch editor Activity ─────────────────────────────────────────────
+        Intent intent = new Intent(activity, PhotoEditorActivity.class);
+        intent.putExtra("selectedImagePath", props.getString("path"));
         intent.putExtra("colorPickerColors", colorPickerColors);
         intent.putExtra("hiddenControls", hiddenControlsIntent);
         intent.putExtra("stickers", stickersIntent);
 
-        mCancelCallback = onCancel;
-        mDoneCallback = onDone;
-
-        getCurrentActivity().startActivityForResult(intent, PHOTO_EDITOR_REQUEST);
+        activity.startActivityForResult(intent, PHOTO_EDITOR_REQUEST);
     }
 }

package/android/src/main/java/ui/photoeditor/RNPhotoEditorPackage.java

@@ -1,23 +1,61 @@
-
 package ui.photoeditor;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import androidx.annotation.NonNull;
 
-import com.facebook.react.ReactPackage;
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ReactPackage registration for RNPhotoEditor.
+ *
+ * Extends {@link TurboReactPackage} instead of the old {@link com.facebook.react.ReactPackage}.
+ *
+ * Why TurboReactPackage?
+ * ──────────────────────
+ * On New Architecture, React Native discovers TurboModules through the
+ * {@link TurboReactPackage#getModule} / {@link TurboReactPackage#getReactModuleInfoProvider}
+ * contract. A plain {@code ReactPackage} that only overrides
+ * {@code createNativeModules()} is never consulted by the TurboModule registry,
+ * so {@code TurboModuleRegistry.getEnforcing("RNPhotoEditor")} would throw
+ * "No TurboModule found for RNPhotoEditor" at runtime on New Arch.
+ *
+ * On Old Architecture, {@link TurboReactPackage} delegates back to
+ * {@code getModule()} so no separate code path is needed.
+ */
+public class RNPhotoEditorPackage extends TurboReactPackage {
 
-public class RNPhotoEditorPackage implements ReactPackage {
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-      return Arrays.<NativeModule>asList(new RNPhotoEditorModule(reactContext));
+    public NativeModule getModule(
+            @NonNull String name,
+            @NonNull ReactApplicationContext reactContext) {
+        if (RNPhotoEditorModule.NAME.equals(name)) {
+            return new RNPhotoEditorModule(reactContext);
+        }
+        return null;
     }
 
     @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-      return Collections.emptyList();
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            Map<String, ReactModuleInfo> map = new HashMap<>();
+            map.put(
+                RNPhotoEditorModule.NAME,
+                new ReactModuleInfo(
+                    RNPhotoEditorModule.NAME,   // name
+                    RNPhotoEditorModule.NAME,   // className (used for logging)
+                    false,   // canOverrideExistingModule
+                    false,   // needsEagerInit
+                    false,   // isCxxModule
+                    true     // isTurboModule — registers with the JSI TurboModule registry
+                )
+            );
+            return map;
+        };
     }
-}
+}

package/android/src/newarch/java/ui/photoeditor/RNPhotoEditorSpec.java

@@ -4,8 +4,16 @@ import com.facebook.react.bridge.ReactApplicationContext;
 
 /**
  * New Architecture spec wrapper.
- * On New Architecture, this extends the codegen-generated NativeRNPhotoEditorSpec
- * which provides TurboModule integration with compile-time type validation.
+ *
+ * On New Architecture, the React Native codegen generates
+ * {@code NativeRNPhotoEditorSpec} from {@code src/NativeRNPhotoEditor.ts}.
+ * That generated class already extends {@code ReactContextBaseJavaModule} and
+ * declares the abstract {@code edit(ReadableMap props, Promise promise)} method.
+ *
+ * This thin wrapper simply inherits from the generated spec so that
+ * {@link ui.photoeditor.RNPhotoEditorModule} can extend a single
+ * {@code RNPhotoEditorSpec} type regardless of architecture, keeping
+ * {@code RNPhotoEditorModule.java} in the shared {@code main} source set.
  */
 abstract class RNPhotoEditorSpec extends NativeRNPhotoEditorSpec {
     RNPhotoEditorSpec(ReactApplicationContext context) {

package/android/src/oldarch/java/ui/photoeditor/RNPhotoEditorSpec.java

@@ -1,19 +1,37 @@
 package ui.photoeditor;
 
-import com.facebook.react.bridge.Callback;
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReadableMap;
 
 /**
  * Old Architecture compatibility spec.
- * On Old Architecture (bridge mode), this extends ReactContextBaseJavaModule directly.
- * The concrete module (RNPhotoEditorModule) extends this class.
+ *
+ * On Old Architecture (classic bridge), there is no codegen-generated base
+ * class, so we hand-write the abstract contract here.
+ *
+ * The method signature mirrors the New Architecture codegen output exactly:
+ *   {@code edit(ReadableMap props, Promise promise)}
+ *
+ * This means {@link ui.photoeditor.RNPhotoEditorModule} compiles and behaves
+ * identically regardless of which source set ({@code newarch} / {@code oldarch})
+ * is active.
  */
 abstract class RNPhotoEditorSpec extends ReactContextBaseJavaModule {
+
     RNPhotoEditorSpec(ReactApplicationContext context) {
         super(context);
     }
 
-    public abstract void Edit(ReadableMap props, Callback onDone, Callback onCancel);
+    /**
+     * Open the photo editor.
+     *
+     * @param props   Editor configuration map (path, colors, stickers, …).
+     * @param promise Resolved with the saved image path on success; rejected
+     *                with code {@code "CANCELLED"} when the user dismisses.
+     */
+    public abstract void edit(@NonNull ReadableMap props, @NonNull Promise promise);
 }

package/ios/RNImageEditor.podspec

@@ -3,24 +3,55 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "../package.json")))
 
 Pod::Spec.new do |s|
-  s.name = "RNImageEditor"
-  s.version = package["version"]
-  s.summary = package["description"]
+  s.name        = "RNImageEditor"
+  s.version     = package["version"]
+  s.summary     = package["description"]
   s.description = package["description"]
-  s.homepage = package["homepage"]
-  s.license = package["license"]
-  s.author = package["author"]
-  s.source = { :git => "https://github.com/phucprime/react-native-image-editor.git", :tag => s.version }
+  s.homepage    = package["homepage"]
+  s.license     = package["license"]
+  s.author      = package["author"]
+  s.source      = {
+    :git => "https://github.com/nguyenhoangphucvnm/react-native-image-editor.git",
+    :tag => s.version
+  }
 
   s.platforms = { :ios => "13.0" }
 
   s.preserve_paths = "LICENSE", "package.json"
-  s.source_files = "**/*.{h,m,mm}"
+
+  # Include .swift — previously missing, which meant RNPhotoEditor.swift was
+  # never compiled when consumers installed this pod. The ObjC bridge (.mm)
+  # references the Swift class via RCT_EXTERN_MODULE, so both must be compiled.
+  s.source_files = "**/*.{h,m,mm,swift}"
+
+  # External photo-editor SDK (Swift framework)
   s.dependency "iOSPhotoEditor"
 
+  # Always enforce C++17 so the pod target can include C++ standard-library
+  # headers (<utility>, <vector>, <chrono>, …) pulled in transitively by
+  # React Native's TurboModule / JSI headers, regardless of RN version or
+  # architecture.  Without this flag the compiler treats .mm files as plain
+  # Objective-C and fails with "'utility' file not found".
+  s.pod_target_xcconfig = {
+    "CLANG_CXX_LANGUAGE_STANDARD"  => "c++17",
+    "OTHER_CPLUSPLUSFLAGS"         => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+  }
+
+  # install_modules_dependencies wires up all New Architecture (TurboModule /
+  # Fabric) pod dependencies automatically on RN >= 0.71.  On older RN it falls
+  # through to the else branch and adds React-Core manually.
   if respond_to?(:install_modules_dependencies, true)
     install_modules_dependencies(s)
   else
     s.dependency "React-Core"
+
+    if ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
   end
 end

package/ios/RNPhotoEditor.mm

@@ -4,11 +4,37 @@
 #import <RNPhotoEditorSpec/RNPhotoEditorSpec.h>
 #endif
 
+/**
+ * Objective-C++ bridge that exposes the Swift `RNPhotoEditor` class to
+ * React Native.
+ *
+ * Method selector change
+ * ──────────────────────
+ * The TurboModule codegen spec defines `edit(props: UnsafeObject): Promise<string>`.
+ * Codegen maps a Promise-returning method to two extra parameters on the native
+ * side — a resolve block and a reject block — using the naming convention:
+ *
+ *   edit:(NSDictionary *)props
+ *   resolve:(RCTPromiseResolveBlock)resolve
+ *   reject:(RCTPromiseRejectBlock)reject
+ *
+ * The previous selector `Edit:onDone:onCancel:` used `RCTResponseSenderBlock`
+ * which is not recognised by the TurboModule codegen validator and is unsafe
+ * across JS context reloads.
+ *
+ * requiresMainQueueSetup / methodQueue
+ * ─────────────────────────────────────
+ * Returning YES from +requiresMainQueueSetup ensures the module is initialised
+ * on the main thread.  The Swift side also overrides methodQueue to return
+ * DispatchQueue.main, so UI work happens synchronously without dispatch_async.
+ */
 @interface RCT_EXTERN_MODULE(RNPhotoEditor, NSObject)
 
-RCT_EXTERN_METHOD(Edit:(NSDictionary *)props
-                  onDone:(RCTResponseSenderBlock)onDone
-                  onCancel:(RCTResponseSenderBlock)onCancel)
+RCT_EXTERN_METHOD(
+    edit:(NSDictionary *)props
+    resolve:(RCTPromiseResolveBlock)resolve
+    reject:(RCTPromiseRejectBlock)reject
+)
 
 + (BOOL)requiresMainQueueSetup {
     return YES;
@@ -17,9 +43,9 @@ RCT_EXTERN_METHOD(Edit:(NSDictionary *)props
 @end
 
 #ifdef RCT_NEW_ARCH_ENABLED
-// Conform to the codegen-generated protocol for TurboModule support.
-// The actual implementation is in RNPhotoEditor.swift; this declaration
-// tells the compiler the Swift class satisfies the protocol.
+// Declare that the Swift class satisfies the codegen-generated protocol.
+// The actual implementation is in RNPhotoEditor.swift; this forward
+// declaration makes the compiler verify conformance at build time.
 @interface RNPhotoEditor () <NativeRNPhotoEditorSpec>
 @end
 #endif