@leafer-ui/display 1.0.0-rc.19 → 1.0.0-rc.20

package/package.json

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

package/src/Box.ts

@@ -38,10 +38,9 @@ export class Box extends Group implements IBox {
     public __updateRectRenderSpread(): number { return 0 }
 
     public __updateRenderSpread(): number {
-        let width = this.__updateRectRenderSpread() || super.__updateRenderSpread()
-        this.__.__drawAfterFill = this.__.overflow === 'hide'
-        if (!width) width = this.__.__drawAfterFill ? 0 : 1
-        return width
+        const width = this.__updateRectRenderSpread()
+        const hide = this.__.__drawAfterFill = this.__.overflow === 'hide'
+        return (width || hide) ? width : -1
     }
 
 

package/src/Canvas.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, ILeaferCanvasConfig, INumber, IRenderOptions, IPointData, ICanvasContext2D, IScreenSizeData, ISizeData, IHitType } from '@leafer/interface'
+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 { ICanvas, ICanvasData, ICanvasInputData, IUI } from '@leafer-ui/interface'
@@ -28,6 +28,9 @@ export class Canvas extends Rect implements ICanvas {
     @resizeType(true)
     public smooth: boolean
 
+    @resizeType()
+    public contextSettings: ICanvasContext2DSettings
+
     @hitType('all')
     declare public hitFill: IHitType
 

package/src/Group.ts

@@ -9,7 +9,7 @@ import { UI } from './UI'
 
 @useModule(Branch)
 @registerUI()
-export class Group extends UI implements IGroup {
+export class Group extends UI implements IGroup {   // tip: rewrited Box
 
     public get __tag() { return 'Group' }
 

package/src/Leafer.ts

@@ -1,5 +1,5 @@
-import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, IEventListenerId, ITimer, IValue, IObject, IControl, IPointData, ILeaferType, ICursorType, IBoundsData, INumber, IZoomType, IFourNumber } from '@leafer/interface'
-import { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, ImageManager, DataHelper, Creator, Run, Debug, RenderEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, WaitHelper, WatchEvent, Bounds } from '@leafer/core'
+import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, IEventListenerId, ITimer, IValue, IObject, IControl, IPointData, ILeaferType, ICursorType, IBoundsData, INumber, IZoomType, IFourNumber, IBounds } from '@leafer/interface'
+import { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, ImageManager, DataHelper, Creator, Run, Debug, RenderEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, WaitHelper, WatchEvent, Bounds, LeafList } from '@leafer/core'
 
 import { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ILeafer, IApp, IEditorBase } from '@leafer-ui/interface'
 import { LeaferData } from '@leafer-ui/data'
@@ -11,6 +11,12 @@ const debug = Debug.get('Leafer')
 @registerUI()
 export class Leafer extends Group implements ILeafer {
 
+
+    static get version() { return '1.0.0-rc.20' }
+
+    static list = new LeafList() // 所有leafer实例
+
+
     public get __tag() { return 'Leafer' }
 
     @dataProcessor(LeaferData)
@@ -60,6 +66,7 @@ export class Leafer extends Group implements ILeafer {
         start: true,
         hittable: true,
         smooth: true,
+        lazySpeard: 100,
         zoom: {
             min: 0.01,
             max: 256
@@ -72,7 +79,9 @@ export class Leafer extends Group implements ILeafer {
     }
 
     public autoLayout?: IAutoBounds
+    public lazyBounds: IBounds
 
+    public get FPS(): number { return this.renderer ? this.renderer.FPS : 60 }
     public get cursorPoint(): IPointData { return (this.interaction && this.interaction.hoverData) || { x: this.width / 2, y: this.height / 2 } }
     public leafs = 0
 
@@ -80,6 +89,7 @@ export class Leafer extends Group implements ILeafer {
     protected __startTimer: ITimer
     protected __controllers: IControl[] = []
 
+    protected __initWait: IFunction[] // assign in waitInit()
     protected __readyWait: IFunction[] = []
     protected __viewReadyWait: IFunction[] = []
     protected __viewCompletedWait: IFunction[] = []
@@ -89,6 +99,7 @@ export class Leafer extends Group implements ILeafer {
         super(data)
         this.userConfig = userConfig
         if (userConfig && (userConfig.view || userConfig.width)) this.init(userConfig)
+        Leafer.list.add(this)
     }
 
     public init(userConfig?: ILeaferConfig, parentApp?: IApp): void {
@@ -103,16 +114,17 @@ export class Leafer extends Group implements ILeafer {
         this.initType(config.type) // LeaferType
 
         // render / layout
-        this.canvas = Creator.canvas(config)
+        const canvas = this.canvas = Creator.canvas(config)
         this.__controllers.push(
-            this.renderer = Creator.renderer(this, this.canvas, config),
+            this.renderer = Creator.renderer(this, canvas, config),
             this.watcher = Creator.watcher(this, config),
             this.layouter = Creator.layouter(this, config)
         )
 
         if (this.isApp) this.__setApp()
         this.__checkAutoLayout(config)
-        this.view = this.canvas.view
+        this.updateLazyBounds()
+        this.view = canvas.view
 
         // interaction / manager
         if (parentApp) {
@@ -120,7 +132,7 @@ export class Leafer extends Group implements ILeafer {
             start = parentApp.running
         } else {
             this.selector = Creator.selector(this)
-            this.interaction = Creator.interaction(this, this.canvas, this.selector, config)
+            this.interaction = Creator.interaction(this, canvas, this.selector, config)
 
             if (this.interaction) {
                 this.__controllers.unshift(this.interaction)
@@ -134,12 +146,14 @@ export class Leafer extends Group implements ILeafer {
 
         this.hittable = config.hittable
         this.fill = config.fill
-        this.canvasManager.add(this.canvas)
+        this.canvasManager.add(canvas)
+
 
         this.__listenEvents()
 
         if (start) this.__startTimer = setTimeout(this.start.bind(this))
 
+        WaitHelper.run(this.__initWait)
         this.onInit() // can rewrite init event
     }
 
@@ -148,13 +162,7 @@ export class Leafer extends Group implements ILeafer {
     public initType(_type: ILeaferType): void { } // rewrite in @leafer-ui/type
 
     public set(data: IUIInputData): void {
-        if (!this.children) {
-            setTimeout(() => {
-                super.set(data)
-            })
-        } else {
-            super.set(data)
-        }
+        this.waitInit(() => { super.set(data) })
     }
 
     public start(): void {
@@ -205,10 +213,16 @@ export class Leafer extends Group implements ILeafer {
         if (i) cursor ? i.setCursor(cursor) : i.updateCursor()
     }
 
+    public updateLazyBounds(): void {
+        this.lazyBounds = this.canvas.bounds.clone().spread(this.config.lazySpeard)
+    }
+
     protected __doResize(size: IScreenSizeData): void {
-        if (!this.canvas || this.canvas.isSameSize(size)) return
+        const { canvas } = this
+        if (!canvas || canvas.isSameSize(size)) return
         const old = DataHelper.copyAttrs({}, this.canvas, canvasSizeAttrs) as IScreenSizeData
-        this.canvas.resize(size)
+        canvas.resize(size)
+        this.updateLazyBounds()
         this.__onResize(new ResizeEvent(size, old))
     }
 
@@ -240,7 +254,7 @@ export class Leafer extends Group implements ILeafer {
         }
     }
 
-    public __setAttr(attrName: string, newValue: IValue): void {
+    public __setAttr(attrName: string, newValue: IValue): boolean {
         if (this.canvas) {
             if (canvasSizeAttrs.includes(attrName)) {
                 this.__changeCanvasSize(attrName, newValue as number)
@@ -250,7 +264,7 @@ export class Leafer extends Group implements ILeafer {
                 this.canvas.hittable = newValue as boolean
             }
         }
-        super.__setAttr(attrName, newValue)
+        return super.__setAttr(attrName, newValue)
     }
 
     public __getAttr(attrName: string): IValue {
@@ -320,6 +334,12 @@ export class Leafer extends Group implements ILeafer {
         }
     }
 
+    public waitInit(item: IFunction, bind?: IObject): void {
+        if (bind) item = item.bind(bind)
+        if (!this.__initWait) this.__initWait = [] // set() use
+        this.canvas ? item() : this.__initWait.push(item)
+    }
+
     public waitReady(item: IFunction, bind?: IObject): void {
         if (bind) item = item.bind(bind)
         this.ready ? item() : this.__readyWait.push(item)
@@ -355,12 +375,9 @@ export class Leafer extends Group implements ILeafer {
     // need view plugin
     public zoom(_zoomType: IZoomType, _padding?: IFourNumber, _fixedScale?: boolean): IBoundsData { return undefined }
 
-    public validScale(changeScale: number): number {
-        const { scaleX } = this.zoomLayer.__, { min, max } = this.app.config.zoom, absScale = Math.abs(scaleX * changeScale)
-        if (absScale < min) changeScale = min / scaleX
-        else if (absScale > max) changeScale = max / scaleX
-        return changeScale
-    }
+    // interaction window rewrite
+    public getValidMove(moveX: number, moveY: number): IPointData { return { x: moveX, y: moveY } }
+    public getValidScale(changeScale: number): number { return changeScale }
 
     protected __checkUpdateLayout(): void {
         this.__layout.update()
@@ -388,9 +405,10 @@ export class Leafer extends Group implements ILeafer {
         this.__eventIds.length = 0
     }
 
-    public destroy(): void {
-        setTimeout(() => {
+    public destroy(sync?: boolean): void {
+        const doDestory = () => {
             if (!this.destroyed) {
+                Leafer.list.remove(this)
                 try {
                     this.stop()
                     this.emitEvent(new LeaferEvent(LeaferEvent.END, this))
@@ -419,7 +437,7 @@ export class Leafer extends Group implements ILeafer {
                     debug.error(e)
                 }
             }
-        })
-
+        }
+        sync ? doDestory() : setTimeout(doDestory)
     }
 }

package/src/Line.ts

@@ -14,7 +14,7 @@ const { toBounds } = PathBounds
 
 
 @registerUI()
-export class Line extends UI implements ILine {
+export class Line extends UI implements ILine { // tip: rewrited Polygon
 
     public get __tag() { return 'Line' }
 
@@ -33,6 +33,9 @@ export class Line extends UI implements ILine {
     @pathType(0)
     public curve: boolean | number
 
+    @pathType(false)
+    declare public closed: boolean
+
     public get toPoint(): IPointData {
         const { width, rotation } = this.__
         const to: IPointData = getPointData()
@@ -60,7 +63,7 @@ export class Line extends UI implements ILine {
 
         if (this.__.points) {
 
-            drawPoints(path, this.__.points, false)
+            drawPoints(path, this.__.points, this.__.closed)
 
         } else {
 
@@ -73,7 +76,7 @@ export class Line extends UI implements ILine {
     public __updateRenderPath(): void {
         const data = this.__
         if (!this.pathInputed && data.points && data.curve) {
-            drawPoints(data.__pathForRender = [], data.points, data.curve, this.pathClosed)
+            drawPoints(data.__pathForRender = [], data.points, data.curve, data.closed)
             if (data.__useArrow) PathArrow.addArrows(this, false)
         } else {
             super.__updateRenderPath()

package/src/Pen.ts

@@ -7,7 +7,7 @@ import { Group } from './Group'
 import { Path } from './Path'
 
 
-@useModule(PathCreator, ['beginPath', 'path'])
+@useModule(PathCreator, ['set', 'beginPath', 'path'])
 @registerUI()
 export class Pen extends Group implements IPen {
 
@@ -76,11 +76,13 @@ export class Pen extends Group implements IPen {
 
     public drawPoints(_points: number[], _curve?: boolean | number, _close?: boolean): Pen { return this }
 
+    public clearPath(): Pen { return this }
 
     public paint(): void {
         this.pathElement.forceUpdate('path')
     }
 
+
 }
 
 function penPathType() {

package/src/Polygon.ts

@@ -32,7 +32,6 @@ export class Polygon extends UI implements IPolygon {
 
     constructor(data?: IPolygonInputData) {
         super(data)
-        this.pathClosed = true
     }
 
     public __updatePath(): void {

package/src/Rect.ts

@@ -10,7 +10,7 @@ import { UI } from './UI'
 @useModule(RectRender)
 @rewriteAble()
 @registerUI()
-export class Rect extends UI implements IRect {
+export class Rect extends UI implements IRect { // tip: rewrited Box
 
     public get __tag() { return 'Rect' }
 

package/src/Text.ts

@@ -166,6 +166,8 @@ export class Text extends UI implements IText {
             super.__updateBoxBounds()
         }
 
+        if (italic) b.width += fontSize * 0.16
+
         const contentBounds = includes(b, bounds) ? b : bounds
         if (contentBounds !== layout.contentBounds) {
             layout.contentBounds = contentBounds

package/src/UI.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IAround, IValue, IWindingRule, IPathCreator } from '@leafer/interface'
 import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, 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, IEditSize, ILeafer } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowType, IFindUIMethod, IEditSize, ILeafer, IEditorConfig } from '@leafer-ui/interface'
 import { arrowType, effectType, stateType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -10,12 +10,10 @@ import { UIBounds, UIRender } from '@leafer-ui/display-module'
 import { Export, PathArrow } from '@leafer-ui/external'
 
 
-
-
 @useModule(UIBounds)
 @useModule(UIRender)
 @rewriteAble()
-export class UI extends Leaf implements IUI {
+export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     @dataProcessor(UIData)
     declare public __: IUIData
@@ -84,35 +82,35 @@ export class UI extends Leaf implements IUI {
 
 
     // position
-    @positionType(0)
+    @positionType(0, true)
     public x: INumber
 
-    @positionType(0)
+    @positionType(0, true)
     public y: INumber
 
     // size
-    @boundsType(100)
+    @boundsType(100, true)
     public width: INumber
 
-    @boundsType(100)
+    @boundsType(100, true)
     public height: INumber
 
     // scale
-    @scaleType(1)
+    @scaleType(1, true)
     public scaleX: INumber
 
-    @scaleType(1)
+    @scaleType(1, true)
     public scaleY: INumber
 
     // rotate
-    @rotationType(0)
+    @rotationType(0, true)
     public rotation: INumber
 
     // skew
-    @rotationType(0)
+    @rotationType(0, true)
     public skewX: INumber
 
-    @rotationType(0)
+    @rotationType(0, true)
     public skewY: INumber
 
 
@@ -130,6 +128,9 @@ export class UI extends Leaf implements IUI {
     @dataType('size')
     public editSize?: IEditSize
 
+    @dataType()
+    public editorStyle: IEditorConfig
+
 
     // hit
     @hitType(true)
@@ -209,6 +210,9 @@ export class UI extends Leaf implements IUI {
     @pathType()
     public windingRule: IWindingRule
 
+    @pathType(true)
+    public closed: boolean
+
 
     // arrow
 
@@ -337,10 +341,8 @@ export class UI extends Leaf implements IUI {
 
     public __onUpdateSize(): void {
         if (this.__.__input) {
-            const data = this.__
-            data.__needComputePaint = true
-            if (data.lazy && this.leafer && !this.leafer.canvas.bounds.hit(this.__world)) return
-            data.__computePaint()
+            const data = this.__;
+            (data.lazy && this.leafer && this.leafer.created && !this.leafer.lazyBounds.hit(this.__world)) ? data.__needComputePaint = true : data.__computePaint()
         }
     }
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { IString, INumber, IBoolean, IMaskType, IAround, IHitType, ICursorType, IPathCommandData, IPathString, IWindingRule, IPointData, IPathCreator, IValue, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IBoundsData, IResizeEvent, IObject, IZoomType, IFourNumber, IRenderOptions, ILeaferImage, ICanvasContext2D } from '@leafer/interface';
-import { Leaf } from '@leafer/core';
-import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IEditSize, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IFindUIMethod, IExportOptions, IExportResult, 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, IUnitData, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
+import { IString, INumber, IBoolean, IMaskType, IAround, IHitType, ICursorType, IPathCommandData, IPathString, IWindingRule, IPointData, IPathCreator, IValue, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IBoundsData, IResizeEvent, IObject, IZoomType, IFourNumber, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
+import { Leaf, LeafList } from '@leafer/core';
+import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IEditSize, IEditorConfig, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IFindUIMethod, IExportOptions, IExportResult, 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, IUnitData, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
 
 declare class UI extends Leaf implements IUI {
     __: IUIData;
@@ -38,6 +38,7 @@ declare class UI extends Leaf implements IUI {
     draggable: IBoolean;
     editable: IBoolean;
     editSize?: IEditSize;
+    editorStyle: IEditorConfig;
     hittable: IBoolean;
     hitFill: IHitType;
     hitStroke: IHitType;
@@ -60,6 +61,7 @@ declare class UI extends Leaf implements IUI {
     pixelRatio: INumber;
     path: IPathCommandData | IPathString;
     windingRule: IWindingRule;
+    closed: boolean;
     startArrow: IArrowType;
     endArrow: IArrowType;
     cornerRadius: number | number[] | ICornerRadiusString;
@@ -123,6 +125,8 @@ declare class Group extends UI implements IGroup {
 }
 
 declare class Leafer extends Group implements ILeafer {
+    static get version(): string;
+    static list: LeafList;
     get __tag(): string;
     __: ILeaferData;
     pixelRatio: INumber;
@@ -151,11 +155,14 @@ declare class Leafer extends Group implements ILeafer {
     userConfig: ILeaferConfig;
     config: ILeaferConfig;
     autoLayout?: IAutoBounds;
+    lazyBounds: IBounds;
+    get FPS(): number;
     get cursorPoint(): IPointData;
     leafs: number;
     __eventIds: IEventListenerId[];
     protected __startTimer: ITimer;
     protected __controllers: IControl[];
+    protected __initWait: IFunction[];
     protected __readyWait: IFunction[];
     protected __viewReadyWait: IFunction[];
     protected __viewCompletedWait: IFunction[];
@@ -173,13 +180,14 @@ declare class Leafer extends Group implements ILeafer {
     forceFullRender(): void;
     forceRender(bounds?: IBoundsData): void;
     updateCursor(cursor?: ICursorType): void;
+    updateLazyBounds(): void;
     protected __doResize(size: IScreenSizeData): void;
     protected __onResize(event: IResizeEvent): void;
     protected __setApp(): void;
     protected __bindApp(app: IApp): void;
     __setLeafer(leafer: ILeafer): void;
     protected __checkAutoLayout(config: ILeaferConfig): void;
-    __setAttr(attrName: string, newValue: IValue): void;
+    __setAttr(attrName: string, newValue: IValue): boolean;
     __getAttr(attrName: string): IValue;
     protected __changeCanvasSize(attrName: string, newValue: number): void;
     protected __changeFill(newValue: string): void;
@@ -189,17 +197,19 @@ declare class Leafer extends Group implements ILeafer {
     protected __onNextRender(): void;
     protected __checkViewCompleted(emit?: boolean): void;
     protected __onWatchData(): void;
+    waitInit(item: IFunction, bind?: IObject): void;
     waitReady(item: IFunction, bind?: IObject): void;
     waitViewReady(item: IFunction, bind?: IObject): void;
     waitViewCompleted(item: IFunction, bind?: IObject): void;
     nextRender(item: IFunction, bind?: IObject, off?: 'off'): void;
     zoom(_zoomType: IZoomType, _padding?: IFourNumber, _fixedScale?: boolean): IBoundsData;
-    validScale(changeScale: number): number;
+    getValidMove(moveX: number, moveY: number): IPointData;
+    getValidScale(changeScale: number): number;
     protected __checkUpdateLayout(): void;
     protected emitLeafer(type: string): void;
     protected __listenEvents(): void;
     protected __removeListenEvents(): void;
-    destroy(): void;
+    destroy(sync?: boolean): void;
 }
 
 declare class Box extends Group implements IBox {
@@ -277,6 +287,7 @@ declare class Line extends UI implements ILine {
     height: INumber;
     points: number[];
     curve: boolean | number;
+    closed: boolean;
     get toPoint(): IPointData;
     set toPoint(value: IPointData);
     constructor(data?: ILineInputData);
@@ -302,6 +313,7 @@ declare class Canvas extends Rect implements ICanvas {
     height: INumber;
     pixelRatio: INumber;
     smooth: boolean;
+    contextSettings: ICanvasContext2DSettings;
     hitFill: IHitType;
     canvas: ILeaferCanvas;
     context: ICanvasContext2D;
@@ -378,6 +390,7 @@ declare class Pen extends Group implements IPen {
     drawEllipse(_x: number, _y: number, _radiusX: number, _radiusY: number, _rotation?: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen;
     drawArc(_x: number, _y: number, _radius: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen;
     drawPoints(_points: number[], _curve?: boolean | number, _close?: boolean): Pen;
+    clearPath(): Pen;
     paint(): void;
 }