@leafer/interface 1.0.0 → 1.0.2

package/package.json

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

package/src/app/ILeafer.ts

@@ -17,10 +17,11 @@ import { IControl } from '../control/IControl'
 import { IFunction } from '../function/IFunction'
 
 
-export type ILeaferType = 'draw' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom'
+export type ILeaferType = 'draw' | 'block' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom'
 export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean
     type?: ILeaferType
+    mobile?: boolean
     realCanvas?: boolean
     lazySpeard?: IFourNumber
 }
@@ -82,6 +83,10 @@ export interface ILeaferAttrData {
     getValidScale(changeScale: number): number
 
     getWorldPointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData
+    getPagePointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData
+    updateClientBounds(): void
+
+    receiveEvent(event: any): void
 }
 
 export type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData

package/src/canvas/ILeaferCanvas.ts

@@ -10,6 +10,7 @@ import { IExportOptions } from '../file/IExport'
 
 export interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject
+    canvas?: string | IObject
     fill?: string
     pixelRatio?: number
     smooth?: boolean
@@ -199,7 +200,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     getSameCanvas(useSameWorldTransform?: boolean, useSameSmooth?: boolean): ILeaferCanvas
     recycle(clearBounds?: IBoundsData): void
 
-    updateRender(): void
+    updateRender(bounds: IBoundsData): void
     unrealCanvas(): void
     destroy(): void
 }

package/src/canvas/ISkiaCanvas.ts

@@ -1,6 +1,6 @@
 import { IExportFileType, IExportImageType } from '../file/IFileType'
 
