react-native-video-trim 4.0.0 → 5.0.0

package/src/index.tsx

@@ -1,22 +1,39 @@
-import { NitroModules } from 'react-native-nitro-modules';
+import VideoTrim from './NativeVideoTrim';
 import type {
+  BaseOptions,
   EditorConfig,
   FileValidationResult,
-  VideoTrim,
-} from './VideoTrim.nitro';
+  TrimOptions,
+} from './NativeVideoTrim';
 import { processColor } from 'react-native';
+export * from './NativeVideoTrim';
 
-const VideoTrimHybridObject =
-  NitroModules.createHybridObject<VideoTrim>('VideoTrim');
+function createBaseOptions(overrides: Partial<BaseOptions> = {}): BaseOptions {
+  return {
+    saveToPhoto: false,
+    type: 'video',
+    outputExt: 'mp4',
+    openDocumentsOnFinish: false,
+    openShareSheetOnFinish: false,
+    removeAfterSavedToPhoto: false,
+    removeAfterFailedToSavePhoto: false,
+    removeAfterSavedToDocuments: false,
+    removeAfterFailedToSaveDocuments: false,
+    removeAfterShared: false,
+    removeAfterFailedToShare: false,
+    enableRotation: false,
+    rotationAngle: 0,
+    ...overrides,
+  };
+}
 
 function createEditorConfig(
   overrides: Partial<EditorConfig> = {}
 ): EditorConfig {
   return {
     enableHapticFeedback: true,
-    saveToPhoto: false,
-    maxDuration: -1, // Adjust default as needed
-    minDuration: 1000,
+    maxDuration: -1,
+    minDuration: -1,
     cancelButtonText: 'Cancel',
     saveButtonText: 'Save',
     enableCancelDialog: true,
@@ -31,17 +48,7 @@ function createEditorConfig(
     saveDialogConfirmText: 'Proceed',
     trimmingText: 'Trimming video...',
     fullScreenModalIOS: false,
-    type: 'video',
-    outputExt: 'mp4',
-    openDocumentsOnFinish: false,
-    openShareSheetOnFinish: false,
-    removeAfterSavedToPhoto: false,
-    removeAfterFailedToSavePhoto: false,
-    removeAfterSavedToDocuments: false,
-    removeAfterFailedToSaveDocuments: false,
-    removeAfterShared: false,
-    removeAfterFailedToShare: false,
-    autoplay: false, // Adjust default as needed
+    autoplay: false,
     jumpToPositionOnLoad: -1,
     closeWhenFinish: true,
     enableCancelTrimming: true,
@@ -51,7 +58,7 @@ function createEditorConfig(
     cancelTrimmingDialogMessage: 'Are you sure want to cancel trimming?',
     cancelTrimmingDialogCancelText: 'Close',
     cancelTrimmingDialogConfirmText: 'Proceed',
-    headerText: '', // Adjust default as needed
+    headerText: '',
     headerTextSize: 16,
     headerTextColor: processColor('white') as number,
     alertOnFailToLoad: true,
@@ -59,82 +66,104 @@ function createEditorConfig(
     alertOnFailMessage:
       'Fail to load media. Possibly invalid file or no network connection',
     alertOnFailCloseText: 'Close',
+    ...createBaseOptions(overrides),
     ...overrides,
   };
 }
 
-function noop() {}
+function createTrimOptions(overrides: Partial<TrimOptions> = {}): TrimOptions {
+  return {
+    startTime: 0,
+    endTime: 1000,
+    ...createBaseOptions(overrides),
+    ...overrides,
+  };
+}
 
 /**
- * Delete a file
+ * Show video editor
  *
- * @param {string} videoPath: absolute non-empty file path to edit
+ * @param {string} filePath: absolute non-empty file path to edit
  * @param {EditorConfig} config: editor configuration
- * @returns {void} A **Promise** which resolves `void`
+ * @param {Function} onEvent: event callback
+ * @returns {void}
  */
 export function showEditor(
   filePath: string,
   config: Partial<Omit<EditorConfig, 'headerTextColor'>> & {
     headerTextColor?: string;
-  },
-  onEvent?: (eventName: string, payload: Record<string, string>) => void
+  }
 ): void {
   const { headerTextColor } = config;
   const color = processColor(headerTextColor || 'white');
 
-  VideoTrimHybridObject.showEditor(
+  VideoTrim.showEditor(
     filePath,
     createEditorConfig({
       ...config,
       headerTextColor: color as any,
-    }),
-    onEvent || noop
+    })
   );
 }
 
 /**
- * Clean output files generated at all time
+ * List output files generated at all time
  *
  * @returns {Promise<string[]>} A **Promise** which resolves to array of files
  */
 export function listFiles(): Promise<string[]> {
-  return VideoTrimHybridObject.listFiles();
+  return VideoTrim.listFiles();
 }
 
 /**
  * Clean output files generated at all time
  *
- * @returns {Promise} A **Promise** which resolves to number of deleted files
+ * @returns {Promise<number>} A **Promise** which resolves to number of deleted files
  */
 export function cleanFiles(): Promise<number> {
-  return VideoTrimHybridObject.cleanFiles();
+  return VideoTrim.cleanFiles();
 }
 
 /**
  * Delete a file
  *
  * @param {string} filePath: absolute non-empty file path to delete
- * @returns {Promise} A **Promise** which resolves `true` if successful
+ * @returns {Promise<boolean>} A **Promise** which resolves `true` if successful
  */
 export function deleteFile(filePath: string): Promise<boolean> {
   if (!filePath?.trim().length) {
     throw new Error('File path cannot be empty!');
   }
-  return VideoTrimHybridObject.deleteFile(filePath);
+  return VideoTrim.deleteFile(filePath);
 }
 
 /**
  * Close editor
  */
-export function closeEditor(onComplete?: () => void): void {
-  return VideoTrimHybridObject.closeEditor(onComplete || noop);
+export function closeEditor(): void {
+  return VideoTrim.closeEditor();
 }
 
 /**
  * Check if a file is valid audio or video file
  *
- * @returns {Promise} A **Promise** which resolves file info if successful
+ * @param {string} url: file path to validate
+ * @returns {Promise<FileValidationResult>} A **Promise** which resolves file info if successful
  */
 export function isValidFile(url: string): Promise<FileValidationResult> {
-  return VideoTrimHybridObject.isValidFile(url);
+  return VideoTrim.isValidFile(url);
+}
+
+/**
+ * Trim a video file
+ *
+ * @param {string} url: absolute non-empty file path to edit
+ * @param {TrimOptions} options: trim options
+ * @returns {Promise<string>} A **Promise** which resolves to the trimmed file path
+ */
+export function trim(
+  url: string,
+  options: Partial<TrimOptions>
+): Promise<string> {
+  return VideoTrim.trim(url, createTrimOptions(options));
 }

package/android/CMakeLists.txt

@@ -1,24 +0,0 @@
-project(videotrim)
-cmake_minimum_required(VERSION 3.9.0)
-
-set(PACKAGE_NAME videotrim)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_STANDARD 20)
-
-# Define C++ library and add all sources
-add_library(${PACKAGE_NAME} SHARED src/main/cpp/cpp-adapter.cpp)
-
-# Add Nitrogen specs :)
-include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/videotrim+autolinking.cmake)
-
-# Set up local includes
-include_directories("src/main/cpp" "../cpp")
-
-find_library(LOG_LIB log)
-
-# Link all libraries together
-target_link_libraries(
-        ${PACKAGE_NAME}
-        ${LOG_LIB}
-        android # <-- Android core
-)

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +0,0 @@
-#include <jni.h>
-#include "videotrimOnLoad.hpp"
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::videotrim::initialize(vm);
-}