react-native-photo-video-editor 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -2,9 +2,29 @@
 
 ## Unreleased
 
+## 0.3.0
+
+- Breaking API change: migrate `initialStickerId: 'brand'` to `initialStickerIds: ['brand']`.
+- Replace `initialStickerId` with `initialStickerIds` and add a top-right control on the selected default sticker to cycle through default stickers on Android and iOS. Swaps preserve transforms and support undo/redo; the button is enabled only for multiple IDs.
+- Place the swap control on the sticker’s top-right corner, above the scale control, so it follows dragging and rotation.
+- Remove dummy sticker data from the example; default stickers are supplied by the caller.
+
+## 0.2.2
+
+- Add `initialStickerId` to place a matching `stickerAssets` image at the center when opening the photo or video editor on Android and iOS.
+- Validate initial sticker IDs before opening the editor and report unreadable initial images.
+- Support base64 PNG data URIs for locally embedded sticker images.
+- Keep initial stickers optional: the editor opens without a sticker unless one is supplied.
+
 ## 0.2.1
 
 - Fix an iOS build failure in `TextEditorSheet`: its private stored property `editing` collided with `UIViewController.isEditing`, which is exported to Objective-C as `editing`, so the compiler treated it as an invalid override ("cannot override with a stored property" / "overriding property must be as accessible as its enclosing type"). The property is now `isEditingExisting`; the `editing:` initialiser label is unchanged, so call sites are unaffected.
+- Fix three more iOS build failures in `PhotoVideoEditorViewController`:
+  - `ZoomableImageView()` had no matching initialiser. The class overrides `init(frame:)`, so it does not inherit `UIView`'s no-argument initialiser; the call is now `ZoomableImageView(frame: .zero)`. This also cleared the cascading "cannot infer type of closure parameter 'bounds'" error on the `onBoundsChanged` assignment.
+  - Two layer-transform handlers used an immediately-applied closure inside a ternary (`{ var layer = $0; ... }()`). The `$0` inside bound to the inner closure's own parameter rather than the enclosing `map`'s element, making it a one-argument closure invoked with none. Both are rewritten as an explicit `map { current in ... }` with a `guard`.
+- Fix an iOS build failure in `PhotoExporter`: `(exportOptions?["maxWidth"] as? NSNumber)?.doubleValue.map { ... }` applied `map` to the non-optional `Double` inside the optional chain rather than to the optional itself. `map` now runs on the optional `NSNumber`, keeping the `CGFloat?` type that `resize(_:maxWidth:maxHeight:)` expects.
+- Fix an iOS build failure in `VideoEditSession`: inside `private extension Int64`, the bare `min`/`max` in `clamped(to:)` resolved to the static properties `Int64.min`/`Int64.max` instead of the global functions. They are now qualified as `Swift.min`/`Swift.max`.
+- Fix an iOS build failure in `PhotoVideoEditor.mm`: the TurboModule class subclassed the Swift `PhotoVideoEditorSwift`, which Objective-C cannot do — Swift emits every class into the generated header with `objc_subclassing_restricted`. The TurboModule now holds a `PhotoVideoEditorSwift` instance and forwards `openEditor`, `cancelExport` and `isAvailable` to it.
 
 ## 0.2.0
 

package/README.md

