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

package/android/build.gradle

@@ -4,6 +4,10 @@ def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+def isNewArchitectureEnabled() {
+    return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a
@@ -21,6 +25,10 @@ buildscript {
     }
 }
 
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
+
 android {
     namespace "ui.photoeditor"
     compileSdkVersion safeExtGet('compileSdkVersion', 35)
@@ -41,6 +49,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch']
+            } else {
+                java.srcDirs += ['src/oldarch']
+            }
+        }
+    }
 }
 
 repositories {
@@ -53,7 +71,6 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation files('libs/photo-editor-android.jar')
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
-    implementation 'com.nineoldandroids:library:2.4.0'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

package/android/libs/README.md

@@ -0,0 +1,7 @@
+The real problem was that photo-editor-android.jar is a plain JAR (not an AAR). When distributed as a JAR, the Android build system has no way to generate an R.java for its package com.ahmedadeltito.photoeditorsdk — that only happens for AAR/library modules. The JAR's compiled bytecode hardcodes references to com.ahmedadeltito.photoeditorsdk.R$layout, which never gets created in the final APK.
+
+The previous attempt (adding a R.java stub) was the right idea but Android's build system ignores hand-written R.java files — it generates and owns the R classes itself and overwrites them.
+
+The working fix: Used a Python script to directly rewrite the constant pool in PhotoEditorSDK.class inside the JAR — replacing every com/ahmedadeltito/photoeditorsdk/R reference with ui/photoeditor/R (your library's actual namespace). Now at runtime, the SDK correctly resolves ui.photoeditor.R$layout.photo_editor_sdk_image_item_list and ui.photoeditor.R$id.photo_editor_sdk_image_iv, which exist in your compiled resources.
+
+The two layout XMLs created in the previous step (photo_editor_sdk_image_item_list.xml and photo_editor_sdk_text_item_list.xml) are still needed — they provide the actual layouts the SDK inflates.

package/android/src/main/java/com/ahmedadeltito/photoeditor/widget/SlidingUpPanelLayout.java

@@ -25,7 +25,6 @@ import android.widget.ListView;
 import android.widget.ScrollView;
 
 import ui.photoeditor.R;
-import com.nineoldandroids.view.animation.AnimatorProxy;
 
 public class SlidingUpPanelLayout extends ViewGroup {
 
@@ -1150,11 +1149,7 @@ public class SlidingUpPanelLayout extends ViewGroup {
     private void applyParallaxForCurrentSlideOffset() {
         if (mParallaxOffset > 0) {
             int mainViewOffset = getCurrentParallaxOffset();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                mMainView.setTranslationY(mainViewOffset);
-            } else {
-                AnimatorProxy.wrap(mMainView).setTranslationY(mainViewOffset);
-            }
+            mMainView.setTranslationY(mainViewOffset);
         }
     }
 

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

@@ -9,13 +9,12 @@ import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.BaseActivityEventListener;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import java.util.ArrayList;
 
-public class RNPhotoEditorModule extends ReactContextBaseJavaModule {
+public class RNPhotoEditorModule extends RNPhotoEditorSpec {
 
     private static final int PHOTO_EDITOR_REQUEST = 1;
     private static final String E_PHOTO_EDITOR_CANCELLED = "E_PHOTO_EDITOR_CANCELLED";

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

@@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
 
 public class RNPhotoEditorPackage implements ReactPackage {
     @Override
@@ -17,11 +16,6 @@ public class RNPhotoEditorPackage implements ReactPackage {
       return Arrays.<NativeModule>asList(new RNPhotoEditorModule(reactContext));
     }
 
-    // Deprecated from RN 0.47
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-      return Collections.emptyList();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
       return Collections.emptyList();

package/android/src/main/res/layout/photo_editor_sdk_image_item_list.xml

@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/photo_editor_sdk_image_rl"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/photo_editor_sdk_image_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="80dp"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="12dp"
+        android:adjustViewBounds="true"
+        android:gravity="center"
+        android:scaleType="fitCenter" />
+
+</RelativeLayout>

package/android/src/main/res/layout/photo_editor_sdk_text_item_list.xml

@@ -0,0 +1,13 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/photo_editor_sdk_text_rl"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/photo_editor_sdk_text_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:textSize="18sp" />
+
+</RelativeLayout>

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

@@ -0,0 +1,14 @@
+package ui.photoeditor;
+
+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.
+ */
+abstract class RNPhotoEditorSpec extends NativeRNPhotoEditorSpec {
+    RNPhotoEditorSpec(ReactApplicationContext context) {
+        super(context);
+    }
+}

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

@@ -0,0 +1,19 @@
+package ui.photoeditor;
+
+import com.facebook.react.bridge.Callback;
+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.
+ */
+abstract class RNPhotoEditorSpec extends ReactContextBaseJavaModule {
+    RNPhotoEditorSpec(ReactApplicationContext context) {
+        super(context);
+    }
+
+    public abstract void Edit(ReadableMap props, Callback onDone, Callback onCancel);
+}

package/ios/RNPhotoEditor.mm

@@ -0,0 +1,25 @@
+#import <React/RCTBridgeModule.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <RNPhotoEditorSpec/RNPhotoEditorSpec.h>
+#endif
+
+@interface RCT_EXTERN_MODULE(RNPhotoEditor, NSObject)
+
+RCT_EXTERN_METHOD(Edit:(NSDictionary *)props
+                  onDone:(RCTResponseSenderBlock)onDone
+                  onCancel:(RCTResponseSenderBlock)onCancel)
+
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
+@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.
+@interface RNPhotoEditor () <NativeRNPhotoEditorSpec>
+@end
+#endif

package/lib/NativeRNPhotoEditor.d.ts

@@ -0,0 +1,14 @@
+import type { TurboModule } from 'react-native';
+/**
+ * TurboModule codegen spec for RNPhotoEditor.
+ *
+ * This spec enables proper New Architecture (Fabric + TurboModules) support
+ * with compile-time type validation. On Old Architecture, TurboModuleRegistry
+ * falls back to the NativeModules bridge automatically.
+ */
+export interface Spec extends TurboModule {
+    Edit(props: Object, onDone: (result: string) => void, onCancel: (result: number) => void): void;
+}
+declare const _default: Spec;
+export default _default;
+//# sourceMappingURL=NativeRNPhotoEditor.d.ts.map

package/lib/NativeRNPhotoEditor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeRNPhotoEditor.d.ts","sourceRoot":"","sources":["../src/NativeRNPhotoEditor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD;;;;;;GAMG;AACH,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,IAAI,CACF,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,EAChC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GACjC,IAAI,CAAC;CACT;;AAED,wBAAuE"}

package/lib/NativeRNPhotoEditor.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_native_1 = require("react-native");
+exports.default = react_native_1.TurboModuleRegistry.getEnforcing('RNPhotoEditor');
+//# sourceMappingURL=NativeRNPhotoEditor.js.map

package/lib/NativeRNPhotoEditor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeRNPhotoEditor.js","sourceRoot":"","sources":["../src/NativeRNPhotoEditor.ts"],"names":[],"mappings":";;AACA,+CAAmD;AAiBnD,kBAAe,kCAAmB,CAAC,YAAY,CAAO,eAAe,CAAC,CAAC"}

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,kCAAkC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kCAAkC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kDAAkD;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wDAAwD;AACxD,MAAM,MAAM,aAAa,GACrB,MAAM,GACN,OAAO,GACP,MAAM,GACN,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,CAAC;AAEX;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;;OAGG;IACH,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IAEjC;;OAEG;IACH,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAEhC;;;OAGG;IACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAsCD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,cAAM,WAAW;IACf;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAgC5C;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC,GAChE,OAAO,CAAC,MAAM,CAAC;IAYlB;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;CAG7C;AAED;;GAEG;AACH,QAAA,MAAM,WAAW,oBAAc,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;AACpC,eAAe,WAAW,CAAC;AAG3B,mDAAmD;AACnD,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AACjD,qDAAqD;AACrD,MAAM,MAAM,QAAQ,GAAG,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,kCAAkC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kCAAkC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kDAAkD;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wDAAwD;AACxD,MAAM,MAAM,aAAa,GACrB,MAAM,GACN,OAAO,GACP,MAAM,GACN,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,CAAC;AAEX;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;;OAGG;IACH,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IAEjC;;OAEG;IACH,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAEhC;;;OAGG;IACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAsCD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,cAAM,WAAW;IACf;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAgC5C;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC,GAChE,OAAO,CAAC,MAAM,CAAC;IAYlB;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;CAG7C;AAED;;GAEG;AACH,QAAA,MAAM,WAAW,oBAAc,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;AACpC,eAAe,WAAW,CAAC;AAG3B,mDAAmD;AACnD,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AACjD,qDAAqD;AACrD,MAAM,MAAM,QAAQ,GAAG,mBAAmB,CAAC"}

package/lib/index.js

@@ -10,16 +10,16 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PhotoEditor = exports.ImageEditor = void 0;
-const react_native_1 = require("react-native");
-// Support both New Architecture (interop layer) and Old Architecture (NativeModules bridge).
-// In RN 0.78+, NativeModules works through the TurboModule interop layer in bridgeless mode.
-const RNPhotoEditor = react_native_1.NativeModules.RNPhotoEditor;
-if (!RNPhotoEditor) {
-    throw new Error('@phucprime/react-native-image-editor: NativeModule RNPhotoEditor is null. ' +
-        'Make sure the native module is properly linked.');
-}
+const NativeRNPhotoEditor_1 = __importDefault(require("./NativeRNPhotoEditor"));
+// TurboModuleRegistry.getEnforcing handles both architectures:
+// - New Architecture: Uses TurboModule system directly
+// - Old Architecture: Falls back to NativeModules bridge (RN 0.73+)
+const RNPhotoEditor = NativeRNPhotoEditor_1.default;
 /** Default color palette for the editor. */
 const DEFAULT_COLORS = [
     '#000000',

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+CAAuD;AAEvD,6FAA6F;AAC7F,6FAA6F;AAC7F,MAAM,aAAa,GAAG,4BAAa,CAAC,aAAa,CAAC;AAClD,IAAI,CAAC,aAAa,EAAE,CAAC;IACnB,MAAM,IAAI,KAAK,CACb,4EAA4E;QAC1E,iDAAiD,CACpD,CAAC;AACJ,CAAC;AA4FD,4CAA4C;AAC5C,MAAM,cAAc,GAAa;IAC/B,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;CACV,CAAC;AAEF,oCAAoC;AACpC,MAAM,iBAAiB,GAAkC;IACvD,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;IACjB,aAAa,EAAE,WAAW;IAC1B,WAAW,EAAE,QAAQ;IACrB,YAAY,EAAE,SAAS;IACvB,iBAAiB,EAAE,cAAc;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,4BAA4B;IACjD,yBAAyB,EACvB,0DAA0D;IAC5D,WAAW,EAAE,UAAU;IACvB,MAAM,EAAE,SAAS;IACjB,oBAAoB,EAAE,qDAAqD;IAC3E,gBAAgB,EAAE,aAAa;IAC/B,WAAW,EAAE,QAAQ;CACtB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW;IACf;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAyB;QACnC,MAAM,EACJ,QAAQ,GAAG,EAAE,EACb,cAAc,GAAG,EAAE,EACnB,MAAM,GAAG,cAAc,EACvB,SAAS,EACT,MAAM,EACN,QAAQ,KAEN,MAAM,EADL,IAAI,UACL,MAAM,EARJ,2EAQL,CAAS,CAAC;QAEX,MAAM,eAAe,GAAG,SAAS;YAC/B,CAAC,iCAAM,iBAAiB,GAAK,SAAS,EACtC,CAAC,CAAC,iBAAiB,CAAC;QAEtB,aAAa,CAAC,IAAI,iBAEd,MAAM;YACN,cAAc;YACd,QAAQ,EACR,SAAS,EAAE,eAAe,IACvB,IAAI,GAET,CAAC,SAAiB,EAAE,EAAE;YACpB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,SAAS,CAAC,CAAC;QACtB,CAAC,EACD,CAAC,UAAkB,EAAE,EAAE;YACrB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,UAAU,CAAC,CAAC;QACzB,CAAC,CACF,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,OAAiE;QAEjE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,WAAW,CAAC,IAAI,iCACX,OAAO,KACV,IAAI,EACJ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE,CACvB,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAC,IAChE,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,MAAyB;QACnC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;CACF;AAOQ,kCAAW;AALpB;;GAEG;AACH,MAAM,WAAW,GAAG,WAAW,CAAC;AAEV,kCAAW;AACjC,kBAAe,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gFAAwD;AAExD,+DAA+D;AAC/D,uDAAuD;AACvD,oEAAoE;AACpE,MAAM,aAAa,GAAG,6BAAmB,CAAC;AA4F1C,4CAA4C;AAC5C,MAAM,cAAc,GAAa;IAC/B,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;CACV,CAAC;AAEF,oCAAoC;AACpC,MAAM,iBAAiB,GAAkC;IACvD,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;IACjB,aAAa,EAAE,WAAW;IAC1B,WAAW,EAAE,QAAQ;IACrB,YAAY,EAAE,SAAS;IACvB,iBAAiB,EAAE,cAAc;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,4BAA4B;IACjD,yBAAyB,EACvB,0DAA0D;IAC5D,WAAW,EAAE,UAAU;IACvB,MAAM,EAAE,SAAS;IACjB,oBAAoB,EAAE,qDAAqD;IAC3E,gBAAgB,EAAE,aAAa;IAC/B,WAAW,EAAE,QAAQ;CACtB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW;IACf;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAyB;QACnC,MAAM,EACJ,QAAQ,GAAG,EAAE,EACb,cAAc,GAAG,EAAE,EACnB,MAAM,GAAG,cAAc,EACvB,SAAS,EACT,MAAM,EACN,QAAQ,KAEN,MAAM,EADL,IAAI,UACL,MAAM,EARJ,2EAQL,CAAS,CAAC;QAEX,MAAM,eAAe,GAAG,SAAS;YAC/B,CAAC,iCAAM,iBAAiB,GAAK,SAAS,EACtC,CAAC,CAAC,iBAAiB,CAAC;QAEtB,aAAa,CAAC,IAAI,iBAEd,MAAM;YACN,cAAc;YACd,QAAQ,EACR,SAAS,EAAE,eAAe,IACvB,IAAI,GAET,CAAC,SAAiB,EAAE,EAAE;YACpB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,SAAS,CAAC,CAAC;QACtB,CAAC,EACD,CAAC,UAAkB,EAAE,EAAE;YACrB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,UAAU,CAAC,CAAC;QACzB,CAAC,CACF,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,OAAiE;QAEjE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,WAAW,CAAC,IAAI,iCACX,OAAO,KACV,IAAI,EACJ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE,CACvB,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAC,IAChE,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,MAAyB;QACnC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;CACF;AAOQ,kCAAW;AALpB;;GAEG;AACH,MAAM,WAAW,GAAG,WAAW,CAAC;AAEV,kCAAW;AACjC,kBAAe,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phucprime/react-native-image-editor",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "React Native: Native Image Editor for iOS and Android with drawing, text, stickers, cropping and more",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -49,9 +49,17 @@
   ],
   "author": "phucprime",
   "license": "Apache-2.0",
+  "codegenConfig": {
+    "name": "RNPhotoEditorSpec",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "ui.photoeditor"
+    }
+  },
   "peerDependencies": {
-    "react": ">=16.8.0",
-    "react-native": ">=0.60.0"
+    "react": ">=18.2.0",
+    "react-native": ">=0.73.0"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -62,12 +70,12 @@
     }
   },
   "devDependencies": {
-    "@types/react": "^18.2.0 || ^19.0.0",
-    "prettier": "^3.2.0",
+    "@types/react": "18.2.0 || 19.0.0",
+    "prettier": "3.2.0",
     "react-native": "0.78.2",
-    "typescript": "^5.3.0"
+    "typescript": "5.9.3"
   },
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}

package/react-native-image-editor.podspec

@@ -15,6 +15,14 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.dependency "iOSPhotoEditor"
 
+  # Always enforce C++17 so that C++ standard-library headers (<utility>, <vector>,
+  # <chrono>, …) resolve correctly when the pod is compiled alongside React Native's
+  # C++ TurboModule/JSI headers, regardless of architecture or RN version.
+  s.pod_target_xcconfig = {
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+    "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+  }
+
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   if respond_to?(:install_modules_dependencies, true)
     install_modules_dependencies(s)
@@ -24,11 +32,6 @@ Pod::Spec.new do |s|
     # Don't install the dependencies when we run `pod install` in the old architecture.
     if ENV["RCT_NEW_ARCH_ENABLED"] == "1"
       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"

package/src/NativeRNPhotoEditor.ts

@@ -0,0 +1,19 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+/**
+ * TurboModule codegen spec for RNPhotoEditor.
+ *
+ * This spec enables proper New Architecture (Fabric + TurboModules) support
+ * with compile-time type validation. On Old Architecture, TurboModuleRegistry
+ * falls back to the NativeModules bridge automatically.
+ */
+export interface Spec extends TurboModule {
+  Edit(
+    props: Object,
+    onDone: (result: string) => void,
+    onCancel: (result: number) => void,
+  ): void;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('RNPhotoEditor');

package/src/index.ts

@@ -1,14 +1,9 @@
-import { NativeModules, Platform } from 'react-native';
-
-// Support both New Architecture (interop layer) and Old Architecture (NativeModules bridge).
-// In RN 0.78+, NativeModules works through the TurboModule interop layer in bridgeless mode.
-const RNPhotoEditor = NativeModules.RNPhotoEditor;
-if (!RNPhotoEditor) {
-  throw new Error(
-    '@phucprime/react-native-image-editor: NativeModule RNPhotoEditor is null. ' +
-      'Make sure the native module is properly linked.',
-  );
-}
+import NativeRNPhotoEditor from './NativeRNPhotoEditor';
+
+// TurboModuleRegistry.getEnforcing handles both architectures:
+// - New Architecture: Uses TurboModule system directly
+// - Old Architecture: Falls back to NativeModules bridge (RN 0.73+)
+const RNPhotoEditor = NativeRNPhotoEditor;
 
 /**
  * Localization strings for the image editor UI.

package/ios/RNPhotoEditor.m

@@ -1,13 +0,0 @@
-#import <React/RCTBridgeModule.h>
-
-@interface RCT_EXTERN_MODULE(RNPhotoEditor, NSObject)
-
-RCT_EXTERN_METHOD(Edit:(NSDictionary *)props
-                  onDone:(RCTResponseSenderBlock)onDone
-                  onCancel:(RCTResponseSenderBlock)onCancel)
-
-+ (BOOL)requiresMainQueueSetup {
-    return YES;
-}
-
-@end