chore: refactor src handling

Author: farfromrefug

src/image/index-common.ts

@@ -230,6 +230,8 @@ export const needRequestImage = function (target: any, propertyKey: string | Sym
     };
 };
 
+export type BasicSrcType = string | ImageSource | ImageAsset;
+export type SrcType = BasicSrcType | (() => BasicSrcType | PromiseLike<BasicSrcType>) | PromiseLike<BasicSrcType>;
 export abstract class ImageBase extends View {
     public static finalImageSetEvent: string = 'finalImageSet';
     public static failureEvent: string = 'failure';
@@ -238,7 +240,7 @@ export abstract class ImageBase extends View {
     public static releaseEvent: string = 'release';
     public static submitEvent: string = 'submit';
 
-    public src: string | ImageSource | ImageAsset;
+    public src: SrcType;
     public lowerResSrc: string;
     public placeholderImageUri: string;
     public failureImageUri: string;

src/image/index.android.ts

@@ -444,8 +444,9 @@ export class Img extends ImageBase {
     }
     get cacheKey() {
         const src = this.src;
-        if (src && !(src instanceof ImageSource)) {
-            return getUri(src);
+        const srcType = typeof src;
+        if (src && (srcType === 'string' || src instanceof ImageAsset)) {
+            return getUri(src as string | ImageAsset);
         }
         return undefined;
     }
@@ -459,8 +460,8 @@ export class Img extends ImageBase {
             await imagePipeLine.evictFromCache(cacheKey);
             // }
         }
-        this.src = null;
-        this.src = src;
+        this.handleImageSrc(null);
+        this.initImage();
     }
 
     @needUpdateHierarchy
@@ -581,13 +582,18 @@ export class Img extends ImageBase {
 
     controllerListener: com.facebook.drawee.controller.ControllerListener<com.facebook.imagepipeline.image.ImageInfo>;
 
-    protected async initImage() {
+    protected async handleImageSrc(src: SrcType) {
         const view = this.nativeViewProtected;
         if (view) {
-            // this.nativeImageViewProtected.setImageURI(null);
-            const src = this.src;
             if (src instanceof Promise) {
-                this.src = await src;
+                this.handleImageSrc(await src);
+                return;
+            } else if (typeof src === 'function') {
+                const newSrc = src();
+                if (newSrc instanceof Promise) {
+                    await newSrc;
+                }
+                this.handleImageSrc(newSrc);
                 return;
             }
             if (src) {
@@ -788,6 +794,11 @@ export class Img extends ImageBase {
         }
     }
 
+    protected async initImage() {
+        // this.nativeImageViewProtected.setImageURI(null);
+        this.handleImageSrc(this.src);
+    }
+
     private updateHierarchy() {
         if (!this.mCanUpdateHierarchy) {
             this.mNeedUpdateHierarchy = true;

src/image/index.ios.ts

@@ -10,6 +10,7 @@ import {
     ImageInfo as ImageInfoBase,
     ImagePipelineConfigSetting,
     ScaleType,
+    SrcType,
     Stretch,
     failureImageUriProperty,
     imageRotationProperty,
@@ -295,17 +296,17 @@ export class Img extends ImageBase {
     public async updateImageUri() {
         const imagePipeLine = getImagePipeline();
         const src = this.src;
-        if (!(src instanceof ImageSource)) {
-            const cachekKey = this.mCacheKey || getUri(src).absoluteString;
+        const srcType = typeof src;
+        if (src && (srcType === 'string' || src instanceof ImageAsset)) {
+            const cachekKey = this.mCacheKey || getUri(src as string | ImageAsset).absoluteString;
             // const isInCache = imagePipeLine.isInBitmapMemoryCache(cachekKey);
             // if (isInCache) {
             await imagePipeLine.evictFromCache(cachekKey);
             // }
         }
-        this.src = null;
         // ensure we clear the image as
         this._setNativeImage(null, false);
-        this.src = src;
+        this.initImage();
     }
 
     public _setNativeImage(nativeImage: UIImage, animated = true) {
@@ -402,10 +403,21 @@ export class Img extends ImageBase {
     }
 
     protected async initImage() {
+        // this.nativeImageViewProtected.setImageURI(null);
+        this.handleImageSrc(this.src);
+    }
+
+    protected async handleImageSrc(src: SrcType) {
         if (this.nativeViewProtected) {
-            const src = this.src;
             if (src instanceof Promise) {
-                this.src = await src;
+                this.handleImageSrc(await src);
+                return;
+            } else if (typeof src === 'function') {
+                const newSrc = src();
+                if (newSrc instanceof Promise) {
+                    await newSrc;
+                }
+                this.handleImageSrc(newSrc);
                 return;
             }
             if (src) {
@@ -426,7 +438,7 @@ export class Img extends ImageBase {
                     }
                 }
 
-                const uri = getUri(src);
+                const uri = getUri(src as string | ImageAsset);
                 this.isLoading = true;
                 let options = SDWebImageOptions.ScaleDownLargeImages | SDWebImageOptions.AvoidAutoSetImage;