@@ -55,3 +55,30 @@ try {
 See [API](docs/api.md), [architecture](docs/architecture.md), [photo editor](docs/photo-editor.md), [video editor](docs/video-editor.md), and [roadmap](docs/roadmap.md). Known limitations are non-functional tool placeholders, no transformed export, local-URI-only input, and no verified legacy-architecture support.
 
 For local work, run `yarn`, then `yarn typecheck`, `yarn lint`, `yarn test`, and `yarn prepare`. See [CONTRIBUTING.md](CONTRIBUTING.md). MIT licensed; see [LICENSE](LICENSE).
+
+To place a sticker at the center automatically when opening either editor, pass
+`initialStickerIds` containing unique IDs from `stickerAssets`:
+
+```ts
+await openPhotoEditor({
+  source: { uri: photoUri, type: 'photo' },
+  stickerAssets: [
+    { id: 'brand', uri: 'https://example.com/brand-sticker.png' },
+    { id: 'alternate', uri: 'https://example.com/alternate.png' },
+  ],
+  initialStickerIds: ['brand', 'alternate'],
+});
+```
+
+The first sticker starts at the center of the media and can be moved, resized, or
+removed. The “Switch default sticker” control at the selected default sticker’s top-right
+corner, above its bottom-right scale control, cycles through the IDs in
+order and wraps around, replacing the current default sticker while preserving
+its transforms. Switching is undoable. After deletion, use Undo to restore the sticker and its
+controls. The swap control is disabled for one ID and appears only on the selected
+default sticker. Failed swaps leave the existing sticker in place. The same option works with `openVideoEditor` and `openEditor`, even if
+`features.stickers` hides the sticker picker. Omit it to start without a sticker.
+An unknown or duplicate ID rejects with `E_INVALID_OPTIONS`; an unreadable image
+rejects with `E_SOURCE_UNREADABLE`. HTTPS and local sticker URIs are supported.
+
+Migration: replace `initialStickerId: 'brand'` with `initialStickerIds: ['brand']`.

package/android/src/main/java/com/photovideoeditor/editor/PhotoVideoEditorActivity.kt

@@ -185,6 +185,81 @@ class PhotoVideoEditorActivity : Activity() {
     }
     applyStatusBarStyle()
     setContentView(createEditorView())
+    if (!isFinishing) insertInitialSticker()
+  }
+
+  private val initialStickerIds: List<String> by lazy {
+    val ids = request.optJSONArray("initialStickerIds")
+    if (ids == null) emptyList() else (0 until ids.length()).map { ids.optString(it) }.filter { it.isNotBlank() }.distinct()
+  }
+  private val initialStickerLayerId = java.util.UUID.randomUUID().toString()
+  private val initialStickerPaths = mutableMapOf<String, String>()
+  private var initialStickerLoading = false
+
+  private fun currentInitialSticker(): PhotoLayer? =
+    (photoSession?.layerStack?.layers ?: videoSession?.layerStack?.layers)?.firstOrNull { it.id == initialStickerLayerId }
+
+  private fun switchInitialSticker() {
+    if (initialStickerLoading || initialStickerIds.size < 2) return
+    val currentIndex = initialStickerIds.indexOf(currentInitialSticker()?.stickerId)
+    insertInitialSticker((currentIndex + 1) % initialStickerIds.size)
+  }
+
+  private fun insertInitialSticker(index: Int = 0) {
+    if (initialStickerLoading) return
+    val id = initialStickerIds.getOrNull(index) ?: return
+    val asset = runtimeStickerAssets().firstOrNull { it.id == id } ?: return
+    initialStickerLoading = true
+    window.setFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
+    Thread {
+      val path = try {
+        val localPath = initialStickerPaths[id] ?: if (asset.uri.startsWith("https://", ignoreCase = true)) {
+          val output = File.createTempFile("pve_initial_sticker_", ".img", cacheDir)
+          val connection = java.net.URL(asset.uri).openConnection().apply {
+            connectTimeout = 10_000
+            readTimeout = 15_000
+          }
+          connection.getInputStream().use { input -> output.outputStream().use { input.copyTo(it) } }
+          output.absolutePath
+        } else SourceResolver.resolvePath(this, asset.uri, "pve_initial_sticker")
+        localPath?.takeIf {
+          val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+          BitmapFactory.decodeFile(it, options)
+          options.outWidth > 0 && options.outHeight > 0
+        }
+      } catch (_: Exception) { null }
+      runOnUiThread {
+        initialStickerLoading = false
+        window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
+        if (isFinishing || isDestroyed) return@runOnUiThread
+        if (path == null) {
+          if (initialStickerPaths.isEmpty()) finishWithError("The initial sticker could not be loaded.", "E_SOURCE_UNREADABLE")
+          else Toast.makeText(this, "Could not load this sticker. Try again.", Toast.LENGTH_SHORT).show()
+          return@runOnUiThread
+        }
+        initialStickerPaths[id] = path
+        window.decorView.post {
+          if (isFinishing || isDestroyed) return@post
+          val uri = Uri.fromFile(File(path)).toString()
+          val fresh = newSticker(stickerId = id, stickerUri = uri)
+          val layer = currentInitialSticker()?.copy(stickerId = id, stickerUri = uri, overlayAspectRatio = fresh.overlayAspectRatio)
+            ?: fresh.copy(id = initialStickerLayerId)
+          val replace: (List<PhotoLayer>) -> List<PhotoLayer> = { layers ->
+            if (layers.any { it.id == initialStickerLayerId }) layers.map { if (it.id == initialStickerLayerId) layer else it }
+            else layers + layer
+          }
+          if (mediaType == "photo") {
+            photoSession?.layerStack?.commit(replace)
+            onLayerStackChanged()
+            selectLayer(layer.id)
+          } else videoSession?.let { session ->
+            session.layerStack.commit(replace)
+            onVideoLayerStackChanged()
+            selectVideoLayer(layer.id, session)
+          }
+        }
+      }
+    }.start()
   }
 
   private fun applyStatusBarStyle() {
@@ -275,6 +350,9 @@ class PhotoVideoEditorActivity : Activity() {
     previewContainer.addView(overlay, FrameLayout.LayoutParams(MATCH, MATCH))
 
     val layers = LayerOverlayView(this)
+    layers.swappableLayerId = initialStickerLayerId
+    layers.stickerSwapEnabled = initialStickerIds.size > 1
+    layers.onStickerSwap = { switchInitialSticker() }
     layerOverlay = layers
     previewContainer.addView(layers, FrameLayout.LayoutParams(MATCH, MATCH))
 
@@ -1456,6 +1534,9 @@ class PhotoVideoEditorActivity : Activity() {
       if (videoCropMode) videoCropOverlay.restore(videoMediaBounds(session, playerView, false), session.state.crop)
     }
     val layerOverlay = LayerOverlayView(this)
+    layerOverlay.swappableLayerId = initialStickerLayerId
+    layerOverlay.stickerSwapEnabled = initialStickerIds.size > 1
+    layerOverlay.onStickerSwap = { switchInitialSticker() }
     videoLayerOverlay = layerOverlay
     preview.addView(layerOverlay, FrameLayout.LayoutParams(MATCH, MATCH))
     layerOverlay.onLayerDelete = { id ->

package/android/src/main/java/com/photovideoeditor/files/SourceResolver.kt

@@ -15,6 +15,13 @@ object SourceResolver {
     val uri = Uri.parse(sourceUri)
     return when (uri.scheme) {
       "file", null -> uri.path ?: sourceUri
+      "data" -> {
+        if (!sourceUri.startsWith("data:image/png;base64,")) return null
+        val bytes = try {
+          android.util.Base64.decode(sourceUri.substringAfter(','), android.util.Base64.DEFAULT)
+        } catch (_: IllegalArgumentException) { return null }
+        File.createTempFile(tempPrefix, ".png", context.cacheDir).apply { writeBytes(bytes) }.absolutePath
+      }
       "content" -> {
         val tempFile = File.createTempFile(tempPrefix, ".tmp", context.cacheDir)
         val copied = context.contentResolver.openInputStream(uri)?.use { input ->

package/android/src/main/java/com/photovideoeditor/photo/ui/LayerOverlayView.kt

@@ -28,6 +28,11 @@ class LayerOverlayView(context: Context) : View(context) {
     set(value) { field = value; invalidate() }
   var selectedLayerId: String? = null
     set(value) { field = value; invalidate() }
+  var swappableLayerId: String? = null
+    set(value) { field = value; invalidate() }
+  var stickerSwapEnabled = false
+    set(value) { field = value; invalidate() }
+  var onStickerSwap: (() -> Unit)? = null
   var onLayerDelete: ((String) -> Unit)? = null
   var onLayerTapped: ((String?) -> Unit)? = null
   var onLayerDoubleTapped: ((String) -> Unit)? = null
@@ -71,6 +76,10 @@ class LayerOverlayView(context: Context) : View(context) {
     }
     drawControl(canvas, -half.first, -half.second, R.drawable.ic_close, Color.rgb(255, 100, 115))
     drawControl(canvas, half.first, half.second, R.drawable.ic_fullscreen, Color.rgb(167, 139, 250))
+    if (selected.type == LayerType.STICKER && selected.id == swappableLayerId) {
+      drawControl(canvas, half.first, -half.second, R.drawable.ic_swap_sticker,
+        if (stickerSwapEnabled && !selected.locked) Color.rgb(167, 139, 250) else Color.GRAY)
+    }
     canvas.restore()
   }
 
@@ -92,6 +101,17 @@ class LayerOverlayView(context: Context) : View(context) {
         if (selected != null && !selected.locked) {
           val handle = handlePoint(selected)
           val center = centerOf(selected)
+          if (selected.type == LayerType.STICKER && selected.id == swappableLayerId) {
+            val swap = swapPoint(selected)
+            val swapDistance = hypot(event.x - swap.first, event.y - swap.second)
+            val deleteDistance = hypot(event.x - (2 * center.first - handle.first), event.y - (2 * center.second - handle.second))
+            val scaleDistance = hypot(event.x - handle.first, event.y - handle.second)
+            if (swapDistance <= handleTouchRadius && swapDistance <= deleteDistance && swapDistance <= scaleDistance) {
+              resetGesture()
+              if (stickerSwapEnabled) onStickerSwap?.invoke()
+              return true
+            }
+          }
           if (hypot(event.x - (2 * center.first - handle.first), event.y - (2 * center.second - handle.second)) <= handleTouchRadius) {
             onLayerDelete?.invoke(selected.id); resetGesture(); return true
           }
@@ -225,6 +245,12 @@ class LayerOverlayView(context: Context) : View(context) {
     return Pair(center.first + (half.first * cos(radians) - half.second * sin(radians)).toFloat(), center.second + (half.first * sin(radians) + half.second * cos(radians)).toFloat())
   }
 
+  private fun swapPoint(layer: PhotoLayer): Pair<Float, Float> {
+    val center = centerOf(layer); val half = selectionHalfExtents(layer)
+    val radians = Math.toRadians(layer.rotationDegrees.toDouble())
+    return Pair(center.first + (half.first * cos(radians) + half.second * sin(radians)).toFloat(), center.second + (half.first * sin(radians) - half.second * cos(radians)).toFloat())
+  }
+
   private fun isHandleHit(layer: PhotoLayer, x: Float, y: Float): Boolean {
     val handle = handlePoint(layer)
     return hypot(x - handle.first, y - handle.second) <= handleTouchRadius

package/android/src/main/res/drawable/ic_swap_sticker.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M7,7h11l-3,-3 1.4,-1.4L22,8l-5.6,5.4L15,12l3,-3H7zM17,17H6l3,3 -1.4,1.4L2,16l5.6,-5.4L9,12l-3,3h11z" />
+</vector>