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

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/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/package.json

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