react-native-video-trim 5.1.1 → 6.0.0

package/README.md

@@ -1,6 +1,7 @@
 # Table of contents
 - [Installation](#installation)
    * [For iOS (React Native CLI project)](#for-ios-react-native-cli-project)
+   * [For Android New Arch (React Native CLI project)](#for-android-new-arch-react-native-cli-project)
    * [For Expo project](#for-expo-project)
    * [Usage](#usage)
 - [Methods](#methods)
@@ -11,10 +12,7 @@
    * [listFiles()](#listfiles)
    * [cleanFiles()](#cleanfiles)
    * [deleteFile()](#deletefile)
-- [Callbacks (New arch)](#callbacks-new-arch)
-   * [showEditor](#showeditor)
-   * [closeEditor](#closeeditor-1)
-- [Audio support](#audio-support)
+- [Audio only support](#audio-only-support)
 - [Cancel trimming](#cancel-trimming)
 - [Fail to load media](#fail-to-load-media)
 - [Rotation](#rotation)
@@ -45,27 +43,26 @@
 
 # Installation
 
+Both new + old arch are supported in a single distribution
+
 ```sh
-# new arch
 npm install react-native-video-trim
 
-# old arch
-npm install react-native-video-trim@^3.0.0
-
 # or with yarn
-
-# new arch
 yarn add react-native-video-trim
 
-# old arch
-yarn add react-native-video-trim@^3.0.0
 ```
 
-## For iOS (React Native CLI project)
+## iOS (RN CLI project)
 Run the following command to setup for iOS:
 ```
 npx pod-install ios
 ```
+## Android New Arch (RN CLI project)
+If you are using New Arch, in `android` folder run:
+```
+./gradlew generateCodegenArtifactsFromSchema
+```
 ## For Expo project
 You need to run `prebuild` in order for native code takes effect:
 ```
@@ -75,7 +72,7 @@ Then you should to restart to make the changes take effect
 
 Note that on iOS, Expo Go may not work because of library linking, you may see this error:
 
-<img src="images/expo_error.PNG" width="300" />
+<img src="images/expo_error.PNG" width="150" />
 
 To avoid the error, you should open `ios/yourproject.xcworkspace` then manually build and run your app
 
@@ -94,7 +91,10 @@ showEditor(videoUrl, {
   maxDuration: 20,
 });
 ```
-Usually this library will be used along with other library to select video file, Eg. [react-native-image-picker](https://github.com/react-native-image-picker/react-native-image-picker). Below is real world example:
+Usually this library will be used along with other library to select video file, Eg. [react-native-image-picker](https://github.com/react-native-image-picker/react-native-image-picker). Below are real world examples:
+
+<details>
+  <summary>New Arch usage</summary>
 
 ```jsx
 import * as React from 'react';
@@ -104,51 +104,49 @@ import {
   View,
   Text,
   TouchableOpacity,
-  NativeEventEmitter,
-  NativeModules,
   type EventSubscription,
 } from 'react-native';
-import { isValidFile, showEditor } from 'react-native-video-trim';
+import { isValidFile, showEditor, type Spec } from 'react-native-video-trim';
 import { launchImageLibrary } from 'react-native-image-picker';
 
 export default function App() {
   const listenerSubscription = useRef<Record<string, EventSubscription>>({});
 
   useEffect(() => {
-    listenerSubscription.current.onLoad = NativeVideoTrim.onLoad(
+    listenerSubscription.current.onLoad = (NativeVideoTrim as Spec).onLoad(
       ({ duration }) => console.log('onLoad', duration)
     );
 
     listenerSubscription.current.onStartTrimming =
-      NativeVideoTrim.onStartTrimming(() => console.log('onStartTrimming'));
+      (NativeVideoTrim as Spec).onStartTrimming(() => console.log('onStartTrimming'));
 
     listenerSubscription.current.onCancelTrimming =
-      NativeVideoTrim.onCancelTrimming(() => console.log('onCancelTrimming'));
-    listenerSubscription.current.onCancel = NativeVideoTrim.onCancel(() =>
+      (NativeVideoTrim as Spec).onCancelTrimming(() => console.log('onCancelTrimming'));
+    listenerSubscription.current.onCancel = (NativeVideoTrim as Spec).onCancel(() =>
       console.log('onCancel')
     );
-    listenerSubscription.current.onHide = NativeVideoTrim.onHide(() =>
+    listenerSubscription.current.onHide = (NativeVideoTrim as Spec).onHide(() =>
       console.log('onHide')
     );
-    listenerSubscription.current.onShow = NativeVideoTrim.onShow(() =>
+    listenerSubscription.current.onShow = (NativeVideoTrim as Spec).onShow(() =>
       console.log('onShow')
     );
     listenerSubscription.current.onFinishTrimming =
-      NativeVideoTrim.onFinishTrimming(
+      (NativeVideoTrim as Spec).onFinishTrimming(
         ({ outputPath, startTime, endTime, duration }) =>
           console.log(
             'onFinishTrimming',
             `outputPath: ${outputPath}, startTime: ${startTime}, endTime: ${endTime}, duration: ${duration}`
           )
       );
-    listenerSubscription.current.onLog = NativeVideoTrim.onLog(
+    listenerSubscription.current.onLog = (NativeVideoTrim as Spec).onLog(
       ({ level, message, sessionId }) =>
         console.log(
           'onLog',
           `level: ${level}, message: ${message}, sessionId: ${sessionId}`
         )
     );
-    listenerSubscription.current.onStatistics = NativeVideoTrim.onStatistics(
+    listenerSubscription.current.onStatistics = (NativeVideoTrim as Spec).onStatistics(
       ({
         sessionId,
         videoFrameNumber,
@@ -164,7 +162,7 @@ export default function App() {
           `sessionId: ${sessionId}, videoFrameNumber: ${videoFrameNumber}, videoFps: ${videoFps}, videoQuality: ${videoQuality}, size: ${size}, time: ${time}, bitrate: ${bitrate}, speed: ${speed}`
         )
     );
-    listenerSubscription.current.onError = NativeVideoTrim.onError(
+    listenerSubscription.current.onError = (NativeVideoTrim as Spec).onError(
       ({ message, errorCode }) =>
         console.log('onError', `message: ${message}, errorCode: ${errorCode}`)
     );
@@ -229,6 +227,130 @@ const styles = StyleSheet.create({
   },
 });
 ```
+</details>
+
+<br />
+
+<details>
+  <summary>Old Arch usage</summary>
+
+```jsx
+import * as React from 'react';
+
+import {
+  StyleSheet,
+  View,
+  Text,
+  TouchableOpacity,
+  NativeEventEmitter,
+  NativeModules,
+} from 'react-native';
+import { isValidFile, showEditor } from 'react-native-video-trim';
+import { launchImageLibrary } from 'react-native-image-picker';
+
+export default function App() {
+  useEffect(() => {
+    const eventEmitter = new NativeEventEmitter(NativeModules.VideoTrim);
+    const subscription = eventEmitter.addListener('VideoTrim', (event) => {
+      switch (event.name) {
+        case 'onLoad': {
+          console.log('onLoadListener', event);
+          break;
+        }
+        case 'onShow': {
+          console.log('onShowListener', event);
+          break;
+        }
+        case 'onHide': {
+          console.log('onHide', event);
+          break;
+        }
+        case 'onStartTrimming': {
+          console.log('onStartTrimming', event);
+          break;
+        }
+        case 'onFinishTrimming': {
+          console.log('onFinishTrimming', event);
+          break;
+        }
+        case 'onCancelTrimming': {
+          console.log('onCancelTrimming', event);
+          break;
+        }
+        case 'onCancel': {
+          console.log('onCancel', event);
+          break;
+        }
+        case 'onError': {
+          console.log('onError', event);
+          break;
+        }
+        case 'onLog': {
+          console.log('onLog', event);
+          break;
+        }
+        case 'onStatistics': {
+          console.log('onStatistics', event);
+          break;
+        }
+      }
+    });
+
+    return () => {
+      subscription.remove();
+    };
+  }, []);
+
+  return (
+    <View style={styles.container}>
+      <TouchableOpacity
+        onPress={async () => {
+          const result = await launchImageLibrary({
+            mediaType: 'video',
+            assetRepresentationMode: 'current',
+          });
+
+          isValidFile(result.assets![0]?.uri || '').then((res) =>
+            console.log(res)
+          );
+
+          showEditor(result.assets![0]?.uri || '', {
+            maxDuration: 20,
+          });
+        }}
+        style={{ padding: 10, backgroundColor: 'red' }}
+      >
+        <Text>Launch Library</Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        onPress={() => {
+          isValidFile('invalid file path').then((res) => console.log(res));
+        }}
+        style={{
+          padding: 10,
+          backgroundColor: 'blue',
+          marginTop: 20,
+        }}
+      >
+        <Text>Check Video Valid</Text>
+      </TouchableOpacity>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+});
+```
+</details>
+
+<br />
+
+Checkout [Example folder](./example/src/) for more details
 
 # Methods
 
@@ -286,7 +408,7 @@ Main method to show Video Editor UI.
   - `alertOnFailCloseText` (`default = "Close"`)
   - `enableRotation` (`default = false`)
   - `rotationAngle` (`default = 0`)
-  - `changeStatusBarColorOnOpen` (`default = false`): Update status bar color to black background color when editor is opened (useful in somecases where your theme has titlebar in different color than black)
+  - `changeStatusBarColorOnOpen` (`default = false`): (Android only) Update status bar color to black background color when editor is opened (useful in somecases where your theme has titlebar in different color than black)
 
 If `saveToPhoto = true`, you must ensure that you have request permission to write to photo/gallery
 - For Android: you need to have `<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />` in AndroidManifest.xml
@@ -338,21 +460,7 @@ Clean all generated output files in app storage. Return number of successfully d
 ## deleteFile()
 Delete a file in app storage. Return `true` if success
 
-# Callbacks (New arch)
-
-## showEditor
-
-```ts
-showEditor('file', config)
-```
-
-## closeEditor
-
-```ts
-closeEditor()
-```
-
-# Audio support
+# Audio only support
 <div align="left">
 <img src="images/audio_android.jpg" width="200" />
 <img src="images/audio_ios.jpg" width="200" />

package/android/build.gradle

@@ -19,7 +19,9 @@ buildscript {
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-apply plugin: "com.facebook.react"
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
 
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["VideoTrim_" + name]).toInteger()
@@ -33,6 +35,10 @@ def getPackageVersionOrDefault() {
   return rootProject.ext.has("VideoTrim_ffmpeg_version") ? rootProject.ext.get("VideoTrim_ffmpeg_version") : project.properties["VideoTrim_ffmpeg_version"]
 }
 
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
 android {
   namespace "com.videotrim"
 
@@ -41,6 +47,7 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
 
   buildFeatures {
@@ -64,10 +71,16 @@ android {
 
   sourceSets {
     main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni"
-      ]
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += [
+          "src/newarch",
+          // Codegen specs
+          "generated/java",
+          "generated/jni"
+        ]
+      } else {
+        java.srcDirs += "src/oldarch"
+      }
     }
   }
 }
@@ -85,8 +98,10 @@ dependencies {
   implementation 'io.github.maitrungduc1410:ffmpeg-kit-' + getPackageNameOrDefault() +':' + getPackageVersionOrDefault()
 }
 
-react {
-  jsRootDir = file("../src/")
-  libraryName = "VideoTrim"
-  codegenJavaPackageName = "com.videotrim"
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "VideoTrim"
+    codegenJavaPackageName = "com.videotrim"
+  }
 }

package/android/src/main/java/com/videotrim/{VideoTrimModule.kt → BaseVideoTrimModule.kt}

@@ -17,7 +17,6 @@ import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.LinearLayout
@@ -32,8 +31,14 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.arthenica.ffmpegkit.FFmpegKit
 import com.arthenica.ffmpegkit.ReturnCode
-import com.facebook.react.bridge.*
-import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.BaseActivityEventListener
+import com.facebook.react.bridge.LifecycleEventListener
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.bridge.WritableMap
 import com.videotrim.enums.ErrorCode
 import com.videotrim.interfaces.VideoTrimListener
 import com.videotrim.utils.MediaMetadataUtil
@@ -47,9 +52,14 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.TimeZone
 
-@ReactModule(name = VideoTrimModule.NAME)
-class VideoTrimModule(reactContext: ReactApplicationContext) :
-  NativeVideoTrimSpec(reactContext), VideoTrimListener, LifecycleEventListener {
+/**
+ * Contains all shared business logic between old + new arch.
+ * Does NOT know how to emit events.
+ */
+open class BaseVideoTrimModule internal constructor(
+  private val reactApplicationContext: ReactApplicationContext,
+  private val sendEvent: (eventName: String, params: WritableMap?) -> Unit
+) : VideoTrimListener, LifecycleEventListener {
 
   private var isInit: Boolean = false
   private var trimmerView: VideoTrimmerView? = null
@@ -62,6 +72,8 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
   private var editorConfig: ReadableMap? = null
   private var trimOptions: ReadableMap? = null
   private var originalStatusBarColor: Int = Color.TRANSPARENT
+  private val shouldChangeStatusBarColorOnOpen: Boolean
+    get() = editorConfig?.hasKey("changeStatusBarColorOnOpen") == true && editorConfig?.getBoolean("changeStatusBarColorOnOpen") == true
 
   init {
     val mActivityEventListener = object : BaseActivityEventListener() {
@@ -114,7 +126,8 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     reactApplicationContext.addActivityEventListener(mActivityEventListener)
   }
 
-  override fun showEditor(
+
+  fun showEditor(
     filePath: String,
     config: ReadableMap,
   ) {
@@ -149,7 +162,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
       alertDialog?.setOnShowListener {
         applySafeAreaToDialog(alertDialog!!, trimmerView!!)
 
-        emitOnShow()
+        sendEvent("onShow", null)
       }
 
       // this is to ensure to release resource if dialog is dismissed in unexpected way (Eg. open control/notification center by dragging from top of screen)
@@ -160,7 +173,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
           trimmerView = null
         }
         hideDialog(true)
-        emitOnHide()
+        sendEvent("onHide", null)
       }
 
       alertDialog?.show()
@@ -196,8 +209,8 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
 
       // 2. restore flags to their previous state
       //    For most cases, just setting the color is enough.
-       it.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-       it.clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+      it.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+      it.clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
     }
   }
 
@@ -249,15 +262,15 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     hideDialog(true)
   }
 
-  override fun invalidate() {
-    super.invalidate()
-    hideDialog(true)
-  }
+//  override fun invalidate() {
+//    super.invalidate()
+//    hideDialog(true)
+//  }
 
   override fun onLoad(duration: Int) {
     val map = Arguments.createMap()
     map.putInt("duration", duration)
-    emitOnLoad(map)
+    sendEvent("onLoad", map)
   }
 
   override fun onTrimmingProgress(percentage: Int) {
@@ -279,7 +292,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     map.putInt("duration", duration)
     map.putDouble("startTime", startTime.toDouble())
     map.putDouble("endTime", endTime.toDouble())
-    emitOnFinishTrimming(map)
+    sendEvent("onFinishTrimming", map)
 
     if (editorConfig?.getBoolean("saveToPhoto") == true && isVideoType) {
       try {
@@ -311,19 +324,19 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
   }
 
   override fun onCancelTrim() {
-    emitOnCancelTrimming()
+    sendEvent("onCancelTrimming", null)
   }
 
   override fun onError(errorMessage: String?, errorCode: ErrorCode) {
     val map = Arguments.createMap()
     map.putString("message", errorMessage)
     map.putString("errorCode", errorCode.name)
-    emitOnError(map)
+    sendEvent("onError", map)
   }
 
   override fun onCancel() {
     if (!editorConfig?.getBoolean("enableCancelDialog")!!) {
-      emitOnCancel()
+      sendEvent("onCancel", null)
       hideDialog(true)
       return
     }
@@ -334,7 +347,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     builder.setCancelable(false)
     builder.setPositiveButton(editorConfig?.getString("cancelDialogConfirmText")) { dialog: DialogInterface, _: Int ->
       dialog.cancel()
-      emitOnCancel()
+      sendEvent("onCancel", null)
       hideDialog(true)
     }
     builder.setNegativeButton(
@@ -369,12 +382,12 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     alertDialog.show()
   }
 
-  override fun onLog(log: ReadableMap) {
-    emitOnLog( log)
+  override fun onLog(log: WritableMap) {
+    sendEvent("onLog", log)
   }
 
-  override fun onStatistics(statistics: ReadableMap) {
-    emitOnStatistics(statistics)
+  override fun onStatistics(statistics: WritableMap) {
+    sendEvent("onStatistics", statistics)
   }
 
   private fun startTrim() {
@@ -478,7 +491,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     mProgressDialog = builder.create()
 
     mProgressDialog!!.setOnShowListener {
-      emitOnStartTrimming()
+      sendEvent("onStartTrimming", null)
       if (trimmerView != null) {
         trimmerView!!.onSaveClicked()
       }
@@ -516,45 +529,33 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     }
   }
 
-//  private fun sendEvent(
-//    eventName: String,
-//    params: Map<String, String>
-//  ) {
-//    onEvent?.let { it(eventName, params) }
-//
-//    if (eventName == "onHide" && onComplete != null) {
-//      onComplete?.let { it() }
-//      onComplete = null // Clear the callback after invoking it
-//    }
-//  }
-
-  override fun listFiles(promise: Promise) {
-      promise.resolve(StorageUtil.listFiles(reactApplicationContext))
+  fun listFiles(promise: Promise) {
+    promise.resolve(Arguments.fromArray(StorageUtil.listFiles(reactApplicationContext)))
   }
 
-  override fun cleanFiles(promise: Promise) {
-      val files = StorageUtil.listFiles(reactApplicationContext)
-      var successCount = 0
-      for (file in files) {
-        val state = StorageUtil.deleteFile(file)
-        if (state) {
-          successCount++
-        }
+  fun cleanFiles(promise: Promise) {
+    val files = StorageUtil.listFiles(reactApplicationContext)
+    var successCount = 0
+    for (file in files) {
+      val state = StorageUtil.deleteFile(file)
+      if (state) {
+        successCount++
       }
+    }
 
-      promise.resolve(successCount.toDouble())
+    promise.resolve(successCount.toDouble())
   }
 
-  override fun deleteFile(filePath: String?, promise: Promise) {
-      promise.resolve(StorageUtil.deleteFile(filePath))
+  fun deleteFile(filePath: String, promise: Promise) {
+    promise.resolve(StorageUtil.deleteFile(filePath))
   }
 
-  override fun closeEditor() {
+  fun closeEditor() {
     hideDialog(true)
-    emitOnHide()
+    sendEvent("onHide", null)
   }
 
-  override fun isValidFile(url: String, promise: Promise) {
+  fun isValidFile(url: String, promise: Promise) {
     MediaMetadataUtil.checkFileValidity(url) { isValid: Boolean, fileType: String, duration: Long ->
       if (isValid) {
         Log.d(TAG, "Valid $fileType file with duration: $duration milliseconds")
@@ -572,7 +573,7 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  override fun trim(url: String, options: ReadableMap?, promise: Promise) {
+  fun trim(url: String, options: ReadableMap?, promise: Promise) {
     trimOptions = options
 
     val currentDate = Date()
@@ -694,9 +695,6 @@ class VideoTrimModule(reactContext: ReactApplicationContext) :
     reactApplicationContext.currentActivity?.startActivity(Intent.createChooser(shareIntent, "Share file"))
   }
 
-  val shouldChangeStatusBarColorOnOpen: Boolean
-    get() = editorConfig?.hasKey("changeStatusBarColorOnOpen") == true && editorConfig?.getBoolean("changeStatusBarColorOnOpen") == true
-
   companion object {
     const val NAME = "VideoTrim"
     const val TAG = "VideoTrimModule"

package/android/src/main/java/com/videotrim/interfaces/VideoTrimListener.java

@@ -1,6 +1,7 @@
 package com.videotrim.interfaces;
 
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
 import com.videotrim.enums.ErrorCode;
 
 import java.util.Map;
@@ -13,6 +14,6 @@ public interface VideoTrimListener {
   void onError(String errorMessage, ErrorCode errorCode);
   void onCancel();
   void onSave();
-  void onLog(ReadableMap log);
-  void onStatistics(ReadableMap statistics);
+  void onLog(WritableMap log);
+  void onStatistics(WritableMap statistics);
 }

package/android/src/main/java/com/videotrim/utils/VideoTrimmerUtil.java

@@ -17,9 +17,7 @@ import com.videotrim.interfaces.VideoTrimListener;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.TimeZone;
 
 import iknow.android.utils.DeviceUtil;
@@ -81,8 +79,14 @@ public class VideoTrimmerUtil {
     cmds.add(outputFile);
 
     String[] command = cmds.toArray(new String[0]);
+    String cmdStr = "Command: " + String.join(" ", command);
 
-    Log.d(TAG,"Command: " + String.join(",", command));
+    Log.d(TAG, cmdStr);
+
+    WritableMap m = Arguments.createMap();
+    m.putString("message", cmdStr);
+
+    callback.onLog(m);
 
     return FFmpegKit.executeWithArgumentsAsync(command, session -> {
       SessionState state = session.getState();

package/android/src/newarch/VideoTrimModule.kt

@@ -0,0 +1,76 @@
+package com.videotrim
+
+import android.util.Log
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
+
+class VideoTrimModule(
+  context: ReactApplicationContext
+) : VideoTrimSpec(context) {
+  // making BaseVideoTrimModule as abstract class then inherit from here doesn't work
+  // hence using composition instead of inheritance
+  private val base = BaseVideoTrimModule(
+    context
+  ) { eventName, params -> sendEvent(eventName, params) }
+
+  private fun sendEvent(eventName: String, params: WritableMap?) {
+      when (eventName) {
+        "onHide" -> emitOnHide()
+        "onShow" -> emitOnShow()
+        "onCancel" -> emitOnCancel()
+        "onStartTrimming" -> emitOnStartTrimming()
+        "onFinishTrimming" -> emitOnFinishTrimming(params)
+        "onCancelTrimming" -> emitOnCancelTrimming()
+        "onLog" -> emitOnLog(params)
+        "onStatistics" -> emitOnStatistics(params)
+        "onError" -> emitOnError(params)
+        "onLoad" -> emitOnLoad(params)
+        // default case to handle unexpected event names
+        else -> {
+          Log.d(NAME, "Unknown event: $eventName")
+        }
+      }
+  }
+
+  override fun showEditor(
+    filePath: String,
+    config: ReadableMap
+  ) {
+    base.showEditor(filePath, config)
+  }
+
+  override fun listFiles(promise: Promise) {
+    base.listFiles(promise)
+  }
+
+  override fun cleanFiles(promise: Promise) {
+    base.cleanFiles(promise)
+  }
+
+  override fun deleteFile(filePath: String, promise: Promise) {
+    base.deleteFile(filePath, promise)
+  }
+
+  override fun closeEditor() {
+    base.closeEditor()
+  }
+
+  override fun isValidFile(url: String, promise: Promise) {
+    base.isValidFile(url, promise)
+  }
+
+  override fun trim(
+    url: String,
+    options: ReadableMap,
+    promise: Promise
+  ) {
+    base.trim(url, options, promise)
+  }
+
+  companion object {
+    const val NAME = "VideoTrim"
+  }
+
+}

package/android/src/newarch/VideoTrimSpec.kt

@@ -0,0 +1,7 @@
+package com.videotrim
+
+import com.facebook.react.bridge.ReactApplicationContext
+
+abstract class VideoTrimSpec internal constructor(context: ReactApplicationContext) :
+  NativeVideoTrimSpec(context) {
+}

package/android/src/oldarch/VideoTrimModule.kt

@@ -0,0 +1,75 @@
+package com.videotrim
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+
+import com.facebook.react.bridge.*
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.modules.core.DeviceEventManagerModule
+
+
+@ReactModule(name = VideoTrimModule.NAME)
+class VideoTrimModule internal constructor(context: ReactApplicationContext) : VideoTrimSpec(context) {
+  // making BaseVideoTrimModule as abstract class then inherit from here doesn't work
+  // hence using composition instead of inheritance
+  private val base = BaseVideoTrimModule(
+    context
+  ) { eventName, params -> sendEvent(eventName, params) }
+
+
+  private fun sendEvent(eventName: String, params: WritableMap?) {
+    val map = params ?: Arguments.createMap()
+    map.putString("name", eventName)
+    reactApplicationContext
+      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+      .emit(NAME, map)
+  }
+
+  override fun getName(): String {
+    return NAME
+  }
+
+  @ReactMethod
+  override fun showEditor(filePath: String, config: ReadableMap) {
+    base.showEditor(filePath, config)
+  }
+
+  @ReactMethod
+  override fun listFiles(promise: Promise) {
+    base.listFiles(promise)
+  }
+
+  @ReactMethod
+  override fun cleanFiles(promise: Promise) {
+    base.cleanFiles(promise)
+  }
+
+  @ReactMethod
+  override fun deleteFile(filePath: String, promise: Promise) {
+    base.deleteFile(filePath, promise)
+  }
+
+  @ReactMethod
+  override fun closeEditor() {
+    base.closeEditor()
+  }
+
+  @ReactMethod
+  override fun isValidFile(url: String, promise: Promise) {
+    base.isValidFile(url, promise)
+  }
+
+  @ReactMethod
+  override fun trim(
+    url: String,
+    options: ReadableMap?,
+    promise: Promise
+  ) {
+    base.trim(url, options, promise)
+  }
+
+  companion object {
+    const val NAME = "VideoTrim"
+  }
+}

package/android/src/oldarch/VideoTrimSpec.kt

@@ -0,0 +1,24 @@
+package com.videotrim
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReadableMap
+
+abstract class VideoTrimSpec internal constructor(context: ReactApplicationContext) :
+  ReactContextBaseJavaModule(context) {
+
+  abstract fun showEditor(filePath: String, config: ReadableMap)
+
+  abstract fun listFiles(promise: Promise)
+
+  abstract fun cleanFiles(promise: Promise)
+
+  abstract fun deleteFile(filePath: String, promise: Promise)
+
+  abstract fun closeEditor()
+
+  abstract fun isValidFile(url: String, promise: Promise)
+
+  abstract fun trim(url: String, options: ReadableMap?, promise: Promise)
+}

package/ios/VideoTrim-Bridging-Header.h

@@ -1 +1 @@
-
+#import <React/RCTBridgeModule.h>

package/ios/VideoTrim.mm

@@ -1,5 +1,12 @@
-#import "VideoTrim.h"
+// because Swift class inherits from RCTEventEmitter, hence we need to import it here for both new and old arch
+#import <React/RCTEventEmitter.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <VideoTrimSpec/VideoTrimSpec.h>
 #import <VideoTrim-Swift.h>
+@interface VideoTrim : NativeVideoTrimSpecBase <NativeVideoTrimSpec, VideoTrimProtocol>
+@end
 
 @implementation VideoTrim {
   VideoTrimSwift  * _Nullable videoTrim;
@@ -45,9 +52,9 @@ RCT_EXPORT_MODULE()
      options:(JS::NativeVideoTrim::TrimOptions &)options
      resolve:(nonnull RCTPromiseResolveBlock)resolve
       reject:(nonnull RCTPromiseRejectBlock)reject {
-  // TODO: implement
   if (!self->videoTrim) {
     self->videoTrim = [[VideoTrimSwift alloc] init];
+    self->videoTrim.isNewArch = true;
   }
   
   NSMutableDictionary *dict = [NSMutableDictionary dictionary];
@@ -83,6 +90,7 @@ RCT_EXPORT_MODULE()
   if (!self->videoTrim) {
     self->videoTrim = [[VideoTrimSwift alloc] init];
     self->videoTrim.delegate = self;
+    self->videoTrim.isNewArch = true;
   }
   
   NSMutableDictionary *dict = [NSMutableDictionary dictionary];
@@ -178,3 +186,27 @@ RCT_EXPORT_MODULE()
 }
 
 @end
+
+#else
+
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(VideoTrim, VideoTrimSwift, RCTEventEmitter)
+
+RCT_EXTERN_METHOD(showEditor:(NSString*)uri withConfig:(NSDictionary *)config)
+RCT_EXTERN_METHOD(listFiles:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(cleanFiles:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(deleteFile:(NSString*)uri withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(closeEditor)
+RCT_EXTERN_METHOD(isValidFile:(NSString*)uri withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(trim:(NSString*)uri withConfig:(NSDictionary *)config
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+@end
+
+#endif
+

package/ios/VideoTrim.swift

@@ -6,7 +6,7 @@ let FILE_PREFIX = "trimmedVideo"
 let BEFORE_TRIM_PREFIX = "beforeTrim"
 
 @objc(VideoTrimSwift)
-public class VideoTrim: NSObject, AssetLoaderDelegate, UIDocumentPickerDelegate {
+public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate {
   // MARK: instance private props
   private var isShowing = false
   private var vc: VideoTrimmerViewController?
@@ -210,10 +210,41 @@ public class VideoTrim: NSObject, AssetLoaderDelegate, UIDocumentPickerDelegate
   }
   
   @objc public weak var delegate: VideoTrimProtocol?
+  @objc public var isNewArch = false
+
+  
+  
+  // MARK: for old arch
+  private var hasListeners = false
+  
+  @objc
+  static public override func requiresMainQueueSetup() -> Bool {
+    return false
+  }
+  
+  public override func supportedEvents() -> [String]! {
+    return ["VideoTrim"]
+  }
+  
+  public override func startObserving() {
+    hasListeners = true
+  }
+  
+  public override func stopObserving() {
+    hasListeners = false
+  }
   
   
   private func emitEventToJS(_ eventName: String, eventData: [String: Any]?) {
-    delegate?.emitEventToJS(eventName: eventName, body: eventData)
+    if isNewArch {
+      delegate?.emitEventToJS(eventName: eventName, body: eventData)
+    } else {
+      if hasListeners {
+        var modifiedEventData = eventData ?? [:] // If eventData is nil, create an empty dictionary
+        modifiedEventData["name"] = eventName
+        sendEvent(withName: "VideoTrim", body: modifiedEventData)
+      }
+    }
   }
   
   private static func deleteFile(url: URL) -> Int {
@@ -433,6 +464,7 @@ public class VideoTrim: NSObject, AssetLoaderDelegate, UIDocumentPickerDelegate
     })
   }
   
+  // New Arch
   @objc(trim:url:config:)
   public func _trim(inputFile: String, config: NSDictionary, completion: @escaping ([String: Any]?) -> Void) {
     var destPath: URL?
@@ -502,7 +534,13 @@ public class VideoTrim: NSObject, AssetLoaderDelegate, UIDocumentPickerDelegate
     }, withLogCallback: nil, withStatisticsCallback: nil)
   }
   
-  
+  // Old Arch
+  @objc(trim:withConfig:withResolver:withRejecter:)
+  func _trim(inputFile: String, config: NSDictionary, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    _trim(inputFile: inputFile, config: config, completion: { payload in
+      resolve(payload)
+    })
+  }
   
   private func saveFileToFilesApp(fileURL: URL) {
     DispatchQueue.main.async {
@@ -602,6 +640,7 @@ public class VideoTrim: NSObject, AssetLoaderDelegate, UIDocumentPickerDelegate
 
 // MARK: @objc instance methods
 extension VideoTrim {
+  // Old + New arch
   @objc(showEditor:withConfig:)
   public func showEditor(uri: String, config: NSDictionary) {
     if isShowing {
@@ -755,6 +794,7 @@ extension VideoTrim {
     }
   }
   
+  // New Arch
   @objc(closeEditor:)
   public func closeEditor(delay: Int = 0) {
     guard let vc = vc else { return }
@@ -768,15 +808,29 @@ extension VideoTrim {
       })
     }
   }
+  
+  // Old Arch
+  @objc(closeEditor)
+  func closeEditor() -> Void {
+    closeEditor()
+  }
 }
 
 // MARK: @objc static methods
 extension VideoTrim {
+  // New Arch
   @objc(listFiles)
   public static func _listFiles() -> [String] {
     return listFiles().map{ $0.absoluteString }
   }
   
+  // Old Arch
+  @objc(listFiles:withRejecter:)
+  func listFiles(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    resolve(VideoTrim._listFiles())
+  }
+  
+  // New Arch
   @objc(cleanFiles)
   public static func cleanFiles() -> Int {
     let files = listFiles()
@@ -792,12 +846,25 @@ extension VideoTrim {
     return successCount
   }
   
+  // Old Arch
+  @objc(cleanFiles:withRejecter:)
+  func cleanFiles(resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    resolve(VideoTrim.cleanFiles())
+  }
+  
+  // New Arch
   @objc(deleteFile:)
   public static func deleteFile(uri: String) -> Bool {
     let state = deleteFile(url: URL(string: uri)!)
     return state == 0
   }
   
+  // Old Arch
+  @objc(deleteFile:withResolver:withRejecter:)
+  func deleteFile(uri: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    resolve(VideoTrim.deleteFile(uri: uri))
+  }
+  
   private static func listFiles() -> [URL] {
     var files: [URL] = []
     
@@ -818,6 +885,7 @@ extension VideoTrim {
     return files
   }
   
+  // New Arch
   @objc(isValidFile:url:)
   public static func isValidFile(url: String, completion: @escaping ([String: Any]) -> Void) -> Void {
     let fileURL = URL(string: url)!
@@ -838,6 +906,15 @@ extension VideoTrim {
     }
   }
   
+  // Old Arch
+  @objc(isValidFile:withResolver:withRejecter:)
+  func isValidFile(uri: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+    VideoTrim.isValidFile(url: uri, completion: { payload in
+        resolve(payload)
+      }
+    )
+  }
+  
   private static func checkFileValidity(url: URL, completion: @escaping (Bool, String, Double) -> Void) {
     let asset = AVAsset(url: url)
     

package/lib/module/OldArch.js

@@ -0,0 +1,15 @@
+"use strict";
+
+import { NativeModules, Platform } from 'react-native';
+export * from "./NativeVideoTrim.js";
+const LINKING_ERROR = `The package 'react-native-video-trim' doesn't seem to be linked. Make sure: \n\n` + Platform.select({
+  ios: "- You have run 'pod install'\n",
+  default: ''
+}) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo Go\n';
+const VideoTrim = NativeModules.VideoTrim ? NativeModules.VideoTrim : new Proxy({}, {
+  get() {
+    throw new Error(LINKING_ERROR);
+  }
+});
+export default VideoTrim;
+//# sourceMappingURL=OldArch.js.map

package/lib/module/OldArch.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","VideoTrim","Proxy","get","Error"],"sourceRoot":"../../src","sources":["OldArch.ts"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AACtD,cAAc,sBAAmB;AAEjC,MAAMC,aAAa,GACjB,kFAAkF,GAClFD,QAAQ,CAACE,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,SAAS,GAAGN,aAAa,CAACM,SAAS,GACrCN,aAAa,CAACM,SAAS,GACvB,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEL,eAAeI,SAAS","ignoreList":[]}

package/lib/module/index.js

@@ -1,8 +1,12 @@
 "use strict";
 
-import VideoTrim from "./NativeVideoTrim.js";
+import VideoTrimNewArch from "./NativeVideoTrim.js";
+import VideoTrimOldArch from "./OldArch.js";
 import { processColor } from 'react-native';
-export * from "./NativeVideoTrim.js";
+
+// React Native runtime flags like nativeFabricUIManager are not in TypeScript types. Using `any` here is intentional and safe.
+const isFabric = !!global.nativeFabricUIManager;
+const VideoTrim = isFabric ? VideoTrimNewArch : VideoTrimOldArch;
 function createBaseOptions(overrides = {}) {
   return {
     saveToPhoto: false,

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["VideoTrim","processColor","createBaseOptions","overrides","saveToPhoto","type","outputExt","openDocumentsOnFinish","openShareSheetOnFinish","removeAfterSavedToPhoto","removeAfterFailedToSavePhoto","removeAfterSavedToDocuments","removeAfterFailedToSaveDocuments","removeAfterShared","removeAfterFailedToShare","enableRotation","rotationAngle","createEditorConfig","enableHapticFeedback","maxDuration","minDuration","cancelButtonText","saveButtonText","enableCancelDialog","cancelDialogTitle","cancelDialogMessage","cancelDialogCancelText","cancelDialogConfirmText","enableSaveDialog","saveDialogTitle","saveDialogMessage","saveDialogCancelText","saveDialogConfirmText","trimmingText","fullScreenModalIOS","autoplay","jumpToPositionOnLoad","closeWhenFinish","enableCancelTrimming","cancelTrimmingButtonText","enableCancelTrimmingDialog","cancelTrimmingDialogTitle","cancelTrimmingDialogMessage","cancelTrimmingDialogCancelText","cancelTrimmingDialogConfirmText","headerText","headerTextSize","headerTextColor","alertOnFailToLoad","alertOnFailTitle","alertOnFailMessage","alertOnFailCloseText","createTrimOptions","startTime","endTime","showEditor","filePath","config","color","listFiles","cleanFiles","deleteFile","trim","length","Error","closeEditor","isValidFile","url","options"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["VideoTrimNewArch","VideoTrimOldArch","processColor","isFabric","global","nativeFabricUIManager","VideoTrim","createBaseOptions","overrides","saveToPhoto","type","outputExt","openDocumentsOnFinish","openShareSheetOnFinish","removeAfterSavedToPhoto","removeAfterFailedToSavePhoto","removeAfterSavedToDocuments","removeAfterFailedToSaveDocuments","removeAfterShared","removeAfterFailedToShare","enableRotation","rotationAngle","createEditorConfig","enableHapticFeedback","maxDuration","minDuration","cancelButtonText","saveButtonText","enableCancelDialog","cancelDialogTitle","cancelDialogMessage","cancelDialogCancelText","cancelDialogConfirmText","enableSaveDialog","saveDialogTitle","saveDialogMessage","saveDialogCancelText","saveDialogConfirmText","trimmingText","fullScreenModalIOS","autoplay","jumpToPositionOnLoad","closeWhenFinish","enableCancelTrimming","cancelTrimmingButtonText","enableCancelTrimmingDialog","cancelTrimmingDialogTitle","cancelTrimmingDialogMessage","cancelTrimmingDialogCancelText","cancelTrimmingDialogConfirmText","headerText","headerTextSize","headerTextColor","alertOnFailToLoad","alertOnFailTitle","alertOnFailMessage","alertOnFailCloseText","createTrimOptions","startTime","endTime","showEditor","filePath","config","color","listFiles","cleanFiles","deleteFile","trim","length","Error","closeEditor","isValidFile","url","options"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/OldArch.d.ts

@@ -0,0 +1,4 @@
+export * from './NativeVideoTrim';
+declare const VideoTrim: any;
+export default VideoTrim;
+//# sourceMappingURL=OldArch.d.ts.map

package/lib/typescript/src/OldArch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"OldArch.d.ts","sourceRoot":"","sources":["../../../src/OldArch.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAC;AAQlC,QAAA,MAAM,SAAS,KASV,CAAC;AAEN,eAAe,SAAS,CAAC"}

package/lib/typescript/src/index.d.ts

@@ -1,6 +1,5 @@
-import VideoTrim from './NativeVideoTrim';
 import type { EditorConfig, FileValidationResult, TrimOptions } from './NativeVideoTrim';
-export * from './NativeVideoTrim';
+declare const VideoTrim: any;
 /**
  * Show video editor
  *

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAEV,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,cAAc,mBAAmB,CAAC;AA0ElC;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,GAAG;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,IAAI,CAWN;AAED;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAE7C;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAK7D;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAEtE;AAED;;;;;;GAMG;AACH,wBAAgB,IAAI,CAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,cAAc,mBAAmB,CAAC;AAClC,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAK3B,QAAA,MAAM,SAAS,KAAiD,CAAC;AA0EjE;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,GAAG;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,IAAI,CAWN;AAED;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAE7C;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAK7D;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAEtE;AAED;;;;;;GAMG;AACH,wBAAgB,IAAI,CAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,cAAc,mBAAmB,CAAC;AAClC,eAAe,SAAS,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "5.1.1",
+  "version": "6.0.0",
   "description": "Video trimmer for your React Native app",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/OldArch.ts

@@ -0,0 +1,21 @@
+import { NativeModules, Platform } from 'react-native';
+export * from './NativeVideoTrim';
+
+const LINKING_ERROR =
+  `The package 'react-native-video-trim' doesn't seem to be linked. Make sure: \n\n` +
+  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
+  '- You rebuilt the app after installing the package\n' +
+  '- You are not using Expo Go\n';
+
+const VideoTrim = NativeModules.VideoTrim
+  ? NativeModules.VideoTrim
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error(LINKING_ERROR);
+        },
+      }
+    );
+
+export default VideoTrim;

package/src/index.tsx

@@ -1,4 +1,5 @@
-import VideoTrim from './NativeVideoTrim';
+import VideoTrimNewArch from './NativeVideoTrim';
+import VideoTrimOldArch from './OldArch';
 import type {
   BaseOptions,
   EditorConfig,
@@ -6,7 +7,10 @@ import type {
   TrimOptions,
 } from './NativeVideoTrim';
 import { processColor } from 'react-native';
-export * from './NativeVideoTrim';
+
+// React Native runtime flags like nativeFabricUIManager are not in TypeScript types. Using `any` here is intentional and safe.
+const isFabric = !!(global as any).nativeFabricUIManager;
+const VideoTrim = isFabric ? VideoTrimNewArch : VideoTrimOldArch;
 
 function createBaseOptions(overrides: Partial<BaseOptions> = {}): BaseOptions {
   return {

package/ios/VideoTrim.h

@@ -1,5 +0,0 @@
-#import <VideoTrimSpec/VideoTrimSpec.h>
-#import <VideoTrim-Swift.h>
-
-@interface VideoTrim : NativeVideoTrimSpecBase <NativeVideoTrimSpec, VideoTrimProtocol>
-@end