@leafer/interface 1.0.2 → 1.0.3

package/package.json

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

package/src/display/ILeaf.ts

@@ -5,7 +5,7 @@ import { ILeaferCanvas, IHitCanvas } from '../canvas/ILeaferCanvas'
 import { IRenderOptions } from '../renderer/IRenderer'
 
 import { IObject, INumber, IBoolean, IValue, IString, IPathString, IFourNumber } from '../data/IData'
-import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IRadiusPointData, ILayoutBoundsData, IMatrixData, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAutoBoxData, IUnitPointData } from '../math/IMath'
+import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IRadiusPointData, ILayoutBoundsData, IMatrixData, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAutoBoxData, IUnitPointData, IRotationPointData } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
 
 import { ILeafDataProxy } from './module/ILeafDataProxy'
@@ -19,6 +19,7 @@ import { IFindMethod } from '../selector/ISelector'
 import { IPathCommandData } from '../path/IPathCommand'
 import { IWindingRule, IPath2D } from '../canvas/ICanvas'
 import { IJSONOptions } from '../file/IExport'
+import { IMotionPathData } from '../path/IPathData'
 
 
 export interface ICachedLeaf {
@@ -28,97 +29,6 @@ export interface ICachedLeaf {
 }
 
 
-export interface ILeafAttrData {
-    // layer data
-    id?: IString
-    name?: IString
-    className?: IString
-
-    blendMode?: IBlendMode
-    opacity?: INumber
-    visible?: IBoolean | 0 // 0 = display: none
-    selected?: IBoolean
-    disabled?: IBoolean
-    locked?: IBoolean
-    zIndex?: INumber
-
-    mask?: IBoolean | IMaskType
-    eraser?: IBoolean | IEraserType
-
-    // layout data
-    x?: INumber
-    y?: INumber
-    width?: INumber
-    height?: INumber
-    scaleX?: INumber
-    scaleY?: INumber
-    rotation?: INumber
-    skewX?: INumber
-    skewY?: INumber
-
-    scale?: INumber | IPointData // helper
-
-    offsetX?: INumber
-    offsetY?: INumber
-    scrollX?: INumber
-    scrollY?: INumber
-
-    origin?: IAlign | IUnitPointData
-    around?: IAlign | IUnitPointData
-
-    lazy?: IBoolean
-    pixelRatio?: INumber
-
-    path?: IPathCommandData | IPathString
-    windingRule?: IWindingRule
-    closed?: IBoolean
-
-    // auto layout
-    flow?: IFlowType
-    padding?: IFourNumber
-    gap?: IGap | IPointGap
-    flowAlign?: IFlowAlign | IFlowAxisAlign
-    flowWrap?: IFlowWrap
-    itemBox?: IFlowBoxType
-
-    inFlow?: IBoolean
-    autoWidth?: IAutoSize
-    autoHeight?: IAutoSize
-    lockRatio?: IBoolean
-    autoBox?: IAutoBoxData | IConstraint
-
-    widthRange?: IRangeSize
-    heightRange?: IRangeSize
-
-    // interactive
-    draggable?: IBoolean | IAxis
-    dragBounds?: IBoundsData | 'parent'
-
-    editable?: IBoolean
-
-    hittable?: IBoolean
-    hitFill?: IHitType
-    hitStroke?: IHitType
-    hitBox?: IBoolean
-    hitChildren?: IBoolean
-    hitSelf?: IBoolean
-    hitRadius?: INumber
-
-    cursor?: ICursorType | ICursorType[]
-
-    event?: IEventMap
-
-    normalStyle?: ILeafInputData // restore hover / press / focus / selected / disabled style
-    hoverStyle?: ILeafInputData
-    pressStyle?: ILeafInputData
-    focusStyle?: ILeafInputData
-    selectedStyle?: ILeafInputData
-    disabledStyle?: ILeafInputData
-
-    // 预留给用户使用的数据对象
-    data: IObject
-}
-
 export type ISide = 'width' | 'height'
 
 export type IAxis = 'x' | 'y'
@@ -293,9 +203,9 @@ export type IStateStyleType =
     | 'selectedStyle'
     | 'disabledStyle'
 
-export interface ILeafInputData {
-    tag?: string
 
+
+export interface ILeafAttrData {
     // layer data
     id?: IString
     name?: IString
@@ -303,7 +213,7 @@ export interface ILeafInputData {
 
     blendMode?: IBlendMode
     opacity?: INumber
-    visible?: IBoolean | 0
+    visible?: IBoolean | 0 // 0 = display: none
     selected?: IBoolean
     disabled?: IBoolean
     locked?: IBoolean
@@ -371,25 +281,30 @@ export interface ILeafInputData {
     hitSelf?: IBoolean
     hitRadius?: INumber
 
+    button?: IBoolean
     cursor?: ICursorType | ICursorType[]
 
-    event?: IEventMap
+    motionPath?: IBoolean
+    motion?: INumber | IUnitData
+    motionRotation?: INumber | IBoolean
+
+    normalStyle?: IObject
 
-    normalStyle?: ILeafInputData
-    hoverStyle?: ILeafInputData
-    pressStyle?: ILeafInputData
-    focusStyle?: ILeafInputData
-    selectedStyle?: ILeafInputData
-    disabledStyle?: ILeafInputData
+    event?: IEventMap
 
     // 预留给用户使用的数据对象
     data?: IObject
+}
+
+export interface ILeafInputData extends ILeafAttrData {
+    tag?: string
 
     children?: ILeafInputData[]
 
     // other
     noBounds?: boolean
 }
+
 export interface ILeafComputedData {
     // layer data
     id?: string
@@ -464,15 +379,14 @@ export interface ILeafComputedData {
     hitSelf?: boolean
     hitRadius?: number
 
+    button?: boolean
     cursor?: ICursorType | ICursorType[]
 
-    normalStyle?: ILeafInputData
-    hoverStyle?: ILeafInputData
-    pressStyle?: ILeafInputData
-    focusStyle?: ILeafInputData
-    selectedStyle?: ILeafInputData
-    disabledStyle?: ILeafInputData
+    motionPath?: boolean
+    motion?: number | IUnitData
+    motionRotation?: number | boolean
 
+    normalStyle?: IObject
 
     // 预留给用户使用的数据对象
     data?: IObject
@@ -499,6 +413,7 @@ export interface ILeafComputedData {
     __pathInputed?: number // 是否为输入path, 0：否，1：是，2：永远是（不自动检测）
     __pathForRender?: IPathCommandData
     __path2DForRender?: IPath2D
+    __pathForMotion?: IMotionPathData
 }
 
 export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
@@ -526,6 +441,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __proxyData?: ILeafInputData
 
     syncEventer?: ILeaf // 同步触发一样事件的元素
+    lockNormalStyle?: boolean
 
     __layout: ILeafLayout
 
@@ -556,7 +472,12 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     readonly __worldFlipped: boolean
 
+    animation?: IObject
+    animationOut?: IObject
+
     __hasAutoLayout?: boolean
+    __hasMotionPath?: boolean
+
     __hasMask?: boolean
     __hasEraser?: boolean
     __hitCanvas?: IHitCanvas
@@ -572,9 +493,6 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     readonly pathInputed: boolean
 
-    __parentWait?: IFunction[]
-    __leaferWait?: IFunction[]
-
     destroyed: boolean
 
     reset(data?: ILeafInputData): void
@@ -587,7 +505,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     __bindLeafer(leafer: ILeaferBase | null): void
 
-    set(data: IObject): void
+    set(data: IObject, isTemp?: boolean): void
     get(name?: string | string[] | IObject): ILeafInputData | IValue
     setAttr(name: string, value: any): void
     getAttr(name: string): any
@@ -613,6 +531,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     focus(value?: boolean): void
 
+    updateState(): void
     updateLayout(): void
     forceUpdate(attrName?: string): void
     forceRender(_bounds?: IBoundsData): void
@@ -665,16 +584,19 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     worldToInner(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
     innerToWorld(inner: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
 
+    getBoxPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getBoxPointByInner(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getInnerPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getInnerPointByBox(box: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getInnerPointByLocal(local: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getLocalPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getLocalPointByInner(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getPagePoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getWorldPoint(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getWorldPointByBox(box: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getWorldPointByLocal(local: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
-    getPagePoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getWorldPointByPage(page: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
 
-
     // transform
     setTransform(transform?: IMatrixData, resize?: boolean): void
     transform(transform?: IMatrixData, resize?: boolean): void
@@ -725,7 +647,16 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __updatePath(): void
     __updateRenderPath(): void
 
-    // 
+    // motion path
+    getMotionPathData(): IMotionPathData
+    getMotionPoint(motionDistance: number | IUnitData): IRotationPointData
+    getMotionTotal(): number
+
+    __updateMotionPath(): void
+
+    __runAnimation(type: 'in' | 'out', complete?: IFunction): void
+
+    __emitLifeEvent(type: string): void
 
     // branch
     children?: ILeaf[]

package/src/display/module/ILeafDataProxy.ts

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

package/src/display/module/ILeafEventer.ts

@@ -1,5 +1,5 @@
 import { ILeaf } from '../ILeaf'
-import { IEventListener, IEventListenerId, IEventListenerOptions } from '../../event/IEventer'
+import { IEventListener, IEventListenerId, IEventListenerOptions, IEventMap } from '../../event/IEventer'
 import { } from '@leafer/interface'
 import { IEvent } from '../../event/IEvent'
 import { IObject } from '../../data/IData'
@@ -7,7 +7,7 @@ import { IObject } from '../../data/IData'
 export type ILeafEventerModule = ILeafEventer & ThisType<ILeaf>
 
 export interface ILeafEventer {
-    on?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
+    on?(type: string | string[] | IEventMap, 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
     off_?(id: IEventListenerId | IEventListenerId[]): void
@@ -15,4 +15,5 @@ export interface ILeafEventer {
     emit?(type: string, event?: IEvent | IObject, capture?: boolean): void
     emitEvent?(event?: IEvent, capture?: boolean): void
     hasEvent?(type: string, capture?: boolean): boolean
+    destroyEventer?(): void
 }

package/src/event/IEventer.ts

@@ -36,12 +36,13 @@ export interface IEventListenerId {
 export type InnerId = number
 
 export interface IEventer extends ILeafEventer {
-
     readonly innerId: InnerId
     __captureMap?: IEventListenerMap
     __bubbleMap?: IEventListenerMap
+    syncEventer?: IEventer
+    event?: IEventMap
 
-    on(type: string | string[], listener: IEventListener, options?: IEventOption): void
+    on(type: string | string[] | IEventMap, 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

package/src/event/IUIEvent.ts

@@ -23,9 +23,15 @@ export interface IUIEvent extends IEvent {
     path?: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
-    getPage?(): IPointData
+    getBoxPoint?(relative?: ILeaf): IPointData
+    getInnerPoint?(relative?: ILeaf): IPointData
+    getLocalPoint?(relative?: ILeaf): IPointData
+    getPagePoint?(): IPointData
+
+    // 兼容代码，未来可移除
     getInner?(relative?: ILeaf): IPointData
     getLocal?(relative?: ILeaf): IPointData
+    getPage?(): IPointData
 }
 
 

package/src/index.ts

@@ -36,6 +36,7 @@ export { IPlugin } from './plugin/IPlugin'
 export { ILeaferCanvas, ILeaferCanvasView, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ICanvasCacheOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
 export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType, ISkiaNAPICanvas } from './canvas/ISkiaCanvas'
 export { IPathDrawer, IPathCreator } from './path/IPathDrawer'
+export { IMotionPathData } from './path/IPathData'
 export { IWindingRule, ICanvasContext2D, ICanvasContext2DSettings, ITextMetrics, IPath2D, ICanvasPattern } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
 
@@ -52,5 +53,5 @@ export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, ITo
 
 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 { IPoint, IPointData, IFromToData, IUnitPointData, IRotationPointData, 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

@@ -53,6 +53,9 @@ export interface IInteraction extends IControl {
 
     multiTouch(data: IUIEvent, list: IKeepTouchData[]): void
 
+    menu(data: IPointerEvent): void
+    menuTap(data: IPointerEvent): void
+
     move(data: IMoveEvent): void
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void

package/src/layout/ILeafLayout.ts

@@ -56,6 +56,7 @@ export interface ILeafLayout {
     hitCanvasChanged: boolean
 
     childrenSortChanged?: boolean
+    stateStyleChanged?: boolean // hoverStyle ...
 
     // keep state
     affectScaleOrRotation: boolean

package/src/math/IMath.ts

@@ -6,10 +6,8 @@ export interface IPointData {
     y: number
 }
 
-export interface IUnitPointData {
+export interface IUnitPointData extends IPointData {
     type?: 'percent' | 'px'
-    x: number
-    y: number
 }
 
 export interface IFromToData {
@@ -17,6 +15,10 @@ export interface IFromToData {
     to: IPointData
 }
 
+export interface IRotationPointData extends IPointData {
+    rotation: number
+}
+
 export interface IScrollPointData {
     scrollX: number
     scrollY: number

package/src/path/IPathData.ts

@@ -0,0 +1,6 @@
+import { IPathCommandData } from './IPathCommand'
+export interface IMotionPathData {
+    total: number
+    segments: number[]  // 每个命令对应一个片段距离
+    data: IPathCommandData // M L C Z 命令的路径数据
+}

package/types/index.d.ts

@@ -4,15 +4,16 @@ interface IPointData {
     x: number;
     y: number;
 }
-interface IUnitPointData {
+interface IUnitPointData extends IPointData {
     type?: 'percent' | 'px';
-    x: number;
-    y: number;
 }
 interface IFromToData {
     from: IPointData;
     to: IPointData;
 }
+interface IRotationPointData extends IPointData {
+    rotation: number;
+}
 interface IScrollPointData {
     scrollX: number;
     scrollY: number;
@@ -412,7 +413,7 @@ interface IKeepTouchData {
 
 type ILeafEventerModule = ILeafEventer & ThisType<ILeaf>;
 interface ILeafEventer {
-    on?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void;
+    on?(type: string | string[] | IEventMap, 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;
     off_?(id: IEventListenerId | IEventListenerId[]): void;
@@ -420,6 +421,7 @@ interface ILeafEventer {
     emit?(type: string, event?: IEvent | IObject, capture?: boolean): void;
     emitEvent?(event?: IEvent, capture?: boolean): void;
     hasEvent?(type: string, capture?: boolean): boolean;
+    destroyEventer?(): void;
 }
 
 type IEventListener = IFunction;
@@ -448,7 +450,9 @@ interface IEventer extends ILeafEventer {
     readonly innerId: InnerId;
     __captureMap?: IEventListenerMap;
     __bubbleMap?: IEventListenerMap;
-    on(type: string | string[], listener: IEventListener, options?: IEventOption): void;
+    syncEventer?: IEventer;
+    event?: IEventMap;
+    on(type: string | string[] | IEventMap, 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;
@@ -841,6 +845,7 @@ interface ILeafLayout {
     opacityChanged: boolean;
     hitCanvasChanged: boolean;
     childrenSortChanged?: boolean;
+    stateStyleChanged?: boolean;
     affectScaleOrRotation: boolean;
     affectRotation: boolean;
     affectChildrenSort?: boolean;
@@ -1106,6 +1111,7 @@ type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>;
 interface ILeafDataProxy {
     __setAttr?(name: string, newValue: IValue): boolean;
     __getAttr?(name: string): IValue;
+    __realSetAttr?(name: string, newValue: IValue): void;
     setProxyAttr?(name: string, newValue: IValue): void;
     getProxyAttr?(name: string): IValue;
 }
@@ -1235,78 +1241,17 @@ interface ISelector {
     destroy(): void;
 }
 
+interface IMotionPathData {
+    total: number;
+    segments: number[];
+    data: IPathCommandData;
+}
+
 interface ICachedLeaf {
     canvas: ILeaferCanvas;
     matrix?: IMatrix;
     bounds: IBoundsData;
 }
-interface ILeafAttrData {
-    id?: IString;
-    name?: IString;
-    className?: IString;
-    blendMode?: IBlendMode;
-    opacity?: INumber;
-    visible?: IBoolean | 0;
-    selected?: IBoolean;
-    disabled?: IBoolean;
-    locked?: IBoolean;
-    zIndex?: INumber;
-    mask?: IBoolean | IMaskType;
-    eraser?: IBoolean | IEraserType;
-    x?: INumber;
-    y?: INumber;
-    width?: INumber;
-    height?: INumber;
-    scaleX?: INumber;
-    scaleY?: INumber;
-    rotation?: INumber;
-    skewX?: INumber;
-    skewY?: INumber;
-    scale?: INumber | IPointData;
-    offsetX?: INumber;
-    offsetY?: INumber;
-    scrollX?: INumber;
-    scrollY?: INumber;
-    origin?: IAlign | IUnitPointData;
-    around?: IAlign | IUnitPointData;
-    lazy?: IBoolean;
-    pixelRatio?: INumber;
-    path?: IPathCommandData | IPathString;
-    windingRule?: IWindingRule;
-    closed?: IBoolean;
-    flow?: IFlowType;
-    padding?: IFourNumber;
-    gap?: IGap | IPointGap;
-    flowAlign?: IFlowAlign | IFlowAxisAlign;
-    flowWrap?: IFlowWrap;
-    itemBox?: IFlowBoxType;
-    inFlow?: IBoolean;
-    autoWidth?: IAutoSize;
-    autoHeight?: IAutoSize;
-    lockRatio?: IBoolean;
-    autoBox?: IAutoBoxData | IConstraint;
-    widthRange?: IRangeSize;
-    heightRange?: IRangeSize;
-    draggable?: IBoolean | IAxis;
-    dragBounds?: IBoundsData | 'parent';
-    editable?: IBoolean;
-    hittable?: IBoolean;
-    hitFill?: IHitType;
-    hitStroke?: IHitType;
-    hitBox?: IBoolean;
-    hitChildren?: IBoolean;
-    hitSelf?: IBoolean;
-    hitRadius?: INumber;
-    cursor?: ICursorType | ICursorType[];
-    event?: IEventMap;
-    normalStyle?: ILeafInputData;
-    hoverStyle?: ILeafInputData;
-    pressStyle?: ILeafInputData;
-    focusStyle?: ILeafInputData;
-    selectedStyle?: ILeafInputData;
-    disabledStyle?: ILeafInputData;
-    data: IObject;
-}
 type ISide = 'width' | 'height';
 type IAxis = 'x' | 'y';
 type IAxisReverse = 'x-reverse' | 'y-reverse';
@@ -1360,8 +1305,7 @@ type IFlowAlign = IAlign | IBaseLineAlign;
 type IAround = IAlign | IUnitPointData;
 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;
+interface ILeafAttrData {
     id?: IString;
     name?: IString;
     className?: IString;
@@ -1418,15 +1362,17 @@ interface ILeafInputData {
     hitChildren?: IBoolean;
     hitSelf?: IBoolean;
     hitRadius?: INumber;
+    button?: IBoolean;
     cursor?: ICursorType | ICursorType[];
+    motionPath?: IBoolean;
+    motion?: INumber | IUnitData;
+    motionRotation?: INumber | IBoolean;
+    normalStyle?: IObject;
     event?: IEventMap;
-    normalStyle?: ILeafInputData;
-    hoverStyle?: ILeafInputData;
-    pressStyle?: ILeafInputData;
-    focusStyle?: ILeafInputData;
-    selectedStyle?: ILeafInputData;
-    disabledStyle?: ILeafInputData;
     data?: IObject;
+}
+interface ILeafInputData extends ILeafAttrData {
+    tag?: string;
     children?: ILeafInputData[];
     noBounds?: boolean;
 }
@@ -1486,13 +1432,12 @@ interface ILeafComputedData {
     hitChildren?: boolean;
     hitSelf?: boolean;
     hitRadius?: number;
+    button?: boolean;
     cursor?: ICursorType | ICursorType[];
-    normalStyle?: ILeafInputData;
-    hoverStyle?: ILeafInputData;
-    pressStyle?: ILeafInputData;
-    focusStyle?: ILeafInputData;
-    selectedStyle?: ILeafInputData;
-    disabledStyle?: ILeafInputData;
+    motionPath?: boolean;
+    motion?: number | IUnitData;
+    motionRotation?: number | boolean;
+    normalStyle?: IObject;
     data?: IObject;
     __childBranchNumber?: number;
     __complex?: boolean;
@@ -1510,6 +1455,7 @@ interface ILeafComputedData {
     __pathInputed?: number;
     __pathForRender?: IPathCommandData;
     __path2DForRender?: IPath2D;
+    __pathForMotion?: IMotionPathData;
 }
 interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
     tag: string;
@@ -1530,6 +1476,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     proxyData?: ILeafInputData;
     __proxyData?: ILeafInputData;
     syncEventer?: ILeaf;
+    lockNormalStyle?: boolean;
     __layout: ILeafLayout;
     __world: IMatrixWithBoundsScaleData;
     __local?: IMatrixWithBoundsData;
@@ -1549,7 +1496,10 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __level: number;
     __tempNumber?: number;
     readonly __worldFlipped: boolean;
+    animation?: IObject;
+    animationOut?: IObject;
     __hasAutoLayout?: boolean;
+    __hasMotionPath?: boolean;
     __hasMask?: boolean;
     __hasEraser?: boolean;
     __hitCanvas?: IHitCanvas;
@@ -1561,8 +1511,6 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     readonly __ignoreHitWorld: boolean;
     readonly __inLazyBounds: boolean;
     readonly pathInputed: boolean;
-    __parentWait?: IFunction[];
-    __leaferWait?: IFunction[];
     destroyed: boolean;
     reset(data?: ILeafInputData): void;
     resetCustom(): void;
@@ -1571,7 +1519,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     nextRender(item: IFunction, bind?: IObject, off?: 'off'): void;
     removeNextRender(item: IFunction): void;
     __bindLeafer(leafer: ILeaferBase | null): void;
-    set(data: IObject): void;
+    set(data: IObject, isTemp?: boolean): void;
     get(name?: string | string[] | IObject): ILeafInputData | IValue;
     setAttr(name: string, value: any): void;
     getAttr(name: string): any;
@@ -1590,6 +1538,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     findOne(condition: number | string | IFindMethod, options?: any): ILeaf | undefined;
     findId(id: number | string): ILeaf | undefined;
     focus(value?: boolean): void;
+    updateState(): void;
     updateLayout(): void;
     forceUpdate(attrName?: string): void;
     forceRender(_bounds?: IBoundsData): void;
@@ -1624,13 +1573,17 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
     worldToInner(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
     innerToWorld(inner: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
+    getBoxPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
+    getBoxPointByInner(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getInnerPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
+    getInnerPointByBox(box: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getInnerPointByLocal(local: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getLocalPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getLocalPointByInner(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
+    getPagePoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getWorldPoint(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
+    getWorldPointByBox(box: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getWorldPointByLocal(local: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
-    getPagePoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getWorldPointByPage(page: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     setTransform(transform?: IMatrixData, resize?: boolean): void;
     transform(transform?: IMatrixData, resize?: boolean): void;
@@ -1667,6 +1620,12 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __drawRenderPath(canvas: ILeaferCanvas): void;
     __updatePath(): void;
     __updateRenderPath(): void;
+    getMotionPathData(): IMotionPathData;
+    getMotionPoint(motionDistance: number | IUnitData): IRotationPointData;
+    getMotionTotal(): number;
+    __updateMotionPath(): void;
+    __runAnimation(type: 'in' | 'out', complete?: IFunction): void;
+    __emitLifeEvent(type: string): void;
     children?: ILeaf[];
     __updateSortChildren(): void;
     add(child: ILeaf, index?: number): void;
@@ -1731,9 +1690,13 @@ interface IUIEvent extends IEvent {
     buttons?: number;
     path?: ILeafList;
     throughPath?: ILeafList;
-    getPage?(): IPointData;
+    getBoxPoint?(relative?: ILeaf): IPointData;
+    getInnerPoint?(relative?: ILeaf): IPointData;
+    getLocalPoint?(relative?: ILeaf): IPointData;
+    getPagePoint?(): IPointData;
     getInner?(relative?: ILeaf): IPointData;
     getLocal?(relative?: ILeaf): IPointData;
+    getPage?(): IPointData;
 }
 interface IPointerEvent extends IUIEvent {
     width?: number;
@@ -1817,6 +1780,8 @@ interface IInteraction extends IControl {
     pointerUp(data?: IPointerEvent): void;
     pointerCancel(): void;
     multiTouch(data: IUIEvent, list: IKeepTouchData[]): void;
+    menu(data: IPointerEvent): void;
+    menuTap(data: IPointerEvent): void;
     move(data: IMoveEvent): void;
     zoom(data: IZoomEvent): void;
     rotate(data: IRotateEvent): void;
@@ -2167,4 +2132,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, 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 };
+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, IMotionPathData, 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, IRotationPointData, 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 };