@nativescript-community/ui-image 4.3.19 → 4.3.20

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 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)
+
+**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)
 
 ### Bug Fixes

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, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<ImgDirective, "NSImg", never, {}, {}, never, never, false>;
 }
 export declare const NSIMG_DIRECTIVES: (typeof ImgDirective)[];

package/angular/{esm2022 → esm2020}/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 @@ export class ImgDirective {
             }]
     }], function () { return []; }, null); })();
 export const NSIMG_DIRECTIVES = [ImgDirective];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlyZWN0aXZlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9pbWFnZS9hbmd1bGFyL2RpcmVjdGl2ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLMUMsTUFBTSxPQUFPLFlBQVk7SUFDckIsZ0JBQWUsQ0FBQztzRUFEUCxZQUFZOzZEQUFaLFlBQVk7O3VGQUFaLFlBQVk7Y0FIeEIsU0FBUztlQUFDO2dCQUNQLFFBQVEsRUFBRSxPQUFPO2FBQ3BCOztBQUlELE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEaXJlY3RpdmUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQERpcmVjdGl2ZSh7XG4gICAgc2VsZWN0b3I6ICdOU0ltZydcbn0pXG5leHBvcnQgY2xhc3MgSW1nRGlyZWN0aXZlIHtcbiAgICBjb25zdHJ1Y3RvcigpIHt9XG59XG5leHBvcnQgY29uc3QgTlNJTUdfRElSRUNUSVZFUyA9IFtJbWdEaXJlY3RpdmVdO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlyZWN0aXZlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9pbWFnZS9hbmd1bGFyL2RpcmVjdGl2ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLMUMsTUFBTSxPQUFPLFlBQVk7SUFDckIsZ0JBQWUsQ0FBQzs7d0VBRFAsWUFBWTsrREFBWixZQUFZO3VGQUFaLFlBQVk7Y0FIeEIsU0FBUztlQUFDO2dCQUNQLFFBQVEsRUFBRSxPQUFPO2FBQ3BCOztBQUlELE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEaXJlY3RpdmUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQERpcmVjdGl2ZSh7XG4gICAgc2VsZWN0b3I6ICdOU0ltZydcbn0pXG5leHBvcnQgY2xhc3MgSW1nRGlyZWN0aXZlIHtcbiAgICBjb25zdHJ1Y3RvcigpIHt9XG59XG5leHBvcnQgY29uc3QgTlNJTUdfRElSRUNUSVZFUyA9IFtJbWdEaXJlY3RpdmVdO1xuIl19

