react-native-photo-video-editor 0.3.4 → 0.3.6

package/android/src/main/java/com/photovideoeditor/photo/export/PhotoExporter.kt

@@ -126,6 +126,19 @@ object PhotoExporter {
       ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
       ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> matrix.postScale(-1f, 1f)
       ExifInterface.ORIENTATION_FLIP_VERTICAL -> matrix.postScale(1f, -1f)
+      // Mirrored-and-rotated: what a front-facing camera writes for a portrait
+      // shot (CameraX marks the capture as reversed-horizontal, which combines
+      // with the 90/270 sensor rotation into TRANSPOSE/TRANSVERSE rather than
+      // a plain ROTATE_90/270). Falling through to `else` here left those
+      // photos unrotated in the editor.
+      ExifInterface.ORIENTATION_TRANSPOSE -> {
+        matrix.postRotate(90f)
+        matrix.postScale(-1f, 1f)
+      }
+      ExifInterface.ORIENTATION_TRANSVERSE -> {
+        matrix.postRotate(270f)
+        matrix.postScale(-1f, 1f)
+      }
       else -> return bitmap
     }
     return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)

package/android/src/main/java/com/photovideoeditor/photo/render/PhotoEditSession.kt

@@ -112,6 +112,19 @@ class PhotoEditSession(private val context: Context, sourceUri: String, maxPrevi
       ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
       ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> matrix.postScale(-1f, 1f)
       ExifInterface.ORIENTATION_FLIP_VERTICAL -> matrix.postScale(1f, -1f)
+      // Mirrored-and-rotated: what a front-facing camera writes for a portrait
+      // shot (CameraX marks the capture as reversed-horizontal, which combines
+      // with the 90/270 sensor rotation into TRANSPOSE/TRANSVERSE rather than
+      // a plain ROTATE_90/270). Falling through to `else` here left those
+      // photos unrotated in the editor.
+      ExifInterface.ORIENTATION_TRANSPOSE -> {
+        matrix.postRotate(90f)
+        matrix.postScale(-1f, 1f)
+      }
+      ExifInterface.ORIENTATION_TRANSVERSE -> {
+        matrix.postRotate(270f)
+        matrix.postScale(-1f, 1f)
+      }
       else -> return decoded
     }
     return Bitmap.createBitmap(decoded, 0, 0, decoded.width, decoded.height, matrix, true)

package/ios/Editor/PhotoVideoEditorViewController.swift

@@ -1777,9 +1777,9 @@ final class PhotoVideoEditorViewController: UIViewController {
     ])
     clipStripScroll = stripScroll
 
