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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "1.0.0-rc.27",
+  "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.27",
-    "@leafer-ui/data": "1.0.0-rc.27",
-    "@leafer-ui/display-module": "1.0.0-rc.27",
-    "@leafer-ui/decorator": "1.0.0-rc.27",
-    "@leafer-ui/external": "1.0.0-rc.27"
+    "@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.27",
-    "@leafer-ui/interface": "1.0.0-rc.27"
+    "@leafer/interface": "1.0.0-rc.28",
+    "@leafer-ui/interface": "1.0.0-rc.28"
   }
 }

package/src/Canvas.ts

@@ -64,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

@@ -416,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

@@ -142,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;