@leafer-ui/display 1.0.0-rc.26 → 1.0.0-rc.28

package/package.json

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

package/src/Canvas.ts

@@ -1,5 +1,5 @@
-import { ILeaferCanvas, ILeaferCanvasConfig, INumber, IRenderOptions, IPointData, ICanvasContext2D, ICanvasContext2DSettings, IScreenSizeData, ISizeData, IHitType } from '@leafer/interface'
-import { Creator, Matrix, Platform, dataProcessor, registerUI, hitType } from '@leafer/core'
+import { ILeaferCanvas, ILeaferCanvasConfig, INumber, IRenderOptions, IPointData, ICanvasContext2D, ICanvasContext2DSettings, IScreenSizeData, ISizeData } from '@leafer/interface'
+import { Creator, Matrix, Platform, dataProcessor, registerUI } from '@leafer/core'
 
 import { ICanvas, ICanvasData, ICanvasInputData, IUI } from '@leafer-ui/interface'
 import { CanvasData } from '@leafer-ui/data'
@@ -31,9 +31,6 @@ export class Canvas extends Rect implements ICanvas {
     @resizeType()
     public contextSettings: ICanvasContext2DSettings
 
-    @hitType('all')
-    declare public hitFill: IHitType
-
     public canvas: ILeaferCanvas
 
     public context: ICanvasContext2D
@@ -42,7 +39,7 @@ export class Canvas extends Rect implements ICanvas {
         super(data)
         this.canvas = Creator.canvas(this.__ as ILeaferCanvasConfig)
         this.context = this.canvas.context
-        this.__.__drawAfterFill = true
+        this.__.__isCanvas = this.__.__drawAfterFill = true
     }
 
     public draw(ui: IUI, offset?: IPointData, scale?: number | IPointData, rotation?: number): void {
@@ -67,7 +64,7 @@ export class Canvas extends Rect implements ICanvas {
     public __drawAfterFill(canvas: ILeaferCanvas, _options: IRenderOptions): void {
         const origin = this.canvas.view as ISizeData
         const { width, height } = this
-        if (this.__.cornerRadius) {
+        if (this.__.cornerRadius || this.pathInputed) {
             canvas.save()
             canvas.clip()
             canvas.drawImage(this.canvas.view as any, 0, 0, origin.width, origin.height, 0, 0, width, height)

package/src/Group.ts

@@ -84,7 +84,7 @@ export class Group extends UI implements IGroup {   // tip: rewrited Box
         this.add(child, this.children.indexOf(after) + 1)
     }
 
-    public addBefore(child: UI, before: IUI): void {
+    public addBefore(child: IUI, before: IUI): void {
         this.add(child, this.children.indexOf(before))
     }
 

package/src/Leafer.ts

@@ -196,7 +196,7 @@ export class Leafer extends Group implements ILeafer {
         Object.keys(data).forEach(key => (this as any)[key] = data[key])
     }
 
-    public forceRender(bounds?: IBoundsData): void {
+    override forceRender(bounds?: IBoundsData): void {
         this.renderer.addBlock(bounds ? new Bounds(bounds) : this.canvas.bounds)
         if (this.viewReady) this.renderer.update()
     }
@@ -247,7 +247,7 @@ export class Leafer extends Group implements ILeafer {
         }
     }
 
-    public __setAttr(attrName: string, newValue: IValue): boolean {
+    override __setAttr(attrName: string, newValue: IValue): boolean {
         if (this.canvas) {
             if (canvasSizeAttrs.includes(attrName)) {
                 this.__changeCanvasSize(attrName, newValue as number)
@@ -255,12 +255,15 @@ export class Leafer extends Group implements ILeafer {
                 this.__changeFill(newValue as string)
             } else if (attrName === 'hittable') {
                 if (!this.parent) this.canvas.hittable = newValue as boolean
+            } else if (attrName === 'zIndex') {
+                this.canvas.zIndex = newValue as any
+                setTimeout(() => this.parent && this.parent.__updateSortChildren())
             }
         }
         return super.__setAttr(attrName, newValue)
     }
 
-    public __getAttr(attrName: string): IValue {
+    override __getAttr(attrName: string): IValue {
         if (this.canvas && canvasSizeAttrs.includes(attrName)) return this.canvas[attrName]
         return super.__getAttr(attrName)
     }
@@ -404,7 +407,7 @@ export class Leafer extends Group implements ILeafer {
         this.__eventIds.length = 0
     }
 
-    public destroy(sync?: boolean): void {
+    override destroy(sync?: boolean): void {
         const doDestory = () => {
             if (!this.destroyed) {
                 Leafer.list.remove(this)

package/src/UI.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IEraserType, IValue, IWindingRule, IPathCreator, IFourNumber, IBoundsData, IFlowType, IGap, IFlowWrap, IAxis, IConstraint, IAutoBoxData, IFlowBoxType, IPointGap, IFlowAlign, IFlowAxisAlign, IFindCondition, IAutoSize, IRangeSize, IAlign, IUnitPointData } from '@leafer/interface'
+import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IEraserType, IValue, IWindingRule, IPathCreator, IFourNumber, IBoundsData, IFlowType, IGap, IFlowWrap, IAxis, IConstraint, IAutoBoxData, IFlowBoxType, IPointGap, IFlowAlign, IFlowAxisAlign, IFindCondition, IAutoSize, IRangeSize, IAlign, IUnitPointData, IObject } from '@leafer/interface'
 import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, visibleType, sortType, maskType, dataProcessor, registerUI, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType, pen, naturalBoundsType, pathInputType } from '@leafer/core'
 
 import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowType, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction } from '@leafer-ui/interface'
@@ -326,6 +326,11 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public disabledStyle: IUIInputData
 
 
+    // 预留给用户使用的数据对象
+    @dataType({})
+    public data: IObject
+
+
     public set scale(value: INumber | IPointData) {
         if (typeof value === 'number') {
             this.scaleX = this.scaleY = value
@@ -411,7 +416,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public __onUpdateSize(): void {
         if (this.__.__input) {
             const data = this.__;
-            (data.lazy && this.leafer && this.leafer.created && !this.leafer.lazyBounds.hit(this.__world)) ? data.__needComputePaint = true : data.__computePaint()
+            (data.lazy && !this.__inLazyBounds && !Export.running) ? data.__needComputePaint = true : data.__computePaint()
         }
     }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IString, INumber, IBoolean, IMaskType, IEraserType, IAlign, IUnitPointData, IPathCommandData, IPathString, IWindingRule, IFlowType, IFourNumber, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IHitType, ICursorType, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IObject, IZoomType, IClientPointData, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D, IUnitData } from '@leafer/interface';
+import { IString, INumber, IBoolean, IMaskType, IEraserType, IAlign, IUnitPointData, IPathCommandData, IPathString, IWindingRule, IFlowType, IFourNumber, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IHitType, ICursorType, IObject, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IZoomType, IClientPointData, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D, IUnitData } from '@leafer/interface';
 import { Leaf, LeafList } from '@leafer/core';
 import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IEditorConfig, IFindUIMethod, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupData, IGroupInputData, ILeaferData, IApp, IEditorBase, IFunction, ILeaferInputData, 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, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
 
@@ -93,6 +93,7 @@ declare class UI extends Leaf implements IUI {
     focusStyle: IUIInputData;
     selectedStyle: IUIInputData;
     disabledStyle: IUIInputData;
+    data: IObject;
     set scale(value: INumber | IPointData);
     get scale(): INumber | IPointData;
     get pen(): IPathCreator;
@@ -141,7 +142,7 @@ declare class Group extends UI implements IGroup {
     pick(_hitPoint: IPointData, _options?: IPickOptions): IPickResult;
     addAt(child: IUI, index: number): void;
     addAfter(child: IUI, after: IUI): void;
-    addBefore(child: UI, before: IUI): void;
+    addBefore(child: IUI, before: IUI): void;
     add(_child: IUI, _index?: number): void;
     addMany(..._children: IUI[]): void;
     remove(_child?: IUI, _destroy?: boolean): void;
@@ -341,7 +342,6 @@ declare class Canvas extends Rect implements ICanvas {
     pixelRatio: INumber;
     smooth: boolean;
     contextSettings: ICanvasContext2DSettings;
-    hitFill: IHitType;
     canvas: ILeaferCanvas;
     context: ICanvasContext2D;
     constructor(data?: ICanvasInputData);