@leafer-ui/data 1.0.0-beta.10 → 1.0.0-beta.12

package/package.json

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

package/src/UIData.ts

@@ -1,7 +1,8 @@
-import { IBooleanMap, ILeaferImage, __Value } from '@leafer/interface'
-import { ImageManager, LeafData } from '@leafer/core'
+import { __Value } from '@leafer/interface'
+import { LeafData } from '@leafer/core'
 
 import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
+import { Paint } from '@leafer-ui/external'
 
 
 const emptyPaint: ILeafPaint = {}
@@ -26,7 +27,7 @@ export class UIData extends LeafData implements IUIData {
         if (typeof value === 'string' || !value) {
             if (this.__isFills) {
                 this.__removeInput('fill')
-                this.__recycleImage('fill')
+                Paint.recycleImage(this, 'fill')
                 this.__isFills = false
             }
             this._fill = value
@@ -42,7 +43,7 @@ export class UIData extends LeafData implements IUIData {
         if (typeof value === 'string' || !value) {
             if (this.__isStrokes) {
                 this.__removeInput('stroke')
-                this.__recycleImage('stroke')
+                Paint.recycleImage(this, 'stroke')
                 this.__isStrokes = false
             }
             this._stroke = value
@@ -78,31 +79,6 @@ export class UIData extends LeafData implements IUIData {
         }
     }
 
-    public __recycleImage(attrName: string): IBooleanMap {
-        const paints = (attrName === 'fill' ? this._fill : this._stroke) as ILeafPaint[]
-        if (paints instanceof Array) {
-            let image: ILeaferImage, map: IBooleanMap
-            for (let i = 0, len = paints.length; i < len; i++) {
-                image = paints[i].image
-                if (image) {
-                    const { url } = image
-                    if (!map) map = {}
-                    map[url] = true
-                    ImageManager.recycle(image)
-
-                    // stop load
-                    if (image.loading) {
-                        const p = this.__input && this.__input[attrName]
-                        const hasSame = p && (p instanceof Array ? p.some(item => item.url === url) : p.url === url)
-                        if (!hasSame) image.unload(paints[i].loadId)
-                    }
-                }
-            }
-            return map
-        }
-        return null
-    }
-
 }