expo-image 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 2.0.3 — 2024-11-29
+
+### 🐛 Bug fixes
+
+- [Android] Fixed `useImage` causing a native crash when uri is unresolvable. ([#33268](https://github.com/expo/expo/pull/33268) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Fixes adding a blurhash placeholder to `Image` or `ImageBackground` causing blurry version of the image. ([#33272](https://github.com/expo/expo/pull/33272) by [@lukmccall](https://github.com/lukmccall))
+
+## 2.0.2 — 2024-11-22
+
+### 💡 Others
+
+- Add a warning when `children` are passed to `Image`. ([#33139](https://github.com/expo/expo/pull/33139) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 2.0.1 — 2024-11-19
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
   namespace "expo.modules.image"
   defaultConfig {
     versionCode 1
-    versionName "2.0.1"
+    versionName "2.0.3"
     consumerProguardFiles("proguard-rules.pro")
 
     buildConfigField("boolean", "ALLOW_GLIDE_LOGS", project.properties.get("EXPO_ALLOW_GLIDE_LOGS", "false"))

package/android/src/main/java/expo/modules/image/ExpoImageModule.kt

@@ -31,15 +31,13 @@ import expo.modules.image.records.SourceMap
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.apifeatures.EitherType
 import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.functions.Coroutine
 import expo.modules.kotlin.functions.Queues
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.kotlin.sharedobjects.SharedRef
 import expo.modules.kotlin.types.EitherOfThree
 import expo.modules.kotlin.types.toKClass
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 class ExpoImageModule : Module() {
   override fun definition() = ModuleDefinition {
@@ -110,10 +108,8 @@ class ExpoImageModule : Module() {
       }
     }
 
-    AsyncFunction("loadAsync") { source: SourceMap, options: ImageLoadOptions?, promise: Promise ->
-      CoroutineScope(Dispatchers.Main).launch {
-        ImageLoadTask(appContext, source, options ?: ImageLoadOptions()).load(promise)
-      }
+    AsyncFunction("loadAsync") Coroutine { source: SourceMap, options: ImageLoadOptions? ->
+      ImageLoadTask(appContext, source, options ?: ImageLoadOptions()).load()
     }
 
     Class(Image::class) {

package/android/src/main/java/expo/modules/image/ExpoImageViewWrapper.kt

@@ -540,8 +540,10 @@ class ExpoImageViewWrapper(context: Context, appContext: AppContext) : ExpoView(
           }
           newTarget.placeholderContentFit = newPlaceholderContentFit
 
-          thumbnail(requestManager.load(placeholderModel.getGlideModel()))
-            .apply(placeholderSource.createGlideOptions(context))
+          thumbnail(
+            requestManager.load(placeholderModel.getGlideModel())
+              .apply(placeholderSource.createGlideOptions(context))
+          )
         }
         .downsample(downsampleStrategy)
         .addListener(GlideRequestListener(WeakReference(this)))

package/android/src/main/java/expo/modules/image/ImageLoadTask.kt

@@ -1,42 +1,36 @@
 package expo.modules.image
 
-import android.graphics.drawable.Drawable
 import com.bumptech.glide.Glide
 import expo.modules.image.records.ImageLoadOptions
 import expo.modules.image.records.SourceMap
 import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.Exceptions
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.withContext
 
-open class ImageLoadTask(private val appContext: AppContext, private val source: SourceMap, private val options: ImageLoadOptions) {
-  private var task: Job? = null
+open class ImageLoadTask(
+  private val appContext: AppContext,
+  private val source: SourceMap,
+  private val options: ImageLoadOptions
+) {
+  suspend fun load(): Image {
+    val context =
+      this@ImageLoadTask.appContext.reactContext ?: throw Exceptions.ReactContextLost()
 
-  suspend fun load(promise: Promise) {
-    return coroutineScope {
-      val deferred = async {
-        val context = this@ImageLoadTask.appContext.reactContext ?: throw Exceptions.ReactContextLost()
-        withContext(Dispatchers.IO) {
-          Glide
-            .with(context)
-            .asDrawable()
-            .load(source.uri)
-            .centerInside()
-            .submit(options.maxWidth, options.maxHeight)
-            .get()
-        }
-      }
-      task = deferred
-      try {
-        val bitmap: Drawable = deferred.await()
-        promise.resolve(Image(bitmap))
-      } catch (e: Exception) {
-        promise.reject(ImageLoadFailed(e))
+    try {
+      val bitmap = withContext(Dispatchers.IO) {
+        Glide
+          .with(context)
+          .asDrawable()
+          .load(source.uri)
+          .centerInside()
+          .submit(options.maxWidth, options.maxHeight)
+          .get()
       }
+
+      return Image(bitmap)
+    } catch (e: Exception) {
+      throw ImageLoadFailed(e)
     }
   }
 }

package/build/Image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../src/Image.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,UAAU,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,eAAe,CAAC;AAOvB,qBAAa,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC;IACxD,aAAa,MAAC;IACd,gBAAgB,MAAC;gBACL,KAAK,KAAA;IAOjB,gBAAgB,YAMd;IAEF;;OAEG;IACH,MAAM,CAAC,KAAK,kBAAqB;IAEjC;;;;;;;;;;OAUG;WACU,QAAQ,CACnB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EACvB,WAAW,CAAC,EAAE,oBAAoB,CAAC,aAAa,CAAC,GAChD,OAAO,CAAC,OAAO,CAAC;IACnB;;;;;;;;;;OAUG;WACU,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBhG;;;;;;;OAOG;WACU,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjD;;;;;;;OAOG;WACU,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/C;;;;;;;;;OASG;WACU,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIxE;;;;;;;OAOG;WACU,qBAAqB,CAChC,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GACvE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIzB;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;;OAMG;WACU,SAAS,CACpB,MAAM,EAAE,WAAW,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,QAAQ,CAAC;IAKpB,MAAM;CAuCP"}
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../src/Image.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,UAAU,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,eAAe,CAAC;AAQvB,qBAAa,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC;IACxD,aAAa,MAAC;IACd,gBAAgB,MAAC;gBACL,KAAK,KAAA;IAOjB,gBAAgB,YAMd;IAEF;;OAEG;IACH,MAAM,CAAC,KAAK,kBAAqB;IAEjC;;;;;;;;;;OAUG;WACU,QAAQ,CACnB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EACvB,WAAW,CAAC,EAAE,oBAAoB,CAAC,aAAa,CAAC,GAChD,OAAO,CAAC,OAAO,CAAC;IACnB;;;;;;;;;;OAUG;WACU,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBhG;;;;;;;OAOG;WACU,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjD;;;;;;;OAOG;WACU,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/C;;;;;;;;;OASG;WACU,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIxE;;;;;;;OAOG;WACU,qBAAqB,CAChC,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GACvE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIzB;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;;OAMG;WACU,SAAS,CACpB,MAAM,EAAE,WAAW,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,QAAQ,CAAC;IAKpB,MAAM;CA8CP"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-image",
   "title": "Expo Image",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "A cross-platform, performant image component for React Native and Expo with Web support",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -41,5 +41,5 @@
       "optional": true
     }
   },
-  "gitHead": "128718d43bac2eaed764b3551469b95400f2363e"
+  "gitHead": "728158f99d680cf64fb06f08301d3806c18c6f63"
 }

package/src/Image.tsx

@@ -17,6 +17,7 @@ import { resolveContentFit, resolveContentPosition, resolveTransition } from './
 import { resolveSource, resolveSources } from './utils/resolveSources';
 
 let loggedDefaultSourceDeprecationWarning = false;
+let loggedRenderingChildrenWarning = false;
 
 export class Image extends React.PureComponent<ImageProps> {
   nativeViewRef;
@@ -198,6 +199,13 @@ export class Image extends React.PureComponent<ImageProps> {
       loggedDefaultSourceDeprecationWarning = true;
     }
 
+    if (restProps.children && !loggedRenderingChildrenWarning) {
+      console.warn(
+        'The <Image> component does not support children. If you want to render content on top of the image, consider using the <ImageBackground> component or absolute positioning.'
+      );
+      loggedRenderingChildrenWarning = true;
+    }
+
     return (
       <ExpoImage
         {...restProps}