@leafer/interface 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

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

package/src/app/ILeafer.ts

@@ -5,7 +5,7 @@ import { ILayouter, ILayouterConfig } from '../layouter/ILayouter'
 import { ISelector, ISelectorConfig } from '../selector/ISelector'
 import { IInteraction, IInteractionCanvas, IInteractionConfig } from '../interaction/IInteraction'
 import { IWatcher, IWatcherConfig } from '../watcher/IWatcher'
-import { IAutoBounds, IScreenSizeData } from '../math/IMath'
+import { IAutoBounds, IPointData, IScreenSizeData } from '../math/IMath'
 import { ICanvasManager } from '../canvas/ICanvasManager'
 import { IHitCanvasManager } from '../canvas/IHitCanvasManager'
 import { IEventListenerId } from '../event/IEventer'
@@ -56,11 +56,14 @@ export interface ILeafer extends IZoomView, IControl {
 
     config: ILeaferConfig
 
+    readonly cursorPoint: IPointData
+    leafs: number
+
     __eventIds: IEventListenerId[]
     __nextRenderWait: IFunction[]
 
     init(userConfig?: ILeaferConfig, parentApp?: IApp): void
-    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void
+    setZoomLayer(zoomLayer: ILeaf): void
     forceFullRender(): void
     updateCursor(): void
     resize(size: IScreenSizeData): void

package/src/canvas/ISkiaCanvas.ts

@@ -1,7 +1,8 @@
 import { IExportFileType, IExportImageType } from '../file/IFileType'
 
-export type ICanvasType = 'skia' | 'canvas' | 'wx'
+export type ICanvasType = 'skia' | 'napi' | 'canvas' | 'wx'
 
+// skia
 export interface ISkiaCanvas {
     toBuffer(format: IExportFileType, config: ISkiaCanvasExportConfig): Promise<any>
     toBufferSync(format: IExportFileType, config: ISkiaCanvasExportConfig): any
@@ -17,4 +18,22 @@ export interface ISkiaCanvasExportConfig {
     density?: number,
     quality?: number,
     outline?: boolean
+}
+
+// skia-napi
+export interface ISkiaNAPICanvas {
+    encodeSync(format: 'webp' | 'jpeg', quality?: number): any
+    encodeSync(format: 'png'): any
+
+    encode(format: 'webp' | 'jpeg' | string, quality?: number): Promise<any>
+    encode(format: 'png'): Promise<any>
+
+    toBuffer(mime: 'image/png'): any
+    toBuffer(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): any
+
+    toDataURL(mime?: 'image/png'): string
+    toDataURL(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): string
+
+    toDataURLAsync(mime?: 'image/png'): Promise<string>
+    toDataURLAsync(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): Promise<string>
 }

package/src/data/ILeafData.ts

@@ -14,7 +14,7 @@ export interface IDataProcessor extends IObject {
     __setInput(name: string, value: any): void
     __getInput(name: string): any
     __removeInput(name: string): void
-    __getInputData(): IObject
+    __getInputData(options?: ILeafDataOptions): IObject
 
     __setMiddle(name: string, value: any): void
     __getMiddle(name: string): any
@@ -22,6 +22,11 @@ export interface IDataProcessor extends IObject {
     destroy(): void
 }
 
+export interface ILeafDataOptions {
+    attrs?: 'all' | string[]
+    children?: boolean
+}
+
 export interface ILeafData extends IDataProcessor, ILeafComputedData {
 
 }

package/src/display/ILeaf.ts

@@ -15,7 +15,8 @@ import { ILeafLayout, ILayoutBoundsType, ILayoutLocationType } from '../layout/I
 import { ILeafHit } from './module/ILeafHit'
 import { ILeafRender } from './module/ILeafRender'
 import { ILeafMask } from './module/ILeafMask'
-import { ILeafData } from '../data/ILeafData'
+import { ILeafData, ILeafDataOptions } from '../data/ILeafData'
+import { IFindMethod } from '../selector/ISelector'
 
 
 export interface ICachedLeaf {
@@ -57,6 +58,7 @@ export interface ILeafAttrData {
     hittable: __Boolean
     hitFill: IHitType
     hitStroke: IHitType
+    hitBox: __Boolean
     hitChildren: __Boolean
     hitSelf: __Boolean
     hitRadius: __Number
@@ -96,6 +98,7 @@ export type IBlendMode =
     | 'destination-in'
     | 'destination-out'
     | 'destination-atop'
+    | 'xor'
 
 export type IResizeType = 'size' | 'scale'
 export interface IImageCursor {
@@ -183,6 +186,7 @@ export interface ILeafInputData extends IObject {
     hittable?: __Boolean
     hitFill?: IHitType
     hitStroke?: IHitType
+    hitBox?: __Boolean
     hitChildren?: __Boolean
     hitSelf?: __Boolean
     hitRadius?: __Number
@@ -222,6 +226,7 @@ export interface ILeafComputedData {
     hittable?: boolean
     hitFill?: IHitType
     hitStroke?: IHitType
+    hitBox?: boolean
     hitChildren?: boolean
     hitSelf?: boolean
     hitRadius?: number
@@ -252,6 +257,8 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     isBranchLeaf?: boolean
 
     __: ILeafData
+    proxyData?: ILeafInputData
+
     __layout: ILeafLayout
 
     __world: IMatrixWithLayoutData
@@ -269,8 +276,6 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
 
     readonly worldOpacity: number
 
-    __renderTime?: number // μs 1000微秒 = 1毫秒
-
     __level: number // 图层级别 root(1) -> hight
     __tempNumber?: number // 用于临时运算储存状态
 
@@ -290,6 +295,9 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
 
     destroyed: boolean
 
+    reset(data?: ILeafInputData): void
+    resetCustom(): void
+
     waitParent(item: IFunction): void
     waitLeafer(item: IFunction): void
     nextRender(item: IFunction): void
@@ -297,12 +305,19 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __bindLeafer(leafer: ILeafer | null): void
 
     set(data: IObject): void
+    get(options?: ILeafDataOptions): ILeafInputData
     toJSON(): IObject
     toString(): string
 
     // ILeafData ->
     __setAttr(attrName: string, newValue: __Value): void
     __getAttr(attrName: string): __Value
+    setProxyAttr(name: string, newValue: __Value): void
+    getProxyAttr(name: string): __Value
+
+    // find
+    find(condition: number | string | IFindMethod): ILeaf[]
+    findOne(condition: number | string | IFindMethod): ILeaf
 
     forceUpdate(attrName?: string): void
 
@@ -331,7 +346,7 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     // IBranchMask ->
     __updateEraser(value?: boolean): void
     __updateMask(value?: boolean): void
-    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void
+    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas, recycle?: boolean): void
     __removeMask(child?: ILeaf): void
 
     // convert

package/src/display/IView.ts

@@ -1,10 +1,7 @@
 import { IBranch } from './IBranch'
 import { ILeaf } from './ILeaf'
-import { ITransformEventData } from '../event/IEvent'
 
 export interface IZoomView extends IBranch {
     zoomLayer?: ILeaf
-    moveLayer?: ILeaf
-    transformData?: ITransformEventData
-    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void
+    setZoomLayer(zoomLayer: ILeaf): void
 }

package/src/display/module/ILeafDataProxy.ts

@@ -6,5 +6,7 @@ export type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>
 export interface ILeafDataProxy {
     __setAttr?(name: string, newValue: __Value): void
     __getAttr?(name: string): __Value
+    setProxyAttr?(name: string, newValue: __Value): void
+    getProxyAttr?(name: string): __Value
 }
 

package/src/display/module/ILeafMask.ts

@@ -6,7 +6,7 @@ export type ILeafMaskModule = ILeafMask & ThisType<ILeaf>
 export interface ILeafMask {
     __updateEraser?(value?: boolean): void
     __updateMask?(value?: boolean): void
-    __renderMask?(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void
+    __renderMask?(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas, recycle?: boolean): void
     __removeMask?(child?: ILeaf): void
 }
 

package/src/event/IEvent.ts

@@ -3,8 +3,11 @@ import { IWatchEventData } from '../watcher/IWatcher'
 import { ILayoutBlockData } from '../layouter/ILayouter'
 import { ILeaf } from '../display/ILeaf'
 import { IScreenSizeData, IPointData } from '../math/IMath'
+import { IObject } from '../data/IData'
 
 export interface IEvent {
+    origin?: IObject
+
     type?: string
     target?: IEventTarget
     current?: IEventTarget
@@ -75,29 +78,6 @@ export interface IWatchEvent extends IEvent {
     readonly data: IWatchEventData
 }
 
-export interface ITransformEventData {
-    x: number
-    y: number
-    scaleX: number
-    scaleY: number
-    rotation: number
-
-    readonly zooming: boolean
-    readonly moving: boolean
-    readonly rotating: boolean
-    readonly changing: boolean
-}
-
-export interface ITransformEvent extends IEvent, ITransformEventData {
-    readonly x: number
-    readonly y: number
-    readonly scaleX: number
-    readonly scaleY: number
-    readonly rotation: number
-}
-export type TransformMode = 'move' | 'zoom' | 'rotate'
-
-
 export interface IMultiTouchData {
     move: IPointData,
     scale: number,

package/src/event/IUIEvent.ts

@@ -23,10 +23,8 @@ export interface IUIEvent extends IEvent {
     path?: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
-    origin?: IObject
-
-    getInner?(target?: ILeaf): IPointData
-    getLocal?(target?: ILeaf): IPointData
+    getInner?(relative?: ILeaf): IPointData
+    getLocal?(relative?: ILeaf): IPointData
 }
 
 
@@ -48,10 +46,10 @@ export interface IDragEvent extends IPointerEvent {
     totalX?: number
     totalY?: number
 
-    getInnerMove?(target?: ILeaf): IPointData
-    getLocalMove?(target?: ILeaf): IPointData
-    getInnerTotal?(target?: ILeaf): IPointData
-    getLocalTotal?(target?: ILeaf): IPointData
+    getInnerMove?(relative?: ILeaf): IPointData
+    getLocalMove?(relative?: ILeaf): IPointData
+    getInnerTotal?(relative?: ILeaf): IPointData
+    getLocalTotal?(relative?: ILeaf): IPointData
 }
 
 export interface IDropEvent extends IPointerEvent {

package/src/image/IImageManager.ts

@@ -1,5 +1,6 @@
 import { ILeaferImage, ILeaferImageConfig } from './ILeaferImage'
 import { ITaskProcessor } from '../task/ITaskProcessor'
+import { IExportFileType } from '../file/IFileType'
 
 interface ILeaferImageMap {
     [name: string]: ILeaferImage
@@ -14,5 +15,7 @@ export interface IImageManager {
     get(config: ILeaferImageConfig): ILeaferImage
     recycle(image: ILeaferImage): void
     clearRecycled(): void
+    isPixel(config: ILeaferImageConfig): boolean // png / svg / webp
+    isFormat(format: IExportFileType, config: ILeaferImageConfig): boolean
     destroy(): void
 }

package/src/index.ts

@@ -5,7 +5,7 @@ export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
 
-export { ILeafData, IDataProcessor } from './data/ILeafData'
+export { ILeafData, IDataProcessor, ILeafDataOptions } from './data/ILeafData'
 export { ILeafLayout, ILayoutLocationType, ILayoutBoundsType } from './layout/ILeafLayout'
 
 export { ILeafDataProxy, ILeafDataProxyModule } from './display/module/ILeafDataProxy'
@@ -20,7 +20,7 @@ export { IBranchRender, IBranchRenderModule } from './display/module/IBranchRend
 export { IRenderer, IRendererConfig, IRenderOptions } from './renderer/IRenderer'
 export { IWatcher, IWatchEventData, IWatcherConfig } from './watcher/IWatcher'
 export { ILayouter, ILayoutChangedData, ILayoutBlockData, ILayouterConfig, IPartLayoutConfig } from './layouter/ILayouter'
-export { ISelector, ISelectorConfig, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
+export { ISelector, ISelectorConfig, IFindMethod, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
 
 export { ICanvasManager } from './canvas/ICanvasManager'
 export { IHitCanvasManager } from './canvas/IHitCanvasManager'
@@ -35,7 +35,7 @@ export { IPlugin } from './plugin/IPlugin'
 
 
 export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
-export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType } from './canvas/ISkiaCanvas'
+export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType, ISkiaNAPICanvas } from './canvas/ISkiaCanvas'
 export { IPathDrawer, IPathCreator } from './path/IPathDrawer'
 export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
@@ -44,7 +44,7 @@ export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnE
 export { IExportFileType, IExportImageType } from './file/IFileType'
 
 export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
-export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode, IMultiTouchData, IKeepTouchData } from './event/IEvent'
+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 { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
 

package/src/interaction/IInteraction.ts

@@ -48,6 +48,7 @@ export interface IInteraction extends IControl {
     keyUp(data: IKeyEvent): void
 
     findPath(data: IPointerEvent, options?: ISelectPathOptions): ILeafList
+    isDrag(leaf: ILeaf): boolean
 
     updateDownData(data?: IPointerEvent): void
     updateHoverData(data: IPointerEvent): void
@@ -82,7 +83,7 @@ export interface IMoveConfig {
 }
 
 export interface IWheelConfig {
-    zoomMode?: boolean
+    zoomMode?: boolean | 'mouse'
     zoomSpeed?: number // 取值范围 0 ～ 1, 默认0.5
     moveSpeed?: number
     rotateSpeed?: number // 取值范围 0 ～ 1, 默认0.5

package/src/layout/ILeafLayout.ts

@@ -8,7 +8,7 @@ export interface ILeafLayout {
 
     leaf: ILeaf
 
-    useZoomProxy: boolean
+    proxyZoom: boolean
 
     // inner
 
@@ -30,10 +30,8 @@ export interface ILeafLayout {
 
     // matrix changed
     matrixChanged: boolean // include positionChanged scaleChanged skewChanged
-    positionChanged: boolean // x, y
-    originChanged?: boolean // originX originY
     scaleChanged: boolean // scaleX scaleY
-    rotationChanged: boolean // rotaiton, skewX scaleY 数据更新
+    rotationChanged: boolean // rotaiton, skewX skewY 数据更新
 
     // bounds changed
     boundsChanged: boolean
@@ -80,9 +78,9 @@ export interface ILeafLayout {
     renderChange(): void
 
     // matrix
-    positionChange(): void
     scaleChange(): void
     rotationChange(): void
+    matrixChange(): void
 
     // face
     surfaceChange(): void

package/src/math/IMath.ts

@@ -57,10 +57,11 @@ export interface IBounds extends IBoundsData {
     clone(): IBounds
 
     scale(scaleX: number, scaleY?: number): IBounds
+    scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IBounds
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds
     getFitMatrix(put: IBoundsData): IMatrix
 
-    spread(size: number): IBounds
+    spread(spreadX: number, spreadY?: number): IBounds
     ceil(): IBounds
     unsign(): IBounds
 

package/src/platform/IPlatform.ts

@@ -4,12 +4,14 @@ import { ILeaf } from '../display/ILeaf'
 import { IExportFileType, IExportImageType } from '../file/IFileType'
 import { IBoundsData, ISizeData } from '../math/IMath'
 import { IObject } from '../data/IData'
+import { ICanvasType } from '../canvas/ISkiaCanvas'
 
 export interface IPlatform {
     name?: 'web' | 'node' | 'miniapp'
     os?: 'Mac' | 'Windows' | 'Linux'
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
+    canvasType?: ICanvasType
     isWorker?: boolean
     isMobile?: boolean
     devicePixelRatio?: number
@@ -28,6 +30,13 @@ export interface IPlatform {
         loadImage(url: string): Promise<any>
         noRepeat?: string  // fix: 微信小程序 createPattern 直接使用 no-repeat 有bug，导致无法显示
     },
+    roundRectPatch?: boolean //  fix: skia-canvas roundRect
+    ellipseToCurve?: boolean, // fix: skia 绘制圆环和椭圆弧
+    event?: {
+        stopDefault(origin: IObject): void
+        stopNow(origin: IObject): void
+        stop(origin: IObject): void
+    },
     miniapp?: IMiniapp
     imageSuffix?: string // 需要带上后缀区分dom中image标签的缓存，否则会导致浏览器缓存跨域问题
 }

package/src/renderer/IRenderer.ts

@@ -5,6 +5,7 @@ import { IFunction } from '../function/IFunction'
 import { IControl } from '../control/IControl'
 
 export interface IRenderOptions {
+    includes?: boolean,
     bounds?: IBounds,
     hideBounds?: IBounds,
     matrix?: IMatrix,

package/src/selector/ISelector.ts

@@ -19,17 +19,24 @@ export interface ISelectorConfig {
 
 }
 
+export interface IFindMethod {
+    (leaf: ILeaf, options?: any): any
+}
+
 export interface ISelector {
     target: ILeaf
 
+    list: ILeafList
+
     config: ISelectorConfig
 
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult
 
-    find(name: number | string, branch?: ILeaf): ILeaf | ILeaf[]
-    getByInnerId(name: number, branch?: ILeaf): ILeaf
-    getById(name: string, branch?: ILeaf): ILeaf
-    getByClassName(name: string, branch?: ILeaf): ILeaf[]
-    getByTagName(name: string, branch?: ILeaf): ILeaf[]
+    getBy(condition: number | string | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[]
+    getByInnerId(innerId: number, branch?: ILeaf): ILeaf
+    getById(id: string, branch?: ILeaf): ILeaf
+    getByClassName(className: string, branch?: ILeaf): ILeaf[]
+    getByTag(tag: string, branch?: ILeaf): ILeaf[]
+    getByMethod(method: IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[]
     destroy(): void
 }

package/types/index.d.ts

@@ -133,9 +133,10 @@ interface IBounds extends IBoundsData {
     copy(bounds: IBoundsData): IBounds;
     clone(): IBounds;
     scale(scaleX: number, scaleY?: number): IBounds;
+    scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IBounds;
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds;
     getFitMatrix(put: IBoundsData): IMatrix;
-    spread(size: number): IBounds;
+    spread(spreadX: number, spreadY?: number): IBounds;
     ceil(): IBounds;
     unsign(): IBounds;
     add(bounds: IBoundsData): IBounds;
@@ -269,6 +270,7 @@ interface ILayouter extends IControl {
 }
 
 interface IEvent {
+    origin?: IObject;
     type?: string;
     target?: IEventTarget;
     current?: IEventTarget;
@@ -319,25 +321,6 @@ interface ILayoutEvent extends IEvent {
 interface IWatchEvent extends IEvent {
     readonly data: IWatchEventData;
 }
-interface ITransformEventData {
-    x: number;
-    y: number;
-    scaleX: number;
-    scaleY: number;
-    rotation: number;
-    readonly zooming: boolean;
-    readonly moving: boolean;
-    readonly rotating: boolean;
-    readonly changing: boolean;
-}
-interface ITransformEvent extends IEvent, ITransformEventData {
-    readonly x: number;
-    readonly y: number;
-    readonly scaleX: number;
-    readonly scaleY: number;
-    readonly rotation: number;
-}
-type TransformMode = 'move' | 'zoom' | 'rotate';
 interface IMultiTouchData {
     move: IPointData;
     scale: number;
@@ -886,6 +869,7 @@ interface IPointDataFunction {
 }
 
 interface IRenderOptions {
+    includes?: boolean;
     bounds?: IBounds;
     hideBounds?: IBounds;
     matrix?: IMatrix;
@@ -926,6 +910,8 @@ type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>;
 interface ILeafDataProxy {
     __setAttr?(name: string, newValue: __Value): void;
     __getAttr?(name: string): __Value;
+    setProxyAttr?(name: string, newValue: __Value): void;
+    getProxyAttr?(name: string): __Value;
 }
 
 type ILeafMatrixModule = ILeafMatrix & ThisType<ILeaf>;
@@ -953,7 +939,7 @@ type ILayoutLocationType = 'world' | 'local' | 'inner';
 type ILayoutBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render';
 interface ILeafLayout {
     leaf: ILeaf;
-    useZoomProxy: boolean;
+    proxyZoom: boolean;
     boxBounds: IBoundsData;
     strokeBounds: IBoundsData;
     renderBounds: IBoundsData;
@@ -962,8 +948,6 @@ interface ILeafLayout {
     localStrokeBounds: IBoundsData;
     localRenderBounds: IBoundsData;
     matrixChanged: boolean;
-    positionChanged: boolean;
-    originChanged?: boolean;
     scaleChanged: boolean;
     rotationChanged: boolean;
     boundsChanged: boolean;
@@ -993,9 +977,9 @@ interface ILeafLayout {
     localBoxChange(): void;
     strokeChange(): void;
     renderChange(): void;
-    positionChange(): void;
     scaleChange(): void;
     rotationChange(): void;
+    matrixChange(): void;
     surfaceChange(): void;
     opacityChange(): void;
     childrenSortChange(): void;
@@ -1024,7 +1008,7 @@ type ILeafMaskModule = ILeafMask & ThisType<ILeaf>;
 interface ILeafMask {
     __updateEraser?(value?: boolean): void;
     __updateMask?(value?: boolean): void;
-    __renderMask?(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void;
+    __renderMask?(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas, recycle?: boolean): void;
     __removeMask?(child?: ILeaf): void;
 }
 
@@ -1038,14 +1022,48 @@ interface IDataProcessor extends IObject {
     __setInput(name: string, value: any): void;
     __getInput(name: string): any;
     __removeInput(name: string): void;
-    __getInputData(): IObject;
+    __getInputData(options?: ILeafDataOptions): IObject;
     __setMiddle(name: string, value: any): void;
     __getMiddle(name: string): any;
     destroy(): void;
 }
+interface ILeafDataOptions {
+    attrs?: 'all' | string[];
+    children?: boolean;
+}
 interface ILeafData extends IDataProcessor, ILeafComputedData {
 }
 
+interface ISelectPathResult {
+    leaf: ILeaf;
+    path: ILeafList;
+    throughPath?: ILeafList;
+}
+interface ISelectPathOptions {
+    name?: string;
+    through?: boolean;
+    exclude?: ILeafList;
+    ignoreHittable?: boolean;
+}
+interface ISelectorConfig {
+}
+interface IFindMethod {
+    (leaf: ILeaf, options?: any): any;
+}
+interface ISelector {
+    target: ILeaf;
+    list: ILeafList;
+    config: ISelectorConfig;
+    getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult;
+    getBy(condition: number | string | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
+    getByInnerId(innerId: number, branch?: ILeaf): ILeaf;
+    getById(id: string, branch?: ILeaf): ILeaf;
+    getByClassName(className: string, branch?: ILeaf): ILeaf[];
+    getByTag(tag: string, branch?: ILeaf): ILeaf[];
+    getByMethod(method: IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
+    destroy(): void;
+}
+
 interface ICachedLeaf {
     canvas: ILeaferCanvas;
     matrix?: IMatrix;
@@ -1076,13 +1094,14 @@ interface ILeafAttrData {
     hittable: __Boolean;
     hitFill: IHitType;
     hitStroke: IHitType;
+    hitBox: __Boolean;
     hitChildren: __Boolean;
     hitSelf: __Boolean;
     hitRadius: __Number;
     cursor: ICursorType | ICursorType[];
 }
 type IHitType = 'path' | 'pixel' | 'all' | 'none';
-type IBlendMode = 'pass-through' | 'normal' | 'multiply' | 'screen' | 'overlay' | 'darken' | 'lighten' | 'color-dodge' | 'color-burn' | 'hard-light' | 'soft-light' | 'difference' | 'exclusion' | 'hue' | 'saturation' | 'color' | 'luminosity' | 'source-over' | 'source-in' | 'source-out' | 'source-atop' | 'destination-over' | 'destination-in' | 'destination-out' | 'destination-atop';
+type IBlendMode = 'pass-through' | 'normal' | 'multiply' | 'screen' | 'overlay' | 'darken' | 'lighten' | 'color-dodge' | 'color-burn' | 'hard-light' | 'soft-light' | 'difference' | 'exclusion' | 'hue' | 'saturation' | 'color' | 'luminosity' | 'source-over' | 'source-in' | 'source-out' | 'source-atop' | 'destination-over' | 'destination-in' | 'destination-out' | 'destination-atop' | 'xor';
 type IResizeType = 'size' | 'scale';
 interface IImageCursor {
     url: string;
@@ -1120,6 +1139,7 @@ interface ILeafInputData extends IObject {
     hittable?: __Boolean;
     hitFill?: IHitType;
     hitStroke?: IHitType;
+    hitBox?: __Boolean;
     hitChildren?: __Boolean;
     hitSelf?: __Boolean;
     hitRadius?: __Number;
@@ -1150,6 +1170,7 @@ interface ILeafComputedData {
     hittable?: boolean;
     hitFill?: IHitType;
     hitStroke?: IHitType;
+    hitBox?: boolean;
     hitChildren?: boolean;
     hitSelf?: boolean;
     hitRadius?: number;
@@ -1172,6 +1193,7 @@ interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatr
     isBranch?: boolean;
     isBranchLeaf?: boolean;
     __: ILeafData;
+    proxyData?: ILeafInputData;
     __layout: ILeafLayout;
     __world: IMatrixWithLayoutData;
     __local: IMatrixWithBoundsData;
@@ -1183,7 +1205,6 @@ interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatr
     readonly worldStrokeBounds: IBoundsData;
     readonly worldRenderBounds: IBoundsData;
     readonly worldOpacity: number;
-    __renderTime?: number;
     __level: number;
     __tempNumber?: number;
     readonly resizeable: boolean;
@@ -1196,15 +1217,22 @@ interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatr
     __parentWait?: IFunction[];
     __leaferWait?: IFunction[];
     destroyed: boolean;
+    reset(data?: ILeafInputData): void;
+    resetCustom(): void;
     waitParent(item: IFunction): void;
     waitLeafer(item: IFunction): void;
     nextRender(item: IFunction): void;
     __bindLeafer(leafer: ILeafer | null): void;
     set(data: IObject): void;
+    get(options?: ILeafDataOptions): ILeafInputData;
     toJSON(): IObject;
     toString(): string;
     __setAttr(attrName: string, newValue: __Value): void;
     __getAttr(attrName: string): __Value;
+    setProxyAttr(name: string, newValue: __Value): void;
+    getProxyAttr(name: string): __Value;
+    find(condition: number | string | IFindMethod): ILeaf[];
+    findOne(condition: number | string | IFindMethod): ILeaf;
     forceUpdate(attrName?: string): void;
     __updateWorldMatrix(): void;
     __updateLocalMatrix(): void;
@@ -1221,7 +1249,7 @@ interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatr
     __onUpdateSize(): void;
     __updateEraser(value?: boolean): void;
     __updateMask(value?: boolean): void;
-    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void;
+    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas, recycle?: boolean): void;
     __removeMask(child?: ILeaf): void;
     getWorld(attrName: IMatrixDecompositionAttr): number;
     getBounds(type: ILayoutBoundsType, locationType?: ILayoutLocationType): IBoundsData;
@@ -1259,31 +1287,6 @@ interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatr
     remove(child?: ILeaf, destroy?: boolean): void;
 }
 
-interface ISelectPathResult {
-    leaf: ILeaf;
-    path: ILeafList;
-    throughPath?: ILeafList;
-}
-interface ISelectPathOptions {
-    name?: string;
-    through?: boolean;
-    exclude?: ILeafList;
-    ignoreHittable?: boolean;
-}
-interface ISelectorConfig {
-}
-interface ISelector {
-    target: ILeaf;
-    config: ISelectorConfig;
-    getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult;
-    find(name: number | string, branch?: ILeaf): ILeaf | ILeaf[];
-    getByInnerId(name: number, branch?: ILeaf): ILeaf;
-    getById(name: string, branch?: ILeaf): ILeaf;
-    getByClassName(name: string, branch?: ILeaf): ILeaf[];
-    getByTagName(name: string, branch?: ILeaf): ILeaf[];
-    destroy(): void;
-}
-
 type IExportImageType = 'jpg' | 'png' | 'webp';
 type IExportFileType = IExportImageType | 'svg' | 'pdf' | 'json';
 
@@ -1331,9 +1334,8 @@ interface IUIEvent extends IEvent {
     buttons?: number;
     path?: ILeafList;
     throughPath?: ILeafList;
-    origin?: IObject;
-    getInner?(target?: ILeaf): IPointData;
-    getLocal?(target?: ILeaf): IPointData;
+    getInner?(relative?: ILeaf): IPointData;
+    getLocal?(relative?: ILeaf): IPointData;
 }
 interface IPointerEvent extends IUIEvent {
     width?: number;
@@ -1351,10 +1353,10 @@ interface IDragEvent extends IPointerEvent {
     moveY: number;
     totalX?: number;
     totalY?: number;
-    getInnerMove?(target?: ILeaf): IPointData;
-    getLocalMove?(target?: ILeaf): IPointData;
-    getInnerTotal?(target?: ILeaf): IPointData;
-    getLocalTotal?(target?: ILeaf): IPointData;
+    getInnerMove?(relative?: ILeaf): IPointData;
+    getLocalMove?(relative?: ILeaf): IPointData;
+    getInnerTotal?(relative?: ILeaf): IPointData;
+    getLocalTotal?(relative?: ILeaf): IPointData;
 }
 interface IDropEvent extends IPointerEvent {
     list: ILeafList;
@@ -1408,6 +1410,7 @@ interface IInteraction extends IControl {
     keyDown(data: IKeyEvent): void;
     keyUp(data: IKeyEvent): void;
     findPath(data: IPointerEvent, options?: ISelectPathOptions): ILeafList;
+    isDrag(leaf: ILeaf): boolean;
     updateDownData(data?: IPointerEvent): void;
     updateHoverData(data: IPointerEvent): void;
     updateCursor(hoverData?: IPointerEvent): void;
@@ -1434,7 +1437,7 @@ interface IMoveConfig {
     autoDistance?: number;
 }
 interface IWheelConfig {
-    zoomMode?: boolean;
+    zoomMode?: boolean | 'mouse';
     zoomSpeed?: number;
     moveSpeed?: number;
     rotateSpeed?: number;
@@ -1474,9 +1477,7 @@ interface IBranch extends ILeaf {
 
 interface IZoomView extends IBranch {
     zoomLayer?: ILeaf;
-    moveLayer?: ILeaf;
-    transformData?: ITransformEventData;
-    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void;
+    setZoomLayer(zoomLayer: ILeaf): void;
 }
 
 type ILeaferType = 'draw' | 'design' | 'board' | 'document' | 'user';
@@ -1506,10 +1507,12 @@ interface ILeafer extends IZoomView, IControl {
     hitCanvasManager?: IHitCanvasManager;
     autoLayout?: IAutoBounds;
     config: ILeaferConfig;
+    readonly cursorPoint: IPointData;
+    leafs: number;
     __eventIds: IEventListenerId[];
     __nextRenderWait: IFunction[];
     init(userConfig?: ILeaferConfig, parentApp?: IApp): void;
-    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void;
+    setZoomLayer(zoomLayer: ILeaf): void;
     forceFullRender(): void;
     updateCursor(): void;
     resize(size: IScreenSizeData): void;
@@ -1605,14 +1608,46 @@ interface IImageManager {
     get(config: ILeaferImageConfig): ILeaferImage;
     recycle(image: ILeaferImage): void;
     clearRecycled(): void;
+    isPixel(config: ILeaferImageConfig): boolean;
+    isFormat(format: IExportFileType, config: ILeaferImageConfig): boolean;
     destroy(): void;
 }
 
+type ICanvasType = 'skia' | 'napi' | 'canvas' | 'wx';
+interface ISkiaCanvas {
+    toBuffer(format: IExportFileType, config: ISkiaCanvasExportConfig): Promise<any>;
+    toBufferSync(format: IExportFileType, config: ISkiaCanvasExportConfig): any;
+    toDataURL(format: IExportImageType, config: ISkiaCanvasExportConfig): Promise<string>;
+    toDataURLSync(format: IExportImageType, config: ISkiaCanvasExportConfig): string;
+    saveAs(filename: string, config: ISkiaCanvasExportConfig): Promise<void>;
+    saveAsSync(filename: string, config: ISkiaCanvasExportConfig): void;
+}
+interface ISkiaCanvasExportConfig {
+    page?: number;
+    matte?: string;
+    density?: number;
+    quality?: number;
+    outline?: boolean;
+}
+interface ISkiaNAPICanvas {
+    encodeSync(format: 'webp' | 'jpeg', quality?: number): any;
+    encodeSync(format: 'png'): any;
+    encode(format: 'webp' | 'jpeg' | string, quality?: number): Promise<any>;
+    encode(format: 'png'): Promise<any>;
+    toBuffer(mime: 'image/png'): any;
+    toBuffer(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): any;
+    toDataURL(mime?: 'image/png'): string;
+    toDataURL(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): string;
+    toDataURLAsync(mime?: 'image/png'): Promise<string>;
+    toDataURLAsync(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): Promise<string>;
+}
+
 interface IPlatform {
     name?: 'web' | 'node' | 'miniapp';
     os?: 'Mac' | 'Windows' | 'Linux';
     requestRender?(render: IFunction): void;
     canvas?: ILeaferCanvas;
+    canvasType?: ICanvasType;
     isWorker?: boolean;
     isMobile?: boolean;
     devicePixelRatio?: number;
@@ -1631,6 +1666,13 @@ interface IPlatform {
         loadImage(url: string): Promise<any>;
         noRepeat?: string;
     };
+    roundRectPatch?: boolean;
+    ellipseToCurve?: boolean;
+    event?: {
+        stopDefault(origin: IObject): void;
+        stopNow(origin: IObject): void;
+        stop(origin: IObject): void;
+    };
     miniapp?: IMiniapp;
     imageSuffix?: string;
 }
@@ -1656,21 +1698,4 @@ interface IPlugin extends IObject {
     onLeafer?(leafer: ILeafer): void;
 }
 
-type ICanvasType = 'skia' | 'canvas' | 'wx';
-interface ISkiaCanvas {
-    toBuffer(format: IExportFileType, config: ISkiaCanvasExportConfig): Promise<any>;
-    toBufferSync(format: IExportFileType, config: ISkiaCanvasExportConfig): any;
-    toDataURL(format: IExportImageType, config: ISkiaCanvasExportConfig): Promise<string>;
-    toDataURLSync(format: IExportImageType, config: ISkiaCanvasExportConfig): string;
-    saveAs(filename: string, config: ISkiaCanvasExportConfig): Promise<void>;
-    saveAsSync(filename: string, config: ISkiaCanvasExportConfig): void;
-}
-interface ISkiaCanvasExportConfig {
-    page?: number;
-    matte?: string;
-    density?: number;
-    quality?: number;
-    outline?: boolean;
-}
-
-export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAnimateEvent, IApp, IAround, IAutoBounds, IAutoBoundsData, IBlendMode, IBlob, IBlobFunction, IBooleanMap, IBounds, IBoundsData, IBoundsDataHandle, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasContext2D, ICanvasManager, ICanvasStrokeOptions, ICanvasType, IChildEvent, IControl, ICreator, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDragEvent, IDropEvent, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventTarget, IEventer, IExportFileType, IExportImageType, IFunction, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IKeepTouchData, IKeyEvent, ILayoutBlockData, ILayoutBoundsType, ILayoutChangedData, ILayoutEvent, ILayoutLocationType, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMask, ILeafMaskModule, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeafer, ILeaferCanvas, ILeaferCanvasConfig, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, IMatrix, IMatrixData, IMatrixDecompositionAttr, IMatrixDecompositionData, IMatrixWithBoundsData, IMatrixWithLayoutData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMoveEvent, IMultiTouchData, INumberMap, IObject, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPlatform, IPlugin, IPoint, IPointData, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IResizeType, IRotateEvent, IScreenSizeData, ISelectPathOptions, ISelectPathResult, ISelector, ISelectorConfig, ISize, ISizeData, ISkiaCanvas, ISkiaCanvasExportConfig, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITransformEvent, ITransformEventData, ITwoPointBounds, ITwoPointBoundsData, IUICreator, IUIEvent, IUpdateEvent, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, TransformMode, VCommandData, ZCommandData, __Boolean, __Number, __Object, __String, __Value };
+export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAnimateEvent, IApp, IAround, IAutoBounds, IAutoBoundsData, IBlendMode, IBlob, IBlobFunction, IBooleanMap, IBounds, IBoundsData, IBoundsDataHandle, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasContext2D, ICanvasManager, ICanvasStrokeOptions, ICanvasType, IChildEvent, IControl, ICreator, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDragEvent, IDropEvent, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventTarget, IEventer, IExportFileType, IExportImageType, IFindMethod, IFunction, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IKeepTouchData, IKeyEvent, ILayoutBlockData, ILayoutBoundsType, ILayoutChangedData, ILayoutEvent, ILayoutLocationType, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMask, ILeafMaskModule, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeafer, ILeaferCanvas, ILeaferCanvasConfig, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, IMatrix, IMatrixData, IMatrixDecompositionAttr, IMatrixDecompositionData, IMatrixWithBoundsData, IMatrixWithLayoutData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMoveEvent, IMultiTouchData, INumberMap, IObject, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPlatform, IPlugin, IPoint, IPointData, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IResizeType, IRotateEvent, IScreenSizeData, ISelectPathOptions, ISelectPathResult, ISelector, ISelectorConfig, ISize, ISizeData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITwoPointBounds, ITwoPointBoundsData, IUICreator, IUIEvent, IUpdateEvent, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData, __Boolean, __Number, __Object, __String, __Value };