@leafer/image 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/image",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "@leafer/image",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/task": "1.6.1",
-    "@leafer/file": "1.6.1",
-    "@leafer/platform": "1.6.1"
+    "@leafer/task": "1.6.3",
+    "@leafer/file": "1.6.3",
+    "@leafer/platform": "1.6.3"
   },
   "devDependencies": {
-    "@leafer/interface": "1.6.1"
+    "@leafer/interface": "1.6.3"
   }
 }

package/src/ImageManager.ts

@@ -32,8 +32,8 @@ export const ImageManager: IImageManager = {
         }
     },
 
-    hasOpacityPixel(config: ILeaferImageConfig): boolean {
-        return FileHelper.opacityTypes.some(item => I.isFormat(item, config))
+    hasAlphaPixel(config: ILeaferImageConfig): boolean {
+        return FileHelper.alphaPixelTypes.some(item => I.isFormat(item, config))
     },
 
     isFormat(format: IExportFileType, config: ILeaferImageConfig): boolean {

package/src/LeaferImage.ts

@@ -1,4 +1,4 @@
-import { ILeaferImage, ILeaferImageConfig, IFunction, IObject, InnerId, IMatrixData, ICanvasPattern, ILeaferImageCacheCanvas, ILeaferImagePatternPaint } from '@leafer/interface'
+import { ILeaferImage, ILeaferImageConfig, IFunction, IObject, InnerId, IMatrixData, ICanvasPattern, ILeaferImageCacheCanvas, ILeaferImagePatternPaint, IProgressData } from '@leafer/interface'
 import { Platform } from '@leafer/platform'
 import { Resource } from '@leafer/file'
 import { IncrementId } from '@leafer/math'
@@ -19,7 +19,7 @@ export class LeaferImage implements ILeaferImage {
     public height: number
 
     public isSVG: boolean
-    public hasOpacityPixel: boolean // check png / svg / webp
+    public hasAlphaPixel: boolean // check png / svg / webp
 
     public get completed() { return this.ready || !!this.error }
 
@@ -27,6 +27,8 @@ export class LeaferImage implements ILeaferImage {
     public error: IObject
     public loading: boolean
 
+    public progress: IProgressData
+
     public use = 0
 
     public config: ILeaferImageConfig
@@ -44,13 +46,15 @@ export class LeaferImage implements ILeaferImage {
         }
 
         ImageManager.isFormat('svg', config) && (this.isSVG = true)
-        ImageManager.hasOpacityPixel(config) && (this.hasOpacityPixel = true)
+        ImageManager.hasAlphaPixel(config) && (this.hasAlphaPixel = true)
     }
 
     public load(onSuccess?: IFunction, onError?: IFunction): number {
         if (!this.loading) {
             this.loading = true
-            Resource.tasker.add(async () => await Platform.origin.loadImage(this.url as string).then(img => this.setView(img)).catch((e) => {
+            let { loadImage, loadImageWithProgress } = Platform.origin, onProgress = this.config.showProgress && loadImageWithProgress && this.onProgress.bind(this)
+            if (onProgress) loadImage = loadImageWithProgress
+            Resource.tasker.add(async () => await loadImage(this.url, onProgress).then(img => this.setView(img)).catch((e) => {
                 this.error = e
                 this.onComplete(false)
             }))
@@ -76,6 +80,10 @@ export class LeaferImage implements ILeaferImage {
         this.onComplete(true)
     }
 
+    protected onProgress(progress: IProgressData): void {
+        this.progress = progress
+    }
+
     protected onComplete(isSuccess: boolean): void {
         let odd: number
         this.waitComplete.forEach((item, index) => {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaferImage, InnerId, IObject, ILeaferImageConfig, IFunction, ILeaferImageCacheCanvas, IMatrixData, ILeaferImagePatternPaint, ICanvasPattern, IImageManager } from '@leafer/interface';
+import { ILeaferImage, InnerId, IObject, IProgressData, ILeaferImageConfig, IFunction, ILeaferImageCacheCanvas, IMatrixData, ILeaferImagePatternPaint, ICanvasPattern, IImageManager } from '@leafer/interface';
 
 declare class LeaferImage implements ILeaferImage {
     readonly innerId: InnerId;
@@ -7,11 +7,12 @@ declare class LeaferImage implements ILeaferImage {
     width: number;
     height: number;
     isSVG: boolean;
-    hasOpacityPixel: boolean;
+    hasAlphaPixel: boolean;
     get completed(): boolean;
     ready: boolean;
     error: IObject;
     loading: boolean;
+    progress: IProgressData;
     use: number;
     config: ILeaferImageConfig;
     protected waitComplete: IFunction[];
@@ -20,6 +21,7 @@ declare class LeaferImage implements ILeaferImage {
     load(onSuccess?: IFunction, onError?: IFunction): number;
     unload(index: number, stopEvent?: boolean): void;
     protected setView(img: any): void;
+    protected onProgress(progress: IProgressData): void;
     protected onComplete(isSuccess: boolean): void;
     getFull(_filters?: IObject): any;
     getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): any;