@imgly/editor-react-native 1.47.0 → 1.49.0

package/android/build.gradle

@@ -6,16 +6,38 @@ buildscript {
         google()
         gradlePluginPortal()
     }
-    dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22")
-    }
 }
 
 def isNewArchitectureEnabled() {
     return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+def getKotlinVersion() {
+    return project.plugins.findPlugin("kotlin-android")?.class?.package?.implementationVersion
+}
+
+def isKotlin2OrHigher() {
+    def kotlinVersion = getKotlinVersion()
+    if (kotlinVersion) {
+        def mainVersion = kotlinVersion.split('-')[0]
+        def versionParts = mainVersion.tokenize('.').collect { it.toInteger() }
+        return versionParts[0] >= 2
+    }
+    return false
+}
+
+def getComposeVersion() {
+    if (isKotlin2OrHigher()) {
+        def mainVersion = getKotlinVersion().split('-')[0]
+        return mainVersion
+    }
+    return gradle.ext.has("kotlinCompilerExtensionVersion") ? gradle.ext.kotlinCompilerExtensionVersion : "1.5.10"
+}
+
+if (isKotlin2OrHigher()) {
+    project.plugins.apply('org.jetbrains.kotlin.plugin.compose')
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'com.facebook.react'
 apply plugin: 'org.jetbrains.kotlin.android'
@@ -44,8 +66,10 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.10"
+    if (!isKotlin2OrHigher()) {
+        composeOptions {
+            kotlinCompilerExtensionVersion = getComposeVersion()
+        }
     }
 }
 
@@ -55,7 +79,7 @@ repositories {
 }
 
 dependencies {
-    implementation findProject(":editor") ?: "ly.img:editor:1.47.0"
+    implementation findProject(":editor") ?: "ly.img:editor:1.49.0"
     implementation platform("androidx.compose:compose-bom:2023.05.01")
     implementation "androidx.activity:activity-compose:1.6.1"
     implementation "androidx.activity:activity:1.7.0"

package/android/src/main/kotlin/ly/img/editor/reactnative/module/builder/EditorBuilder.kt

@@ -1,6 +1,8 @@
 package ly.img.editor.reactnative.module.builder
 
+import android.graphics.Bitmap
 import android.net.Uri
+import android.util.Log
 import androidx.compose.runtime.Composable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -30,10 +32,12 @@ import ly.img.engine.DemoAssetSource
 import ly.img.engine.DesignBlock
 import ly.img.engine.DesignBlockType
 import ly.img.engine.Engine
+import ly.img.engine.FillType
 import ly.img.engine.MimeType
 import ly.img.engine.addDefaultAssetSources
 import ly.img.engine.addDemoAssetSources
 import java.io.File
+import java.io.FileOutputStream
 import java.util.UUID
 import kotlin.coroutines.cancellation.CancellationException
 
@@ -370,10 +374,15 @@ object EditorBuilderDefaults {
             val tempFile = EditorDefaults.writeToTempFile(blob, mimeType)
             val scene = engine.scene.get()
             val sceneString = scene?.let {
-                engine.scene.saveToString(it)
+                checkForContentUris(engine)
+                engine.scene.saveToString(
+                    scene = it,
+                    allowedResourceSchemes = listOf("blob", "bundle", "file", "http", "https", "content"),
+                )
             }
             val sceneUri = sceneString?.let { saveScene(it) }
             val firstPage = engine.scene.getPages().first()
+            engine.block.setVisible(firstPage, true)
             val thumbnail = saveThumbnail(firstPage, engine, thumbnailHeight)
             eventHandler.send(HideLoading)
             return EditorResult(
@@ -406,7 +415,11 @@ object EditorBuilderDefaults {
             val thumbnail = saveThumbnail(page, engine, thumbnailHeight)
             val scene = engine.scene.get()
             val sceneString = scene?.let {
-                engine.scene.saveToString(it)
+                checkForContentUris(engine)
+                engine.scene.saveToString(
+                    scene = it,
+                    allowedResourceSchemes = listOf("blob", "bundle", "file", "http", "https", "content"),
+                )
             }
 
             val buffer = engine.block.exportVideo(
@@ -447,7 +460,55 @@ object EditorBuilderDefaults {
         val frames = engine.block.generateVideoThumbnailSequence(id, height, timeBegin = 0.0, timeEnd = 0.1, numberOfFrames = 1).toList()
         val firstFrame = frames.first()
         val buffer = firstFrame.imageData
-        val tempFile = EditorDefaults.writeToTempFile(buffer, MimeType.PNG)
-        return Uri.fromFile(tempFile)
+        val bitmap = Bitmap.createBitmap(firstFrame.width, firstFrame.height, Bitmap.Config.ARGB_8888)
+        buffer.rewind()
+        bitmap.copyPixelsFromBuffer(buffer)
+        return withContext(Dispatchers.IO) {
+            val file = File.createTempFile(UUID.randomUUID().toString(), ".png")
+            FileOutputStream(file).use { out ->
+                bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
+            }
+            Uri.fromFile(file)
+        }
+    }
+
+    private fun checkForContentUris(engine: Engine) = runCatching {
+        fun isContentUri(uri: String) = uri.startsWith("content://")
+
+        val graphicBlocks = engine.block.findByType(DesignBlockType.Graphic)
+        for (block in graphicBlocks) {
+            val fill = if (engine.block.supportsFill(block)) {
+                engine.block.getFill(block).takeIf { engine.block.isValid(it) }
+            } else {
+                null
+            }
+            fill ?: continue
+            val fillType = FillType.get(engine.block.getType(fill))
+            val contentUriFound = when (fillType) {
+                FillType.Image -> {
+                    isContentUri(engine.block.getString(fill, "fill/image/imageFileURI")) ||
+                        isContentUri(engine.block.getString(fill, "fill/image/previewFileURI"))
+                }
+                FillType.Video -> {
+                    isContentUri(engine.block.getString(fill, "fill/video/fileURI"))
+                }
+                else -> continue
+            }
+            if (contentUriFound) {
+                Log.w(
+                    "IMG.LY",
+                    """
+                    This scene contains block(s) that reference `content://` Uri(s) 
+                    (e.g. when media is picked from gallery or camera). These may not be 
+                    resolvable when loading the scene again, especially outside the 
+                    original app context. If you need to support reloading such scenes, 
+                    consider using a custom implementation with 
+                    `EngineConfiguration.onUpload` and `engine.editor.setUriResolver` 
+                    to handle these Uri(s) appropriately.
+                    """.trimIndent(),
+                )
+                break
+            }
+        }
     }
 }

package/ios/Extensions/OnExport+.swift

@@ -21,6 +21,7 @@ public extension OnExport {
 
     var thumbnail: URL?
     if let firstPage = try engine.scene.getPages().first {
+      try engine.block.setVisible(firstPage, visible: true)
       thumbnail = try await helper.saveThumbnail(firstPage, engine, thumbnailHeight)
     }
     return EditorResult(

package/ios/IMGLYEditorModule.mm

@@ -37,13 +37,9 @@ RCT_EXPORT_MODULE(IMGLYEditor)
   return std::make_shared<facebook::react::NativeIMGLYEditorSpecJSI>(params);
 }
 #else
-RCT_EXPORT_METHOD(openEditor
-                  : (nonnull NSDictionary*)settings source
-                  : (nullable NSDictionary*)source preset
-                  : (NSString*)preset metadata
-                  : (NSDictionary*)metadata resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(openEditor : (nonnull NSDictionary*)settings source : (nullable NSDictionary*)
+                    source preset : (NSString*)preset metadata : (NSDictionary*)
+                      metadata resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject) {
   NSMutableDictionary* mergedSettings = [settings mutableCopy];
   mergedSettings[@"source"] = source;
   [self open:mergedSettings preset:preset metadata:metadata resolve:resolve reject:reject];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imgly/editor-react-native",
-  "version": "1.47.0",
+  "version": "1.49.0",
   "description": "CreativeEditor SDK for React Native - enable photo, video and design editing for your users on iOS and Android.",
   "react-native": "index.js",
   "source": "index.js",

package/src/NativeIMGLYEditor.ts

@@ -24,7 +24,16 @@ export enum EditorPreset {
  * information.
  */
 export interface EditorResult {
-  /** The scene. */
+  /** The scene.
+   * ⚠️ On Android, this scene might contain blocks that reference
+   * `content://` Uri(s) (e.g. when media is picked from gallery or camera).
+   * These may not be resolvable when loading the scene again, especially
+   * outside the original app context.
+   *
+   * If you need to support reloading such scenes, consider using a custom
+   * implementation with `EngineConfiguration.onUpload` and
+   * `engine.editor.setUriResolver` to handle these Uri(s) appropriately.
+   */
   scene?: string;
 
   /** The path of the exported image/video/pdf. */