@nativescript-community/ui-image 4.3.21 → 4.3.22

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.22](https://github.com/nativescript-community/ui-image/compare/v4.3.21...v4.3.22) (2023-11-17)
+
+### Bug Fixes
+
+* edge cases auto measurement fix ([dff9f29](https://github.com/nativescript-community/ui-image/commit/dff9f293f22f36641bd623fd8df3a5799ad14ffa))
+
 ## [4.3.21](https://github.com/nativescript-community/ui-image/compare/v4.3.20...v4.3.21) (2023-11-09)
 
 **Note:** Version bump only for package @nativescript-community/ui-image

package/index.android.d.ts

@@ -62,13 +62,14 @@ export declare class FailureEventData extends EventData {
     get error(): ImageError;
     set error(value: ImageError);
 }
-export declare const needUpdateHierarchy: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
+export declare const needUpdateHierarchy: (targetOrNeedsLayout: any, propertyKey?: string | Symbol, descriptor?: PropertyDescriptor) => any;
 export declare class Img extends ImageBase {
     nativeViewProtected: com.nativescript.image.DraweeView;
     nativeImageViewProtected: com.nativescript.image.DraweeView;
     isLoading: boolean;
     mCanUpdateHierarchy: boolean;
     mNeedUpdateHierarchy: boolean;
+    mNeedUpdateLayout: boolean;
     onResumeNativeUpdates(): void;
     createNativeView(): com.nativescript.image.DraweeView;
     updateViewSize(imageInfo: any): void;

package/index.android.js

@@ -2,6 +2,7 @@ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
 export * from './index-common';
 import { Application, Background, Color, ImageAsset, ImageSource, Trace, Utils, backgroundInternalProperty, knownFolders, path } from '@nativescript/core';
 import { isString } from '@nativescript/core/utils/types';
+import { layout } from '@nativescript/core/utils/layout-helper';
 import { CLog, CLogTypes, EventData, ImageBase, ScaleType, aspectRatioProperty, backgroundUriProperty, blurDownSamplingProperty, blurRadiusProperty, fadeDurationProperty, failureImageUriProperty, imageRotationProperty, lowerResSrcProperty, needRequestImage, placeholderImageUriProperty, progressBarColorProperty, roundAsCircleProperty, roundBottomLeftRadiusProperty, roundBottomRightRadiusProperty, roundTopLeftRadiusProperty, roundTopRightRadiusProperty, showProgressBarProperty, srcProperty, stretchProperty, tintColorProperty } from './index-common';
 let initialized = false;
 let initializeConfig;
@@ -264,7 +265,27 @@ export class FailureEventData extends EventData {
         this._error = value;
     }
 }
-export const needUpdateHierarchy = function (target, propertyKey, descriptor) {
+export const needUpdateHierarchy = function (targetOrNeedsLayout, propertyKey, descriptor) {
+    if (typeof targetOrNeedsLayout === 'boolean') {
+        return function (target2, propertyKey, descriptor) {
+            const originalMethod = descriptor.value;
+            descriptor.value = function (...args) {
+                if (!this.mCanUpdateHierarchy) {
+                    this.mNeedUpdateHierarchy = true;
+                    if (this.isLoaded && targetOrNeedsLayout) {
+                        const layoutParams = this.nativeViewProtected?.getLayoutParams();
+                        if (layoutParams) {
+                            if (layout.getMeasureSpecMode(layoutParams.height) !== layout.EXACTLY || layout.getMeasureSpecMode(layoutParams.width) !== layout.EXACTLY) {
+                                this.mNeedUpdateLayout = true;
+                            }
+                        }
+                    }
+                    return;
+                }
+                return originalMethod.apply(this, args);
+            };
+        };
+    }
     const originalMethod = descriptor.value;
     descriptor.value = function (...args) {
         if (!this.mCanUpdateHierarchy) {
@@ -280,6 +301,7 @@ export class Img extends ImageBase {
         this.isLoading = false;
         this.mCanUpdateHierarchy = true;
         this.mNeedUpdateHierarchy = false;
+        this.mNeedUpdateLayout = false;
     }
     onResumeNativeUpdates() {
         // {N} suspends properties update on `_suspendNativeUpdates`. So we only need to do this in onResumeNativeUpdates
@@ -290,6 +312,10 @@ export class Img extends ImageBase {
             this.mNeedUpdateHierarchy = false;
             this.updateHierarchy();
         }
+        if (this.mNeedUpdateLayout) {
+            this.mNeedUpdateLayout = false;
+            this.nativeViewProtected.requestLayout();
+        }
     }
     createNativeView() {
         if (!initialized) {
@@ -747,7 +773,7 @@ __decorate([
     needUpdateHierarchy
 ], Img.prototype, _j, null);
 __decorate([
-    needUpdateHierarchy
+    needUpdateHierarchy(true)
 ], Img.prototype, _k, null);
 __decorate([
     needUpdateHierarchy
@@ -778,7 +804,7 @@ __decorate([
 ], Img.prototype, _u, null);
 class GenericDraweeHierarchyBuilder {
     constructor() {
-        const res = Utils.ad.getApplicationContext().getResources();
+        const res = Utils.android.getApplicationContext().getResources();
         this.nativeBuilder = new com.facebook.drawee.generic.GenericDraweeHierarchyBuilder(res);
     }
     setPlaceholderImage(drawable, scaleType) {

package/index.ios.js

@@ -252,12 +252,23 @@ export class Img extends ImageBase {
             const imgRatio = nativeWidth / nativeHeight;
             const ratio = this.aspectRatio || imgRatio;
             // const scale = this.computeScaleFactor(width, height, finiteWidth, finiteHeight, nativeWidth, nativeHeight, this.aspectRatio || imgRatio );
-            if (!finiteWidth) {
+            if (!finiteWidth && finiteHeight) {
                 widthMeasureSpec = layout.makeMeasureSpec(height * ratio, layout.EXACTLY);
             }
-            if (!finiteHeight) {
+            else if (!finiteHeight && finiteWidth) {
                 heightMeasureSpec = layout.makeMeasureSpec(width / ratio, layout.EXACTLY);
             }
+            else if (!finiteWidth && !finiteHeight) {
+                const viewRatio = width / height;
+                if (viewRatio < ratio) {
+                    widthMeasureSpec = layout.makeMeasureSpec(width, layout.EXACTLY);
+                    heightMeasureSpec = layout.makeMeasureSpec((width / ratio), layout.EXACTLY);
+                }
+                else {
+                    widthMeasureSpec = layout.makeMeasureSpec((height * ratio), layout.EXACTLY);
+                    heightMeasureSpec = layout.makeMeasureSpec(height, layout.EXACTLY);
+                }
+            }
             if (Trace.isEnabled()) {
                 CLog(CLogTypes.info, 'onMeasure scale', this.src, this.aspectRatio, finiteWidth, finiteHeight, width, height, nativeWidth, nativeHeight, widthMeasureSpec, heightMeasureSpec);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.21",
+    "version": "4.3.22",
     "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,
@@ -44,5 +44,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "c8d5da96305841a97fce835b01fd2f41f8125257"
+    "gitHead": "3fe49515ffcfabf813d3be28cd679a6c1acba778"
 }

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

@@ -26,6 +26,7 @@ import android.graphics.PorterDuffXfermode;
 import android.view.ViewOutlineProvider;
 
 import org.nativescript.widgets.BorderDrawable;
+import com.nativescript.image.ScalingUtils.AbstractScaleType;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -159,18 +160,33 @@ public class DraweeView extends SimpleDraweeView {
         int width = MeasureSpec.getSize(widthMeasureSpec);
         int heightMode = MeasureSpec.getMode(heightMeasureSpec);
         int height = MeasureSpec.getSize(heightMeasureSpec);
-        final float aspectRatio = this.getAspectRatio();
+        float aspectRatio = this.getAspectRatio();
         if (aspectRatio > 0) {
             boolean finiteWidth = widthMode == android.view.View.MeasureSpec.EXACTLY;
             boolean finiteHeight = heightMode == android.view.View.MeasureSpec.EXACTLY;
+            Object scaleType = getHierarchy().getActualImageScaleType();
+            if (scaleType instanceof AbstractScaleType) {
+                final float rotation = ((AbstractScaleType)scaleType).getImageRotation();
+                if (Math.abs(rotation) % 180 != 0) {
+                    aspectRatio = 1.0f / aspectRatio;
+                }
+            }
             if (imageWidth != 0 && imageHeight != 0) {
-                if (!finiteWidth) {
+                if (!finiteWidth && finiteHeight) {
                     widthMeasureSpec = android.view.View.MeasureSpec.makeMeasureSpec((int) (height * aspectRatio),
                             android.view.View.MeasureSpec.EXACTLY);
-                }
-                if (!finiteHeight) {
+                } else if (!finiteHeight && finiteWidth) {
                     heightMeasureSpec = android.view.View.MeasureSpec.makeMeasureSpec((int) (width / aspectRatio),
                             android.view.View.MeasureSpec.EXACTLY);
+                } else if (!finiteWidth &&  !finiteHeight ) {
+                    float viewRatio = width / (float)height;
+                    if (viewRatio < aspectRatio) {
+                        widthMeasureSpec = android.view.View.MeasureSpec.makeMeasureSpec((int) width, android.view.View.MeasureSpec.EXACTLY);
+                        heightMeasureSpec = android.view.View.MeasureSpec.makeMeasureSpec((int) (width / aspectRatio), android.view.View.MeasureSpec.EXACTLY);
+                    } else {
+                        widthMeasureSpec = android.view.View.MeasureSpec.makeMeasureSpec((int) (height * aspectRatio), android.view.View.MeasureSpec.EXACTLY);
+                        heightMeasureSpec = android.view.View.MeasureSpec.makeMeasureSpec((int) height, android.view.View.MeasureSpec.EXACTLY);
+                    }
                 }
             }
         }

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

@@ -123,6 +123,10 @@ public class ScalingUtils {
     public void setImageMatrix(Matrix matrix) {
         _imageMatrix = matrix;
     }
+
+    public float getImageRotation() {
+        return _imageRotation;
+    }
     public void setImageRotation(float rotation) {
         _imageRotation = rotation;
     }