@nativescript-community/ui-image 4.3.29 → 4.3.31

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.31](https://github.com/nativescript-community/ui-image/compare/v4.3.30...v4.3.31) (2024-02-23)
+
+### Bug Fixes
+
+* **image,ios:** fix for decodeWidth/decodeHeight ([d056b89](https://github.com/nativescript-community/ui-image/commit/d056b8952fdef091dad458742a344ab3f280b6b3))
+
+## [4.3.30](https://github.com/nativescript-community/ui-image/compare/v4.3.29...v4.3.30) (2024-02-16)
+
+### Bug Fixes
+
+* allow only decodeWidth or decodeHeight to be specified ([6062459](https://github.com/nativescript-community/ui-image/commit/60624598e9226bedaebe682cfdb0219235fcb36d))
+
 ## [4.3.29](https://github.com/nativescript-community/ui-image/compare/v4.3.28...v4.3.29) (2024-02-02)
 
 ### Bug Fixes

package/index.ios.js

@@ -402,7 +402,7 @@ export class Img extends ImageBase {
                 }
                 if (this.decodeWidth || this.decodeHeight) {
                     //@ts-ignore
-                    transformers.push(NSImageDecodeSizeTransformer.transformerWithDecodeWidthDecodeHeight(this.decodeWidth, this.decodeHeight));
+                    transformers.push(NSImageDecodeSizeTransformer.transformerWithDecodeWidthDecodeHeight(this.decodeWidth || this.decodeHeight, this.decodeHeight || this.decodeWidth));
                 }
                 if (this.tintColor) {
                     transformers.push(SDImageTintTransformer.transformerWithColor(this.tintColor.ios));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.29",
+    "version": "4.3.31",
     "description": "Advanced and efficient image display plugin which uses Fresco (Android) and SDWebImage (iOS) to implement caching, placeholders, image effects, and much more.",
     "main": "./index",
     "sideEffects": false,
@@ -36,5 +36,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "0940ba815f6f11c1b94f13050689e4e1d472855a"
+    "gitHead": "d9a9465cbfbabbe5b2cd99c16b16b36067e37988"
 }

package/platforms/android/java/com/nativescript/image/DraweeView.java

@@ -288,8 +288,8 @@ public class DraweeView extends SimpleDraweeView {
             int decodeWidth = object.optInt("decodeWidth");
             int decodeHeight = object.optInt("decodeHeight");
 
-            if (decodeWidth > 0 && decodeHeight > 0) {
-                requestBuilder = requestBuilder.setResizeOptions(new com.facebook.imagepipeline.common.ResizeOptions(decodeWidth, decodeHeight));
+            if (decodeWidth > 0 || decodeHeight > 0) {
+                requestBuilder = requestBuilder.setResizeOptions(new com.facebook.imagepipeline.common.ResizeOptions(decodeWidth > 0 ? decodeWidth : decodeHeight, decodeHeight  > 0 ? decodeHeight : decodeWidth));
             }
             int blurRadius = object.optInt("blurRadius", 0);
             if (blurRadius > 0) {

package/platforms/ios/src/NSImageDecodeSizeTransformer.m

@@ -25,20 +25,18 @@
     if (!image) {
         return nil;
     }
-    CGFloat widthRatio = 1.0f;
-    CGFloat heightRatio = 1.0f;
+    CGFloat ratio = 1.0f;
 
     CGFloat width = (CGFloat)image.size.width;
     CGFloat height = (CGFloat)image.size.height;
     if (self.decodeWidth && self.decodeHeight) {
-        widthRatio = self.decodeWidth / width;
-        heightRatio = self.decodeHeight / height;
+        ratio =  MIN(self.decodeWidth / width, self.decodeHeight / height);
     } else if (self.decodeWidth > 0) {
-        widthRatio = self.decodeWidth / width;
+        ratio = self.decodeWidth / width;
     } else {
-        heightRatio = self.decodeHeight / height;
+        ratio = self.decodeHeight / height;
     }
-    return [image sd_resizedImageWithSize:CGSizeMake(width * widthRatio, height * heightRatio) scaleMode:2];
+    return [image sd_resizedImageWithSize:CGSizeMake(width * ratio, height * ratio) scaleMode:2];
 }
 
 @end