@nativescript-community/ui-image 4.3.4 → 4.3.6

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.6](https://github.com/nativescript-community/ui-image/compare/v4.3.5...v4.3.6) (2022-12-01)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
+
+
+
+
+## [4.3.5](https://github.com/nativescript-community/ui-image/compare/v4.3.4...v4.3.5) (2022-09-29)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
+
+
+
+
 ## [4.3.4](https://github.com/nativescript-community/ui-image/compare/v4.3.3...v4.3.4) (2022-09-20)
 
 **Note:** Version bump only for package @nativescript-community/ui-image

package/angular/package.json

@@ -6,13 +6,13 @@
   "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": "nativescript-community-ui-image-angular.d.ts",
+  "typings": "index.d.ts",
   "exports": {
     "./package.json": {
       "default": "./package.json"
     },
     ".": {
-      "types": "./nativescript-community-ui-image-angular.d.ts",
+      "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",

package/index.android.js

@@ -3,19 +3,19 @@ export * from './index-common';
 import { Color, Image, ImageAsset, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { android as androidApp } from '@nativescript/core/application';
 import { isString } from '@nativescript/core/utils/types';
-import { RESOURCE_PREFIX, ad, isFileOrResourcePath, isFontIconURI } from '@nativescript/core/utils/utils';
 import { CLog, CLogTypes, EventData, ImageBase, ScaleType } from './index-common';
+import { layout } from '@nativescript/core/utils/layout-helper';
 let initialized = false;
 let initializeConfig;
 export function initialize(config) {
     if (!initialized) {
-        const context = ad.getApplicationContext();
+        const context = Utils.ad.getApplicationContext();
         if (!context) {
             initializeConfig = config;
             return;
         }
         let builder;
-        const useOkhttp = config === null || config === void 0 ? void 0 : config.useOkhttp;
+        const useOkhttp = config?.useOkhttp;
         if (useOkhttp) {
             if (useOkhttp instanceof okhttp3.OkHttpClient) {
                 builder = com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory.newBuilder(context, useOkhttp);
@@ -27,10 +27,10 @@ export function initialize(config) {
         else {
             builder = com.facebook.imagepipeline.core.ImagePipelineConfig.newBuilder(context);
         }
-        if (config === null || config === void 0 ? void 0 : config.isDownsampleEnabled) {
+        if (config?.isDownsampleEnabled) {
             builder.setDownsampleEnabled(true);
         }
-        if (config === null || config === void 0 ? void 0 : config.leakTracker) {
+        if (config?.leakTracker) {
             builder.setCloseableReferenceLeakTracker(config.leakTracker);
         }
         const imagePipelineConfig = builder.build();
@@ -65,9 +65,9 @@ function getUri(src) {
     else {
         imagePath = src;
     }
-    if (isFileOrResourcePath(imagePath)) {
-        if (imagePath.indexOf(RESOURCE_PREFIX) === 0) {
-            const resName = imagePath.substring(RESOURCE_PREFIX.length);
+    if (Utils.isFileOrResourcePath(imagePath)) {
+        if (imagePath.indexOf(Utils.RESOURCE_PREFIX) === 0) {
+            const resName = imagePath.substring(Utils.RESOURCE_PREFIX.length);
             const identifier = Utils.ad.resources.getDrawableId(resName);
             if (0 < identifier) {
                 uri = new android.net.Uri.Builder().scheme(com.facebook.common.util.UriUtil.LOCAL_RESOURCE_SCHEME).path(java.lang.String.valueOf(identifier)).build();
@@ -329,9 +329,8 @@ export class Img extends ImageBase {
         this.updateHierarchy();
     }
     [ImageBase.imageRotationProperty.setNative](value) {
-        var _u;
         const scaleType = this.nativeImageViewProtected.getHierarchy().getActualImageScaleType();
-        (_u = scaleType['setImageRotation']) === null || _u === void 0 ? void 0 : _u.call(scaleType, value);
+        scaleType['setImageRotation']?.(value);
         this.nativeImageViewProtected.invalidate();
     }
     [_k = ImageBase.roundTopRightRadiusProperty.setNative]() {
@@ -371,15 +370,15 @@ export class Img extends ImageBase {
             if (src) {
                 let drawable;
                 if (src instanceof ImageSource) {
-                    drawable = new android.graphics.drawable.BitmapDrawable(ad.getApplicationContext().getResources(), src.android);
+                    drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), src.android);
                     this.updateViewSize(src.android);
                 }
-                else if (isFontIconURI(src)) {
+                else if (Utils.isFontIconURI(src)) {
                     const fontIconCode = src.split('//')[1];
                     if (fontIconCode !== undefined) {
                         const font = this.style.fontInternal;
                         const color = this.style.color;
-                        drawable = new android.graphics.drawable.BitmapDrawable(ad.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
+                        drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
                     }
                 }
                 if (drawable) {
@@ -620,16 +619,16 @@ export class Img extends ImageBase {
     getDrawable(path) {
         let drawable;
         if (typeof path === 'string') {
-            if (isFontIconURI(path)) {
+            if (Utils.isFontIconURI(path)) {
                 const fontIconCode = path.split('//')[1];
                 if (fontIconCode !== undefined) {
                     const font = this.style.fontInternal;
                     const color = this.style.color;
-                    drawable = new android.graphics.drawable.BitmapDrawable(ad.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
+                    drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
                 }
             }
-            else if (isFileOrResourcePath(path)) {
-                if (path.indexOf(RESOURCE_PREFIX) === 0) {
+            else if (Utils.isFileOrResourcePath(path)) {
+                if (path.indexOf(Utils.RESOURCE_PREFIX) === 0) {
                     return this.getDrawableFromResource(path);
                 }
                 else {
@@ -638,7 +637,7 @@ export class Img extends ImageBase {
             }
         }
         else {
-            drawable = new android.graphics.drawable.BitmapDrawable(ad.getApplicationContext().getResources(), path.android);
+            drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), path.android);
         }
         return drawable;
     }
@@ -646,12 +645,12 @@ export class Img extends ImageBase {
         const img = ImageSource.fromFileSync(localFilePath);
         let drawable = null;
         if (img) {
-            drawable = new android.graphics.drawable.BitmapDrawable(ad.getApplicationContext().getResources(), img.android);
+            drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), img.android);
         }
         return drawable;
     }
     getDrawableFromResource(resourceName) {
-        const identifier = ad.getApplication().getResources().getIdentifier(resourceName.substr(RESOURCE_PREFIX.length), 'drawable', ad.getApplication().getPackageName());
+        const identifier = Utils.ad.getApplication().getResources().getIdentifier(resourceName.substr(Utils.RESOURCE_PREFIX.length), 'drawable', Utils.ad.getApplication().getPackageName());
         return identifier;
     }
     startAnimating() {
@@ -733,7 +732,7 @@ __decorate([
 ], Img.prototype, _t, null);
 class GenericDraweeHierarchyBuilder {
     constructor() {
-        const res = ad.getApplicationContext().getResources();
+        const res = Utils.ad.getApplicationContext().getResources();
         this.nativeBuilder = new com.facebook.drawee.generic.GenericDraweeHierarchyBuilder(res);
     }
     setPlaceholderImage(drawable, scaleType) {

package/index.ios.js

@@ -1,8 +1,8 @@
 export * from './index-common';
-import { ImageAsset, ImageSource, Screen, Trace, knownFolders, path } from '@nativescript/core';
+import { ImageAsset, ImageSource, Screen, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { isString } from '@nativescript/core/utils/types';
-import { RESOURCE_PREFIX, isFileOrResourcePath, isFontIconURI, layout } from '@nativescript/core/utils/utils';
 import { CLog, CLogTypes, EventData, ImageBase, ScaleType } from './index-common';
+import { layout } from '@nativescript/core/utils/layout-helper';
 export class ImageInfo {
     constructor(width, height) {
         this.width = width;
@@ -135,8 +135,8 @@ function getUri(src) {
     if (src instanceof ImageAsset) {
         return NSURL.sd_URLWithAsset(src.ios);
     }
-    if (uri.indexOf(RESOURCE_PREFIX) === 0) {
-        const resName = uri.substr(RESOURCE_PREFIX.length);
+    if (uri.indexOf(Utils.RESOURCE_PREFIX) === 0) {
+        const resName = uri.substr(Utils.RESOURCE_PREFIX.length);
         if (screenScale === -1) {
             screenScale = Screen.mainScreen.scale;
         }
@@ -168,6 +168,9 @@ export class Img extends ImageBase {
         this._imageSourceAffectsLayout = true;
         this.handleImageLoaded = (image, error, cacheType) => {
             this.isLoading = false;
+            if (!this.nativeViewProtected) {
+                return;
+            }
             const animate = (this.alwaysFade || cacheType !== 2) && this.fadeDuration > 0;
             if (image) {
                 this._setNativeImage(image, animate);
@@ -277,7 +280,7 @@ export class Img extends ImageBase {
         }
         let image;
         if (typeof imagePath === 'string') {
-            if (isFontIconURI(imagePath)) {
+            if (Utils.isFontIconURI(imagePath)) {
                 const fontIconCode = imagePath.split('//')[1];
                 if (fontIconCode !== undefined) {
                     const font = this.style.fontInternal;
@@ -285,7 +288,7 @@ export class Img extends ImageBase {
                     image = ImageSource.fromFontIconCodeSync(fontIconCode, font, color).ios;
                 }
             }
-            if (!image && isFileOrResourcePath(imagePath)) {
+            if (!image && Utils.isFileOrResourcePath(imagePath)) {
                 image = ImageSource.fromFileOrResourceSync(imagePath);
             }
         }
@@ -311,7 +314,7 @@ export class Img extends ImageBase {
                     return;
                 }
                 else if (typeof src === 'string') {
-                    if (isFontIconURI(src)) {
+                    if (Utils.isFontIconURI(src)) {
                         const fontIconCode = src.split('//')[1];
                         if (fontIconCode !== undefined) {
                             const font = this.style.fontInternal;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.4",
+    "version": "4.3.6",
     "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": "9bd6af7233a62486e754dcdbeb8a95a53e73c041"
+    "gitHead": "b15694e34058498f37ead9ddc5e2362cc1f2e18c"
 }

package/angular/nativescript-community-ui-image-angular.d.ts

@@ -1,2 +0,0 @@
-/// <amd-module name="@nativescript-community/ui-image-angular" />
-export * from './index';