expo-image-manipulator 12.0.2 → 12.0.4

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 12.0.4 — 2024-05-13
+
+### 🐛 Bug fixes
+
+- On `iOS` correctly handle urls coming from the users photo library. ([#28777](https://github.com/expo/expo/pull/28777) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 12.0.3 — 2024-05-01
+
+_This version does not introduce any user-facing changes._
+
 ## 12.0.2 — 2024-04-23
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '12.0.2'
+version = '12.0.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.imagemanipulator"
   defaultConfig {
     versionCode 23
-    versionName "12.0.2"
+    versionName "12.0.4"
   }
 }
 

package/android/src/main/java/expo/modules/imagemanipulator/FileUtils.kt

@@ -30,6 +30,7 @@ internal object FileUtils {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
         CompressFormat.WEBP_LOSSY
       } else {
+        @Suppress("DEPRECATION")
         CompressFormat.WEBP
       } -> ".webp"
       else -> ".jpg"

package/android/src/main/java/expo/modules/imagemanipulator/ManipulationArguments.kt

@@ -23,6 +23,7 @@ data class SaveOptions(
       ImageFormat.WEBP -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
         CompressFormat.WEBP_LOSSY
       } else {
+        @Suppress("DEPRECATION")
         CompressFormat.WEBP
       }
     }

package/ios/ImageManipulatorModule.swift

@@ -51,8 +51,7 @@ public class ImageManipulatorModule: Module {
       }
       return callback(.success(image))
     }
-    if url.scheme == "assets-library" {
-      // TODO: ALAsset URLs are deprecated as of iOS 11, we should migrate to `ph://` soon.
+    if url.scheme == "ph" || url.scheme == "assets-library" {
       return loadImageFromPhotoLibrary(url: url, callback: callback)
     }
 
@@ -75,7 +74,7 @@ public class ImageManipulatorModule: Module {
    Loads the image from user's photo library.
    */
   internal func loadImageFromPhotoLibrary(url: URL, callback: @escaping LoadImageCallback) {
-    guard let asset = PHAsset.fetchAssets(withALAssetURLs: [url], options: nil).firstObject else {
+    guard let asset = retreiveAsset(from: url) else {
       return callback(.failure(ImageNotFoundException()))
     }
     let size = CGSize(width: asset.pixelWidth, height: asset.pixelHeight)
@@ -119,17 +118,3 @@ public class ImageManipulatorModule: Module {
     return (url: fileUrl, data: data)
   }
 }
-
-/**
- Returns pixel data representation of the image.
- */
-func imageData(from image: UIImage, format: ImageFormat, compression: Double) -> Data? {
-  switch format {
-  case .jpeg, .jpg:
-    return image.jpegData(compressionQuality: compression)
-  case .png:
-    return image.pngData()
-  case .webp:
-    return SDImageWebPCoder.shared.encodedData(with: image, format: .webP, options: [.encodeCompressionQuality: compression])
-  }
-}

package/ios/ImageManipulatorUtils.swift

@@ -0,0 +1,27 @@
+import SDWebImageWebPCoder
+import Photos
+
+/**
+ Returns pixel data representation of the image.
+ */
+func imageData(from image: UIImage, format: ImageFormat, compression: Double) -> Data? {
+  switch format {
+  case .jpeg, .jpg:
+    return image.jpegData(compressionQuality: compression)
+  case .png:
+    return image.pngData()
+  case .webp:
+    return SDImageWebPCoder.shared.encodedData(with: image, format: .webP, options: [.encodeCompressionQuality: compression])
+  }
+}
+
+/**
+ Checks if we are dealing with a ph asset URL and uses the correct method to fetch it.
+ */
+func retreiveAsset(from url: URL) -> PHAsset? {
+  if url.scheme == "ph" {
+    let identifier = String(url.absoluteString.dropFirst(5)) // removes ph://
+    return PHAsset.fetchAssets(withLocalIdentifiers: [identifier], options: nil).firstObject
+  }
+  return PHAsset.fetchAssets(withALAssetURLs: [url], options: nil).firstObject
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-manipulator",
-  "version": "12.0.2",
+  "version": "12.0.4",
   "description": "Provides functions that let you manipulation images on the local file system, eg: resize, crop.",
   "main": "build/ImageManipulator.js",
   "types": "build/ImageManipulator.d.ts",
@@ -39,5 +39,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
+  "gitHead": "07499b5e78e55efbf484e309ef0c200f2ac93fe5"
 }