-export type ICanvasType = 'skia' | 'napi' | 'canvas' | 'wx'
+export type ICanvasType = 'skia' | 'napi' | 'canvas' | 'miniapp'
 
 // skia
 export interface ISkiaCanvas {

package/src/data/IData.ts

@@ -1,4 +1,5 @@
 import { IPointData } from '../math/IMath'
+import { IFunction } from '../function/IFunction'
 
 export type INumber = number // number | string    will convert to number
 export type IBoolean = boolean // boolean | string  will convert to boolean
@@ -26,6 +27,11 @@ export interface IStringMap {
     [name: string]: string
 }
 
+export interface IFunctionMap {
+    [name: string]: IFunction
+}
+
+
 export interface IPointDataMap {
     [name: string]: IPointData
 }

package/src/display/ILeaf.ts

@@ -1,5 +1,5 @@
 import { ILeaferBase } from '../app/ILeafer'
-import { IEventer } from '../event/IEventer'
+import { IEventer, IEventMap } from '../event/IEventer'
 
 import { ILeaferCanvas, IHitCanvas } from '../canvas/ILeaferCanvas'
 import { IRenderOptions } from '../renderer/IRenderer'
@@ -106,6 +106,8 @@ export interface ILeafAttrData {
 
     cursor?: ICursorType | ICursorType[]
 
+    event?: IEventMap
+
     normalStyle?: ILeafInputData // restore hover / press / focus / selected / disabled style
     hoverStyle?: ILeafInputData
     pressStyle?: ILeafInputData
@@ -117,6 +119,7 @@ export interface ILeafAttrData {
     data: IObject
 }
 
+export type ISide = 'width' | 'height'
 
 export type IAxis = 'x' | 'y'
 
@@ -221,6 +224,12 @@ export type IDirection =
     | 'left'
     | 'center'
 
+export type IDirection4 =
+    | 'top'
+    | 'right'
+    | 'bottom'
+    | 'left'
+
 export type IAlign = IDirection
 
 export type IBaseLineAlign =
@@ -364,6 +373,8 @@ export interface ILeafInputData {
 
     cursor?: ICursorType | ICursorType[]
 
+    event?: IEventMap
+
     normalStyle?: ILeafInputData
     hoverStyle?: ILeafInputData
     pressStyle?: ILeafInputData
@@ -475,8 +486,8 @@ export interface ILeafComputedData {
 
     readonly __autoWidth?: boolean
     readonly __autoHeight?: boolean
-    readonly __autoSide?: boolean
-    readonly __autoSize?: boolean
+    readonly __autoSide?: boolean // 自动宽或自动高
+    readonly __autoSize?: boolean // 自动宽高
 
     readonly __useNaturalRatio: boolean // 宽高存在一个值时，另一个自动值是否采用natural尺寸比例
     readonly __isLinePath: boolean
@@ -619,7 +630,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __updateLocalRenderBounds(): void
 
     __updateContentBounds(): void
-    __updateBoxBounds(): void
+    __updateBoxBounds(secondLayout?: boolean): void
     __updateStrokeBounds(): void
     __updateRenderBounds(): void
 
@@ -667,8 +678,9 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     // transform
     setTransform(transform?: IMatrixData, resize?: boolean): void
     transform(transform?: IMatrixData, resize?: boolean): void
-
     move(x: number | IPointData, y?: number): void
+
+    moveInner(x: number | IPointData, y?: number): void
     scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void
     rotateOf(origin: IPointData | IAlign, rotation: number): void
     skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void
@@ -679,6 +691,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     rotateOfWorld(worldOrigin: IPointData, rotation: number): void
     skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void
 
+    flip(axis: IAxis): void
+
     scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void
     __scaleResize(scaleX: number, scaleY: number): void
 

package/src/display/module/ILeafBounds.ts

@@ -10,7 +10,7 @@ export interface ILeafBounds {
     __updateLocalStrokeBounds?(): void
     __updateLocalRenderBounds?(): void
 
-    __updateBoxBounds?(): void
+    __updateBoxBounds?(secondLayout?: boolean): void
     __updateStrokeBounds?(): void
     __updateRenderBounds?(): void
 

package/src/event/IEventer.ts

@@ -12,6 +12,8 @@ export interface IEventListenerOptions {
     once?: boolean
 }
 
+export type IEventOption = IEventListenerOptions | boolean | 'once'
+
 export interface IEventListenerItem extends IEventListenerOptions {
     listener: IEventListener
 }
@@ -20,11 +22,15 @@ export interface IEventListenerMap {
     [name: string]: IEventListenerItem[]
 }
 
+export interface IEventMap {
+    [name: string]: IEventListener | [IEventListener, IEventOption]
+}
+
 export interface IEventListenerId {
     type: string | string[]
     current: ILeaf
     listener: IEventListener
-    options?: IEventListenerOptions | boolean
+    options?: IEventOption
 }
 
 export type InnerId = number
@@ -35,9 +41,9 @@ export interface IEventer extends ILeafEventer {
     __captureMap?: IEventListenerMap
     __bubbleMap?: IEventListenerMap
 
-    on(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
-    off(type?: string | string[], listener?: IEventListener, options?: IEventListenerOptions | boolean): void
-    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
+    on(type: string | string[], listener: IEventListener, options?: IEventOption): void
+    off(type?: string | string[], listener?: IEventListener, options?: IEventOption): void
+    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventOption): IEventListenerId
     off_(id: IEventListenerId | IEventListenerId[]): void
     once(type: string | string[], listener: IEventListener): void
     emit(type: string, event?: IEvent | IObject, capture?: boolean): void

package/src/event/IUIEvent.ts

@@ -33,6 +33,7 @@ export interface IPointerEvent extends IUIEvent {
     width?: number
     height?: number
     pointerType?: PointerType
+    multiTouch?: boolean
     pressure?: number
     tangentialPressure?: number
     tiltX?: number
@@ -73,7 +74,7 @@ export interface IZoomEvent extends IUIEvent {
 }
 
 export interface IMoveEvent extends IDragEvent {
-
+    moveType?: 'drag' | 'move'
 }
 
 export interface ISwipeEvent extends IDragEvent {

package/src/file/IExport.ts

@@ -2,12 +2,13 @@ import { IBlob, ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { ICanvasContext2DSettings } from '../canvas/ICanvas'
 import { ILeaf } from '../display/ILeaf'
 import { ILocationType } from '../layout/ILeafLayout'
-import { IBoundsData } from '../math/IMath'
+import { IBoundsData, IPointData, ISizeData } from '../math/IMath'
 
 export interface IExportOptions {
     quality?: number
     blob?: boolean
-    scale?: number
+    scale?: number | IPointData
+    size?: number | ISizeData
     smooth?: boolean
     pixelRatio?: number
     slice?: boolean

package/src/index.ts

@@ -1,6 +1,6 @@
 export { IAppBase } from './app/IApp'
 export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator, IZoomType } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IFlowType, IFlowBoxType, IAlign, IAxisAlign, IFlowAlign, IFlowAxisAlign, IAxis, IGap, IPointGap, IAxisReverse, IBaseLineAlign, IFlowWrap, IAutoSize, IRangeSize, IPercentData, IUnitData, IConstraint, IConstraintType, IHitType, IMaskType, IEraserType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IDirection, IAround, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from './display/ILeaf'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IFlowType, IFlowBoxType, IAlign, IAxisAlign, IFlowAlign, IFlowAxisAlign, ISide, IAxis, IGap, IPointGap, IAxisReverse, IBaseLineAlign, IFlowWrap, IAutoSize, IRangeSize, IPercentData, IUnitData, IConstraint, IConstraintType, IHitType, IMaskType, IEraserType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IDirection, IDirection4, IAround, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
@@ -43,14 +43,14 @@ export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnE
 export { IExportFileType, IExportImageType } from './file/IFileType'
 export { IExportOptions, IJSONOptions, IExportResult, IExportResultFunction, IExportOnCanvasFunction } from './file/IExport'
 
-export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
+export { InnerId, IEventer, IEventMap, IEventListener, IEventOption, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
 export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, IMultiTouchData, IKeepTouchData } from './event/IEvent'
 export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
 export { ICursorTypeMap, ICursorRotate, ICursorRotateMap } from './interaction/ICursor'
-export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
+export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, ITouchConfig, IPointerConfig } from './interaction/IInteraction'
 
 
-export { INumber, IBoolean, IString, IValue, IFourNumber, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IPointDataMap, IDataTypeHandle } from './data/IData'
+export { INumber, IBoolean, IString, IValue, IFourNumber, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IFunctionMap, IPointDataMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'
 export { IPoint, IPointData, IFromToData, IUnitPointData, IScrollPointData, IClientPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataFn, IOffsetBoundsData, ITwoPointBoundsData, IAutoBounds, IAutoBoxData, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithScaleData, IMatrixWithOptionScaleData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
 export { IFunction, IStringFunction, INumberFunction, IObjectFunction, IPointDataFunction, IAttrDecorator } from './function/IFunction'

package/src/interaction/IInteraction.ts

@@ -16,10 +16,18 @@ export interface IInteraction extends IControl {
     selector: ISelector
 
     running: boolean
+
     readonly dragging: boolean
+    readonly transforming: boolean
+
+    readonly moveMode: boolean
+    readonly canHover: boolean
+
     readonly isDragEmpty: boolean
+    readonly isMobileDragEmpty: boolean
+    readonly isHoldMiddleKey: boolean
     readonly isHoldRightKey: boolean
-    readonly moveMode: boolean
+    readonly isHoldSpaceKey: boolean
 
     config: IInteractionConfig
 
@@ -82,6 +90,7 @@ export interface IInteractionCanvas extends ILeaferCanvas {
 export interface IInteractionConfig {
     wheel?: IWheelConfig
     pointer?: IPointerConfig
+    touch?: ITouchConfig
     zoom?: IZoomConfig
     move?: IMoveConfig
     eventer?: IObject
@@ -101,7 +110,7 @@ export interface IMoveConfig {
     holdMiddleKey?: boolean
     holdRightKey?: boolean
     scroll?: boolean | 'limit'
-    drag?: boolean
+    drag?: boolean | 'auto'
     dragAnimate?: boolean
     dragEmpty?: boolean
     dragOut?: boolean
@@ -127,7 +136,11 @@ export interface IPointerConfig {
     tapTime?: number
     longPressTime?: number
     transformTime?: number
+
+    // mobile
     hover?: boolean
+    touch?: boolean // 使用touch事件代替pointer事件
+
     dragHover?: boolean
     dragDistance?: number
     swipeDistance?: number
@@ -136,6 +149,11 @@ export interface IPointerConfig {
     preventDefaultMenu?: boolean
 }
 
+export interface ITouchConfig {
+    preventDefault?: boolean | 'auto'
+}
+
+
 export interface ICursorConfig {
     stop?: boolean
 }

package/src/math/IMath.ts

@@ -1,4 +1,5 @@
 import { IFourNumber, IObject } from '../data/IData'
+import { ISide } from '../display/ILeaf'
 
 export interface IPointData {
     x: number
@@ -91,8 +92,8 @@ export interface IBounds extends IBoundsData, ITwoPointBoundsData {
     toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds
     getFitMatrix(put: IBoundsData, baseScale?: number): IMatrix
 
-    spread(fourNumber: IFourNumber): IBounds
-    shrink(fourNumber: IFourNumber): IBounds
+    spread(fourNumber: IFourNumber, side?: ISide): IBounds
+    shrink(fourNumber: IFourNumber, side?: ISide): IBounds
     ceil(): IBounds
     unsign(): IBounds
     float(maxLength?: number): IBounds
@@ -221,8 +222,8 @@ export interface IMatrix extends IMatrixWithScaleData {
     toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void
     toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void
 
-    setLayout(data: ILayoutData, origin?: IPointData): IMatrix
-    getLayout(origin?: IPointData, firstSkewY?: boolean): ILayoutData
+    setLayout(data: ILayoutData, origin?: IPointData, around?: IPointData,): IMatrix
+    getLayout(origin?: IPointData, around?: IPointData, firstSkewY?: boolean): ILayoutData
 
     withScale(scaleX?: number, scaleY?: number): IMatrixWithScaleData
 

package/src/platform/IPlatform.ts

@@ -12,10 +12,11 @@ export interface IPlatform {
     toURL(text: string, fileType?: 'text' | 'svg'): string
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
+    renderCanvas?: ILeaferCanvas
     canvasType?: ICanvasType
     isWorker?: boolean
     isMobile?: boolean
-    devicePixelRatio?: number
+    readonly devicePixelRatio?: number
     intWheelDeltaY?: boolean // firefox / Windows need
     conicGradientSupport?: boolean
     conicGradientRotate90?: boolean // firefox need rotate

package/types/index.d.ts

@@ -72,8 +72,8 @@ interface IBounds extends IBoundsData, ITwoPointBoundsData {
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds;
     toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds;
     getFitMatrix(put: IBoundsData, baseScale?: number): IMatrix;
-    spread(fourNumber: IFourNumber): IBounds;
-    shrink(fourNumber: IFourNumber): IBounds;
+    spread(fourNumber: IFourNumber, side?: ISide): IBounds;
+    shrink(fourNumber: IFourNumber, side?: ISide): IBounds;
     ceil(): IBounds;
     unsign(): IBounds;
     float(maxLength?: number): IBounds;
@@ -166,8 +166,8 @@ interface IMatrix extends IMatrixWithScaleData {
     invertWith(): IMatrix;
     toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void;
     toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void;
-    setLayout(data: ILayoutData, origin?: IPointData): IMatrix;
-    getLayout(origin?: IPointData, firstSkewY?: boolean): ILayoutData;
+    setLayout(data: ILayoutData, origin?: IPointData, around?: IPointData): IMatrix;
+    getLayout(origin?: IPointData, around?: IPointData, firstSkewY?: boolean): ILayoutData;
     withScale(scaleX?: number, scaleY?: number): IMatrixWithScaleData;
     reset(): void;
 }
@@ -184,6 +184,28 @@ interface IMatrixWithBoundsScaleData extends IMatrixData, IBoundsData, IScaleDat
 interface IMatrixWithLayoutData extends IMatrixData, ILayoutBoundsData {
 }
 
+interface IFunction {
+    (...arg: any): any;
+}
+interface INumberFunction {
+    (...arg: any): number;
+}
+interface IStringFunction {
+    (...arg: any): string;
+}
+interface IObjectFunction {
+    (...arg: any): IObject;
+}
+interface IPointDataFunction {
+    (...arg: any): IPointData;
+}
+interface IAttrDecorator {
+    (...arg: any): IAttrDecoratorInner;
+}
+interface IAttrDecoratorInner {
+    (target: any, key: string): any;
+}
+
 type INumber = number;
 type IBoolean = boolean;
 type IString = string;
@@ -203,6 +225,9 @@ interface INumberMap {
 interface IStringMap {
     [name: string]: string;
 }
+interface IFunctionMap {
+    [name: string]: IFunction;
+}
 interface IPointDataMap {
     [name: string]: IPointData;
 }
@@ -397,53 +422,35 @@ interface ILeafEventer {
     hasEvent?(type: string, capture?: boolean): boolean;
 }
 
-interface IFunction {
-    (...arg: any): any;
-}
-interface INumberFunction {
-    (...arg: any): number;
-}
-interface IStringFunction {
-    (...arg: any): string;
-}
-interface IObjectFunction {
-    (...arg: any): IObject;
-}
-interface IPointDataFunction {
-    (...arg: any): IPointData;
-}
-interface IAttrDecorator {
-    (...arg: any): IAttrDecoratorInner;
-}
-interface IAttrDecoratorInner {
-    (target: any, key: string): any;
-}
-
 type IEventListener = IFunction;
 interface IEventListenerOptions {
     capture?: boolean;
     once?: boolean;
 }
+type IEventOption = IEventListenerOptions | boolean | 'once';
 interface IEventListenerItem extends IEventListenerOptions {
     listener: IEventListener;
 }
 interface IEventListenerMap {
     [name: string]: IEventListenerItem[];
 }
+interface IEventMap {
+    [name: string]: IEventListener | [IEventListener, IEventOption];
+}
 interface IEventListenerId {
     type: string | string[];
     current: ILeaf;
     listener: IEventListener;
-    options?: IEventListenerOptions | boolean;
+    options?: IEventOption;
 }
 type InnerId = number;
 interface IEventer extends ILeafEventer {
     readonly innerId: InnerId;
     __captureMap?: IEventListenerMap;
     __bubbleMap?: IEventListenerMap;
-    on(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void;
-    off(type?: string | string[], listener?: IEventListener, options?: IEventListenerOptions | boolean): void;
-    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId;
+    on(type: string | string[], listener: IEventListener, options?: IEventOption): void;
+    off(type?: string | string[], listener?: IEventListener, options?: IEventOption): void;
+    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventOption): IEventListenerId;
     off_(id: IEventListenerId | IEventListenerId[]): void;
     once(type: string | string[], listener: IEventListener): void;
     emit(type: string, event?: IEvent | IObject, capture?: boolean): void;
@@ -879,7 +886,8 @@ interface ILeafLayout {
 interface IExportOptions {
     quality?: number;
     blob?: boolean;
-    scale?: number;
+    scale?: number | IPointData;
+    size?: number | ISizeData;
     smooth?: boolean;
     pixelRatio?: number;
     slice?: boolean;
@@ -910,6 +918,7 @@ interface IExportOnCanvasFunction {
 
 interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject;
+    canvas?: string | IObject;
     fill?: string;
     pixelRatio?: number;
     smooth?: boolean;
@@ -1042,7 +1051,7 @@ interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     isSameSize(options: ILeaferCanvasConfig): boolean;
     getSameCanvas(useSameWorldTransform?: boolean, useSameSmooth?: boolean): ILeaferCanvas;
     recycle(clearBounds?: IBoundsData): void;
-    updateRender(): void;
+    updateRender(bounds: IBoundsData): void;
     unrealCanvas(): void;
     destroy(): void;
 }
@@ -1114,7 +1123,7 @@ interface ILeafBounds {
     __updateLocalBoxBounds?(): void;
     __updateLocalStrokeBounds?(): void;
     __updateLocalRenderBounds?(): void;
-    __updateBoxBounds?(): void;
+    __updateBoxBounds?(secondLayout?: boolean): void;
     __updateStrokeBounds?(): void;
     __updateRenderBounds?(): void;
     __updateAutoLayout?(): void;
@@ -1289,6 +1298,7 @@ interface ILeafAttrData {
     hitSelf?: IBoolean;
     hitRadius?: INumber;
     cursor?: ICursorType | ICursorType[];
+    event?: IEventMap;
     normalStyle?: ILeafInputData;
     hoverStyle?: ILeafInputData;
     pressStyle?: ILeafInputData;
@@ -1297,6 +1307,7 @@ interface ILeafAttrData {
     disabledStyle?: ILeafInputData;
     data: IObject;
 }
+type ISide = 'width' | 'height';
 type IAxis = 'x' | 'y';
 type IAxisReverse = 'x-reverse' | 'y-reverse';
 type IFlowType = boolean | IAxis | IAxisReverse;
@@ -1342,6 +1353,7 @@ interface IImageCursor {
     rotation?: number;
 }
 type IDirection = 'top-left' | 'top' | 'top-right' | 'right' | 'bottom-right' | 'bottom' | 'bottom-left' | 'left' | 'center';
+type IDirection4 = 'top' | 'right' | 'bottom' | 'left';
 type IAlign = IDirection;
 type IBaseLineAlign = 'baseline-left' | 'baseline-center' | 'baseline-right';
 type IFlowAlign = IAlign | IBaseLineAlign;
@@ -1407,6 +1419,7 @@ interface ILeafInputData {
     hitSelf?: IBoolean;
     hitRadius?: INumber;
     cursor?: ICursorType | ICursorType[];
+    event?: IEventMap;
     normalStyle?: ILeafInputData;
     hoverStyle?: ILeafInputData;
     pressStyle?: ILeafInputData;
@@ -1588,7 +1601,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __updateLocalStrokeBounds(): void;
     __updateLocalRenderBounds(): void;
     __updateContentBounds(): void;
-    __updateBoxBounds(): void;
+    __updateBoxBounds(secondLayout?: boolean): void;
     __updateStrokeBounds(): void;
     __updateRenderBounds(): void;
     __updateAutoLayout(): void;
@@ -1622,6 +1635,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     setTransform(transform?: IMatrixData, resize?: boolean): void;
     transform(transform?: IMatrixData, resize?: boolean): void;
     move(x: number | IPointData, y?: number): void;
+    moveInner(x: number | IPointData, y?: number): void;
     scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void;
     rotateOf(origin: IPointData | IAlign, rotation: number): void;
     skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void;
@@ -1630,6 +1644,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     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;
+    flip(axis: IAxis): void;
     scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void;
     __scaleResize(scaleX: number, scaleY: number): void;
     resizeWidth(width: number): void;
@@ -1724,6 +1739,7 @@ interface IPointerEvent extends IUIEvent {
     width?: number;
     height?: number;
     pointerType?: PointerType;
+    multiTouch?: boolean;
     pressure?: number;
     tangentialPressure?: number;
     tiltX?: number;
@@ -1756,6 +1772,7 @@ interface IZoomEvent extends IUIEvent {
     scale: number;
 }
 interface IMoveEvent extends IDragEvent {
+    moveType?: 'drag' | 'move';
 }
 interface ISwipeEvent extends IDragEvent {
 }
@@ -1776,9 +1793,14 @@ interface IInteraction extends IControl {
     selector: ISelector;
     running: boolean;
     readonly dragging: boolean;
+    readonly transforming: boolean;
+    readonly moveMode: boolean;
+    readonly canHover: boolean;
     readonly isDragEmpty: boolean;
+    readonly isMobileDragEmpty: boolean;
+    readonly isHoldMiddleKey: boolean;
     readonly isHoldRightKey: boolean;
-    readonly moveMode: boolean;
+    readonly isHoldSpaceKey: boolean;
     config: IInteractionConfig;
     cursor: ICursorType | ICursorType[];
     readonly hitRadius: number;
@@ -1821,6 +1843,7 @@ interface IInteractionCanvas extends ILeaferCanvas {
 interface IInteractionConfig {
     wheel?: IWheelConfig;
     pointer?: IPointerConfig;
+    touch?: ITouchConfig;
     zoom?: IZoomConfig;
     move?: IMoveConfig;
     eventer?: IObject;
@@ -1838,7 +1861,7 @@ interface IMoveConfig {
     holdMiddleKey?: boolean;
     holdRightKey?: boolean;
     scroll?: boolean | 'limit';
-    drag?: boolean;
+    drag?: boolean | 'auto';
     dragAnimate?: boolean;
     dragEmpty?: boolean;
     dragOut?: boolean;
@@ -1863,6 +1886,7 @@ interface IPointerConfig {
     longPressTime?: number;
     transformTime?: number;
     hover?: boolean;
+    touch?: boolean;
     dragHover?: boolean;
     dragDistance?: number;
     swipeDistance?: number;
@@ -1870,6 +1894,9 @@ interface IPointerConfig {
     preventDefault?: boolean;
     preventDefaultMenu?: boolean;
 }
+interface ITouchConfig {
+    preventDefault?: boolean | 'auto';
+}
 
 interface IHitCanvasManager extends ICanvasManager {
     maxTotal: number;
@@ -1880,10 +1907,11 @@ interface IHitCanvasManager extends ICanvasManager {
 interface IZoomView extends IBranch {
 }
 
-type ILeaferType = 'draw' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom';
+type ILeaferType = 'draw' | 'block' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom';
 interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean;
     type?: ILeaferType;
+    mobile?: boolean;
     realCanvas?: boolean;
     lazySpeard?: IFourNumber;
 }
@@ -1927,6 +1955,9 @@ interface ILeaferAttrData {
     getValidMove(moveX: number, moveY: number): IPointData;
     getValidScale(changeScale: number): number;
     getWorldPointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData;
+    getPagePointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData;
+    updateClientBounds(): void;
+    receiveEvent(event: any): void;
 }
 type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData;
 interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
@@ -2030,7 +2061,7 @@ interface IImageManager {
     destroy(): void;
 }
 
-type ICanvasType = 'skia' | 'napi' | 'canvas' | 'wx';
+type ICanvasType = 'skia' | 'napi' | 'canvas' | 'miniapp';
 interface ISkiaCanvas {
     toBuffer(format: IExportFileType, config: ISkiaCanvasExportConfig): Promise<any>;
     toBufferSync(format: IExportFileType, config: ISkiaCanvasExportConfig): any;
@@ -2065,10 +2096,11 @@ interface IPlatform {
     toURL(text: string, fileType?: 'text' | 'svg'): string;
     requestRender?(render: IFunction): void;
     canvas?: ILeaferCanvas;
+    renderCanvas?: ILeaferCanvas;
     canvasType?: ICanvasType;
     isWorker?: boolean;
     isMobile?: boolean;
-    devicePixelRatio?: number;
+    readonly devicePixelRatio?: number;
     intWheelDeltaY?: boolean;
     conicGradientSupport?: boolean;
     conicGradientRotate90?: boolean;
@@ -2135,4 +2167,4 @@ interface ICursorRotateMap {
     [name: string]: ICursorRotate;
 }
 
-export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAlign, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IAutoBoxData, IAutoSize, IAxis, IAxisAlign, IAxisReverse, IBaseLineAlign, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasContext2DSettings, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IClientPointData, IConstraint, IConstraintType, IControl, ICreator, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDirection, IDragEvent, IDropEvent, IEditSize, IEraserType, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindCondition, IFindMethod, IFlowAlign, IFlowAxisAlign, IFlowBoxType, IFlowType, IFlowWrap, IFourNumber, IFromToData, IFunction, IGap, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IJSONOptions, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafAttrDescriptor, ILeafAttrDescriptorFn, 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, INumberFunction, INumberMap, IObject, IObjectFunction, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPercentData, IPickBottom, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointDataFunction, IPointDataMap, IPointGap, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRangeSize, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IScaleData, IScaleRotationData, IScreenSizeData, IScrollPointData, ISelector, ISelectorConfig, ISelectorProxy, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IString, IStringFunction, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITwoPointBoundsData, IUICreator, IUIEvent, IUnitData, IUnitPointData, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomType, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };
+export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAlign, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IAutoBoxData, IAutoSize, IAxis, IAxisAlign, IAxisReverse, IBaseLineAlign, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasContext2DSettings, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IClientPointData, IConstraint, IConstraintType, IControl, ICreator, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDirection, IDirection4, IDragEvent, IDropEvent, IEditSize, IEraserType, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventMap, IEventOption, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindCondition, IFindMethod, IFlowAlign, IFlowAxisAlign, IFlowBoxType, IFlowType, IFlowWrap, IFourNumber, IFromToData, IFunction, IFunctionMap, IGap, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IJSONOptions, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafAttrDescriptor, ILeafAttrDescriptorFn, 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, INumberFunction, INumberMap, IObject, IObjectFunction, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPercentData, IPickBottom, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointDataFunction, IPointDataMap, IPointGap, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRangeSize, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IScaleData, IScaleRotationData, IScreenSizeData, IScrollPointData, ISelector, ISelectorConfig, ISelectorProxy, ISide, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IString, IStringFunction, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITouchConfig, ITwoPointBoundsData, IUICreator, IUIEvent, IUnitData, IUnitPointData, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomType, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };