@nativescript-community/ui-image 4.3.22 → 4.3.23

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.23](https://github.com/nativescript-community/ui-image/compare/v4.3.22...v4.3.23) (2023-11-22)
+
+### Bug Fixes
+
+* **ios:** updated native dep ([e6cc5f5](https://github.com/nativescript-community/ui-image/commit/e6cc5f5e0d42f048acbf37d0f8b936f138326b78))
+
 ## [4.3.22](https://github.com/nativescript-community/ui-image/compare/v4.3.21...v4.3.22) (2023-11-17)
 
 ### Bug Fixes

package/index-common.js

@@ -94,7 +94,7 @@ export const srcProperty = new Property({ name: 'src' });
 export const lowerResSrcProperty = new Property({ name: 'lowerResSrc' });
 export const placeholderImageUriProperty = new Property({ name: 'placeholderImageUri' });
 export const failureImageUriProperty = new Property({ name: 'failureImageUri' });
-export const stretchProperty = new Property({ name: 'stretch', defaultValue: 'aspectFill' });
+export const stretchProperty = new Property({ name: 'stretch' });
 export const backgroundUriProperty = new Property({ name: 'backgroundUri' });
 export const progressiveRenderingEnabledProperty = new Property({ name: 'progressiveRenderingEnabled', valueConverter: booleanConverter });
 export const localThumbnailPreviewsEnabledProperty = new Property({ name: 'localThumbnailPreviewsEnabled', valueConverter: booleanConverter });

package/index.android.d.ts

@@ -74,6 +74,7 @@ export declare class Img extends ImageBase {
     createNativeView(): com.nativescript.image.DraweeView;
     updateViewSize(imageInfo: any): void;
     disposeNativeView(): void;
+    get cacheKey(): string | globalAndroid.net.Uri;
     updateImageUri(): void;
     controllerListener: com.facebook.drawee.controller.ControllerListener<com.facebook.imagepipeline.image.ImageInfo>;
     protected initImage(): Promise<void>;

package/index.android.js

@@ -353,15 +353,22 @@ export class Img extends ImageBase {
         this.controllerListener = null;
         // this.nativeImageViewProtected.setImageURI(null, null);
     }
+    get cacheKey() {
+        const src = this.src;
+        if (src && !(src instanceof ImageSource)) {
+            return getUri(src);
+        }
+        return undefined;
+    }
     updateImageUri() {
         const imagePipeLine = getImagePipeline();
+        const cacheKey = this.cacheKey;
         const src = this.src;
-        if (!(src instanceof ImageSource)) {
-            const uri = getUri(src);
-            const isInCache = imagePipeLine.isInBitmapMemoryCache(uri);
-            if (isInCache) {
-                imagePipeLine.evictFromCache(uri);
-            }
+        if (cacheKey) {
+            // const isInCache = imagePipeLine.isInBitmapMemoryCache(uri);
+            // // if (isInCache) {
+            imagePipeLine.evictFromCache(cacheKey);
+            // }
         }
         this.src = null;
         this.src = src;

package/index.d.ts

@@ -208,6 +208,8 @@ export class Img extends View {
      * Android: custom imageRotation
      */
     imageRotation: number;
+
+    cacheKey: string;
 }
 
 /**

package/index.ios.d.ts

@@ -17,11 +17,11 @@ export declare class ImagePipeline {
     private mIos;
     constructor();
     getCacheKey(uri: string, context: any): string;
-    isInDiskCache(uri: string): boolean;
-    isInBitmapMemoryCache(uri: string): boolean;
-    evictFromMemoryCache(uri: string): void;
-    evictFromDiskCache(uri: string): void;
-    evictFromCache(uri: string): void;
+    isInDiskCache(key: string): boolean;
+    isInBitmapMemoryCache(key: string): boolean;
+    evictFromMemoryCache(key: string): void;
+    evictFromDiskCache(key: string): void;
+    evictFromCache(key: string): void;
     clearCaches(): void;
     clearMemoryCaches(): void;
     clearDiskCaches(): void;
@@ -36,6 +36,8 @@ export declare class Img extends ImageBase {
     nativeViewProtected: SDAnimatedImageView | UIImageView;
     nativeImageViewProtected: SDAnimatedImageView | UIImageView;
     isLoading: boolean;
+    mCacheKey: string;
+    get cacheKey(): string;
     protected mImageSourceAffectsLayout: boolean;
     protected mCIFilter: CIFilter;
     createNativeView(): UIImageView;

package/index.ios.js

@@ -80,20 +80,20 @@ export class ImagePipeline {
     getCacheKey(uri, context) {
         return SDWebImageManager.sharedManager.cacheKeyForURLContext(NSURL.URLWithString(uri), context);
     }
-    isInDiskCache(uri) {
-        return this.mIos.diskImageDataExistsWithKey(getUri(uri).absoluteString);
+    isInDiskCache(key) {
+        return this.mIos.diskImageDataExistsWithKey(key);
     }
-    isInBitmapMemoryCache(uri) {
-        return this.mIos.imageFromMemoryCacheForKey(getUri(uri).absoluteString) !== null;
+    isInBitmapMemoryCache(key) {
+        return this.mIos.imageFromMemoryCacheForKey(key) !== null;
     }
-    evictFromMemoryCache(uri) {
-        this.mIos.removeImageFromMemoryForKey(getUri(uri).absoluteString);
+    evictFromMemoryCache(key) {
+        this.mIos.removeImageFromMemoryForKey(key);
     }
-    evictFromDiskCache(uri) {
-        this.mIos.removeImageFromDiskForKey(getUri(uri).absoluteString);
+    evictFromDiskCache(key) {
+        this.mIos.removeImageFromDiskForKey(key);
     }
-    evictFromCache(uri) {
-        const key = getUri(uri).absoluteString;
+    evictFromCache(key) {
+        // const key = getUri(uri).absoluteString;
         this.mIos.removeImageFromDiskForKey(key);
         this.mIos.removeImageFromMemoryForKey(key);
         // this.mIos.removeImageForKeyWithCompletion(getUri(uri).absoluteString, null);
@@ -221,6 +221,9 @@ export class Img extends ImageBase {
             this.handleImageProgress(totalSize > 0 ? currentSize / totalSize : -1, totalSize);
         };
     }
+    get cacheKey() {
+        return this.mCacheKey;
+    }
     createNativeView() {
         const result = this.animatedImageView ? SDAnimatedImageView.new() : UIImageView.new();
         result.contentMode = 1 /* UIViewContentMode.ScaleAspectFit */;
@@ -243,9 +246,9 @@ export class Img extends ImageBase {
         const finiteWidth = widthMode === layout.EXACTLY;
         const finiteHeight = heightMode === layout.EXACTLY;
         this.mImageSourceAffectsLayout = !finiteWidth || !finiteHeight;
-        if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, 'onMeasure', this.src, widthMeasureSpec, heightMeasureSpec, width, height, this.aspectRatio, image && image.imageOrientation);
-        }
+        // if (Trace.isEnabled()) {
+        //     CLog(CLogTypes.info, 'onMeasure', this.src, widthMeasureSpec, heightMeasureSpec, width, height, this.aspectRatio, image && image.imageOrientation);
+        // }
         if (image || this.aspectRatio > 0) {
             const nativeWidth = image ? layout.toDevicePixels(image.size.width) : 0;
             const nativeHeight = image ? layout.toDevicePixels(image.size.height) : 0;
@@ -270,7 +273,7 @@ export class Img extends ImageBase {
                 }
             }
             if (Trace.isEnabled()) {
-                CLog(CLogTypes.info, 'onMeasure scale', this.src, this.aspectRatio, finiteWidth, finiteHeight, width, height, nativeWidth, nativeHeight, widthMeasureSpec, heightMeasureSpec);
+                CLog(CLogTypes.info, 'onMeasure', this.src, this.aspectRatio, finiteWidth, finiteHeight, width, height, nativeWidth, nativeHeight, widthMeasureSpec, heightMeasureSpec);
             }
         }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -279,13 +282,15 @@ export class Img extends ImageBase {
         const imagePipeLine = getImagePipeline();
         const src = this.src;
         if (!(src instanceof ImageSource)) {
-            const uri = getUri(src).absoluteString;
-            const isInCache = imagePipeLine.isInBitmapMemoryCache(uri);
-            if (isInCache) {
-                imagePipeLine.evictFromCache(uri);
-            }
+            const cachekKey = this.mCacheKey || getUri(src).absoluteString;
+            // const isInCache = imagePipeLine.isInBitmapMemoryCache(cachekKey);
+            // if (isInCache) {
+            imagePipeLine.evictFromCache(cachekKey);
+            // }
         }
         this.src = null;
+        // ensure we clear the image as 
+        this._setNativeImage(null, false);
         this.src = src;
     }
     _setNativeImage(nativeImage, animated = true) {
@@ -317,7 +322,7 @@ export class Img extends ImageBase {
             this.nativeImageViewProtected.image = nativeImage;
         }
         if (this.mImageSourceAffectsLayout) {
-            this.mImageSourceAffectsLayout = false;
+            // this.mImageSourceAffectsLayout = false;
             this.requestLayout();
         }
     }
@@ -419,6 +424,7 @@ export class Img extends ImageBase {
                     }
                     context.setValueForKey(SDImagePipelineTransformer.transformerWithTransformers(transformers), SDWebImageContextImageTransformer);
                 }
+                this.mCacheKey = SDWebImageManager.sharedManager.cacheKeyForURLContext(uri, context);
                 this.nativeImageViewProtected.sd_setImageWithURLPlaceholderImageOptionsContextProgressCompleted(uri, this.placeholderImage, options, context, this.onLoadProgress, this.handleImageLoaded);
             }
             else if (this.placeholderImage) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.22",
+    "version": "4.3.23",
     "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": "3fe49515ffcfabf813d3be28cd679a6c1acba778"
+    "gitHead": "2a74cda73128571c05d0e636aefe40be63c8d3eb"
 }

package/platforms/ios/Podfile

@@ -1,2 +1,2 @@
-pod 'SDWebImage', '>= 5.13.0'
+pod 'SDWebImage', '>= 5.18.5.0'
 pod 'SDWebImagePhotosPlugin'

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