@leafer/image 1.0.0-beta.10 → 1.0.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/image",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.12",
   "description": "@leafer/image",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,10 +19,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/task": "1.0.0-beta.10",
-    "@leafer/platform": "1.0.0-beta.10"
+    "@leafer/task": "1.0.0-beta.12",
+    "@leafer/platform": "1.0.0-beta.12"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.10"
+    "@leafer/interface": "1.0.0-beta.12"
   }
 }

package/src/ImageManager.ts

@@ -26,14 +26,14 @@ export const ImageManager: IImageManager = {
 
     recycle(image: ILeaferImage): void {
         image.use--
-        setTimeout(() => { if (!image.use) I.recycledList.push(image) }, 0)
+        setTimeout(() => { if (!image.use) I.recycledList.push(image) })
     },
 
     clearRecycled(): void {
         const list = I.recycledList
         if (list.length) {
             list.forEach(image => {
-                if (!image.use) {
+                if (!image.use && image.url) {
                     delete I.map[image.url]
                     image.destroy()
                 }
@@ -44,7 +44,6 @@ export const ImageManager: IImageManager = {
 
     destroy(): void {
         I.map = {}
-        I.tasker = null
     }
 
 }

package/src/LeaferImageBase.ts

@@ -32,7 +32,7 @@ export class LeaferImageBase implements ILeaferImage {
 
     constructor(config: ILeaferImageConfig) {
         this.innerId = create(IMAGE)
-        this.config = config
+        this.config = config || { url: '' }
         const { url } = config
         if (url.startsWith('data:')) {
             if (url.startsWith('data:image/svg')) this.isSVG = true
@@ -44,7 +44,7 @@ export class LeaferImageBase implements ILeaferImage {
     public load(onSuccess: IFunction, onError: IFunction): number {
         if (!this.loading) {
             this.loading = true
-            ImageManager.tasker.addParallel(async () => await Platform.origin.loadImage(this.config.url).then((img) => {
+            ImageManager.tasker.add(async () => await Platform.origin.loadImage(this.url).then((img) => {
                 this.ready = true
                 this.width = img.naturalWidth || img.width
                 this.height = img.naturalHeight || img.height
@@ -53,16 +53,18 @@ export class LeaferImageBase implements ILeaferImage {
             }).catch((e) => {
                 this.error = e
                 this.onComplete(false)
-            }), null, true)
+            }))
         }
         this.waitComplete.push(onSuccess, onError)
         return this.waitComplete.length - 2
     }
 
-    public unload(index: number): void {
+    public unload(index: number, stopEvent?: boolean): void {
         const l = this.waitComplete
-        const error = l[index + 1]
-        if (error) error({ type: 'stop' })
+        if (stopEvent) {
+            const error = l[index + 1]
+            if (error) error({ type: 'stop' })
+        }
         l[index] = l[index + 1] = undefined
     }
 
@@ -93,8 +95,7 @@ export class LeaferImageBase implements ILeaferImage {
     }
 
     public destroy(): void {
-        this.view = null
-        this.config = null
+        this.config = { url: '' }
         this.waitComplete.length = 0
     }