package/angular/{esm2022 → esm2020}/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 @@ export class TNSImageModule {
     }], null, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(TNSImageModule, { declarations: [i1.ImgDirective], exports: [i1.ImgDirective] }); })();
 registerElement('NSImg', () => Img);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2ltYWdlL2FuZ3VsYXIvbW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDOUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGtDQUFrQyxDQUFDOzs7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxDQUFDO0FBS3hCLE1BQU0sT0FBTyxjQUFjO3dFQUFkLGNBQWM7NERBQWQsY0FBYzs7O3VGQUFkLGNBQWM7Y0FKMUIsUUFBUTtlQUFDO2dCQUNOLFlBQVksRUFBRSxDQUFDLGdCQUFnQixDQUFDO2dCQUNoQyxPQUFPLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQzthQUM5Qjs7d0ZBQ1ksY0FBYztBQUUzQixlQUFlLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgcmVnaXN0ZXJFbGVtZW50IH0gZnJvbSAnQG5hdGl2ZXNjcmlwdC9hbmd1bGFyJztcblxuaW1wb3J0IHsgSW1nRGlyZWN0aXZlLCBOU0lNR19ESVJFQ1RJVkVTIH0gZnJvbSAnLi9kaXJlY3RpdmVzJztcbmltcG9ydCB7IEltZyB9IGZyb20gJ0BuYXRpdmVzY3JpcHQtY29tbXVuaXR5L3VpLWltYWdlJztcbmV4cG9ydCB7IEltZ0RpcmVjdGl2ZSB9O1xuQE5nTW9kdWxlKHtcbiAgICBkZWNsYXJhdGlvbnM6IFtOU0lNR19ESVJFQ1RJVkVTXSxcbiAgICBleHBvcnRzOiBbTlNJTUdfRElSRUNUSVZFU10sXG59KVxuZXhwb3J0IGNsYXNzIFROU0ltYWdlTW9kdWxlIHt9XG5cbnJlZ2lzdGVyRWxlbWVudCgnTlNJbWcnLCAoKSA9PiBJbWcpO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2ltYWdlL2FuZ3VsYXIvbW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDOUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGtDQUFrQyxDQUFDOzs7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxDQUFDO0FBS3hCLE1BQU0sT0FBTyxjQUFjOzs0RUFBZCxjQUFjO2dFQUFkLGNBQWM7O3VGQUFkLGNBQWM7Y0FKMUIsUUFBUTtlQUFDO2dCQUNOLFlBQVksRUFBRSxDQUFDLGdCQUFnQixDQUFDO2dCQUNoQyxPQUFPLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQzthQUM5Qjs7d0ZBQ1ksY0FBYztBQUUzQixlQUFlLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgcmVnaXN0ZXJFbGVtZW50IH0gZnJvbSAnQG5hdGl2ZXNjcmlwdC9hbmd1bGFyJztcblxuaW1wb3J0IHsgSW1nRGlyZWN0aXZlLCBOU0lNR19ESVJFQ1RJVkVTIH0gZnJvbSAnLi9kaXJlY3RpdmVzJztcbmltcG9ydCB7IEltZyB9IGZyb20gJ0BuYXRpdmVzY3JpcHQtY29tbXVuaXR5L3VpLWltYWdlJztcbmV4cG9ydCB7IEltZ0RpcmVjdGl2ZSB9O1xuQE5nTW9kdWxlKHtcbiAgICBkZWNsYXJhdGlvbnM6IFtOU0lNR19ESVJFQ1RJVkVTXSxcbiAgICBleHBvcnRzOiBbTlNJTUdfRElSRUNUSVZFU10sXG59KVxuZXhwb3J0IGNsYXNzIFROU0ltYWdlTW9kdWxlIHt9XG5cbnJlZ2lzdGVyRWxlbWVudCgnTlNJbWcnLCAoKSA9PiBJbWcpO1xuIl19

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

