@leafer/image 1.11.2 → 1.12.1

package/package.json

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

package/src/ImageManager.ts

@@ -1,5 +1,5 @@
 import { IImageManager, ILeaferImageConfig, ILeaferImage, IExportFileType } from '@leafer/interface'
-import { Creator } from '@leafer/platform'
+import { Creator, Platform } from '@leafer/platform'
 import { FileHelper, Resource } from '@leafer/file'
 import { TaskProcessor } from '@leafer/task'
 
@@ -21,17 +21,34 @@ export const ImageManager: IImageManager = {
 
     recycle(image: ILeaferImage): void {
         image.use--
-        setTimeout(() => { if (!image.use) I.recycledList.push(image) })
+        setTimeout(() => {
+            if (!image.use) {
+                if (Platform.image.isLarge(image)) {
+                    if (image.url) Resource.remove(image.url)
+                } else {
+                    image.clearLevels()
+                    I.recycledList.push(image)
+                }
+            }
+        })
     },
 
-    clearRecycled(): void {
+    // maybe rewrite
+    recyclePaint(paint: any): void {
+        I.recycle(paint.image)
+    },
+
+    clearRecycled(force?: boolean): void {
         const list = I.recycledList
-        if (list.length > I.maxRecycled) {
-            list.forEach(image => (!image.use && image.url) && Resource.remove(image.url))
+        if (list.length > I.maxRecycled || force) {
+            list.forEach(image => ((!image.use || force) && image.url) && Resource.remove(image.url))
             list.length = 0
         }
     },
 
+    // need rewrite
+    clearLevels(): void { },
+
     hasAlphaPixel(config: ILeaferImageConfig): boolean {
         return FileHelper.alphaPixelTypes.some(item => I.isFormat(item, config))
     },
@@ -49,7 +66,7 @@ export const ImageManager: IImageManager = {
     },
 
     destroy(): void {
-        I.recycledList = []
+        this.clearRecycled(true)
     }
 
 }

package/src/LeaferImage.ts

@@ -121,10 +121,16 @@ export class LeaferImage implements ILeaferImage {
         return pattern
     }
 
+    // need rewrite
+    public clearLevels(_checkUse?: boolean): void { }
 
     public destroy(): void {
+        this.clearLevels()
+
+        const { view } = this
+        if (view && view.close) view.close() // 可能为 ImageBitmap
         this.config = { url: '' }
-        this.cache = null
+        this.cache = this.view = null
         this.waitComplete.length = 0
     }
 

package/types/index.d.ts

@@ -24,6 +24,7 @@ declare class LeaferImage implements ILeaferImage {
     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;
+    clearLevels(_checkUse?: boolean): void;
     destroy(): void;
 }