@leafer/interface 1.0.0-rc.16 → 1.0.0-rc.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.0.0-rc.16",
+  "version": "1.0.0-rc.18",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/app/ILeafer.ts

@@ -9,7 +9,7 @@ import { IAutoBounds, IBoundsData, IPointData, IScreenSizeData } from '../math/I
 import { ICanvasManager } from '../canvas/ICanvasManager'
 import { IHitCanvasManager } from '../canvas/IHitCanvasManager'
 import { IEventListenerId } from '../event/IEventer'
-import { IObject } from '../data/IData'
+import { IFourNumber, IObject } from '../data/IData'
 import { IZoomView } from '../display/IView'
 import { IAppBase } from './IApp'
 import { ILeaferImage, ILeaferImageConfig } from '../image/ILeaferImage'
@@ -67,17 +67,21 @@ export interface ILeaferAttrData {
     unlockLayout(): void
     lockLayout(): void
 
-    setZoomLayer(zoomLayer: ILeaf): void
     forceFullRender(): void
     forceRender(bounds?: IBoundsData): void
     updateCursor(cursor?: ICursorType): void
     resize(size: IScreenSizeData): void
 
-    waitReady(item: IFunction): void
-    waitViewReady(item: IFunction): void
-    waitViewCompleted(item: IFunction): void
+    waitReady(item: IFunction, bind?: IObject): void
+    waitViewReady(item: IFunction, bind?: IObject): void
+    waitViewCompleted(item: IFunction, bind?: IObject): void
+
+    zoom(zoomType: IZoomType, padding?: IFourNumber, fixedScale?: boolean): IBoundsData
+    validScale(changeScale: number): number
 }
 
+export type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData
+
 export interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
     readonly isApp: boolean
     readonly app: ILeaferBase

package/src/data/IData.ts

@@ -6,6 +6,8 @@ export type ITimer = any
 
 export type IPathString = string
 
+export type IFourNumber = number | number[]
+
 export interface IObject {
     [name: string]: any
 }

package/src/data/ILeafData.ts