@@ -0,0 +1,43 @@
+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/angular/{fesm2022 → fesm2020}/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 @@ class 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,7 +1,11 @@
 {
   "name": "@nativescript-community/ui-image-angular",
   "main": "index.js",
-  "module": "fesm2022/nativescript-community-ui-image-angular.mjs",
+  "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",
   "typings": "index.d.ts",
   "exports": {
     "./package.json": {
@@ -9,9 +13,11 @@
     },
     ".": {
       "types": "./index.d.ts",
-      "esm2022": "./esm2022/nativescript-community-ui-image-angular.mjs",
-      "esm": "./esm2022/nativescript-community-ui-image-angular.mjs",
-      "default": "./fesm2022/nativescript-community-ui-image-angular.mjs"
+      "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"
     }
   },
   "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 type Transition = 'fade' | 'curlUp';
+export declare 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 type Stretch = 'none' | 'fill' | 'aspectFill' | 'aspectFit';
+export declare 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>;
@@ -83,7 +83,8 @@ export declare const roundBottomRightRadiusProperty: Property<ImageBase, CoreTyp
 export declare const loadModeProperty: Property<ImageBase, "sync" | "async">;
 export declare const clipToBoundsProperty: Property<ImageBase, boolean>;
 export declare const animatedImageViewProperty: Property<ImageBase, boolean>;
-export declare class ImageBase extends View {
+export declare const needRequestImage: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
+export declare abstract class ImageBase extends View {
     static finalImageSetEvent: string;
     static failureEvent: string;
     static intermediateImageFailedEvent: string;
@@ -121,6 +122,10 @@ export declare class ImageBase extends View {
     tintColor: Color;
     readonly isLoading: boolean;
     get nativeImageViewProtected(): any;
+    mCanRequestImage: boolean;
+    mNeedRequestImage: boolean;
+    protected abstract initImage(): any;
+    onResumeNativeUpdates(): void;
     protected handleImageProgress(value: number, totalSize?: number): void;
     private static needsSizeAdjustment;
     computeScaleFactor(measureWidth: number, measureHeight: number, widthIsFinite: boolean, heightIsFinite: boolean, nativeWidth: number, nativeHeight: number, aspectRatio: number): {

package/index-common.js

@@ -174,11 +174,36 @@ export const loadModeProperty = new Property({
 });
 export const clipToBoundsProperty = new Property({ name: 'clipToBounds', defaultValue: true, valueConverter: booleanConverter });
 export const animatedImageViewProperty = new Property({ name: 'animatedImageView', defaultValue: false, valueConverter: booleanConverter });
+export const needRequestImage = function (target, propertyKey, descriptor) {
+    const originalMethod = descriptor.value;
+    descriptor.value = function (...args) {
+        if (!this.mCanRequestImage) {
+            this.mNeedRequestImage = true;
+            return;
+        }
+        return originalMethod.apply(this, args);
+    };
+};
 export class ImageBase extends View {
+    constructor() {
+        super(...arguments);
+        this.mCanRequestImage = true;
+        this.mNeedRequestImage = false;
+    }
     // public static blendingModeProperty = new Property<ImageBase, string>({ name: 'blendingMode' });
     get nativeImageViewProtected() {
         return this.nativeViewProtected;
     }
+    onResumeNativeUpdates() {
+        // {N} suspends properties update on `_suspendNativeUpdates`. So we only need to do this in onResumeNativeUpdates
+        this.mCanRequestImage = false;
+        super.onResumeNativeUpdates();
+        this.mCanRequestImage = true;
+        if (this.mNeedRequestImage) {
+            this.mNeedRequestImage = false;
+            this.initImage();
+        }
+    }
     handleImageProgress(value, totalSize) { }
     static needsSizeAdjustment(scaleType) {
         if (scaleType === undefined) {

package/index.android.d.ts

@@ -6,6 +6,7 @@ export declare function shutDown(): void;
 export declare class ImagePipeline {
     private _android;
     toUri(value: string | android.net.Uri): globalAndroid.net.Uri;
+    getCacheKey(uri: string, context: any): string;
     isInDiskCache(uri: string | android.net.Uri): boolean;
     isInBitmapMemoryCache(uri: string | android.net.Uri): boolean;
     evictFromMemoryCache(uri: string | android.net.Uri): void;
@@ -61,23 +62,20 @@ export declare class FailureEventData extends EventData {
     get error(): ImageError;
     set error(value: ImageError);
 }
-export declare const needRequestImage: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
 export declare const needUpdateHierarchy: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
 export declare class Img extends ImageBase {
     nativeViewProtected: com.nativescript.image.DraweeView;
     nativeImageViewProtected: com.nativescript.image.DraweeView;
     isLoading: boolean;
-    _canRequestImage: boolean;
-    _canUpdateHierarchy: boolean;
-    _needUpdateHierarchy: boolean;
-    _needRequestImage: boolean;
+    mCanUpdateHierarchy: boolean;
+    mNeedUpdateHierarchy: boolean;
     onResumeNativeUpdates(): void;
     createNativeView(): com.nativescript.image.DraweeView;
     updateViewSize(imageInfo: any): void;
     disposeNativeView(): void;
     updateImageUri(): void;
     controllerListener: com.facebook.drawee.controller.ControllerListener<com.facebook.imagepipeline.image.ImageInfo>;
-    private initImage;
+    protected initImage(): Promise<void>;
     private updateHierarchy;
     private getDrawable;
     private getDrawableFromLocalFile;

package/index.android.js

@@ -2,7 +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 { CLog, CLogTypes, EventData, ImageBase, ScaleType, aspectRatioProperty, backgroundUriProperty, blurDownSamplingProperty, blurRadiusProperty, fadeDurationProperty, failureImageUriProperty, imageRotationProperty, lowerResSrcProperty, placeholderImageUriProperty, progressBarColorProperty, roundAsCircleProperty, roundBottomLeftRadiusProperty, roundBottomRightRadiusProperty, roundTopLeftRadiusProperty, roundTopRightRadiusProperty, showProgressBarProperty, srcProperty, stretchProperty, tintColorProperty } from './index-common';
+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;
 export function initialize(config) {
@@ -99,6 +99,10 @@ export class ImagePipeline {
         }
         return android.net.Uri.parse(value);
     }
+    getCacheKey(uri, context) {
+        // iOS only
+        return uri;
+    }
     isInDiskCache(uri) {
         return this._android.isInDiskCacheSync(this.toUri(uri));
     }
@@ -260,24 +264,11 @@ export class FailureEventData extends EventData {
         this._error = value;
     }
 }
-export const needRequestImage = function (target, propertyKey, descriptor) {
-    const originalMethod = descriptor.value;
-    descriptor.value = function (...args) {
-        if (!this._canRequestImage) {
-            this._needRequestImage = true;
-            // we need to ensure a hierarchy is set or the default aspect ratio wont be set
-            // because aspectFit is the default (wanted) but then we wont go into stretchProperty.setNative
-            // this._needUpdateHierarchy = true;
-            return;
-        }
-        return originalMethod.apply(this, args);
-    };
-};
 export const needUpdateHierarchy = function (target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
     descriptor.value = function (...args) {
-        if (!this._canUpdateHierarchy) {
-            this._needUpdateHierarchy = true;
+        if (!this.mCanUpdateHierarchy) {
+            this.mNeedUpdateHierarchy = true;
             return;
         }
         return originalMethod.apply(this, args);
@@ -287,26 +278,18 @@ export class Img extends ImageBase {
     constructor() {
         super(...arguments);
         this.isLoading = false;
-        this._canRequestImage = true;
-        this._canUpdateHierarchy = true;
-        this._needUpdateHierarchy = false;
-        this._needRequestImage = false;
+        this.mCanUpdateHierarchy = true;
+        this.mNeedUpdateHierarchy = false;
     }
     onResumeNativeUpdates() {
         // {N} suspends properties update on `_suspendNativeUpdates`. So we only need to do this in onResumeNativeUpdates
-        this._canRequestImage = false;
-        this._canUpdateHierarchy = false;
+        this.mCanUpdateHierarchy = false;
         super.onResumeNativeUpdates();
-        this._canUpdateHierarchy = true;
-        this._canRequestImage = true;
-        if (this._needUpdateHierarchy) {
-            this._needUpdateHierarchy = false;
+        this.mCanUpdateHierarchy = true;
+        if (this.mNeedUpdateHierarchy) {
+            this.mNeedUpdateHierarchy = false;
             this.updateHierarchy();
         }
-        if (this._needRequestImage) {
-            this._needRequestImage = false;
-            this.initImage();
-        }
     }
     createNativeView() {
         if (!initialized) {
@@ -621,8 +604,8 @@ export class Img extends ImageBase {
         }
     }
     updateHierarchy() {
-        if (!this._canUpdateHierarchy) {
-            this._needUpdateHierarchy = true;
+        if (!this.mCanUpdateHierarchy) {
+            this.mNeedUpdateHierarchy = true;
             return;
         }
         if (this.nativeImageViewProtected) {
@@ -669,7 +652,7 @@ export class Img extends ImageBase {
                 builder.setCornersRadii(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius);
             }
             this.nativeImageViewProtected.setHierarchy(builder.build());
-            if (!this._needRequestImage) {
+            if (!this.mNeedRequestImage) {
                 this.nativeImageViewProtected.setController(this.nativeImageViewProtected.getController());
             }
         }

package/index.d.ts

@@ -357,6 +357,12 @@ export class ImagePipeline {
      */
     isInBitmapMemoryCache(uri: string): boolean;
 
+    /**
+     * Returns the actual cache key for url + context
+     * this is an iOS feature because imageView properties are used for the cache key
+     */
+    getCacheKey(uri: string, context): string;
+
     /**
      * Returns whether the image is stored in the disk cache.
      */

package/index.ios.d.ts

@@ -14,8 +14,9 @@ export interface FinalEventData extends EventData {
 export declare function initialize(config?: ImagePipelineConfigSetting): void;
 export declare function shutDown(): void;
 export declare class ImagePipeline {
-    private _ios;
+    private mIos;
     constructor();
+    getCacheKey(uri: string, context: any): string;
     isInDiskCache(uri: string): boolean;
     isInBitmapMemoryCache(uri: string): boolean;
     evictFromMemoryCache(uri: string): void;
@@ -29,12 +30,14 @@ export declare class ImagePipeline {
     private prefetchToCacheType;
     get ios(): SDImageCache;
 }
+export declare const needRequestImage: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
 export declare function getImagePipeline(): ImagePipeline;
 export declare class Img extends ImageBase {
     nativeViewProtected: SDAnimatedImageView | UIImageView;
     nativeImageViewProtected: SDAnimatedImageView | UIImageView;
     isLoading: boolean;
-    private _imageSourceAffectsLayout;
+    protected mImageSourceAffectsLayout: boolean;
+    protected mCIFilter: CIFilter;
     createNativeView(): UIImageView;
     _setNativeClipToBounds(): void;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
@@ -43,7 +46,7 @@ export declare class Img extends ImageBase {
     private handleImageLoaded;
     private onLoadProgress;
     private getUIImage;
-    private initImage;
+    protected initImage(): Promise<void>;
     placeholderImage: UIImage;
     startAnimating(): void;
     stopAnimating(): void;

package/index.ios.js

@@ -1,3 +1,4 @@
+var _a, _b;
 export * from './index-common';
 import { ImageAsset, ImageSource, Screen, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { layout } from '@nativescript/core/utils/layout-helper';
@@ -74,32 +75,38 @@ export function initialize(config) {
 export function shutDown() { }
 export class ImagePipeline {
     constructor() {
-        this._ios = SDImageCache.sharedImageCache;
+        this.mIos = SDImageCache.sharedImageCache;
+    }
+    getCacheKey(uri, context) {
+        return SDWebImageManager.sharedManager.cacheKeyForURLContext(NSURL.URLWithString(uri), context);
     }
     isInDiskCache(uri) {
-        return this._ios.diskImageDataExistsWithKey(getUri(uri).absoluteString);
+        return this.mIos.diskImageDataExistsWithKey(getUri(uri).absoluteString);
     }
     isInBitmapMemoryCache(uri) {
-        return this._ios.imageFromMemoryCacheForKey(getUri(uri).absoluteString) !== null;
+        return this.mIos.imageFromMemoryCacheForKey(getUri(uri).absoluteString) !== null;
     }
     evictFromMemoryCache(uri) {
-        this._ios.removeImageFromMemoryForKey(getUri(uri).absoluteString);
+        this.mIos.removeImageFromMemoryForKey(getUri(uri).absoluteString);
     }
     evictFromDiskCache(uri) {
-        this._ios.removeImageFromDiskForKey(getUri(uri).absoluteString);
+        this.mIos.removeImageFromDiskForKey(getUri(uri).absoluteString);
     }
     evictFromCache(uri) {
-        this._ios.removeImageForKeyWithCompletion(getUri(uri).absoluteString, null);
+        const key = getUri(uri).absoluteString;
+        this.mIos.removeImageFromDiskForKey(key);
+        this.mIos.removeImageFromMemoryForKey(key);
+        // this.mIos.removeImageForKeyWithCompletion(getUri(uri).absoluteString, null);
     }
     clearCaches() {
-        this._ios.clearMemory();
-        this._ios.clearDiskOnCompletion(null);
+        this.mIos.clearMemory();
+        this.mIos.clearDiskOnCompletion(null);
     }
     clearMemoryCaches() {
-        this._ios.clearMemory();
+        this.mIos.clearMemory();
     }
     clearDiskCaches() {
-        this._ios.clearDiskOnCompletion(null);
+        this.mIos.clearDiskOnCompletion(null);
     }
     prefetchToDiskCache(uri) {
         return this.prefetchToCacheType(uri, 1 /* SDImageCacheType.Disk */);
@@ -123,9 +130,22 @@ export class ImagePipeline {
         });
     }
     get ios() {
-        return this._ios;
+        return this.mIos;
     }
 }
+export const needRequestImage = function (target, propertyKey, descriptor) {
+    const originalMethod = descriptor.value;
+    descriptor.value = function (...args) {
+        if (!this.mCanRequestImage) {
+            this.mNeedRequestImage = true;
+            // we need to ensure a hierarchy is set or the default aspect ratio wont be set
+            // because aspectFit is the default (wanted) but then we wont go into stretchProperty.setNative
+            // this.mNeedUpdateHierarchy = true;
+            return;
+        }
+        return originalMethod.apply(this, args);
+    };
+};
 export function getImagePipeline() {
     const imagePineLine = new ImagePipeline();
     return imagePineLine;
@@ -165,7 +185,7 @@ export class Img extends ImageBase {
     constructor() {
         super(...arguments);
         this.isLoading = false;
-        this._imageSourceAffectsLayout = true;
+        this.mImageSourceAffectsLayout = true;
         this.handleImageLoaded = (image, error, cacheType) => {
             this.isLoading = false;
             if (!this.nativeViewProtected) {
@@ -179,25 +199,21 @@ export class Img extends ImageBase {
                 this.nativeImageViewProtected.stopAnimating();
             }
             if (error) {
-                const args = {
+                this.notify({
                     eventName: Img.failureEvent,
-                    object: this,
                     error
-                };
-                this.notify(args);
+                });
                 if (this.failureImageUri) {
                     image = this.getUIImage(this.failureImageUri);
                     this._setNativeImage(image, animate);
                 }
             }
             else if (image) {
-                const args = {
+                this.notify({
                     eventName: ImageBase.finalImageSetEvent,
-                    object: this,
                     imageInfo: new ImageInfo(image.size.width, image.size.height),
                     ios: image
-                };
-                this.notify(args);
+                });
             }
             this.handleImageProgress(1);
         };
@@ -226,7 +242,7 @@ export class Img extends ImageBase {
         const image = this.nativeImageViewProtected.image;
         const finiteWidth = widthMode === layout.EXACTLY;
         const finiteHeight = heightMode === layout.EXACTLY;
-        this._imageSourceAffectsLayout = !finiteWidth || !finiteHeight;
+        this.mImageSourceAffectsLayout = !finiteWidth || !finiteHeight;
         if (Trace.isEnabled()) {
             CLog(CLogTypes.info, 'onMeasure', this.src, widthMeasureSpec, heightMeasureSpec, width, height, this.aspectRatio, image && image.imageOrientation);
         }
@@ -262,7 +278,7 @@ export class Img extends ImageBase {
         this.src = src;
     }
     _setNativeImage(nativeImage, animated = true) {
-        if (animated) {
+        if (animated && this.fadeDuration) {
             // switch (this.transition) {
             //     case 'fade':
             this.nativeImageViewProtected.alpha = 0.0;
@@ -289,8 +305,8 @@ export class Img extends ImageBase {
         else {
             this.nativeImageViewProtected.image = nativeImage;
         }
-        if (this._imageSourceAffectsLayout) {
-            this._imageSourceAffectsLayout = false;
+        if (this.mImageSourceAffectsLayout) {
+            this.mImageSourceAffectsLayout = false;
             this.requestLayout();
         }
     }
@@ -316,10 +332,7 @@ export class Img extends ImageBase {
         else {
             image = imagePath;
         }
-        if (image) {
-            image = image.ios;
-        }
-        return image;
+        return image?.ios;
     }
     async initImage() {
         if (this.nativeViewProtected) {
@@ -347,16 +360,17 @@ export class Img extends ImageBase {
                     }
                 }
                 const uri = getUri(src);
-                if (this.noCache) {
-                    const key = uri.absoluteString;
-                    const imagePipeLine = getImagePipeline();
-                    const isInCache = imagePipeLine.isInBitmapMemoryCache(key);
-                    if (isInCache) {
-                        imagePipeLine.evictFromCache(key);
-                    }
-                }
                 this.isLoading = true;
                 let options = 2048 /* SDWebImageOptions.ScaleDownLargeImages */ | 1024 /* SDWebImageOptions.AvoidAutoSetImage */;
+                if (this.noCache) {
+                    // const key = uri.absoluteString;
+                    // const imagePipeLine = getImagePipeline();
+                    // const isInCache = imagePipeLine.isInBitmapMemoryCache(key);
+                    // if (isInCache) {
+                    //     imagePipeLine.evictFromCache(key);
+                    // }
+                    options = options | 65536 /* SDWebImageOptions.FromLoaderOnly */;
+                }
                 if (this.alwaysFade === true) {
                     options |= 131072 /* SDWebImageOptions.ForceTransition */;
                 }
@@ -365,7 +379,7 @@ export class Img extends ImageBase {
                 if (this.progressiveRenderingEnabled === true) {
                     options = options | 4 /* SDWebImageOptions.ProgressiveLoad */;
                 }
-                if (this.decodeWidth && this.decodeHeight) {
+                if (this.decodeWidth || this.decodeHeight) {
                     //@ts-ignore
                     transformers.push(NSImageDecodeSizeTransformer.transformerWithDecodeWidthDecodeHeight(this.decodeWidth, this.decodeHeight));
                 }
@@ -384,6 +398,9 @@ export class Img extends ImageBase {
                     //@ts-ignore
                     NSImageRoundCornerTransformer.transformerWithTopLefRadiusTopRightRadiusBottomRightRadiusBottomLeftRadius(layout.toDeviceIndependentPixels(this.roundTopLeftRadius), layout.toDeviceIndependentPixels(this.roundTopRightRadius), layout.toDeviceIndependentPixels(this.roundBottomRightRadius), layout.toDeviceIndependentPixels(this.roundBottomLeftRadius)));
                 }
+                if (this.mCIFilter) {
+                    transformers.push(SDImageFilterTransformer.transformerWithFilter(this.mCIFilter));
+                }
                 if (transformers.length > 0) {
                     if (this.animatedImageView) {
                         // as we use SDAnimatedImageView  all images are loaded as SDAnimatedImage;
@@ -401,10 +418,10 @@ export class Img extends ImageBase {
             }
         }
     }
-    [srcProperty.setNative](value) {
+    [_a = srcProperty.setNative](value) {
         this.initImage();
     }
-    [placeholderImageUriProperty.setNative]() {
+    [_b = placeholderImageUriProperty.setNative]() {
         this.placeholderImage = this.getUIImage(this.placeholderImageUri);
         this.initImage();
     }
@@ -418,7 +435,6 @@ export class Img extends ImageBase {
         this.nativeImageViewProtected.contentMode = getUIImageScaleType(value);
     }
     // [ImageBase.blendingModeProperty.setNative](value: string) {
-    //     console.log('blendingModeProperty', value);
     //     switch (value) {
     //         case 'multiply':
     //            this.nativeImageViewProtected.layer.compositingFilter = 'multiply';
@@ -438,4 +454,10 @@ export class Img extends ImageBase {
         this.nativeImageViewProtected.stopAnimating();
     }
 }
+__decorate([
+    needRequestImage
+], Img.prototype, _a, null);
+__decorate([
+    needRequestImage
+], Img.prototype, _b, null);
 //# sourceMappingURL=index.ios.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.19",
+    "version": "4.3.20",
     "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": "ae8d3a7db18627516d125198f1958bddc90b023b"
+    "gitHead": "98af31eeaac7f0f4b2b28be8d667cc9909b00b36"
 }

package/references.d.ts

@@ -1,3 +1,4 @@
 /// <reference path="./typings/android.d.ts" />
 /// <reference path="./typings/ios.d.ts" />
 /// <reference path="./typings/objc!SDWebImagePhotosPlugin.d.ts" />
+/// <reference path="../../node_modules/@nativescript/types-ios/lib/ios/objc-x86_64/objc!CoreImage.d.ts" />

package/vue/index.mjs

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