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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "1.0.0-bate",
+  "version": "1.0.0-beta.10",
   "description": "@leafer-ui/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,13 +19,14 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-bate",
-    "@leafer-ui/data": "1.0.0-bate",
-    "@leafer-ui/display-module": "1.0.0-bate",
-    "@leafer-ui/decorator": "1.0.0-bate"
+    "@leafer/core": "1.0.0-beta.10",
+    "@leafer-ui/data": "1.0.0-beta.10",
+    "@leafer-ui/text": "1.0.0-beta.10",
+    "@leafer-ui/display-module": "1.0.0-beta.10",
+    "@leafer-ui/decorator": "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/Group.ts

@@ -50,6 +50,8 @@ export class Group extends UI implements IGroup {
 
     public add(_child: IUI, _index?: number): void { }
 
-    public remove(_child?: IUI): void { }
+    public remove(_child?: IUI, _destroy?: boolean): void { }
+
+    public removeAll(_destroy?: boolean): void { }
 
 }

package/src/Image.ts

@@ -41,7 +41,7 @@ export class Image extends Rect implements IImage {
 
         if (update) {
             if (this.image) this.image = null
-            this.fill = { type: 'image', mode: 'strench', url }
+            this.fill = url ? { type: 'image', mode: 'strench', url } : undefined
             this.once(ImageEvent.LOADED, (e) => this.image = e.image)
         }
 

package/src/UI.ts

@@ -1,13 +1,13 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, __Number, __Boolean, __String } from '@leafer/interface'
-import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, sortType, maskType, dataProcessor, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert } from '@leafer/core'
+import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, __Number, __Boolean, __String, IPathString, IExportFileType } from '@leafer/interface'
+import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, sortType, maskType, dataProcessor, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType } from '@leafer/core'
 
-import { IUI, IShadowEffect, IBlurEffect, IPaint, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IPaintString, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUITagInputData, IUIInputData, IPathString } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IPaint, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IPaintString, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUITagInputData, IUIInputData, IExportOptions, IExportResult } from '@leafer-ui/interface'
 import { effectType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
 import { UIBounds, UIHit, UIRender } from '@leafer-ui/display-module'
 
-import { Paint } from '@leafer-ui/external'
+import { Export, Paint } from '@leafer-ui/external'
 
 
 @useModule(UIBounds)
@@ -47,6 +47,9 @@ export class UI extends Leaf implements IUI {
     @maskType(false)
     public isMask: __Boolean
 
+    @eraserType(false)
+    public isEraser?: __Boolean
+
     @sortType(0)
     public zIndex: __Number
 
@@ -68,7 +71,6 @@ export class UI extends Leaf implements IUI {
     @boundsType(100)
     public height: __Number
 
-
     // scale
     @scaleType(1)
     public scaleX: __Number
@@ -76,7 +78,6 @@ export class UI extends Leaf implements IUI {
     @scaleType(1)
     public scaleY: __Number
 
-
     // rotate
     @rotationType(0)
     public rotation: __Number
@@ -197,8 +198,8 @@ export class UI extends Leaf implements IUI {
     public __onUpdateSize(): void {
         if (this.__.__input) {
             const { fill, stroke } = this.__.__input
-            if (fill) Paint.computeFill(this)
-            if (stroke) Paint.computeStroke(this)
+            if (fill) Paint.compute(this, 'fill')
+            if (stroke) Paint.compute(this, 'stroke')
         }
     }
 
@@ -222,8 +223,17 @@ export class UI extends Leaf implements IUI {
     @rewrite(PathDrawer.drawPathByData)
     public __drawPathByData(_drawer: IPathDrawer, _data: IPathCommandData): void { }
 
+    public export(filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult> {
+        return Export.export(this, filename, options)
+    }
+
     static one(data: IUITagInputData, x?: number, y?: number, width?: number, height?: number): IUI {
         return UICreator.get(data.tag || this.prototype.__tag, data, x, y, width, height) as IUI
     }
 
+    public destroy(): void {
+        this.fill = this.stroke = null
+        super.destroy()
+    }
+
 }