@@ -12,7 +12,7 @@ export interface IDataProcessor {
     __setInput(name: string, value: any): void
     __getInput(name: string): any
     __removeInput(name: string): void
-    __getInputData(): IObject
+    __getInputData(names?: string[] | IObject): IObject
 
     __setMiddle(name: string, value: any): void
     __getMiddle(name: string): any

package/src/display/ILeaf.ts

@@ -36,6 +36,8 @@ export interface ILeafAttrData {
     blendMode: IBlendMode
     opacity: INumber
     visible: IBoolean
+    selected: IBoolean
+    disabled: IBoolean
     locked: IBoolean
     zIndex: INumber
 
@@ -66,7 +68,7 @@ export interface ILeafAttrData {
     windingRule: IWindingRule
 
     editable: IBoolean
-    editSize?: IEditSize
+    editSize: IEditSize
 
     hittable: IBoolean
     hitFill: IHitType
@@ -77,6 +79,13 @@ export interface ILeafAttrData {
     hitRadius: INumber
 
     cursor: ICursorType | ICursorType[]
+
+    normalStyle: ILeafInputData // restore hover / press / focus / selected / disabled style
+    hoverStyle: ILeafInputData
+    pressStyle: ILeafInputData
+    focusStyle: ILeafInputData
+    selectedStyle: ILeafInputData
+    disabledStyle: ILeafInputData
 }
 
 export type IHitType =
@@ -178,6 +187,12 @@ export type ICursorType =
     | 'zoom-in'
     | 'zoom-out'
 
+export type IStateStyleType =
+    | 'hoverStyle'
+    | 'pressStyle'
+    | 'focusStyle'
+    | 'selectedStyle'
+    | 'disabledStyle'
 
 export interface ILeafInputData {
     tag?: string
@@ -190,6 +205,8 @@ export interface ILeafInputData {
     blendMode?: IBlendMode
     opacity?: INumber
     visible?: IBoolean
+    selected?: IBoolean
+    disabled?: IBoolean
     locked?: IBoolean
     zIndex?: INumber
 
@@ -232,6 +249,13 @@ export interface ILeafInputData {
 
     cursor?: ICursorType | ICursorType[]
 
+    normalStyle?: ILeafInputData
+    hoverStyle?: ILeafInputData
+    pressStyle?: ILeafInputData
+    focusStyle?: ILeafInputData
+    selectedStyle?: ILeafInputData
+    disabledStyle?: ILeafInputData
+
     children?: ILeafInputData[]
 
     // other
@@ -246,6 +270,8 @@ export interface ILeafComputedData {
     blendMode?: IBlendMode
     opacity?: number
     visible?: boolean
+    selected?: boolean
+    disabled?: boolean
     locked?: boolean
     zIndex?: number
 
@@ -287,6 +313,13 @@ export interface ILeafComputedData {
 
     cursor?: ICursorType | ICursorType[]
 
+    normalStyle?: ILeafInputData
+    hoverStyle?: ILeafInputData
+    pressStyle?: ILeafInputData
+    focusStyle?: ILeafInputData
+    selectedStyle?: ILeafInputData
+    disabledStyle?: ILeafInputData
+
     // other
     __childBranchNumber?: number // 存在子分支的个数
     __complex?: boolean // 外观是否复杂
@@ -313,6 +346,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     readonly app?: ILeaferBase
     leafer?: ILeaferBase
     parent?: ILeaf
+    zoomLayer?: ILeaf
 
     readonly isApp?: boolean
     readonly isLeafer?: boolean
@@ -372,14 +406,15 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     reset(data?: ILeafInputData): void
     resetCustom(): void
 
-    waitParent(item: IFunction): void
-    waitLeafer(item: IFunction): void
-    nextRender(item: IFunction, off?: 'off'): void
+    waitParent(item: IFunction, bind?: IObject): void
+    waitLeafer(item: IFunction, bind?: IObject): void
+    nextRender(item: IFunction, bind?: IObject, off?: 'off'): void
+    removeNextRender(item: IFunction): void
 
     __bindLeafer(leafer: ILeaferBase | null): void
 
     set(data: IObject): void
-    get(name?: string): ILeafInputData | IValue
+    get(name?: string | string[] | IObject): ILeafInputData | IValue
     toJSON(): IObject
     toString(): string
     toSVG?(): string
@@ -395,6 +430,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     find(condition: number | string | IFindMethod, options?: any): ILeaf[]
     findOne(condition: number | string | IFindMethod, options?: any): ILeaf
 
+    focus(value?: boolean): void
     forceUpdate(attrName?: string): void
 
     updateLayout(): void
@@ -432,9 +468,13 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData // when render use other matrix
 
     getWorld(attrName: ILayoutAttr): number // will remove
+    getTransform(relative?: ILocationType | ILeaf): IMatrixData
+
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData
 
+    getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData
+
     worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
     localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
     worldToInner(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
@@ -459,6 +499,12 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     rotateOf(origin: IPointData, rotation: number): void
     skewOf(origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void
 
+    transformWorld(worldTransform?: IMatrixData, resize?: boolean): void
+    moveWorld(x: number, y?: number): void
+    scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void
+    rotateOfWorld(worldOrigin: IPointData, rotation: number): void
+    skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void
+
     scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void
     __scaleResize(scaleX: number, scaleY: number): void
 
@@ -487,6 +533,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __updatePath(): void
     __updateRenderPath(): void
 
+    // 
+
     // branch
     children?: ILeaf[]
 

package/src/display/IView.ts

@@ -1,7 +1,6 @@
 import { IBranch } from './IBranch'
-import { ILeaf } from './ILeaf'
+
 
 export interface IZoomView extends IBranch {
-    zoomLayer?: ILeaf
-    setZoomLayer(zoomLayer: ILeaf): void
+
 }

package/src/file/IExport.ts

@@ -1,4 +1,5 @@
 import { IBlob, ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { ILeaf } from '../display/ILeaf'
 import { ILocationType } from '../layout/ILeafLayout'
 import { IBoundsData } from '../math/IMath'
 
@@ -12,7 +13,7 @@ export interface IExportOptions {
     trim?: boolean
     fill?: string
     screenshot?: IBoundsData | boolean
-    location?: ILocationType
+    relative?: ILocationType | ILeaf
     onCanvas?: IExportOnCanvasFunction
 }
 

package/src/index.ts

@@ -1,6 +1,6 @@
 export { IAppBase } from './app/IApp'
-export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IAround } from './display/ILeaf'
+export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator, IZoomType } from './app/ILeafer'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IAround } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
@@ -50,7 +50,7 @@ export { ICursorTypeMap, ICursorRotate, ICursorRotateMap } from './interaction/I
 export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
 
 
-export { INumber, IBoolean, IString, IValue, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { INumber, IBoolean, IString, IValue, IFourNumber, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'
 export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataFn, IOffsetBoundsData, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithScaleData, IMatrixWithOptionScaleData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
 export { IFunction, IAttrDecorator } from './function/IFunction'

package/src/interaction/IInteraction.ts

@@ -31,6 +31,7 @@ export interface IInteraction extends IControl {
     downData: IPointerEvent
     hoverData: IPointerEvent
     downTime: number
+    focusData: ILeaf
 
     receive(event: any): void
 
@@ -50,7 +51,13 @@ export interface IInteraction extends IControl {
     keyUp(data: IKeyEvent): void
 
     findPath(data: IPointerEvent, options?: IPickOptions): ILeafList
+
     isDrag(leaf: ILeaf): boolean
+    isPress(leaf: ILeaf): boolean
+    isHover(leaf: ILeaf): boolean
+    isFocus(leaf: ILeaf): boolean
+
+    cancelHover(): void
 
     updateDownData(data?: IPointerEvent, options?: IPickOptions): void
     updateHoverData(data: IPointerEvent): void
@@ -83,7 +90,9 @@ export interface IMoveConfig {
     holdSpaceKey?: boolean
     holdMiddleKey?: boolean
     holdRightKey?: boolean
+    scroll?: boolean
     drag?: boolean
+    dragAnimate?: boolean
     dragEmpty?: boolean
     dragOut?: boolean
     autoDistance?: number

package/src/layout/ILeafLayout.ts

@@ -1,7 +1,7 @@
 import { IBoundsData, IMatrixData, ILayoutBoundsData, IPointData } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 
-export type ILocationType = 'world' | 'local' | 'inner'
+export type ILocationType = 'world' | 'page' | 'local' | 'inner'
 export type IBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
 
 export interface ILeafLayout {

package/src/math/IMath.ts

@@ -1,4 +1,4 @@
-import { IObject } from '../data/IData'
+import { IFourNumber, IObject } from '../data/IData'
 
 export interface IPointData {
     x: number
@@ -70,7 +70,8 @@ export interface IBounds extends IBoundsData, ITwoPointBoundsData {
     toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds
     getFitMatrix(put: IBoundsData): IMatrix
 
-    spread(spreadX: number, spreadY?: number): IBounds
+    spread(fourNumber: IFourNumber, spreadY?: number): IBounds
+    shrink(fourNumber: IFourNumber): IBounds
     ceil(): IBounds
     unsign(): IBounds
     float(maxLength?: number): IBounds

package/src/path/IPathDrawer.ts

@@ -28,9 +28,9 @@ export interface IPathCreator {
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): IPathCreator
     closePath(): IPathCreator
 
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator
+    arc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): IPathCreator
-    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
 
     rect(x: number, y: number, width: number, height: number): IPathCreator
     roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): IPathCreator

package/src/renderer/IRenderer.ts

@@ -32,6 +32,7 @@ export interface IRenderer extends IControl {
 
     waitAgain: boolean
     changed: boolean
+    ignore: boolean
 
     config: IRendererConfig
 

package/types/index.d.ts

@@ -6,6 +6,7 @@ type IString = string;
 type IValue = INumber | IBoolean | IString | IObject;
 type ITimer = any;
 type IPathString = string;
+type IFourNumber = number | number[];
 interface IObject {
     [name: string]: any;
 }
@@ -144,7 +145,8 @@ interface IBounds extends IBoundsData, ITwoPointBoundsData {
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds;
     toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds;
     getFitMatrix(put: IBoundsData): IMatrix;
-    spread(spreadX: number, spreadY?: number): IBounds;
+    spread(fourNumber: IFourNumber, spreadY?: number): IBounds;
+    shrink(fourNumber: IFourNumber): IBounds;
     ceil(): IBounds;
     unsign(): IBounds;
     float(maxLength?: number): IBounds;
@@ -746,9 +748,9 @@ interface IPathCreator {
     bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): IPathCreator;
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): IPathCreator;
     closePath(): IPathCreator;
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator;
+    arc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator;
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): IPathCreator;
-    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator;
     rect(x: number, y: number, width: number, height: number): IPathCreator;
     roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): IPathCreator;
     drawEllipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator;
@@ -768,7 +770,7 @@ interface ICanvasManager {
 type IExportImageType = 'jpg' | 'png' | 'webp';
 type IExportFileType = IExportImageType | 'svg' | 'pdf' | 'json';
 
-type ILocationType = 'world' | 'local' | 'inner';
+type ILocationType = 'world' | 'page' | 'local' | 'inner';
 type IBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render';
 interface ILeafLayout {
     leaf: ILeaf;
@@ -843,7 +845,7 @@ interface IExportOptions {
     trim?: boolean;
     fill?: string;
     screenshot?: IBoundsData | boolean;
-    location?: ILocationType;
+    relative?: ILocationType | ILeaf;
     onCanvas?: IExportOnCanvasFunction;
 }
 interface IExportResult {
@@ -1023,6 +1025,7 @@ interface IRenderer extends IControl {
     rendering: boolean;
     waitAgain: boolean;
     changed: boolean;
+    ignore: boolean;
     config: IRendererConfig;
     update(): void;
     requestLayout(): void;
@@ -1099,7 +1102,7 @@ interface IDataProcessor {
     __setInput(name: string, value: any): void;
     __getInput(name: string): any;
     __removeInput(name: string): void;
-    __getInputData(): IObject;
+    __getInputData(names?: string[] | IObject): IObject;
     __setMiddle(name: string, value: any): void;
     __getMiddle(name: string): any;
     destroy(): void;
@@ -1171,6 +1174,8 @@ interface ILeafAttrData {
     blendMode: IBlendMode;
     opacity: INumber;
     visible: IBoolean;
+    selected: IBoolean;
+    disabled: IBoolean;
     locked: IBoolean;
     zIndex: INumber;
     mask: IBoolean;
@@ -1193,7 +1198,7 @@ interface ILeafAttrData {
     path: IPathCommandData | IPathString;
     windingRule: IWindingRule;
     editable: IBoolean;
-    editSize?: IEditSize;
+    editSize: IEditSize;
     hittable: IBoolean;
     hitFill: IHitType;
     hitStroke: IHitType;
@@ -1202,6 +1207,12 @@ interface ILeafAttrData {
     hitSelf: IBoolean;
     hitRadius: INumber;
     cursor: ICursorType | ICursorType[];
+    normalStyle: ILeafInputData;
+    hoverStyle: ILeafInputData;
+    pressStyle: ILeafInputData;
+    focusStyle: ILeafInputData;
+    selectedStyle: ILeafInputData;
+    disabledStyle: ILeafInputData;
 }
 type IHitType = 'path' | 'pixel' | 'all' | 'none';
 type IMaskType = 'path' | 'pixel' | 'clipping';
@@ -1215,6 +1226,7 @@ interface IImageCursor {
 }
 type IAround = 'topLeft' | 'top' | 'topRight' | 'right' | 'bottomRight' | 'bottom' | 'bottomLeft' | 'left' | 'center' | IPointData;
 type ICursorType = IImageCursor | '' | 'auto' | 'default' | 'none' | 'context-menu' | 'help' | 'pointer' | 'progress' | 'wait' | 'cell' | 'crosshair' | 'text' | 'vertical-text' | 'alias' | 'copy' | 'move' | 'no-drop' | 'not-allowed' | 'grab' | 'grabbing' | 'e-resize' | 'n-resize' | 'ne-resize' | 'nw-resize' | 's-resize' | 'se-resize' | 'sw-resize' | 'w-resize' | 'ew-resize' | 'ns-resize' | 'nesw-resize' | 'nwse-resize' | 'col-resize' | 'row-resize' | 'all-scroll' | 'zoom-in' | 'zoom-out';
+type IStateStyleType = 'hoverStyle' | 'pressStyle' | 'focusStyle' | 'selectedStyle' | 'disabledStyle';
 interface ILeafInputData {
     tag?: string;
     id?: IString;
@@ -1223,6 +1235,8 @@ interface ILeafInputData {
     blendMode?: IBlendMode;
     opacity?: INumber;
     visible?: IBoolean;
+    selected?: IBoolean;
+    disabled?: IBoolean;
     locked?: IBoolean;
     zIndex?: INumber;
     mask?: IBoolean;
@@ -1254,6 +1268,12 @@ interface ILeafInputData {
     hitSelf?: IBoolean;
     hitRadius?: INumber;
     cursor?: ICursorType | ICursorType[];
+    normalStyle?: ILeafInputData;
+    hoverStyle?: ILeafInputData;
+    pressStyle?: ILeafInputData;
+    focusStyle?: ILeafInputData;
+    selectedStyle?: ILeafInputData;
+    disabledStyle?: ILeafInputData;
     children?: ILeafInputData[];
     noBounds?: boolean;
 }
@@ -1264,6 +1284,8 @@ interface ILeafComputedData {
     blendMode?: IBlendMode;
     opacity?: number;
     visible?: boolean;
+    selected?: boolean;
+    disabled?: boolean;
     locked?: boolean;
     zIndex?: number;
     mask?: boolean;
@@ -1294,6 +1316,12 @@ interface ILeafComputedData {
     hitSelf?: boolean;
     hitRadius?: number;
     cursor?: ICursorType | ICursorType[];
+    normalStyle?: ILeafInputData;
+    hoverStyle?: ILeafInputData;
+    pressStyle?: ILeafInputData;
+    focusStyle?: ILeafInputData;
+    selectedStyle?: ILeafInputData;
+    disabledStyle?: ILeafInputData;
     __childBranchNumber?: number;
     __complex?: boolean;
     __naturalWidth?: number;
@@ -1314,6 +1342,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     readonly app?: ILeaferBase;
     leafer?: ILeaferBase;
     parent?: ILeaf;
+    zoomLayer?: ILeaf;
     readonly isApp?: boolean;
     readonly isLeafer?: boolean;
     readonly isBranch?: boolean;
@@ -1353,12 +1382,13 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     destroyed: boolean;
     reset(data?: ILeafInputData): void;
     resetCustom(): void;
-    waitParent(item: IFunction): void;
-    waitLeafer(item: IFunction): void;
-    nextRender(item: IFunction, off?: 'off'): void;
+    waitParent(item: IFunction, bind?: IObject): void;
+    waitLeafer(item: IFunction, bind?: IObject): void;
+    nextRender(item: IFunction, bind?: IObject, off?: 'off'): void;
+    removeNextRender(item: IFunction): void;
     __bindLeafer(leafer: ILeaferBase | null): void;
     set(data: IObject): void;
-    get(name?: string): ILeafInputData | IValue;
+    get(name?: string | string[] | IObject): ILeafInputData | IValue;
     toJSON(): IObject;
     toString(): string;
     toSVG?(): string;
@@ -1369,6 +1399,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     getProxyAttr(name: string): IValue;
     find(condition: number | string | IFindMethod, options?: any): ILeaf[];
     findOne(condition: number | string | IFindMethod, options?: any): ILeaf;
+    focus(value?: boolean): void;
     forceUpdate(attrName?: string): void;
     updateLayout(): void;
     __updateWorldMatrix(): void;
@@ -1391,8 +1422,10 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __renderMask(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
     getWorld(attrName: ILayoutAttr): number;
+    getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
+    getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData;
     worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
     localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
     worldToInner(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
@@ -1411,6 +1444,11 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     scaleOf(origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
     rotateOf(origin: IPointData, rotation: number): void;
     skewOf(origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
+    transformWorld(worldTransform?: IMatrixData, resize?: boolean): void;
+    moveWorld(x: number, y?: number): void;
+    scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
+    rotateOfWorld(worldOrigin: IPointData, rotation: number): void;
+    skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
     scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void;
     __scaleResize(scaleX: number, scaleY: number): void;
     __hitWorld(point: IRadiusPointData): boolean;
@@ -1558,6 +1596,7 @@ interface IInteraction extends IControl {
     downData: IPointerEvent;
     hoverData: IPointerEvent;
     downTime: number;
+    focusData: ILeaf;
     receive(event: any): void;
     pointerDown(data?: IPointerEvent, defaultPath?: boolean): void;
     pointerMove(data?: IPointerEvent): void;
@@ -1572,6 +1611,10 @@ interface IInteraction extends IControl {
     keyUp(data: IKeyEvent): void;
     findPath(data: IPointerEvent, options?: IPickOptions): ILeafList;
     isDrag(leaf: ILeaf): boolean;
+    isPress(leaf: ILeaf): boolean;
+    isHover(leaf: ILeaf): boolean;
+    isFocus(leaf: ILeaf): boolean;
+    cancelHover(): void;
     updateDownData(data?: IPointerEvent, options?: IPickOptions): void;
     updateHoverData(data: IPointerEvent): void;
     updateCursor(hoverData?: IPointerEvent): void;
@@ -1596,7 +1639,9 @@ interface IMoveConfig {
     holdSpaceKey?: boolean;
     holdMiddleKey?: boolean;
     holdRightKey?: boolean;
+    scroll?: boolean;
     drag?: boolean;
+    dragAnimate?: boolean;
     dragEmpty?: boolean;
     dragOut?: boolean;
     autoDistance?: number;
@@ -1635,8 +1680,6 @@ interface IHitCanvasManager extends ICanvasManager {
 }
 
 interface IZoomView extends IBranch {
-    zoomLayer?: ILeaf;
-    setZoomLayer(zoomLayer: ILeaf): void;
 }
 
 type ILeaferType = 'draw' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart';
@@ -1674,15 +1717,17 @@ interface ILeaferAttrData {
     stop(): void;
     unlockLayout(): void;
     lockLayout(): void;
-    setZoomLayer(zoomLayer: ILeaf): void;
     forceFullRender(): void;
     forceRender(bounds?: IBoundsData): void;
     updateCursor(cursor?: ICursorType): void;
     resize(size: IScreenSizeData): void;
-    waitReady(item: IFunction): void;
-    waitViewReady(item: IFunction): void;
-    waitViewCompleted(item: IFunction): void;
+    waitReady(item: IFunction, bind?: IObject): void;
+    waitViewReady(item: IFunction, bind?: IObject): void;
+    waitViewCompleted(item: IFunction, bind?: IObject): void;
+    zoom(zoomType: IZoomType, padding?: IFourNumber, fixedScale?: boolean): IBoundsData;
+    validScale(changeScale: number): number;
 }
+type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData;
 interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
     readonly isApp: boolean;
     readonly app: ILeaferBase;
@@ -1883,4 +1928,4 @@ interface ICursorRotateMap {
     [name: string]: ICursorRotate;
 }
 
-export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IControl, ICreator, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDragEvent, IDropEvent, IEditSize, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindMethod, IFunction, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeaferAttrData, ILeaferBase, ILeaferCanvas, ILeaferCanvasConfig, ILeaferCanvasView, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageCacheCanvas, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferImagePatternPaint, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILocationType, IMaskType, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMoveEvent, IMultiTouchData, INumber, INumberMap, IObject, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IScaleData, IScaleRotationData, IScreenSizeData, ISelector, ISelectorConfig, ISelectorProxy, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IString, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITwoPointBoundsData, IUICreator, IUIEvent, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };
+export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IControl, ICreator, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDragEvent, IDropEvent, IEditSize, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindMethod, IFourNumber, IFunction, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeaferAttrData, ILeaferBase, ILeaferCanvas, ILeaferCanvasConfig, ILeaferCanvasView, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageCacheCanvas, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferImagePatternPaint, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILocationType, IMaskType, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMoveEvent, IMultiTouchData, INumber, INumberMap, IObject, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IScaleData, IScaleRotationData, IScreenSizeData, ISelector, ISelectorConfig, ISelectorProxy, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IString, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITwoPointBoundsData, IUICreator, IUIEvent, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomType, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };