@nativescript-community/ui-image 4.3.20 → 4.3.22

package/CHANGELOG.md

@@ -3,13 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.3.20](https://github.com/nativescript-community/ui-image/compare/v4.3.19...v4.3.20) (2023-11-03)
+## [4.3.22](https://github.com/nativescript-community/ui-image/compare/v4.3.21...v4.3.22) (2023-11-17)
 
-**Note:** Version bump only for package @nativescript-community/ui-image
+### 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
 
+## [4.3.20](https://github.com/nativescript-community/ui-image/compare/v4.3.19...v4.3.20) (2023-11-03)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
 
 ## [4.3.19](https://github.com/nativescript-community/ui-image/compare/v4.3.18...v4.3.19) (2023-10-10)
 

package/angular/directives.d.ts

@@ -2,6 +2,6 @@ import * as i0 from "@angular/core";
 export declare class ImgDirective {
     constructor();
     static ɵfac: i0.ɵɵFactoryDeclaration<ImgDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<ImgDirective, "NSImg", never, {}, {}, never, never, false>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<ImgDirective, "NSImg", never, {}, {}, never, never, false, never>;
 }
 export declare const NSIMG_DIRECTIVES: (typeof ImgDirective)[];

package/angular/{esm2020 → esm2022}/directives.mjs

@@ -2,9 +2,9 @@ import { Directive } from '@angular/core';
 import * as i0 from "@angular/core";
 export class ImgDirective {
     constructor() { }
+    static ɵfac = function ImgDirective_Factory(t) { return new (t || ImgDirective)(); };
+    static ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: ImgDirective, selectors: [["NSImg"]] });
 }
-ImgDirective.ɵfac = function ImgDirective_Factory(t) { return new (t || ImgDirective)(); };
-ImgDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: ImgDirective, selectors: [["NSImg"]] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ImgDirective, [{
         type: Directive,
         args: [{
@@ -12,4 +12,4 @@ ImgDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: ImgDirective,
             }]
     }], function () { return []; }, null); })();
 export const NSIMG_DIRECTIVES = [ImgDirective];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlyZWN0aXZlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9pbWFnZS9hbmd1bGFyL2RpcmVjdGl2ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLMUMsTUFBTSxPQUFPLFlBQVk7SUFDckIsZ0JBQWUsQ0FBQzs7d0VBRFAsWUFBWTsrREFBWixZQUFZO3VGQUFaLFlBQVk7Y0FIeEIsU0FBUztlQUFDO2dCQUNQLFFBQVEsRUFBRSxPQUFPO2FBQ3BCOztBQUlELE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEaXJlY3RpdmUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQERpcmVjdGl2ZSh7XG4gICAgc2VsZWN0b3I6ICdOU0ltZydcbn0pXG5leHBvcnQgY2xhc3MgSW1nRGlyZWN0aXZlIHtcbiAgICBjb25zdHJ1Y3RvcigpIHt9XG59XG5leHBvcnQgY29uc3QgTlNJTUdfRElSRUNUSVZFUyA9IFtJbWdEaXJlY3RpdmVdO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlyZWN0aXZlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9pbWFnZS9hbmd1bGFyL2RpcmVjdGl2ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLMUMsTUFBTSxPQUFPLFlBQVk7SUFDckIsZ0JBQWUsQ0FBQztzRUFEUCxZQUFZOzZEQUFaLFlBQVk7O3VGQUFaLFlBQVk7Y0FIeEIsU0FBUztlQUFDO2dCQUNQLFFBQVEsRUFBRSxPQUFPO2FBQ3BCOztBQUlELE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEaXJlY3RpdmUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQERpcmVjdGl2ZSh7XG4gICAgc2VsZWN0b3I6ICdOU0ltZydcbn0pXG5leHBvcnQgY2xhc3MgSW1nRGlyZWN0aXZlIHtcbiAgICBjb25zdHJ1Y3RvcigpIHt9XG59XG5leHBvcnQgY29uc3QgTlNJTUdfRElSRUNUSVZFUyA9IFtJbWdEaXJlY3RpdmVdO1xuIl19

package/angular/{esm2020 → esm2022}/module.mjs

