@leafer/image 1.12.1 → 1.12.3

package/package.json

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

package/src/ImageManager.ts

@@ -10,7 +10,7 @@ export const ImageManager: IImageManager = {
 
     recycledList: [],
 
-    patternTasker: new TaskProcessor(),
+    patternTasker: new TaskProcessor({ parallel: 1 }),
 
     get(config: ILeaferImageConfig): ILeaferImage {
         let image: ILeaferImage = Resource.get(config.url)

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, ILeaferImageLevel, ISizeData, IImageCrossOrigin } from '@leafer/interface'
 import { Platform } from '@leafer/platform'
 import { Resource } from '@leafer/file'
 import { IncrementId } from '@leafer/math'
@@ -13,6 +13,7 @@ export class LeaferImage implements ILeaferImage {
 
     public readonly innerId: InnerId
     public get url() { return this.config.url }
+    public get crossOrigin(): IImageCrossOrigin { const { crossOrigin } = this.config; return isUndefined(crossOrigin) ? Platform.image.crossOrigin : crossOrigin }
 
     public view: any
 
@@ -48,11 +49,13 @@ export class LeaferImage implements ILeaferImage {
         ImageManager.hasAlphaPixel(config) && (this.hasAlphaPixel = true)
     }
 
-    public load(onSuccess?: IFunction, onError?: IFunction): number {
+    public load(onSuccess?: IFunction, onError?: IFunction, thumbSize?: ISizeData): number {
         if (!this.loading) {
             this.loading = true
-            const { crossOrigin } = this.config
-            Resource.tasker.add(async () => await Platform.origin.loadImage(this.url, isUndefined(crossOrigin) ? Platform.image.crossOrigin : crossOrigin, this).then(img => this.setView(img)).catch((e) => {
+            Resource.tasker.add(async () => await Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
+                if (thumbSize) this.setThumbView(img)
+                this.setView(img)
+            }).catch((e) => {
                 this.error = e
                 this.onComplete(false)
             }))
@@ -72,9 +75,11 @@ export class LeaferImage implements ILeaferImage {
 
     protected setView(img: any): void {
         this.ready = true
-        this.width = img.naturalWidth || img.width
-        this.height = img.naturalHeight || img.height
-        this.view = img
+        if (!this.width) {
+            this.width = img.width
+            this.height = img.height
+            this.view = img
+        }
         this.onComplete(true)
     }
 
@@ -122,6 +127,12 @@ export class LeaferImage implements ILeaferImage {
     }
 
     // need rewrite
+    public getLoadUrl(_thumbSize?: ISizeData): string { return this.url }
+    public setThumbView(_view: number): void { }
+    public getThumbSize(): ISizeData { return undefined }
+
+    public getMinLevel(): number { return undefined }
+    public getLevelData(_level: number): ILeaferImageLevel { return undefined }
     public clearLevels(_checkUse?: boolean): void { }
 
     public destroy(): void {

package/types/index.d.ts

@@ -1,8 +1,9 @@
-import { ILeaferImage, InnerId, IObject, ILeaferImageConfig, IFunction, ILeaferImageCacheCanvas, IMatrixData, ILeaferImagePatternPaint, ICanvasPattern, IImageManager } from '@leafer/interface';
+import { ILeaferImage, InnerId, IImageCrossOrigin, IObject, ILeaferImageConfig, IFunction, ILeaferImageCacheCanvas, ISizeData, IMatrixData, ILeaferImagePatternPaint, ICanvasPattern, ILeaferImageLevel, IImageManager } from '@leafer/interface';
 
 declare class LeaferImage implements ILeaferImage {
     readonly innerId: InnerId;
     get url(): string;
+    get crossOrigin(): IImageCrossOrigin;
     view: any;
     width: number;
     height: number;
@@ -17,13 +18,18 @@ declare class LeaferImage implements ILeaferImage {
     protected waitComplete: IFunction[];
     protected cache: ILeaferImageCacheCanvas;
     constructor(config: ILeaferImageConfig);
-    load(onSuccess?: IFunction, onError?: IFunction): number;
+    load(onSuccess?: IFunction, onError?: IFunction, thumbSize?: ISizeData): number;
     unload(index: number, stopEvent?: boolean): void;
     protected setView(img: any): void;
     protected onComplete(isSuccess: boolean): void;
     getFull(_filters?: IObject): any;
     getCanvas(width: number, height: number, opacity?: number, filters?: IObject, xGap?: number, yGap?: number, smooth?: boolean): any;
     getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: ILeaferImagePatternPaint): ICanvasPattern;
+    getLoadUrl(_thumbSize?: ISizeData): string;
+    setThumbView(_view: number): void;
+    getThumbSize(): ISizeData;
+    getMinLevel(): number;
+    getLevelData(_level: number): ILeaferImageLevel;
     clearLevels(_checkUse?: boolean): void;
     destroy(): void;
 }