-    session.onClipsReady = { [weak self] in
-      guard let self else { return }
-      DispatchQueue.main.async {
+    session.onClipsReady = { [weak self, weak session] in
+      DispatchQueue.main.async { [weak self, weak session] in
+        guard let self, let session else { return }
         self.selectedClipIndex = 0
         self.updateTimeLabel()
         self.bindTrimViewToSelectedClip(session: session)
@@ -1907,7 +1907,7 @@ final class PhotoVideoEditorViewController: UIViewController {
     positionPollTimer = Timer.scheduledTimer(withTimeInterval: 0.25, repeats: true) { [weak self] _ in
       guard let self, let session = self.videoSession else { return }
       if !self.seekingPosition, session.durationMs > 0 {
-        let currentMs = Int64(CMTimeGetSeconds(session.player.currentTime()) * 1000)
+        let currentMs = session.currentPositionMs
         self.positionSlider?.value = Float(min(max(Double(currentMs) / Double(session.durationMs), 0), 1)) * 1000
         self.updateTimeLabel()
       }
@@ -1951,7 +1951,7 @@ final class PhotoVideoEditorViewController: UIViewController {
 
   private func updateTimeLabel() {
     guard let session = videoSession else { return }
-    let currentMs = Int64(CMTimeGetSeconds(session.player.currentTime()) * 1000)
+    let currentMs = session.currentPositionMs
     timeLabel?.text = "\(formatMs(currentMs)) / \(formatMs(session.durationMs))"
   }
 
@@ -1964,7 +1964,7 @@ final class PhotoVideoEditorViewController: UIViewController {
   /// transparent image sized to the video's own natural size. Reuses
   /// `PhotoLayerRenderer` unchanged — overlays are just `PhotoLayer`s with a time range.
   private func refreshVideoOverlayPreview(session: VideoEditSession) {
-    let positionMs = Int64(CMTimeGetSeconds(session.player.currentTime()) * 1000)
+    let positionMs = session.currentPositionMs
     let activeLayers = session.layerStack.layers.filter { $0.isActive(atMs: positionMs, durationMs: session.durationMs) }
     if let overlayView = videoOverlayImageView {
       videoLayerOverlay?.layers = activeLayers
@@ -2305,7 +2305,7 @@ final class PhotoVideoEditorViewController: UIViewController {
     case "crop":
       setVideoCropMode(true, session: session)
     case "cover":
-      let atMs = Int64(CMTimeGetSeconds(session.player.currentTime()) * 1000)
+      let atMs = session.currentPositionMs
       session.update { $0.coverFrameMs = atMs }
       showToast("Cover frame set at \(formatMs(atMs))")
     case "rotate":
@@ -2496,7 +2496,7 @@ final class PhotoVideoEditorViewController: UIViewController {
     guard let session = videoSession, let clip = session.clips[safe: selectedClipIndex] else { return }
     let index = selectedClipIndex
     let precedingMs = session.clips.prefix(index).reduce(Int64(0)) { $0 + $1.trimmedDurationMs() }
-    let globalMs = Int64(CMTimeGetSeconds(session.player.currentTime()) * 1000)
+    let globalMs = session.currentPositionMs
     let splitWithinClipMs = min(max(globalMs - precedingMs, 0), clip.trimmedDurationMs())
     let splitSourceMs = clip.trimStartMs + splitWithinClipMs
     guard splitSourceMs > clip.trimStartMs + 50, splitSourceMs < clip.effectiveTrimEndMs() - 50 else {
@@ -2789,6 +2789,7 @@ final class PhotoVideoEditorViewController: UIViewController {
 
   deinit {
     positionPollTimer?.invalidate()
+    hideVideoControlsTimer?.invalidate()
     timelineThumbnailRequest?.cancel()
     timelineThumbnailRepository?.close()
     photoSession?.release()

package/ios/PhotoVideoEditor.swift

@@ -10,6 +10,16 @@ public class PhotoVideoEditorSwift: NSObject {
     _ request: String,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
+  ) {
+    DispatchQueue.main.async { [self] in
+      presentEditor(request, resolve: resolve, reject: reject)
+    }
+  }
+
+  private func presentEditor(
+    _ request: String,
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
   ) {
     guard let data = request.data(using: .utf8),
           let payload = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
@@ -36,10 +46,11 @@ public class PhotoVideoEditorSwift: NSObject {
       doneButtonText: doneButtonText
     )
     controller.completion = { [weak self, weak controller] outcome in
-      guard let self else { return }
-      self.editorOpen = false
       DispatchQueue.main.async {
-        controller?.dismiss(animated: true) {
+        guard let self, let controller, controller.completion != nil else { return }
+        controller.completion = nil
+        controller.dismiss(animated: true) {
+          self.editorOpen = false
           switch outcome {
           case .cancelled:
             var result: [String: Any] = ["uri": uri, "type": type, "cancelled": true]
@@ -60,7 +71,7 @@ public class PhotoVideoEditorSwift: NSObject {
         }
       }
     }
-    DispatchQueue.main.async { presenter.present(controller, animated: true) }
+    presenter.present(controller, animated: true)
   }
 
   @objc public func cancelExport(_ jobId: String?, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) { resolve(false) }

package/ios/Stickers/OnlineStickerSheetViewController.swift

@@ -52,6 +52,8 @@ final class OnlineStickerSheetViewController: UIViewController {
     view.backgroundColor = DesignTokens.elevatedPanel
     buildUI()
     loadLocalStickers()
+    rebuildCategoryChips()
+    applyFilter()
   }
 
   override func viewDidDisappear(_ animated: Bool) {
@@ -187,9 +189,6 @@ final class OnlineStickerSheetViewController: UIViewController {
       ?? hostBundle.url(forResource: "PhotoVideoEditorStickers", withExtension: "bundle")
     guard let bundleURL, let bundle = Bundle(url: bundleURL) else { return }
     localStickerNames = (bundle.urls(forResourcesWithExtension: "png", subdirectory: nil) ?? []).map(\.lastPathComponent).sorted()
-    displayedLocalStickerNames = localStickerNames
-    rebuildCategoryChips()
-    applyFilter()
   }
 
   private func localStickerURL(named name: String) -> URL? {
@@ -294,12 +293,14 @@ extension OnlineStickerSheetViewController: UICollectionViewDataSource, UICollec
     let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Self.cellReuseID, for: indexPath) as! BundledStickerCell
     if indexPath.item < displayedRuntimeStickers.count {
       let sticker = displayedRuntimeStickers[indexPath.item]
+      cell.representedStickerURI = sticker.uri
       cell.configure(image: nil)
-      loadRuntimeSticker(sticker) { [weak collectionView] _, image in
-        guard collectionView?.indexPath(for: cell) == indexPath else { return }
+      loadRuntimeSticker(sticker) { [weak cell] _, image in
+        guard let cell, cell.representedStickerURI == sticker.uri else { return }
         cell.configure(image: image)
       }
     } else {
+      cell.representedStickerURI = nil
       let name = displayedLocalStickerNames[indexPath.item - displayedRuntimeStickers.count]
       let image = localStickerURL(named: name).flatMap { UIImage(contentsOfFile: $0.path) }
       cell.configure(image: image)
@@ -330,6 +331,7 @@ extension OnlineStickerSheetViewController: UICollectionViewDataSource, UICollec
 
 /// One grid cell for a bundled sticker image.
 private final class BundledStickerCell: UICollectionViewCell {
+  var representedStickerURI: String?
   private let imageView = UIImageView()
 
   override init(frame: CGRect) {
@@ -356,6 +358,7 @@ private final class BundledStickerCell: UICollectionViewCell {
 
   override func prepareForReuse() {
     super.prepareForReuse()
+    representedStickerURI = nil
     imageView.image = nil
   }
 }

package/ios/Video/Render/VideoEditSession.swift

@@ -28,6 +28,7 @@ final class VideoEditSession {
   private var cachedAsset: AVURLAsset?
   private var statusObservation: NSKeyValueObservation?
   private let sourceUri: String
+  private var isReleased = false
 
   init(sourceUri: String) {
     self.sourceUri = sourceUri
@@ -40,14 +41,14 @@ final class VideoEditSession {
     statusObservation = probeItem.observe(\.status, options: [.initial, .new]) { [weak self] observedItem, _ in
       guard let self, observedItem.status == .readyToPlay else { return }
       DispatchQueue.main.async { [weak self] in
-        guard let self, self.clips.isEmpty else { return }
+        guard let self, !self.isReleased, self.clips.isEmpty else { return }
         if let track = asset.tracks(withMediaType: .video).first {
           let size = track.naturalSize.applying(track.preferredTransform)
           self.naturalSize = CGSize(width: max(1, abs(size.width)), height: max(1, abs(size.height)))
         }
         let durationSeconds = CMTimeGetSeconds(asset.duration)
         guard durationSeconds.isFinite, durationSeconds > 0 else { return }
-        self.clips = [VideoClip(sourceUri: sourceUri, originalDurationMs: Int64(durationSeconds * 1000))]
+        self.clips = [VideoClip(sourceUri: sourceUri, originalDurationMs: Self.milliseconds(for: asset.duration))]
         self.rebuildPlayerComposition()
         self.onClipsReady?()
       }
@@ -58,6 +59,15 @@ final class VideoEditSession {
   /// Sum of every clip's trimmed duration — the length of the composed timeline.
   var durationMs: Int64 { clips.reduce(0) { $0 + $1.trimmedDurationMs() } }
 
+  var currentPositionMs: Int64 { Self.milliseconds(for: player.currentTime()) }
+
+  static func milliseconds(for time: CMTime) -> Int64 {
+    guard time.isNumeric else { return 0 }
+    let converted = CMTimeConvertScale(time, timescale: 1000, method: .roundTowardZero)
+    guard converted.isNumeric else { return 0 }
+    return max(0, converted.value)
+  }
+
   func update(_ transform: (inout VideoTransformState) -> Void) {
     transform(&state)
   }
@@ -65,7 +75,7 @@ final class VideoEditSession {
   /// Applies `transform` to the clip list and rebuilds the preview composition to match,
   /// preserving the playhead's position on the composed timeline as closely as possible.
   func updateClips(_ transform: ([VideoClip]) -> [VideoClip]) {
-    let previousPositionMs = Int64(CMTimeGetSeconds(player.currentTime()) * 1000)
+    let previousPositionMs = currentPositionMs
     clips = transform(clips)
     rebuildPlayerComposition()
     player.seek(to: CMTime(value: previousPositionMs.clamped(to: 0...max(0, durationMs)), timescale: 1000))
@@ -108,8 +118,13 @@ final class VideoEditSession {
   }
 
   func release() {
+    isReleased = true
+    onClipsReady = nil
     statusObservation?.invalidate()
+    statusObservation = nil
     player.pause()
+    player.replaceCurrentItem(with: nil)
+    cachedAsset = nil
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-photo-video-editor",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Native photo and video editor for React Native, powered by Kotlin and Swift.",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",