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

package/README.md

@@ -1,44 +1,32 @@
-<p align="center">
-  <img src="https://lh3.googleusercontent.com/dsJXfHnUx0qvZIB_80F-q0iN18eIqmx6g10bmsVN8R6nEnLQDKvJ9lXCbnPCgDEZMw=s180" width="80" />
-</p>
-
 <h1 align="center">@phucprime/react-native-image-editor</h1>
 
 <p align="center">
-  Native image editor for React Native — crop, draw, add text, stickers, and more.
+  Native image editor for React Native — crop, draw, text, stickers, and more.<br/>
+  Supports <strong>New Architecture</strong> (Fabric + TurboModules) and the classic bridge.
 </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://github.com/phucprime/react-native-image-editor/pulls"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square" alt="PRs Welcome" /></a>
 </p>
 
 ---
 
-## Features
-
-- **Cropping** — Resize and reframe images
-- **Drawing** — Freehand drawing with color picker
-- **Text** — Add text overlays with custom colors
-- **Stickers** — Add image stickers from your app resources
-- **Scaling & Rotating** — Transform any added element
-- **Saving & Sharing** — Export edited images
-
-## Demo
-
 | iOS | Android |
 | :-: | :-: |
-| <img src="assets/ios.gif" width="300" /> | <img src="assets/android.gif" width="300" /> |
+| <img src="assets/ios.gif" width="280" /> | <img src="assets/android.gif" width="280" /> |
+
+## Compatibility
 
-## Requirements
+| | Minimum | Tested |
+| --- | --- | --- |
+| React Native | 0.73 | **0.78.2** |
+| iOS | 13.0 | 18 |
+| Android | API 24 | API 35 |
+| Architecture | Old Arch ✅ | **New Arch ✅** |
 
-| Platform | Minimum Version |
-| -------- | --------------- |
-| iOS      | 13.0            |
-| Android  | API 21 (5.0)    |
-| React Native | >= 0.60     |
+> Requires **JDK 17** and **Gradle 8.x** for Android builds.
 
 ## Installation
 
@@ -48,33 +36,18 @@ npm install @phucprime/react-native-image-editor
 yarn add @phucprime/react-native-image-editor
 ```
 
-### iOS Setup
+### iOS
 
-1. Add to your `ios/Podfile`:
+Add to your `Podfile`:
 
 ```ruby
-use_native_modules!
-
-# Required: Flipper must be disabled when using iOSPhotoEditor with use_frameworks!
-flipper_config = FlipperConfiguration.disabled
-
 use_frameworks! :linkage => :static
 pod "iOSPhotoEditor", :git => "https://github.com/phucprime/photo-editor", :branch => "master"
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    if target.name.include?('iOSPhotoEditor')
-      target.build_configurations.each do |config|
-        config.build_settings['SWIFT_VERSION'] = '5'
-      end
-    end
-  end
-end
 ```
 
-2. Run `pod install` in the `ios/` directory.
+Then run `pod install`.
 
-3. Add to `Info.plist`:
+Add to `Info.plist`:
 
 ```xml
 <key>NSPhotoLibraryAddUsageDescription</key>
@@ -83,164 +56,70 @@ end
 <string>Allow access to select photos for editing</string>
 ```
 
-### Android Setup
+### Android
 
-1. Add JitPack repository to your root `android/build.gradle`:
+Add JitPack to your root `android/build.gradle`:
 
 ```groovy
 allprojects {
     repositories {
-        // ...existing repos...
         maven { url "https://jitpack.io" }
     }
 }
 ```
 
-2. Add activities to `AndroidManifest.xml`:
+Add activities to `AndroidManifest.xml`:
 
 ```xml
 <activity android:name="com.ahmedadeltito.photoeditor.PhotoEditorActivity" />
 <activity android:name="com.yalantis.ucrop.UCropActivity" />
 ```
 
-3. For saving to external storage:
-
-```xml
-<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-```
-
-4. **JDK 17 required** (AGP 7.x is incompatible with JDK 21). Add to `android/gradle.properties`:
-
-```properties
-org.gradle.java.home=/path/to/your/jdk-17
-```
-
-> macOS Homebrew: `brew install openjdk@17`, then use `/opt/homebrew/Cellar/openjdk@17/<version>/libexec/openjdk.jdk/Contents/Home`
-
 ## Usage
 
-### Promise-based (recommended)
+### Promise API (recommended)
 
 ```typescript
 import { ImageEditor } from '@phucprime/react-native-image-editor';
 
