expo-image 1.3.1 → 1.3.3

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 1.3.3 — 2023-09-15
+
+### 🐛 Bug fixes
+
+- Fixed placeholders aren't always replaced by full-size images on Android. ([#23705](https://github.com/expo/expo/pull/23705) by [@lukmccall](https://github.com/lukmccall))
+- Fix the image components rendering incorrect assets when the Proguard is enabled on Android. ([#23704](https://github.com/expo/expo/pull/23704) by [@lukmccall](https://github.com/lukmccall))
+- Fixed gif and awebp memory leak on Android. ([#24259](https://github.com/expo/expo/pull/24259) by [@jingpeng](https://github.com/jingpeng))
+- Suppress "Operation cancelled by user during sending the request" error when the load request is canceled (interrupted) by a new one. ([#24279](https://github.com/expo/expo/pull/24279) by [@tsapeta](https://github.com/tsapeta))
+
+## 1.3.2 — 2023-07-12
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed `tintColor` prop not working for SVGs. ([#23418](https://github.com/expo/expo/pull/23418) by [@tsapeta](https://github.com/tsapeta))
+
 ## 1.3.1 — 2023-06-29
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -50,7 +50,8 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 1
-    versionName "1.3.1"
+    versionName "1.3.3"
+    consumerProguardFiles("proguard-rules.pro")
   }
   lintOptions {
     abortOnError false
@@ -96,7 +97,7 @@ dependencies {
   kapt "com.github.bumptech.glide:compiler:${GLIDE_VERSION}"
   api 'com.caverock:androidsvg-aar:1.4'
 
-  implementation "com.github.penfeizhou.android.animation:glide-plugin:2.24.0"
+  implementation "com.github.penfeizhou.android.animation:glide-plugin:2.28.0"
   implementation "com.github.bumptech.glide:avif-integration:${GLIDE_VERSION}"
 
   api 'com.github.bumptech.glide:okhttp3-integration:4.11.0'

package/android/proguard-rules.pro

@@ -1,25 +1,28 @@
 # https://bumptech.github.io/glide/doc/download-setup.html#proguard
 
--keep public class * implements com.bumptech.glide.module.LibraryGlideModule
+-keep public class * extends com.bumptech.glide.module.LibraryGlideModule
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
 -keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
   **[] $VALUES;
   public *;
 }
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
+
+-keep public class com.bumptech.glide.request.ThumbnailRequestCoordinator {
+  *;
+}
 
 -dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
 
 # https://bumptech.github.io/glide/doc/configuration.html#applications
 
--keep public class * extends com.bumptech.glide.module.AppGlideModule
--keep public class expo.modules.image.svg.SVGModule
 -keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
 
 -keep public class com.bumptech.glide.integration.webp.WebpImage { *; }
 -keep public class com.bumptech.glide.integration.webp.WebpFrame { *; }
 -keep public class com.bumptech.glide.integration.webp.WebpBitmapFactory { *; }
-
--keep public class com.bumptech.glide.requestThumbnailRequestCoordinator {
-  *;
-}

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

@@ -316,7 +316,12 @@ class ExpoImageViewWrapper(context: Context, appContext: AppContext) : ExpoView(
 
         firstView
           .recycleView()
-          ?.clear(requestManager)
+          ?.apply {
+            // The current target is already bound to the view. We don't want to cancel it in that case.
+            if (this != target) {
+              clear(requestManager)
+            }
+          }
 
         configureView(firstView, target, resource, isPlaceholder)
         if (transitionDuration > 0) {

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

@@ -73,7 +73,7 @@ class ImageViewWrapperTarget(
     val isPlaceholder = if (request is ThumbnailRequestCoordinator) {
       (request as? ThumbnailRequestCoordinator)
         ?.getPrivateFullRequest()
-        ?.isComplete != true
+        ?.isComplete == false
     } else {
       false
     }

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

@@ -1,18 +1,21 @@
 package expo.modules.image
 
+import android.util.Log
 import com.bumptech.glide.request.Request
 import com.bumptech.glide.request.ThumbnailRequestCoordinator
 
 fun ThumbnailRequestCoordinator.getPrivateFullRequest(): Request? {
-  return getPrivateRequest("full")
+  return getPrivateFiled("full")
 }
 
-private fun ThumbnailRequestCoordinator.getPrivateRequest(name: String): Request? {
+private fun <T> ThumbnailRequestCoordinator.getPrivateFiled(name: String): T? {
   return try {
     val filed = this.javaClass.getDeclaredField(name)
     filed.isAccessible = true
-    filed.get(this) as Request
+    @Suppress("UNCHECKED_CAST")
+    filed.get(this) as T
   } catch (e: Throwable) {
+    Log.e("ExpoImage", "Couldn't receive the `$name` field", e)
     null
   }
 }

package/ios/ImageModule.swift

@@ -54,7 +54,7 @@ public final class ImageModule: Module {
       }
 
       Prop("tintColor") { (view, tintColor: UIColor?) in
-        view.imageTintColor = tintColor ?? .clear
+        view.imageTintColor = tintColor
       }
 
       Prop("priority") { (view, priority: ImagePriority?) in

package/ios/ImageView.swift

@@ -37,7 +37,7 @@ public final class ImageView: ExpoView {
 
   var blurRadius: CGFloat = 0.0
 
-  var imageTintColor: UIColor = .clear
+  var imageTintColor: UIColor?
 
   var cachePolicy: ImageCachePolicy = .disk
 
@@ -128,6 +128,18 @@ public final class ImageView: ExpoView {
     // incorrectly rendered images for resize modes that don't scale (`center` and `repeat`).
     context[.imageScaleFactor] = source.scale
 
+    // It seems that `UIImageView` can't tint some vector graphics. If the `tintColor` prop is specified,
+    // we tell the SVG coder to decode to a bitmap instead. This will become useless when we switch to SVGNative coder.
+    if imageTintColor != nil {
+      context[.imageDecodeOptions] = [
+        SDImageCoderOption.webImageContext: [
+          "svgPrefersBitmap": true,
+          "svgImageSize": sdImageView.bounds.size,
+          "svgImagePreserveAspectRatio": true
+        ]
+      ]
+    }
+
     if source.isCachingAllowed {
       let sdCacheType = cachePolicy.toSdCacheType().rawValue
       context[.originalQueryCacheType] = sdCacheType
@@ -185,7 +197,13 @@ public final class ImageView: ExpoView {
     _ imageUrl: URL?
   ) {
     if let error = error {
-      onError(["error": error.localizedDescription])
+      let code = (error as NSError).code
+
+      // SDWebImage throws an error when loading operation is canceled (interrupted) by another load request.
+      // We do want to ignore that one and wait for the new request to load.
+      if code != SDWebImageError.cancelled.rawValue {
+        onError(["error": error.localizedDescription])
+      }
       return
     }
     guard finished else {
@@ -297,15 +315,14 @@ public final class ImageView: ExpoView {
     guard isViewEmpty || !hasAnySource, let placeholder = placeholderImage else {
       return
     }
-    setImage(placeholder, contentFit: placeholderContentFit)
+    setImage(placeholder, contentFit: placeholderContentFit, isPlaceholder: true)
   }
 
   // MARK: - Processing
 
   private func createTransformPipeline() -> SDImagePipelineTransformer {
     let transformers: [SDImageTransformer] = [
-      SDImageBlurTransformer(radius: blurRadius),
-      SDImageTintTransformer(color: imageTintColor)
+      SDImageBlurTransformer(radius: blurRadius)
     ]
     return SDImagePipelineTransformer(transformers: transformers)
   }
@@ -338,17 +355,24 @@ public final class ImageView: ExpoView {
 
       UIView.transition(with: sdImageView, duration: seconds, options: options) { [weak self] in
         if let self = self {
-          self.setImage(image, contentFit: self.contentFit)
+          self.setImage(image, contentFit: self.contentFit, isPlaceholder: false)
         }
       }
     } else {
-      setImage(image, contentFit: contentFit)
+      setImage(image, contentFit: contentFit, isPlaceholder: false)
     }
   }
 
-  private func setImage(_ image: UIImage?, contentFit: ContentFit) {
+  private func setImage(_ image: UIImage?, contentFit: ContentFit, isPlaceholder: Bool) {
     sdImageView.contentMode = contentFit.toContentMode()
-    sdImageView.image = image
+
+    if let imageTintColor, !isPlaceholder {
+      sdImageView.tintColor = imageTintColor
+      sdImageView.image = image?.withRenderingMode(.alwaysTemplate)
+    } else {
+      sdImageView.tintColor = nil
+      sdImageView.image = image
+    }
 
     if enableLiveTextInteraction {
       analyzeImage()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-image",
   "title": "Expo Image",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "A cross-platform, performant image component for React Native and Expo with Web support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "dce1880a2dc156f551847c78ac8bb4d2420e7ff3"
+  "gitHead": "0fa20c9cbad0c73a30089ffc09073e6d94a6dabb"
 }