@leafer-ui/display 1.0.0-rc.3 → 1.0.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.5",
   "description": "@leafer-ui/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.3",
-    "@leafer-ui/data": "1.0.0-rc.3",
-    "@leafer-ui/display-module": "1.0.0-rc.3",
-    "@leafer-ui/decorator": "1.0.0-rc.3",
-    "@leafer-ui/external": "1.0.0-rc.3"
+    "@leafer/core": "1.0.0-rc.5",
+    "@leafer-ui/data": "1.0.0-rc.5",
+    "@leafer-ui/display-module": "1.0.0-rc.5",
+    "@leafer-ui/decorator": "1.0.0-rc.5",
+    "@leafer-ui/external": "1.0.0-rc.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.3",
-    "@leafer-ui/interface": "1.0.0-rc.3"
+    "@leafer/interface": "1.0.0-rc.5",
+    "@leafer-ui/interface": "1.0.0-rc.5"
   }
 }

package/src/Ellipse.ts

@@ -1,5 +1,5 @@
 import { __Number } from '@leafer/interface'
-import { PathCommandDataHelper, dataProcessor, pathType, registerUI } from '@leafer/core'
+import { PathCommandDataHelper, PathConvert, Platform, dataProcessor, pathType, registerUI } from '@leafer/core'
 
 import { IEllipse, IEllipseInputData, IEllipseData } from '@leafer-ui/interface'
 import { EllipseData } from '@leafer-ui/data'
@@ -48,9 +48,12 @@ export class Ellipse extends UI implements IEllipse {
                     ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius)
                     moveTo(path, width, ry)
                 }
-                ellipse(path, rx, ry, rx, ry, 0, 0, 360, true)
+                ellipse(path, rx, ry, rx, ry, 0, 360, 0, true)
             }
 
+            // fix node
+            if (Platform.name === 'node') this.__.path = PathConvert.toCanvasData(path, true)
+
         } else {
 
             if (startAngle || endAngle) {

package/src/Group.ts

@@ -47,7 +47,11 @@ export class Group extends UI implements IGroup {
             const { children } = data
             delete data.children
 
-            if (!this.children) this.__setBranch()
+            if (!this.children) {
+                this.__setBranch()
+            } else {
+                this.removeAll(true)
+            }
 
             super.set(data)
 

package/src/UI.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, __Number, __Boolean, __String, IPathString, IExportFileType, IPointData, ICursorType, IAround } 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, cursorType } from '@leafer/core'
 
-import { IUI, IShadowEffect, IBlurEffect, IPaint, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IPaintString, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IUIBaseInputData, IExportOptions, IExportResult } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IPaint, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IPaintString, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult } from '@leafer-ui/interface'
 import { effectType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -116,7 +116,7 @@ export class UI extends Leaf implements IUI {
     @hitType()
     public hitRadius: __Number
 
-    @cursorType('default')
+    @cursorType('')
     public cursor: ICursorType | ICursorType[]
 
     // ---
@@ -195,9 +195,8 @@ export class UI extends Leaf implements IUI {
     }
 
 
-    constructor(data?: IUIBaseInputData) {
-        super(data)
-    }
+    @rewrite(Leaf.prototype.reset)
+    public reset(_data?: IUIInputData): void { }
 
 
     public set(data: IUIInputData): void {
@@ -223,8 +222,8 @@ export class UI extends Leaf implements IUI {
     public __onUpdateSize(): void {
         if (this.__.__input) {
             const { fill, stroke } = this.__.__input
-            if (fill) Paint.compute(this, 'fill')
-            if (stroke) Paint.compute(this, 'stroke')
+            if (fill) Paint.compute('fill', this)
+            if (stroke) Paint.compute('stroke', this)
         }
     }
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { __String, __Number, __Boolean, IAround, IHitType, ICursorType, IPointData, IPathCommandData, IPathString, ILeaferCanvas, IPathDrawer, IExportFileType, IRenderOptions, ILeaferImage, ICanvasContext2D, IWindingRule } from '@leafer/interface';
 import { Leaf } from '@leafer/core';
-import { IUI, IUIData, IGroup, IBlendMode, IPaint, IPaintString, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IUIBaseInputData, IUIInputData, IExportOptions, IExportResult, IGroupData, IGroupInputData, IBox, IBoxData, IOverflow, IBoxInputData, IFrame, IFrameData, IFrameInputData, IRect, IRectData, IRectInputData, IEllipse, IEllipseData, IEllipseInputData, IPolygon, IPolygonData, IPolygonInputData, IStar, IStarData, IStarInputData, ILine, ILineData, ILineInputData, IImage, IImageData, IImageInputData, ICanvas, ICanvasData, ICanvasInputData, IText, ITextData, IFontWeight, ITextCase, ITextDecoration, IUnitData, ITextAlign, IVerticalAlign, ITextDrawData, ITextInputData, IPath, IPathData, IPathString as IPathString$1, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
+import { IUI, IUIData, IGroup, IBlendMode, IPaint, IPaintString, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IUIInputData, IExportOptions, IExportResult, IGroupData, IGroupInputData, IBox, IBoxData, IOverflow, IBoxInputData, IFrame, IFrameData, IFrameInputData, IRect, IRectData, IRectInputData, IEllipse, IEllipseData, IEllipseInputData, IPolygon, IPolygonData, IPolygonInputData, IStar, IStarData, IStarInputData, ILine, ILineData, ILineInputData, IImage, IImageData, IImageInputData, ICanvas, ICanvasData, ICanvasInputData, IText, ITextData, IFontWeight, ITextCase, ITextDecoration, IUnitData, ITextAlign, IVerticalAlign, ITextDrawData, ITextInputData, IPath, IPathData, IPathString as IPathString$1, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
 
 declare class UI extends Leaf implements IUI {
     __: IUIData;
@@ -51,7 +51,7 @@ declare class UI extends Leaf implements IUI {
     grayscale: __Number | IGrayscaleEffect;
     set scale(value: __Number | IPointData);
     get scale(): __Number | IPointData;
-    constructor(data?: IUIBaseInputData);
+    reset(_data?: IUIInputData): void;
     set(data: IUIInputData): void;
     get(): IUIInputData;
     getPath(curve?: boolean): IPathCommandData;