-try {
-  const editedPath = await ImageEditor.edit('/path/to/image.jpg', {
-    colors: ['#ff0000', '#00ff00', '#0000ff'],
-    stickers: ['sticker1', 'sticker2'],
-  });
-  console.log('Edited image saved to:', editedPath);
-} catch (error) {
-  console.log('Editor was cancelled');
-}
+const editedPath = await ImageEditor.edit('/path/to/image.jpg', {
+  colors: ['#ff0000', '#00ff00', '#0000ff'],
+  stickers: ['sticker1', 'sticker2'],
+});
 ```
 
-### Callback-based
+### Callback API
 
 ```typescript
-import { ImageEditor } from '@phucprime/react-native-image-editor';
-
 ImageEditor.open({
   path: '/path/to/image.jpg',
-  onDone: (editedPath) => {
-    console.log('Edited image saved to:', editedPath);
-  },
-  onCancel: (resultCode) => {
-    console.log('Editor cancelled with code:', resultCode);
-  },
+  onDone: (path) => console.log('Saved:', path),
+  onCancel: () => console.log('Cancelled'),
 });
 ```
 
-> **Tip:** Use [react-native-fs](https://github.com/itinance/react-native-fs) to copy images into the app sandbox before editing.
-
-## API Reference
-
-### `ImageEditor.edit(path, options?): Promise<string>`
-
-Opens the editor and returns a promise with the edited image path.
+## Options
 
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `path` | `string` | Path to the image file to edit |
-| `options` | `object` | Optional configuration (see below) |
+| 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 |
 
-### `ImageEditor.open(config): void`
-
-Opens the editor with callback-based API.
-
-### Configuration
-
-| Property | Type | Default | Description |
-| -------- | ---- | ------- | ----------- |
-| `path` | `string` | *required* | Path to the image file |
-| `colors` | `string[]` | 13 default colors | Hex color strings for draw/text palette |
-| `stickers` | `string[]` | `[]` | Sticker image names from native resources |
-| `hiddenControls` | `EditorControl[]` | `[]` | Controls to hide: `'text'`, `'clear'`, `'draw'`, `'save'`, `'share'`, `'sticker'`, `'crop'` |
-| `languages` | `ImageEditorLanguage` | English defaults | UI localization strings |
-| `onDone` | `(path: string) => void` | — | Callback when editing completes |
-| `onCancel` | `(code: number) => void` | — | Callback when editing is cancelled |
+> **Tip:** Use [react-native-fs](https://github.com/itinance/react-native-fs) to copy images into the app sandbox before editing.
 
 ## Stickers
 
-Add sticker images to your native project:
-
-- **iOS:** Add to the Resources folder
-- **Android:** Add to the `drawable` folder
-
-See the [Example](Example/) project for reference.
-
-## Migrating from react-native-photo-editor
-
-```diff
-- import PhotoEditor from 'react-native-photo-editor';
-+ import { ImageEditor } from '@phucprime/react-native-image-editor';
-
-- PhotoEditor.Edit({ path: imagePath, onDone: handleDone });
-+ ImageEditor.open({ path: imagePath, onDone: handleDone });
-// or use the Promise API:
-+ const result = await ImageEditor.edit(imagePath);
-```
-
-Update your iOS `Podfile`:
-
-```diff
-- pod 'RNPhotoEditor', :path => '../node_modules/react-native-photo-editor'
-+ pod 'RNImageEditor', :path => '../node_modules/@phucprime/react-native-image-editor'
-- pod 'iOSPhotoEditor', :git => 'https://github.com/prscX/photo-editor'
-+ pod 'iOSPhotoEditor', :git => 'https://github.com/phucprime/photo-editor'
-```
+- **iOS** — Add images to the Resources folder
+- **Android** — Add images to the `drawable` folder
 
-## Troubleshooting
-
-### React Native Firebase v6+
-
-If using Firebase with `use_frameworks!`, add to your `Podfile`:
-
-```ruby
-$RNFirebaseAsStaticFramework = true
-```
-
-### Kotlin Metadata Version Mismatch (Gradle 8.x + RN 0.72)
-
-Add `-Xskip-metadata-version-check` to `node_modules/@react-native/gradle-plugin/build.gradle.kts`:
-
-```kotlin
-tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    freeCompilerArgs += listOf("-Xskip-metadata-version-check")
-  }
-}
-```
+See the [Example](Example/) project for a working setup.
 
 ## Credits
 
-- Android Photo Editor: [eventtus/photo-editor-android](https://github.com/eventtus/photo-editor-android)
-- iOS Photo Editor: [eventtus/photo-editor](https://github.com/eventtus/photo-editor)
-- Original library: [prscX/react-native-photo-editor](https://github.com/prscX/react-native-photo-editor)
-
-## Contributing
-
-See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
+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).
 
 ## License
 

package/android/build.gradle

@@ -16,19 +16,19 @@ buildscript {
         }
 
         dependencies {
-            classpath('com.android.tools.build:gradle:7.4.2')
+            classpath('com.android.tools.build:gradle:8.2.1')
         }
     }
 }
 
 android {
     namespace "ui.photoeditor"
-    compileSdkVersion safeExtGet('compileSdkVersion', 33)
-    buildToolsVersion safeExtGet('buildToolsVersion', '33.0.0')
+    compileSdkVersion safeExtGet('compileSdkVersion', 35)
+    buildToolsVersion safeExtGet('buildToolsVersion', '35.0.0')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 33)
+        minSdkVersion safeExtGet('minSdkVersion', 24)
+        targetSdkVersion safeExtGet('targetSdkVersion', 35)
         versionCode 1
         versionName "1.0"
     }
@@ -38,8 +38,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
@@ -54,9 +54,9 @@ dependencies {
     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.android.support:design:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.github.yalantis:ucrop:2.2.2-native'
-    implementation 'com.android.support:exifinterface:27.1.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.7'
 }

package/ios/RNPhotoEditor.h

@@ -6,8 +6,3 @@
 #endif
 
 #import <UIKit/UIKit.h>
-@import iOSPhotoEditor;
-
-@interface RNPhotoEditor : NSObject <RCTBridgeModule, PhotoEditorDelegate>
-
-@end

package/ios/RNPhotoEditor.m

@@ -1,163 +1,13 @@
+#import <React/RCTBridgeModule.h>
 
-#import "RNPhotoEditor.h"
+@interface RCT_EXTERN_MODULE(RNPhotoEditor, NSObject)
 
+RCT_EXTERN_METHOD(Edit:(NSDictionary *)props
+                  onDone:(RCTResponseSenderBlock)onDone
+                  onCancel:(RCTResponseSenderBlock)onCancel)
 
-@implementation RNPhotoEditor
-
-- (dispatch_queue_t)methodQueue
-{
-    return dispatch_get_main_queue();
-}
-RCT_EXPORT_MODULE()
-
-NSString *_editImagePath = nil;
-
-RCTResponseSenderBlock _onDoneEditing = nil;
-RCTResponseSenderBlock _onCancelEditing = nil;
-
-- (void)doneEditingWithImage:(UIImage *)image {
-    if (_onDoneEditing == nil) return;
-
-    NSError* error;
-
-    BOOL isPNG = [_editImagePath.pathExtension.lowercaseString isEqualToString:@"png"];
-    NSString* path = _editImagePath;
-
-    if ([path containsString:@"file://"]) {
-        NSURL *url = [NSURL URLWithString:_editImagePath];
-        path = url.path;
-    }
-
-    [isPNG ? UIImagePNGRepresentation(image) : UIImageJPEGRepresentation(image, 0.8) writeToFile:path options:NSDataWritingAtomic error:&error];
-
-    if (error != nil)
-        NSLog(@"write error %@", error);
-
-    _onDoneEditing(@[path]);
++ (BOOL)requiresMainQueueSetup {
+    return YES;
 }
 
-- (void)canceledEditing {
-    if (_onCancelEditing == nil) return;
-
-    _onCancelEditing(@[]);
-}
-
-RCT_EXPORT_METHOD(Edit:(nonnull NSDictionary *)props onDone:(RCTResponseSenderBlock)onDone onCancel:(RCTResponseSenderBlock)onCancel) {
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        _editImagePath = [props objectForKey: @"path"];
-
-        _onDoneEditing = onDone;
-        _onCancelEditing = onCancel;
-
-        PhotoEditorViewController *photoEditor = [[PhotoEditorViewController alloc] initWithNibName:@"PhotoEditorViewController" bundle: [NSBundle bundleForClass:[PhotoEditorViewController class]]];
-        // set language
-        NSDictionary *languages = [props objectForKey: @"languages"];
-        [[TranslationService shared]  initTranslations:languages];
-        
-        // Process Image for Editing
-        UIImage *image = [UIImage imageWithContentsOfFile:_editImagePath];
-        if (image == nil) {
-            NSURL *url = [NSURL URLWithString:_editImagePath];
-            NSData *data = [NSData dataWithContentsOfURL:url];
-
-            image = [UIImage imageWithData:data];
-        }
-
-        photoEditor.image = image;
-
-        // Process Stickers
-        NSArray *stickers = [props objectForKey: @"stickers"];
-        NSMutableArray *imageStickers = [[NSMutableArray alloc] initWithCapacity:stickers.count];
-
-        for (NSString *sticker in stickers) {
-            [imageStickers addObject: [UIImage imageNamed: sticker]];
-        }
-
-        photoEditor.stickers = imageStickers;
-
-        //Process Controls
-        NSArray *hiddenControls = [props objectForKey: @"hiddenControls"];
-        NSMutableArray *passHiddenControls = [[NSMutableArray alloc] initWithCapacity:hiddenControls.count];
-
-        for (NSString *hiddenControl in hiddenControls) {
-            [passHiddenControls addObject: [[NSString alloc] initWithString: hiddenControl]];
-        }
-
-        photoEditor.hiddenControls = passHiddenControls;
-
-        //Process Colors
-        NSArray *colors = [props objectForKey: @"colors"];
-        NSMutableArray *passColors = [[NSMutableArray alloc] initWithCapacity:colors.count];
-
-        for (NSString *color in colors) {
-            [passColors addObject: [self colorWithHexString: color]];
-        }
-
-        photoEditor.colors = passColors;
-
-        // Invoke Editor
-        photoEditor.photoEditorDelegate = self;
-
-	// The default modal presenting is page sheet in ios 13, not full screen
-	if (@available(iOS 13, *)) {
-            [photoEditor setModalPresentationStyle: UIModalPresentationFullScreen];
-        }
-
-        id<UIApplicationDelegate> app = [[UIApplication sharedApplication] delegate];
-        UINavigationController *rootViewController = ((UINavigationController*) app.window.rootViewController);
-
-        if (rootViewController.presentedViewController) {
-            [rootViewController.presentedViewController presentViewController:photoEditor animated:YES completion:nil];
-            return;
-        }
-
-        [rootViewController presentViewController:photoEditor animated:YES completion:nil];
-    });
-}
-
-
-- (CGFloat) colorComponentFrom: (NSString *) string start: (NSUInteger) start length: (NSUInteger) length {
-    NSString *substring = [string substringWithRange: NSMakeRange(start, length)];
-    NSString *fullHex = length == 2 ? substring : [NSString stringWithFormat: @"%@%@", substring, substring];
-    unsigned hexComponent;
-    [[NSScanner scannerWithString: fullHex] scanHexInt: &hexComponent];
-    return hexComponent / 255.0;
-}
-
-- (UIColor *) colorWithHexString: (NSString *) hexString {
-    NSString *colorString = [[hexString stringByReplacingOccurrencesOfString: @"#" withString: @""] uppercaseString];
-    CGFloat alpha, red, blue, green;
-    switch ([colorString length]) {
-        case 3: // #RGB
-            alpha = 1.0f;
-            red   = [self colorComponentFrom: colorString start: 0 length: 1];
-            green = [self colorComponentFrom: colorString start: 1 length: 1];
-            blue  = [self colorComponentFrom: colorString start: 2 length: 1];
-            break;
-        case 4: // #ARGB
-            alpha = [self colorComponentFrom: colorString start: 0 length: 1];
-            red   = [self colorComponentFrom: colorString start: 1 length: 1];
-            green = [self colorComponentFrom: colorString start: 2 length: 1];
-            blue  = [self colorComponentFrom: colorString start: 3 length: 1];
-            break;
-        case 6: // #RRGGBB
-            alpha = 1.0f;
-            red   = [self colorComponentFrom: colorString start: 0 length: 2];
-            green = [self colorComponentFrom: colorString start: 2 length: 2];
-            blue  = [self colorComponentFrom: colorString start: 4 length: 2];
-            break;
-        case 8: // #AARRGGBB
-            alpha = [self colorComponentFrom: colorString start: 0 length: 2];
-            red   = [self colorComponentFrom: colorString start: 2 length: 2];
-            green = [self colorComponentFrom: colorString start: 4 length: 2];
-            blue  = [self colorComponentFrom: colorString start: 6 length: 2];
-            break;
-        default:
-            return nil;
-    }
-    return [UIColor colorWithRed: red green: green blue: blue alpha: alpha];
-}
-
-
 @end

package/ios/RNPhotoEditor.swift

@@ -0,0 +1,168 @@
+import Foundation
+import UIKit
+import iOSPhotoEditor
+
+@objc(RNPhotoEditor)
+class RNPhotoEditor: NSObject {
+
+    private var editImagePath: String?
+    private var onDoneEditing: RCTResponseSenderBlock?
+    private var onCancelEditing: RCTResponseSenderBlock?
+
+    @objc static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+
+    @objc func methodQueue() -> DispatchQueue {
+        return .main
+    }
+
+    @objc(Edit:onDone:onCancel:)
+    func edit(_ props: NSDictionary, onDone: @escaping RCTResponseSenderBlock, onCancel: @escaping RCTResponseSenderBlock) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            self.editImagePath = props["path"] as? String
+            self.onDoneEditing = onDone
+            self.onCancelEditing = onCancel
+
+            let photoEditor = PhotoEditorViewController(
+                nibName: "PhotoEditorViewController",
+                bundle: Bundle(for: PhotoEditorViewController.self)
+            )
+
+            // Set language translations
+            // TODO: Re-enable when TranslationService is added to the iOSPhotoEditor pod
+            // if let languages = props["languages"] as? [String: String] {
+            //     TranslationService.shared.initTranslations(languages)
+            // }
+
+            // Process Image for Editing
+            var image: UIImage?
+            if let path = self.editImagePath {
+                image = UIImage(contentsOfFile: path)
+                if image == nil, let url = URL(string: path), let data = try? Data(contentsOf: url) {
+                    image = UIImage(data: data)
+                }
+            }
+            photoEditor.image = image
+
+            // Process Stickers
+            if let stickers = props["stickers"] as? [String] {
+                photoEditor.stickers = stickers.compactMap { UIImage(named: $0) }
+            }
+
+            // Process Controls
+            if let hiddenControls = props["hiddenControls"] as? [String] {
+                photoEditor.hiddenControls = hiddenControls.compactMap { controlName in
+                    switch controlName.lowercased() {
+                    case "crop": return .crop
+                    case "sticker": return .sticker
+                    case "draw": return .draw
+                    case "text": return .text
+                    case "save": return .save
+                    case "share": return .share
+                    case "clear": return .clear
+                    default: return nil
+                    }
+                }
+            }
+
+            // Process Colors
+            if let colors = props["colors"] as? [String] {
+                photoEditor.colors = colors.compactMap { self.color(fromHexString: $0) }
+            }
+
+            // Invoke Editor
+            photoEditor.photoEditorDelegate = self
+
+            // The default modal presenting is page sheet in iOS 13, not full screen
+            photoEditor.modalPresentationStyle = .fullScreen
+
+            guard let rootViewController = UIApplication.shared.delegate?.window??.rootViewController else { return }
+
+            if let presentedVC = rootViewController.presentedViewController {
+                presentedVC.present(photoEditor, animated: true, completion: nil)
+            } else {
+                rootViewController.present(photoEditor, animated: true, completion: nil)
+            }
+        }
+    }
+
+    // MARK: - Hex Color Utilities
+
+    private func colorComponent(from string: String, start: Int, length: Int) -> CGFloat {
+        let startIndex = string.index(string.startIndex, offsetBy: start)
+        let endIndex = string.index(startIndex, offsetBy: length)
+        var substring = String(string[startIndex..<endIndex])
+        if length == 1 {
+            substring = "\(substring)\(substring)"
+        }
+        var hexComponent: UInt64 = 0
+        Scanner(string: substring).scanHexInt64(&hexComponent)
+        return CGFloat(hexComponent) / 255.0
+    }
+
+    private func color(fromHexString hexString: String) -> UIColor? {
+        let colorString = hexString.replacingOccurrences(of: "#", with: "").uppercased()
+        let alpha: CGFloat
+        let red: CGFloat
+        let green: CGFloat
+        let blue: CGFloat
+
+        switch colorString.count {
+        case 3: // #RGB
+            alpha = 1.0
+            red   = colorComponent(from: colorString, start: 0, length: 1)
+            green = colorComponent(from: colorString, start: 1, length: 1)
+            blue  = colorComponent(from: colorString, start: 2, length: 1)
+        case 4: // #ARGB
+            alpha = colorComponent(from: colorString, start: 0, length: 1)
+            red   = colorComponent(from: colorString, start: 1, length: 1)
+            green = colorComponent(from: colorString, start: 2, length: 1)
+            blue  = colorComponent(from: colorString, start: 3, length: 1)
+        case 6: // #RRGGBB
+            alpha = 1.0
+            red   = colorComponent(from: colorString, start: 0, length: 2)
+            green = colorComponent(from: colorString, start: 2, length: 2)
+            blue  = colorComponent(from: colorString, start: 4, length: 2)
+        case 8: // #AARRGGBB
+            alpha = colorComponent(from: colorString, start: 0, length: 2)
+            red   = colorComponent(from: colorString, start: 2, length: 2)
+            green = colorComponent(from: colorString, start: 4, length: 2)
+            blue  = colorComponent(from: colorString, start: 6, length: 2)
+        default:
+            return nil
+        }
+        return UIColor(red: red, green: green, blue: blue, alpha: alpha)
+    }
+}
+
+// MARK: - PhotoEditorDelegate
+
+extension RNPhotoEditor: PhotoEditorDelegate {
+    func doneEditing(image: UIImage) {
+        guard let onDoneEditing = onDoneEditing, let editImagePath = editImagePath else { return }
+
+        let isPNG = (editImagePath as NSString).pathExtension.lowercased() == "png"
+        var path = editImagePath
+
+        if path.contains("file://"), let url = URL(string: editImagePath) {
+            path = url.path
+        }
+
+        let data = isPNG ? image.pngData() : image.jpegData(compressionQuality: 0.8)
+        do {
+            try data?.write(to: URL(fileURLWithPath: path), options: .atomic)
+        } catch {
+            NSLog("write error %@", error.localizedDescription)
+        }
+
+        onDoneEditing([path])
+    }
+
+    func canceledEditing() {
+        guard let onCancelEditing = onCancelEditing else { return }
+        onCancelEditing([])
+    }
+}

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;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;AAuCD;;;;;;;;;;;;;;;;;;;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":"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"}

package/lib/index.js

@@ -13,7 +13,13 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PhotoEditor = exports.ImageEditor = void 0;
 const react_native_1 = require("react-native");
-const { RNPhotoEditor } = react_native_1.NativeModules;
+// 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.');
+}
 /** 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,MAAM,EAAE,aAAa,EAAE,GAAG,4BAAa,CAAC;AA4FxC,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,EAClB,qDAAqD;IACvD,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,+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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phucprime/react-native-image-editor",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "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",
@@ -31,7 +31,7 @@
     "format": "prettier --write src/",
     "clean": "rm -rf lib/",
     "prepare": "npm run clean && npm run build",
-    "release": "npm run prepare && npm publish --access public"
+    "release": "npm run prepare && npm publish --access public --registry https://registry.npmjs.org/"
   },
   "keywords": [
     "react-native",
@@ -62,12 +62,12 @@
     }
   },
   "devDependencies": {
-    "@types/react": "^18.2.0",
-    "@types/react-native": "^0.72.0",
+    "@types/react": "^18.2.0 || ^19.0.0",
     "prettier": "^3.2.0",
+    "react-native": "0.78.2",
     "typescript": "^5.3.0"
   },
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}

package/react-native-image-editor.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.platforms = { :ios => "13.0" }
   s.source = { :git => "https://github.com/phucprime/react-native-image-editor.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm}"
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.dependency "iOSPhotoEditor"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.

package/src/index.ts

@@ -1,6 +1,14 @@
 import { NativeModules, Platform } from 'react-native';
 
-const { RNPhotoEditor } = NativeModules;
+// 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.',
+  );
+}
 
 /**
  * Localization strings for the image editor UI.
@@ -123,8 +131,7 @@ const DEFAULT_LANGUAGES: Required<ImageEditorLanguage> = {
     'To attach photos, we need to access media on your device',
   continueTxt: 'Continue',
   notNow: 'NOT NOW',
-  mediaAccessDeniedMsg:
-    'You denied storage access, no photos will be added.',
+  mediaAccessDeniedMsg: 'You denied storage access, no photos will be added.',
   saveImageSucceed: 'Image saved',
   eraserTitle: 'Eraser',
 };