@@ -6,10 +6,10 @@ import * as i0 from "@angular/core";
 import * as i1 from "./directives";
 export { ImgDirective };
 export class TNSImageModule {
+    static ɵfac = function TNSImageModule_Factory(t) { return new (t || TNSImageModule)(); };
+    static ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: TNSImageModule });
+    static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 }
-TNSImageModule.ɵfac = function TNSImageModule_Factory(t) { return new (t || TNSImageModule)(); };
-TNSImageModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: TNSImageModule });
-TNSImageModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(TNSImageModule, [{
         type: NgModule,
         args: [{
@@ -19,4 +19,4 @@ TNSImageModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
     }], null, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(TNSImageModule, { declarations: [i1.ImgDirective], exports: [i1.ImgDirective] }); })();
 registerElement('NSImg', () => Img);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2ltYWdlL2FuZ3VsYXIvbW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDOUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGtDQUFrQyxDQUFDOzs7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxDQUFDO0FBS3hCLE1BQU0sT0FBTyxjQUFjOzs0RUFBZCxjQUFjO2dFQUFkLGNBQWM7O3VGQUFkLGNBQWM7Y0FKMUIsUUFBUTtlQUFDO2dCQUNOLFlBQVksRUFBRSxDQUFDLGdCQUFnQixDQUFDO2dCQUNoQyxPQUFPLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQzthQUM5Qjs7d0ZBQ1ksY0FBYztBQUUzQixlQUFlLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgcmVnaXN0ZXJFbGVtZW50IH0gZnJvbSAnQG5hdGl2ZXNjcmlwdC9hbmd1bGFyJztcblxuaW1wb3J0IHsgSW1nRGlyZWN0aXZlLCBOU0lNR19ESVJFQ1RJVkVTIH0gZnJvbSAnLi9kaXJlY3RpdmVzJztcbmltcG9ydCB7IEltZyB9IGZyb20gJ0BuYXRpdmVzY3JpcHQtY29tbXVuaXR5L3VpLWltYWdlJztcbmV4cG9ydCB7IEltZ0RpcmVjdGl2ZSB9O1xuQE5nTW9kdWxlKHtcbiAgICBkZWNsYXJhdGlvbnM6IFtOU0lNR19ESVJFQ1RJVkVTXSxcbiAgICBleHBvcnRzOiBbTlNJTUdfRElSRUNUSVZFU10sXG59KVxuZXhwb3J0IGNsYXNzIFROU0ltYWdlTW9kdWxlIHt9XG5cbnJlZ2lzdGVyRWxlbWVudCgnTlNJbWcnLCAoKSA9PiBJbWcpO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2ltYWdlL2FuZ3VsYXIvbW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDOUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGtDQUFrQyxDQUFDOzs7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxDQUFDO0FBS3hCLE1BQU0sT0FBTyxjQUFjO3dFQUFkLGNBQWM7NERBQWQsY0FBYzs7O3VGQUFkLGNBQWM7Y0FKMUIsUUFBUTtlQUFDO2dCQUNOLFlBQVksRUFBRSxDQUFDLGdCQUFnQixDQUFDO2dCQUNoQyxPQUFPLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQzthQUM5Qjs7d0ZBQ1ksY0FBYztBQUUzQixlQUFlLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgcmVnaXN0ZXJFbGVtZW50IH0gZnJvbSAnQG5hdGl2ZXNjcmlwdC9hbmd1bGFyJztcblxuaW1wb3J0IHsgSW1nRGlyZWN0aXZlLCBOU0lNR19ESVJFQ1RJVkVTIH0gZnJvbSAnLi9kaXJlY3RpdmVzJztcbmltcG9ydCB7IEltZyB9IGZyb20gJ0BuYXRpdmVzY3JpcHQtY29tbXVuaXR5L3VpLWltYWdlJztcbmV4cG9ydCB7IEltZ0RpcmVjdGl2ZSB9O1xuQE5nTW9kdWxlKHtcbiAgICBkZWNsYXJhdGlvbnM6IFtOU0lNR19ESVJFQ1RJVkVTXSxcbiAgICBleHBvcnRzOiBbTlNJTUdfRElSRUNUSVZFU10sXG59KVxuZXhwb3J0IGNsYXNzIFROU0ltYWdlTW9kdWxlIHt9XG5cbnJlZ2lzdGVyRWxlbWVudCgnTlNJbWcnLCAoKSA9PiBJbWcpO1xuIl19

package/angular/{fesm2020 → fesm2022}/nativescript-community-ui-image-angular.mjs

@@ -5,9 +5,9 @@ import { Img } from '@nativescript-community/ui-image';
 
 class ImgDirective {
     constructor() { }
+    static ɵfac = function ImgDirective_Factory(t) { return new (t || ImgDirective)(); };
+    static ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: ImgDirective, selectors: [["NSImg"]] });
 }
