react-native-video-trim 2.0.0 → 2.1.0

package/ios/VideoTrimmer.swift

@@ -36,7 +36,7 @@ import AVFoundation
     // TODO: migrate all to AutoLayout
     private let thumbView: VideoTrimmerThumb = {
         let view = VideoTrimmerThumb()
-        view.accessibilityIdentifier = "wrapperView"
+        view.accessibilityIdentifier = "thumbView"
         return view
     }()
     
@@ -59,7 +59,7 @@ import AVFoundation
         let view = UIView()
         view.accessibilityIdentifier = "thumbnailClipView"
         view.translatesAutoresizingMaskIntoConstraints = false
-
+        
         return view
     }()
     
@@ -152,6 +152,7 @@ import AVFoundation
     // a clip cannot be trimmed shorter than this duration
     var minimumDuration: CMTime = CMTime(seconds: 1, preferredTimescale: 600)
     var maximumDuration: CMTime = .positiveInfinity
+    var enableHapticFeedback = true
     
     // the available range of the asset.
     // Will be set to the full duration of the asset when assigning a new asset
@@ -517,7 +518,9 @@ import AVFoundation
         isZoomedIn = true
         animateChanges()
         
-        UISelectionFeedbackGenerator().selectionChanged()
+        if enableHapticFeedback {
+            UISelectionFeedbackGenerator().selectionChanged()
+        }
     }
     
     private func animateChanges() {
@@ -530,12 +533,13 @@ import AVFoundation
     }
     
     private func startPanning() {
-        UISelectionFeedbackGenerator().selectionChanged()
-        
         didClampWhilePanning = false
         
-        impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
-        impactFeedbackGenerator?.prepare()
+        if enableHapticFeedback {
+            UISelectionFeedbackGenerator().selectionChanged()
+            impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
+            impactFeedbackGenerator?.prepare()
+        }
         
         UIView.animate(withDuration: 0.25, delay: 0, options: [.beginFromCurrentState, .allowUserInteraction], animations: {
             self.updateProgressIndicator()
@@ -612,10 +616,12 @@ import AVFoundation
         }
         switch sender.state {
         case .began:
+            if enableHapticFeedback {
+                UISelectionFeedbackGenerator().selectionChanged()
+                impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
+                impactFeedbackGenerator?.prepare()
+            }
             
-            UISelectionFeedbackGenerator().selectionChanged()
-            impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
-            impactFeedbackGenerator?.prepare()
             didClampWhilePanning = false
             
             isScrubbing = true

package/ios/VideoTrimmerViewController.swift

@@ -22,13 +22,36 @@ extension CMTime {
 
 @available(iOS 13.0, *)
 class VideoTrimmerViewController: UIViewController {
-    var asset: AVAsset!
+    var asset: AVAsset? {
+        didSet {
+            if let _ = asset {
+                setupVideoTrimmer()
+                setupPlayerController()
+                setupTimeObserver()
+                updateLabels()
+                
+                loadingIndicator.stopAnimating()
+                btnStackView.removeArrangedSubview(loadingIndicator)
+                loadingIndicator.removeFromSuperview()
+                btnStackView.insertArrangedSubview(playBtn, at: 1)
+                
+                UIView.animate(withDuration: 0.25, animations: {
+                    self.playBtn.alpha = 1
+                    self.playBtn.isEnabled = true
+                    self.saveBtn.alpha = 1
+                    self.saveBtn.isEnabled = true
+                })
+            }
+        }
+    }
     var maximumDuration: Int?
     var minimumDuration: Int?
     var cancelBtnText = "Cancel"
     var saveButtonText = "Save"
     var cancelBtnClicked: (() -> Void)?
     var saveBtnClicked: ((CMTimeRange) -> Void)?
+    var isVideoType = true
+    var enableHapticFeedback = true
     
     private let playerController = AVPlayerViewController()
     private var trimmer: VideoTrimmer!
@@ -39,9 +62,11 @@ class VideoTrimmerViewController: UIViewController {
     private var btnStackView: UIStackView!
     private var cancelBtn: UIButton!
     private var playBtn: UIButton!
+    private var loadingIndicator = UIActivityIndicatorView()
     private var saveBtn: UIButton!
     private let playIcon = UIImage(systemName: "play.fill")
     private let pauseIcon = UIImage(systemName: "pause.fill")
+    private let audioBannerView = UIImage(systemName: "airpodsmax")
     private var player: AVPlayer! { playerController.player }
     private var timeObserverToken: Any?
     
@@ -49,6 +74,32 @@ class VideoTrimmerViewController: UIViewController {
     private var chaseTime = CMTime.zero
     private var preferredFrameRate: Float = 23.98
     
+    public func onAssetFailToLoad() {
+        loadingIndicator.stopAnimating()
+        btnStackView.removeArrangedSubview(loadingIndicator)
+        loadingIndicator.removeFromSuperview()
+        
+        let imageViewContainer = UIView()
+        let imageView = UIImageView(image: UIImage(systemName: "exclamationmark.triangle.fill"))
+        imageView.tintColor = .systemYellow
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+
+        imageViewContainer.addSubview(imageView)
+        NSLayoutConstraint.activate([
+            imageView.widthAnchor.constraint(equalToConstant: 36),
+            imageView.heightAnchor.constraint(equalToConstant: 36),
+            imageView.centerXAnchor.constraint(equalTo: imageViewContainer.centerXAnchor),
+            imageView.centerYAnchor.constraint(equalTo: imageViewContainer.centerYAnchor)
+        ])
+        imageViewContainer.alpha = 0
+        
+        btnStackView.insertArrangedSubview(imageViewContainer, at: 1)
+
+        UIView.animate(withDuration: 0.25, animations: {
+            imageViewContainer.alpha = 1
+        })
+    }
+    
     // MARK: - Input
     @objc private func didBeginTrimmingFromStart(_ sender: VideoTrimmer) {
         handleBeforeProgressChange()
@@ -117,16 +168,13 @@ class VideoTrimmerViewController: UIViewController {
         setupView()
         setupButtons()
         setupTimeLabels()
-        setupVideoTrimmer()
-        setupPlayerController()
-        setupTimeObserver()
-        
-        updateLabels()
     }
     
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
+        // if asset has been initialized
+        guard let _ = asset else { return }
         player.pause()
         if let token = timeObserverToken {
             player.removeTimeObserver(token)
@@ -170,26 +218,38 @@ class VideoTrimmerViewController: UIViewController {
     private func setupButtons() {
         cancelBtn = UIButton.createButton(title: cancelBtnText, font: .systemFont(ofSize: 18), titleColor: .white, target: self, action: #selector(onCancelBtnClicked))
         playBtn = UIButton.createButton(image: playIcon, tintColor: .white, target: self, action: #selector(togglePlay(sender:)))
+        playBtn.alpha = 0
+        playBtn.isEnabled = false
+        
         saveBtn = UIButton.createButton(title: saveButtonText, font: .systemFont(ofSize: 18), titleColor: .systemBlue, target: self, action: #selector(onSaveBtnClicked))
+        saveBtn.alpha = 0
+        saveBtn.isEnabled = false
         
-        btnStackView = UIStackView(arrangedSubviews: [cancelBtn, playBtn, saveBtn])
+        btnStackView = UIStackView(arrangedSubviews: [cancelBtn, loadingIndicator, saveBtn])
         btnStackView.axis = .horizontal
-        btnStackView.alignment = .fill
+        btnStackView.alignment = .center
         btnStackView.distribution = .fillEqually
         btnStackView.spacing = UIStackView.spacingUseSystem
-        view.addSubview(btnStackView)
         btnStackView.translatesAutoresizingMaskIntoConstraints = false
+        
+        view.addSubview(btnStackView)
+        
         NSLayoutConstraint.activate([
             btnStackView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: 16),
             btnStackView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -16),
             btnStackView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor, constant: -16)
         ])
+        
+        loadingIndicator.startAnimating()
     }
     
     private func setupTimeLabels() {
         leadingTrimLabel = UILabel.createLabel(textAlignment: .left, textColor: .white)
+        leadingTrimLabel.text = "00:00.000"
         currentTimeLabel = UILabel.createLabel(textAlignment: .center, textColor: .white)
+        currentTimeLabel.text = "00:00.000"
         trailingTrimLabel = UILabel.createLabel(textAlignment: .right, textColor: .white)
+        trailingTrimLabel.text = "00:00.000"
         
         timingStackView = UIStackView(arrangedSubviews: [leadingTrimLabel, currentTimeLabel, trailingTrimLabel])
         timingStackView.axis = .horizontal
@@ -209,11 +269,12 @@ class VideoTrimmerViewController: UIViewController {
         trimmer = VideoTrimmer()
         trimmer.asset = asset
         trimmer.minimumDuration = CMTime(seconds: 1, preferredTimescale: 600)
+        trimmer.enableHapticFeedback = enableHapticFeedback
         
         if let maxDuration = maximumDuration {
             trimmer.maximumDuration = CMTime(seconds: max(1, Double(maxDuration)), preferredTimescale: 600)
-            if trimmer.maximumDuration > asset.duration {
-                trimmer.maximumDuration = asset.duration
+            if trimmer.maximumDuration > asset!.duration {
+                trimmer.maximumDuration = asset!.duration
             }
             trimmer.selectedRange = CMTimeRange(start: .zero, end: trimmer.maximumDuration)
         }
@@ -233,6 +294,7 @@ class VideoTrimmerViewController: UIViewController {
         trimmer.addTarget(self, action: #selector(didBeginTrimmingFromEnd(_:)), for: VideoTrimmer.didBeginTrimmingFromEnd)
         trimmer.addTarget(self, action: #selector(trailingGrabberChanged(_:)), for: VideoTrimmer.trailingGrabberChanged)
         trimmer.addTarget(self, action: #selector(didEndTrimmingFromEnd(_:)), for: VideoTrimmer.didEndTrimmingFromEnd)
+        trimmer.alpha = 0
         view.addSubview(trimmer)
         trimmer.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
@@ -241,6 +303,10 @@ class VideoTrimmerViewController: UIViewController {
             trimmer.bottomAnchor.constraint(equalTo: timingStackView.topAnchor, constant: -16),
             trimmer.heightAnchor.constraint(equalToConstant: 50)
         ])
+        
+        UIView.animate(withDuration: 0.25, animations: {
+            self.trimmer.alpha = 1
+        })
     }
     
     private func setupPlayerController() {
@@ -249,7 +315,7 @@ class VideoTrimmerViewController: UIViewController {
             playerController.allowsVideoFrameAnalysis = false
         }
         playerController.player = AVPlayer()
-        player.replaceCurrentItem(with: AVPlayerItem(asset: asset))
+        player.replaceCurrentItem(with: AVPlayerItem(asset: asset!))
         
         try? AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
         addChild(playerController)

package/lib/commonjs/index.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cleanFiles = cleanFiles;
+exports.closeEditor = closeEditor;
 exports.deleteFile = deleteFile;
-exports.isValidVideo = isValidVideo;
+exports.isValidFile = isValidFile;
 exports.listFiles = listFiles;
 exports.showEditor = showEditor;
 var _reactNative = require("react-native");
@@ -25,63 +26,9 @@ const VideoTrim = _reactNative.NativeModules.VideoTrim ? _reactNative.NativeModu
  * @param {EditorConfig} config: editor configuration
  * @returns {void} A **Promise** which resolves `void`
  */
-async function showEditor(filePath) {
+function showEditor(filePath) {
   let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
-  const {
-    saveToPhoto = true
-  } = config;
-  const outputPath = await VideoTrim.showEditor(filePath, config);
-  if (_reactNative.Platform.OS === 'android') {
-    if (saveToPhoto) {
-      try {
-        if (_reactNative.Platform.Version >= 33) {
-          // since android 13 it's not needed to request permission for write storage: https://github.com/facebook/react-native/issues/36714#issuecomment-1491338276
-          await VideoTrim.saveVideo(outputPath);
-          if (config.removeAfterSavedToPhoto) {
-            deleteFile(outputPath);
-          }
-        } else {
-          const granted = await _reactNative.PermissionsAndroid.request(_reactNative.PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
-            title: 'Video Trimmer Photos Access Required',
-            message: 'Grant access to your Photos to write output Video',
-            buttonNeutral: 'Ask Me Later',
-            buttonNegative: 'Cancel',
-            buttonPositive: 'OK'
-          });
-          if (granted === _reactNative.PermissionsAndroid.RESULTS.GRANTED) {
-            await VideoTrim.saveVideo(outputPath);
-            if (config.removeAfterSavedToPhoto) {
-              deleteFile(outputPath);
-            }
-          } else {
-            throw new Error('Photos Library permission denied');
-          }
-        }
-      } catch (err) {
-        throw err;
-      } finally {
-        VideoTrim.hideDialog();
-      }
-    } else {
-      VideoTrim.hideDialog();
-    }
-  }
-}
-
-/**
- * Delete a file
- *
- * @param {string} filePath: absolute non-empty file path to check if editable
- * @returns {Promise} A **Promise** which resolves `true` if editable
- */
-function isValidVideo(filePath) {
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
-  return VideoTrim.isValidVideo(filePath);
+  VideoTrim.showEditor(filePath, config);
 }
 
 /**
@@ -114,4 +61,20 @@ function deleteFile(filePath) {
   }
   return VideoTrim.deleteFile(filePath);
 }
+
+/**
+ * Close editor
+ */
+function closeEditor() {
+  return VideoTrim.closeEditor();
+}
+
+/**
+ * Check if a file is valid audio or video file
+ *
+ * @returns {Promise} A **Promise** which resolves file info if successful
+ */
+function isValidFile(url) {
+  return VideoTrim.isValidFile(url);
+}
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","VideoTrim","NativeModules","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","trim","saveToPhoto","outputPath","OS","Version","saveVideo","removeAfterSavedToPhoto","deleteFile","granted","PermissionsAndroid","request","PERMISSIONS","WRITE_EXTERNAL_STORAGE","title","message","buttonNeutral","buttonNegative","buttonPositive","RESULTS","GRANTED","err","hideDialog","isValidVideo","listFiles","cleanFiles"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","VideoTrim","NativeModules","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","listFiles","cleanFiles","deleteFile","trim","closeEditor","isValidFile","url"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,aAAa,GAChB,kFAAiF,GAClFC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,SAAS,GAAGC,0BAAa,CAACD,SAAS,GACrCC,0BAAa,CAACD,SAAS,GACvB,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AA2DL;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASU,UAAUA,CAACC,QAAgB,EAAmC;EAAA,IAAjCC,MAAoB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACpER,SAAS,CAACK,UAAU,CAACC,QAAQ,EAAEC,MAAM,CAAC;AACxC;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASI,SAASA,CAAA,EAAsB;EAC7C,OAAOX,SAAS,CAACW,SAAS,CAAC,CAAC;AAC9B;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,UAAUA,CAAA,EAAoB;EAC5C,OAAOZ,SAAS,CAACY,UAAU,CAAC,CAAC;AAC/B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,UAAUA,CAACP,QAAgB,EAAoB;EAC7D,IAAI,EAACA,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAEQ,IAAI,CAAC,CAAC,CAACL,MAAM,GAAE;IAC5B,MAAM,IAAIL,KAAK,CAAC,4BAA4B,CAAC;EAC/C;EACA,OAAOJ,SAAS,CAACa,UAAU,CAACP,QAAQ,CAAC;AACvC;;AAEA;AACA;AACA;AACO,SAASS,WAAWA,CAAA,EAAS;EAClC,OAAOf,SAAS,CAACe,WAAW,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,WAAWA,CAACC,GAAW,EAAoB;EACzD,OAAOjB,SAAS,CAACgB,WAAW,CAACC,GAAG,CAAC;AACnC"}

package/lib/module/index.js

@@ -1,4 +1,4 @@
-import { NativeModules, PermissionsAndroid, Platform } from 'react-native';
+import { NativeModules, Platform } from 'react-native';
 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: ''
@@ -15,63 +15,9 @@ const VideoTrim = NativeModules.VideoTrim ? NativeModules.VideoTrim : new Proxy(
  * @param {EditorConfig} config: editor configuration
  * @returns {void} A **Promise** which resolves `void`
  */
-export async function showEditor(filePath) {
+export function showEditor(filePath) {
   let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
-  const {
-    saveToPhoto = true
-  } = config;
-  const outputPath = await VideoTrim.showEditor(filePath, config);
-  if (Platform.OS === 'android') {
-    if (saveToPhoto) {
-      try {
-        if (Platform.Version >= 33) {
-          // since android 13 it's not needed to request permission for write storage: https://github.com/facebook/react-native/issues/36714#issuecomment-1491338276
-          await VideoTrim.saveVideo(outputPath);
-          if (config.removeAfterSavedToPhoto) {
-            deleteFile(outputPath);
-          }
-        } else {
-          const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
-            title: 'Video Trimmer Photos Access Required',
-            message: 'Grant access to your Photos to write output Video',
-            buttonNeutral: 'Ask Me Later',
-            buttonNegative: 'Cancel',
-            buttonPositive: 'OK'
-          });
-          if (granted === PermissionsAndroid.RESULTS.GRANTED) {
-            await VideoTrim.saveVideo(outputPath);
-            if (config.removeAfterSavedToPhoto) {
-              deleteFile(outputPath);
-            }
-          } else {
-            throw new Error('Photos Library permission denied');
-          }
-        }
-      } catch (err) {
-        throw err;
-      } finally {
-        VideoTrim.hideDialog();
-      }
-    } else {
-      VideoTrim.hideDialog();
-    }
-  }
-}
-
-/**
- * Delete a file
- *
- * @param {string} filePath: absolute non-empty file path to check if editable
- * @returns {Promise} A **Promise** which resolves `true` if editable
- */
-export function isValidVideo(filePath) {
-  if (!(filePath !== null && filePath !== void 0 && filePath.trim().length)) {
-    throw new Error('File path cannot be empty!');
-  }
-  return VideoTrim.isValidVideo(filePath);
+  VideoTrim.showEditor(filePath, config);
 }
 
 /**
@@ -104,4 +50,20 @@ export function deleteFile(filePath) {
   }
   return VideoTrim.deleteFile(filePath);
 }
+
+/**
+ * Close editor
+ */
+export function closeEditor() {
+  return VideoTrim.closeEditor();
+}
+
+/**
+ * Check if a file is valid audio or video file
+ *
+ * @returns {Promise} A **Promise** which resolves file info if successful
+ */
+export function isValidFile(url) {
+  return VideoTrim.isValidFile(url);
+}
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","PermissionsAndroid","Platform","LINKING_ERROR","select","ios","default","VideoTrim","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","trim","saveToPhoto","outputPath","OS","Version","saveVideo","removeAfterSavedToPhoto","deleteFile","granted","request","PERMISSIONS","WRITE_EXTERNAL_STORAGE","title","message","buttonNeutral","buttonNegative","buttonPositive","RESULTS","GRANTED","err","hideDialog","isValidVideo","listFiles","cleanFiles"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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"}
+{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","VideoTrim","Proxy","get","Error","showEditor","filePath","config","arguments","length","undefined","listFiles","cleanFiles","deleteFile","trim","closeEditor","isValidFile","url"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAEtD,MAAMC,aAAa,GAChB,kFAAiF,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;AA2DL;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASQ,UAAUA,CAACC,QAAgB,EAAmC;EAAA,IAAjCC,MAAoB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACpEP,SAAS,CAACI,UAAU,CAACC,QAAQ,EAAEC,MAAM,CAAC;AACxC;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,SAASA,CAAA,EAAsB;EAC7C,OAAOV,SAAS,CAACU,SAAS,CAAC,CAAC;AAC9B;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAAA,EAAoB;EAC5C,OAAOX,SAAS,CAACW,UAAU,CAAC,CAAC;AAC/B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAACP,QAAgB,EAAoB;EAC7D,IAAI,EAACA,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAEQ,IAAI,CAAC,CAAC,CAACL,MAAM,GAAE;IAC5B,MAAM,IAAIL,KAAK,CAAC,4BAA4B,CAAC;EAC/C;EACA,OAAOH,SAAS,CAACY,UAAU,CAACP,QAAQ,CAAC;AACvC;;AAEA;AACA;AACA;AACA,OAAO,SAASS,WAAWA,CAAA,EAAS;EAClC,OAAOd,SAAS,CAACc,WAAW,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,WAAWA,CAACC,GAAW,EAAoB;EACzD,OAAOhB,SAAS,CAACe,WAAW,CAACC,GAAG,CAAC;AACnC"}

package/lib/typescript/index.d.ts

@@ -1,6 +1,14 @@
 export interface EditorConfig {
+    /**
+     * Enable haptic feedback
+     * @default true
+     */
+    enableHapticFeedback?: boolean;
+    /**
+     * Save the output file to Photos Library. Only video is supported. Note that you have to make sure you have permission to save to Photos Library.
+     * @default false
+     */
     saveToPhoto?: boolean;
-    removeAfterSavedToPhoto?: boolean;
     maxDuration?: number;
     minDuration?: number;
     cancelButtonText?: string;
@@ -17,6 +25,33 @@ export interface EditorConfig {
     saveDialogConfirmText?: string;
     trimmingText?: string;
     fullScreenModalIOS?: boolean;
+    /**
+     * Type of the file to edit. If video file, recommend to use `video`. If audio file, recommend to use `audio`.
+     * @default "video"
+     */
+    type?: 'video' | 'audio';
+    /**
+     * Output file extension. If video file, recommend to use `mp4` or `mov`. If audio file, recommend to use `wav` or `m4a`.
+     * @default "mp4"
+     * @example "mp4", "mov", "wav", "m4a", "3gp", "avi", "mkv", "flv", "wmv", "webm"
+     */
+    outputExt?: string;
+    openDocumentsOnFinish?: boolean;
+    openShareSheetOnFinish?: boolean;
+    removeAfterSavedToPhoto?: boolean;
+    removeAfterFailedToSavePhoto?: boolean;
+    removeAfterSavedToDocuments?: boolean;
+    removeAfterFailedToSaveDocuments?: boolean;
+    /**
+     * Remove the file after shared to other apps. Currently only support iOS, on Android there's no way to detect if the file is shared or not.
+     * @default false
+     */
+    removeAfterShared?: boolean;
+    /**
+     * Remove the file after failed to share to other apps. Currently only support iOS, on Android there's no way to detect if the file is shared or not.
+     * @default false
+     */
+    removeAfterFailedToShare?: boolean;
 }
 /**
  * Delete a file
@@ -25,14 +60,7 @@ export interface EditorConfig {
  * @param {EditorConfig} config: editor configuration
  * @returns {void} A **Promise** which resolves `void`
  */
-export declare function showEditor(filePath: string, config?: EditorConfig): Promise<void>;
-/**
- * Delete a file
- *
- * @param {string} filePath: absolute non-empty file path to check if editable
- * @returns {Promise} A **Promise** which resolves `true` if editable
- */
-export declare function isValidVideo(filePath: string): Promise<boolean>;
+export declare function showEditor(filePath: string, config?: EditorConfig): void;
 /**
  * Clean output files generated at all time
  *
@@ -52,4 +80,14 @@ export declare function cleanFiles(): Promise<number>;
  * @returns {Promise} A **Promise** which resolves `true` if successful
  */
 export declare function deleteFile(filePath: string): Promise<boolean>;
+/**
+ * Close editor
+ */
+export declare function closeEditor(): void;
+/**
+ * Check if a file is valid audio or video file
+ *
+ * @returns {Promise} A **Promise** which resolves file info if successful
+ */
+export declare function isValidFile(url: string): Promise<boolean>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAmBA,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,YAAiB,GACxB,OAAO,CAAC,IAAI,CAAC,CAgDf;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAK/D;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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAmBA,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IACzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,YAAiB,GAAG,IAAI,CAE5E;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;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEzD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Video trimmer for your React Native app",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",