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

package/package.json

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

package/src/BoxData.ts

@@ -4,5 +4,5 @@ import { GroupData } from "./GroupData"
 
 
 export class BoxData extends GroupData implements IBoxData {
-
+    get __boxStroke(): boolean { return true }
 }

package/src/CanvasData.ts

@@ -1,8 +1,8 @@
 import { ICanvasData } from '@leafer-ui/interface'
 
-import { UIData } from "./UIData"
+import { RectData } from './RectData'
 
 
-export class CanvasData extends UIData implements ICanvasData {
+export class CanvasData extends RectData implements ICanvasData {
 
 }

package/src/EllipseData.ts

@@ -4,5 +4,5 @@ import { UIData } from "./UIData"
 
 
 export class EllipseData extends UIData implements IEllipseData {
-
+    get __boxStroke(): boolean { return true }
 }

package/src/ImageData.ts

@@ -1,8 +1,8 @@
 import { IImageData } from '@leafer-ui/interface'
 
-import { UIData } from "./UIData"
+import { RectData } from './RectData'
 
 
-export class ImageData extends UIData implements IImageData {
+export class ImageData extends RectData implements IImageData {
 
 }

package/src/RectData.ts

@@ -4,5 +4,5 @@ import { UIData } from "./UIData"
 
 
 export class RectData extends UIData implements IRectData {
-
+    get __boxStroke(): boolean { return true }
 }

package/src/UIData.ts

@@ -1,16 +1,15 @@
-import { IBlendMode, __Value } from '@leafer/interface'
-import { LeafData } from '@leafer/core'
+import { IBooleanMap, ILeaferImage, __Value } from '@leafer/interface'
+import { ImageManager, LeafData } from '@leafer/core'
 
-import { IShadowEffect, IUI, IUIData, IUnitData } from '@leafer-ui/interface'
-import { Paint } from '@leafer-ui/external'
+import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
 
 
+const emptyPaint: ILeafPaint = {}
 export class UIData extends LeafData implements IUIData {
 
     public __leaf: IUI
 
     public __blendLayer?: boolean
-    public _blendMode: string
 
     public __isFills?: boolean
     public __isStrokes?: boolean
@@ -21,36 +20,37 @@ export class UIData extends LeafData implements IUIData {
     protected _shadow?: __Value
     protected _innerShadow?: __Value
 
-    protected setBlendMode(value: IBlendMode) {
-        this._blendMode = value
-        if (value === 'pass-through' || !value) {
-            if (this.__blendLayer) this.__blendLayer = false
-        } else {
-            this.__blendLayer = true
-        }
-    }
 
     protected setFill(value: __Value) {
+        if (this.__naturalWidth) this.__naturalWidth = this.__naturalHeight = undefined
         if (typeof value === 'string' || !value) {
+            if (this.__isFills) {
+                this.__removeInput('fill')
+                this.__recycleImage('fill')
+                this.__isFills = false
+            }
             this._fill = value
-            if (this.__input) this.__removeInput('fill')
-            this.__isFills && (this.__isFills = false)
         } else if (typeof value === 'object') {
             this.__setInput('fill', value)
-            this.__leaf.__layout.boxChanged ? this._fill = value : Paint.computeFill(this.__leaf)
+            this.__leaf.__layout.boxChanged || this.__leaf.__layout.boxChange()
             this.__isFills = true
+            this._fill || (this._fill = emptyPaint)
         }
     }
 
     protected setStroke(value: __Value) {
         if (typeof value === 'string' || !value) {
+            if (this.__isStrokes) {
+                this.__removeInput('stroke')
+                this.__recycleImage('stroke')
+                this.__isStrokes = false
+            }
             this._stroke = value
-            if (this.__input) this.__removeInput('stroke')
-            this.__isStrokes && (this.__isStrokes = false)
         } else if (typeof value === 'object') {
             this.__setInput('stroke', value)
-            this.__leaf.__layout.boxChanged ? this._stroke = value : Paint.computeStroke(this.__leaf)
+            this.__leaf.__layout.boxChanged || this.__leaf.__layout.boxChange()
             this.__isStrokes = true
+            this._stroke || (this._stroke = emptyPaint)
         }
     }
 
@@ -78,6 +78,31 @@ 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
+    }
+
 }