@imgly/editor-react-native 1.69.0 → 1.70.0

package/android/build.gradle

@@ -142,7 +142,7 @@ repositories {
 }
 
 dependencies {
-    implementation findProject(":editor") ?: "ly.img:editor:1.69.0"
+    implementation findProject(":editor") ?: "ly.img:editor:1.70.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

@@ -343,9 +343,7 @@ object EditorBuilderDefaults {
         }
 
         launch {
-            val assetBaseUri = settings.assetBaseUri ?: "https://cdn.img.ly/assets/v4"
-            val isValid = isValidUri(Uri.parse(assetBaseUri))
-            val baseUri = Uri.parse(if (isValid) assetBaseUri else "https://cdn.img.ly/assets/v4")
+            val baseUri = Uri.parse(settings.baseUri)
             engine.addDefaultAssetSources(baseUri = baseUri)
             SystemGalleryPermission.setMode(SystemGalleryConfiguration.Disabled)
             val context = engine.applicationContext
@@ -359,7 +357,7 @@ object EditorBuilderDefaults {
             engine.addDemoAssetSources(
                 sceneMode = engine.scene.getMode(),
                 withUploadAssetSources = true,
-                baseUri = Uri.parse("https://cdn.img.ly/assets/demo/v3"),
+                baseUri = baseUri,
             )
             val defaultTypeface = TypefaceProvider().provideTypeface(engine, "Roboto")
             requireNotNull(defaultTypeface)

package/android/src/main/kotlin/ly/img/editor/reactnative/module/model/EditorSettings.kt

@@ -6,15 +6,14 @@ import android.os.Parcelable
 /**
  * A class containing all necessary information to configure an editor.
  * @property license The license key. Pass `null` to run the SDK in evaluation mode with a watermark.
- * @property baseUri The base uri for the assets included in the scene that have a relative source.
- * @property assetBaseUri The base uri of the default assets in the asset library.
+ * @property baseUri The base URI used by the engine for built-in assets like emoji and fallback
+ *   fonts, and by the editor for its default and demo asset sources (stickers, filters, and more).
  * @property userId The id of the current user.
  * @property source The source to load into the editor.
  */
 data class EditorSettings(
     val license: String? = null,
     val baseUri: String,
-    val assetBaseUri: String?,
     val userId: String?,
     var source: Source?,
 ) : Parcelable {
@@ -26,7 +25,6 @@ data class EditorSettings(
         parcel.readString(),
         parcel.readString() ?: throw (Exception("Missing value for key 'baseUri.'")),
         parcel.readString(),
-        parcel.readString(),
         parcel.readParcelable(Source::class.java.classLoader),
     )
 
@@ -36,7 +34,6 @@ data class EditorSettings(
     ) {
         parcel.writeString(license)
         parcel.writeString(baseUri)
-        parcel.writeString(assetBaseUri)
         parcel.writeString(userId)
         parcel.writeParcelable(source, flags)
     }
@@ -50,11 +47,10 @@ data class EditorSettings(
 
         fun createFromMap(map: Map<String, Any?>): EditorSettings? = try {
             val license = map["license"] as? String
-            val sceneBaseUri = map["sceneBaseUri"] as? String ?: throw (Exception("Missing value for key 'sceneBaseUri.'"))
-            val assetBaseUri = map["assetBaseUri"] as? String
+            val baseUri = map["baseUri"] as? String ?: throw (Exception("Missing value for key 'baseUri.'"))
             val userId = map["userId"] as? String
             val source = (map["source"] as? Map<String, Any?>)?.let { Source.createFromMap(it) }
-            EditorSettings(license, sceneBaseUri, assetBaseUri, userId, source)
+            EditorSettings(license, baseUri, userId, source)
         } catch (e: Exception) {
             null
         }

package/ios/Extensions/OnCreate+.swift

@@ -42,13 +42,13 @@ extension OnCreate {
         try await OnCreate.default(engine)
       }
 
-      var assetUrl: URL?
-      if let assetBaseUri = settings?.assetBaseUri {
-        if let temp = URL(string: assetBaseUri), temp.scheme != nil {
-          assetUrl = temp
+      var baseURL: URL?
+      if let baseUri = settings?.baseUri {
+        if let temp = URL(string: baseUri), temp.scheme != nil {
+          baseURL = temp
         }
       }
-      try await Self.loadDefaultAssets(baseURL: assetUrl)(engine)
+      try await Self.loadDefaultAssets(baseURL: baseURL)(engine)
     }
   }
 
@@ -60,6 +60,7 @@ extension OnCreate {
       let baseURI = baseURL ?? Engine.assetBaseURL
       try await engine.addDefaultAssetSources(baseURL: baseURI)
       try await engine.addDemoAssetSources(
+        baseURL: baseURI,
         sceneMode: engine.scene.getMode(),
         withUploadAssetSources: true,
       )

package/ios/IMGLYEditorModule.mm

@@ -14,14 +14,11 @@ RCT_EXPORT_MODULE(IMGLYEditor)
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject {
   NSMutableDictionary* mergedSettings = [@{
-    @"sceneBaseUri" : settings.sceneBaseUri(),
+    @"baseUri" : settings.baseUri(),
   } mutableCopy];
   if (settings.license() != nil) {
     mergedSettings[@"license"] = settings.license();
   }
-  if (settings.assetBaseUri() != nil) {
-    mergedSettings[@"assetBaseUri"] = settings.assetBaseUri();
-  }
   if (settings.userId() != nil) {
     mergedSettings[@"userId"] = settings.userId();
   }

package/ios/Model/EditorBuilder.swift

@@ -103,7 +103,7 @@ extension EditorBuilder {
   /// - Parameter settings: The `EditorSettings`.
   /// - Returns: The derived `EngineSettings`.
   private static func engineSettings(for settings: EditorSettings) -> EngineSettings {
-    if let url = URL(string: settings.sceneBaseUri) {
+    if let url = URL(string: settings.baseUri) {
       EngineSettings(license: settings.license, userID: settings.userId, baseURL: url)
     } else {
       EngineSettings(license: settings.license, userID: settings.userId)

package/ios/Model/EditorSettings.swift

@@ -3,11 +3,10 @@
   /// The license key. Pass `nil` to run the SDK in evaluation mode with a watermark.
   public let license: String?
 
-  /// The base uri for the assets included in the scene that have a relative source.
-  public let sceneBaseUri: String
-
-  /// The base uri of the default assets in the asset library.
-  public let assetBaseUri: String?
+  /// The base URI used by the engine for built-in assets like emoji and fallback
+  /// fonts, and by the editor for its default and demo asset sources (stickers,
+  /// filters, and more).
+  public let baseUri: String
 
   /// The id of the current user.
   public let userId: String?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imgly/editor-react-native",
-  "version": "1.69.0",
+  "version": "1.70.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

@@ -59,14 +59,18 @@ export interface EditorSettings {
   license?: string;
 
   /**
-   * The base URI to the assets included in
-   * the scene of which the sources are specified
-   * as relative paths.
+   * The base URI used by the engine for built-in assets like emoji and
+   * fallback fonts, and by the editor for its default and demo asset
+   * sources (stickers, filters, and more).
+   *
+   * By default, assets are loaded from the IMG.LY CDN at
+   * `https://cdn.img.ly/packages/imgly/cesdk-react-native/<version>/assets`.
+   * For production use, we recommend downloading the assets from
+   * `https://cdn.img.ly/packages/imgly/cesdk-react-native/<version>/imgly-assets.zip`,
+   * hosting them on your own server, and setting `baseUri` to your
+   * hosted location.
    */
-  sceneBaseUri: string;
-
-  /** The base URI to the default assets of the asset library. */
-  assetBaseUri?: string;
+  baseUri: string;
 
   /**
    * Unique ID tied to your application's user.
@@ -87,15 +91,12 @@ export class EditorSettingsModel implements EditorSettings {
   license?: string;
 
   /**
-   * The base URI to the assets included in
-   * the scene of which the sources are specified
-   * as relative paths.
+   * The base URI used by the engine for built-in assets like emoji and
+   * fallback fonts, and by the editor for its default and demo asset
+   * sources (stickers, filters, and more).
    */
-  sceneBaseUri: string =
-    'https://cdn.img.ly/packages/imgly/cesdk-engine/1.51.0/assets';
-
-  /** The base URI to the default assets of the asset library. */
-  assetBaseUri?: string;
+  baseUri: string =
+    'https://cdn.img.ly/packages/imgly/cesdk-react-native/1.69.0/assets';
 
   /**
    * Unique ID tied to your application's user.