-ImgDirective.ɵfac = function ImgDirective_Factory(t) { return new (t || ImgDirective)(); };
-ImgDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: ImgDirective, selectors: [["NSImg"]] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ImgDirective, [{
         type: Directive,
         args: [{
@@ -17,10 +17,10 @@ ImgDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: ImgDirective,
 const NSIMG_DIRECTIVES = [ImgDirective];
 
 class TNSImageModule {
+    static ɵfac = function TNSImageModule_Factory(t) { return new (t || TNSImageModule)(); };
+    static ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: TNSImageModule });
+    static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 }
-TNSImageModule.ɵfac = function TNSImageModule_Factory(t) { return new (t || TNSImageModule)(); };
-TNSImageModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: TNSImageModule });
-TNSImageModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(TNSImageModule, [{
         type: NgModule,
         args: [{

package/angular/package.json

@@ -1,11 +1,7 @@
 {
   "name": "@nativescript-community/ui-image-angular",
   "main": "index.js",
-  "module": "fesm2015/nativescript-community-ui-image-angular.mjs",
-  "es2020": "fesm2020/nativescript-community-ui-image-angular.mjs",
-  "esm2020": "esm2020/nativescript-community-ui-image-angular.mjs",
-  "fesm2020": "fesm2020/nativescript-community-ui-image-angular.mjs",
-  "fesm2015": "fesm2015/nativescript-community-ui-image-angular.mjs",
+  "module": "fesm2022/nativescript-community-ui-image-angular.mjs",
   "typings": "index.d.ts",
   "exports": {
     "./package.json": {
@@ -13,11 +9,9 @@
     },
     ".": {
       "types": "./index.d.ts",
-      "esm2020": "./esm2020/nativescript-community-ui-image-angular.mjs",
-      "es2020": "./fesm2020/nativescript-community-ui-image-angular.mjs",
-      "es2015": "./fesm2015/nativescript-community-ui-image-angular.mjs",
-      "node": "./fesm2015/nativescript-community-ui-image-angular.mjs",
-      "default": "./fesm2020/nativescript-community-ui-image-angular.mjs"
+      "esm2022": "./esm2022/nativescript-community-ui-image-angular.mjs",
+      "esm": "./esm2022/nativescript-community-ui-image-angular.mjs",
+      "default": "./fesm2022/nativescript-community-ui-image-angular.mjs"
     }
   },
   "sideEffects": false,

package/index-common.d.ts

@@ -10,7 +10,7 @@ export declare enum CLogTypes {
 }
 export declare const ImageViewTraceCategory = "NativescriptImage";
 export declare const CLog: (type: CLogTypes, ...args: any[]) => void;
-export declare type Transition = 'fade' | 'curlUp';
+export type Transition = 'fade' | 'curlUp';
 export declare enum ScaleType {
     None = "none",
     Fill = "fill",
@@ -52,7 +52,7 @@ export declare class EventData implements IEventData {
     get object(): any;
     set object(value: any);
 }
-export declare type Stretch = 'none' | 'fill' | 'aspectFill' | 'aspectFit';
+export type Stretch = 'none' | 'fill' | 'aspectFill' | 'aspectFit';
 export declare const srcProperty: Property<ImageBase, string | ImageSource | ImageAsset>;
 export declare const lowerResSrcProperty: Property<ImageBase, string>;
 export declare const placeholderImageUriProperty: Property<ImageBase, string>;

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.20",
+    "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": "98af31eeaac7f0f4b2b28be8d667cc9909b00b36"
+    "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;
     }

package/angular/fesm2015/nativescript-community-ui-image-angular.mjs

@@ -1,43 +0,0 @@
-import * as i0 from '@angular/core';
-import { Directive, NgModule } from '@angular/core';
-import { registerElement } from '@nativescript/angular';
-import { Img } from '@nativescript-community/ui-image';
-
-class ImgDirective {
-    constructor() { }
-}
-ImgDirective.ɵfac = function ImgDirective_Factory(t) { return new (t || ImgDirective)(); };
-ImgDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: ImgDirective, selectors: [["NSImg"]] });
-(function () {
-    (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ImgDirective, [{
-            type: Directive,
-            args: [{
-                    selector: 'NSImg'
-                }]
-        }], function () { return []; }, null);
-})();
-const NSIMG_DIRECTIVES = [ImgDirective];
-
-class TNSImageModule {
-}
-TNSImageModule.ɵfac = function TNSImageModule_Factory(t) { return new (t || TNSImageModule)(); };
-TNSImageModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: TNSImageModule });
-TNSImageModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
-(function () {
-    (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(TNSImageModule, [{
-            type: NgModule,
-            args: [{
-                    declarations: [NSIMG_DIRECTIVES],
-                    exports: [NSIMG_DIRECTIVES],
-                }]
-        }], null, null);
-})();
-(function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(TNSImageModule, { declarations: [ImgDirective], exports: [ImgDirective] }); })();
-registerElement('NSImg', () => Img);
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { ImgDirective, TNSImageModule };
-//# sourceMappingURL=nativescript-community-ui-image-angular.mjs.map

package/vue/index.mjs

@@ -1,8 +0,0 @@
-import { Img } from '../image';
-const ImagePlugin = {
-    install(Vue) {
-        Vue.registerElement('NSImg', () => Img);
-    }
-};
-export default ImagePlugin;
-//# sourceMappingURL=index.mjs.map