expo-image 1.12.8 → 1.12.10

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 1.12.10 — 2024-06-05
+
+### 💡 Others
+
+- Pin @react-native subpackage versions to 0.74.83. ([#29441](https://github.com/expo/expo/pull/29441) by [@kudo](https://github.com/kudo))
+
+## 1.12.9 — 2024-05-09
+
+### 💡 Others
+
+- Added setup for native unit tests. ([#28678](https://github.com/expo/expo/pull/28678) by [@tsapeta](https://github.com/tsapeta))
+
 ## 1.12.8 — 2024-05-06
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

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

package/ios/ExpoImage.podspec

@@ -28,4 +28,11 @@ Pod::Spec.new do |s|
   }
 
   s.source_files = "**/*.{h,m,swift}"
+  s.exclude_files = 'Tests/'
+
+  s.test_spec 'Tests' do |test_spec|
+    test_spec.dependency 'ExpoModulesTestCore'
+
+    test_spec.source_files = 'Tests/**/*.{m,swift}'
+  end
 end

package/ios/ImageUtils.swift

@@ -58,7 +58,7 @@ func imageFormatToMediaType(_ format: SDImageFormat) -> String? {
 /**
  Calculates the ideal size that fills in the container size while maintaining the source aspect ratio.
  */
-func idealSize(contentPixelSize: CGSize, containerSize: CGSize, scale: Double, contentFit: ContentFit) -> CGSize {
+func idealSize(contentPixelSize: CGSize, containerSize: CGSize, scale: Double = 1.0, contentFit: ContentFit) -> CGSize {
   switch contentFit {
   case .contain:
     let aspectRatio = min(containerSize.width / contentPixelSize.width, containerSize.height / contentPixelSize.height)

package/ios/Tests/ImageResizingSpec.swift

@@ -0,0 +1,130 @@
+import ExpoModulesTestCore
+
+@testable import ExpoModulesCore
+@testable import ExpoImage
+
+class ImageResizingSpec: ExpoSpec {
+  override class func spec() {
+    describe("ideal size") {
+      // For simplicity use the same container size for all tests
+      let containerSize = CGSize(width: 150, height: 100)
+
+      context("content size is 300x200") {
+        let contentSize = CGSize(width: 300, height: 200)
+        let aspectRatio = contentSize.width / contentSize.height
+
+        it("contains") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .contain)
+          expect(size.width) == containerSize.width       // 150
+          expect(size.height) == containerSize.height     // 100
+          expect(size.width / size.height) == aspectRatio // 1.5
+        }
+
+        it("covers") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .cover)
+          expect(size.width) == containerSize.width       // 150
+          expect(size.height) == containerSize.height     // 100
+          expect(size.width / size.height) == aspectRatio // 1.5
+        }
+
+        it("fills") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .fill)
+          expect(size.width) == containerSize.width   // 150
+          expect(size.height) == containerSize.height // 100
+        }
+
+        it("scales down") {
+          // Behaves like 'contain' content fit
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .scaleDown)
+          expect(size.width) == containerSize.width       // 150
+          expect(size.height) == containerSize.height     // 100
+          expect(size.width / size.height) == aspectRatio // 1.5
+        }
+
+        it("doesn't resize") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .none)
+          expect(size.width) == contentSize.width   // 300
+          expect(size.height) == contentSize.height // 200
+        }
+      }
+
+      context("content size is 168x412") {
+        let contentSize = CGSize(width: 168, height: 412)
+        let aspectRatio = contentSize.width / contentSize.height
+
+        it("contains") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .contain)
+          expect(size.width) == (expected: containerSize.height * aspectRatio, delta: 0.0001) // ~40.77
+          expect(size.height) == containerSize.height                                         // 100
+          expect(size.width / size.height) == (expected: aspectRatio, delta: 0.0001)          // ~0.40
+        }
+
+        it("covers") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .cover)
+          expect(size.width) == containerSize.width                                           // 150
+          expect(size.height) == (expected: containerSize.width / aspectRatio, delta: 0.0001) // ~367.85
+          expect(size.width / size.height) == aspectRatio                                     // ~0.40
+        }
+
+        it("fills") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .fill)
+          expect(size.width) == containerSize.width   // 150
+          expect(size.height) == containerSize.height // 100
+        }
+
+        it("scales down") {
+          // Behaves like 'contain' content fit
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .scaleDown)
+          expect(size.width) == (expected: containerSize.height * aspectRatio, delta: 0.0001) // ~40.77
+          expect(size.height) == containerSize.height                                         // 100
+          expect(size.width / size.height) == (expected: aspectRatio, delta: 0.0001)          // ~0.40
+        }
+
+        it("doesn't resize") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .none)
+          expect(size.width) == contentSize.width   // 168
+          expect(size.height) == contentSize.height // 412
+        }
+      }
+
+      context("content size is 37x21") {
+        let contentSize = CGSize(width: 37, height: 21)
+        let aspectRatio = contentSize.width / contentSize.height
+
+        it("contains") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .contain)
+          expect(size.width) == containerSize.width                                           // 150
+          expect(size.height) == (expected: containerSize.width / aspectRatio, delta: 0.0001) // ~85.13
+          expect(size.width / size.height) == (expected: aspectRatio, delta: 0.0001)          // ~1.76
+        }
+
+        it("covers") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .cover)
+          expect(size.width) == containerSize.height * aspectRatio // ~176.19
+          expect(size.height) == containerSize.height              // 100
+          expect(size.width / size.height) == aspectRatio          // ~1.76
+        }
+
+        it("fills") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .fill)
+          expect(size.width) == containerSize.width   // 150
+          expect(size.height) == containerSize.height // 100
+        }
+
+        it("scales down") {
+          // Behaves like `none` content fit
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .scaleDown)
+          expect(size.width) == contentSize.width         // 37
+          expect(size.height) == contentSize.height       // 21
+          expect(size.width / size.height) == aspectRatio // ~1.76
+        }
+
+        it("doesn't resize") {
+          let size = idealSize(contentPixelSize: contentSize, containerSize: containerSize, contentFit: .none)
+          expect(size.width) == contentSize.width   // 37
+          expect(size.height) == contentSize.height // 21
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-image",
   "title": "Expo Image",
-  "version": "1.12.8",
+  "version": "1.12.10",
   "description": "A cross-platform, performant image component for React Native and Expo with Web support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -27,7 +27,7 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "dependencies": {
-    "@react-native/assets-registry": "~0.74.83"
+    "@react-native/assets-registry": "0.74.83"
   },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
@@ -35,5 +35,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "7995f30a8d2af4836f3aef9fe322e9403fc23d34"
+  "gitHead": "01afaad3852d3af00238b2e28ea6e13db6f0a1f8"
 }