@leafer/interface 1.0.0-bate → 1.0.0-beta.10

package/package.json

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

package/src/app/ILeafer.ts

@@ -8,13 +8,13 @@ import { IWatcher, IWatcherConfig } from '../watcher/IWatcher'
 import { IAutoBounds, IScreenSizeData } from '../math/IMath'
 import { ICanvasManager } from '../canvas/ICanvasManager'
 import { IHitCanvasManager } from '../canvas/IHitCanvasManager'
-import { IImageManager } from '../image/IImageManager'
 import { IEventListenerId } from '../event/IEventer'
 import { IObject } from '../data/IData'
 import { IZoomView } from '../display/IView'
 import { IApp } from './IApp'
 import { ILeaferImage, ILeaferImageConfig } from '../image/ILeaferImage'
 import { IControl } from '../control/IControl'
+import { IFunction } from '../function/IFunction'
 
 
 export type ILeaferType = 'draw' | 'design' | 'board' | 'document' | 'user'
@@ -32,6 +32,7 @@ export interface ILeafer extends IZoomView, IControl {
     running: boolean
     ready: boolean
     viewReady: boolean
+    readonly viewLoaded: boolean
 
     pixelRatio: number
 
@@ -48,7 +49,6 @@ export interface ILeafer extends IZoomView, IControl {
 
     canvasManager: ICanvasManager
     hitCanvasManager?: IHitCanvasManager
-    imageManager: IImageManager
 
     autoLayout?: IAutoBounds
 
@@ -57,10 +57,16 @@ export interface ILeafer extends IZoomView, IControl {
     __eventIds: IEventListenerId[]
 
     init(userConfig?: ILeaferConfig, parentApp?: IApp): void
-
+    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void
     forceFullRender(): void
-
     resize(size: IScreenSizeData): void
+    waitViewLoaded(fun: IFunction): void
+}
+
+export interface ILeaferTypeCreator {
+    list: ILeaferTypeList
+    register(name: string, fn: ILeaferTypeFunction): void
+    run(name: string, leafer: ILeafer): void
 }
 
 export interface ILeaferTypeFunction {
@@ -71,7 +77,6 @@ export interface ILeaferTypeList {
     [key: string]: ILeaferTypeFunction
 }
 
-
 export interface ICreator {
     image?(options?: ILeaferImageConfig): ILeaferImage
     canvas?(options?: ILeaferCanvasConfig, manager?: ICanvasManager): ILeaferCanvas

package/src/canvas/ICanvas.ts

@@ -67,6 +67,10 @@ declare var CanvasGradient: {
     new(): CanvasGradient
 }
 
+interface ImageDataSettings {
+    colorSpace?: PredefinedColorSpace
+}
+
 interface CanvasImageData {
     createImageData(sw: number, sh: number, settings?: ImageDataSettings): ImageData
     createImageData(imagedata: ImageData): ImageData

package/src/canvas/ICanvasManager.ts

@@ -6,5 +6,5 @@ export interface ICanvasManager {
     recycle(old: ILeaferCanvas): void
     clearRecycled(): void
     clear(): void
-    destory(): void
+    destroy(): void
 }

package/src/canvas/IHitCanvasManager.ts

@@ -6,5 +6,5 @@ import { IHitCanvas } from './ILeaferCanvas'
 export interface IHitCanvasManager extends ICanvasManager {
     getPathType(leaf: ILeaf): IHitCanvas
     getImageType(leaf: ILeaf, size: IScreenSizeData): IHitCanvas
-    destory(): void
+    destroy(): void
 }

package/src/canvas/ILeaferCanvas.ts

@@ -74,7 +74,7 @@ interface ICanvasMethod {
     strokeRect(x: number, y: number, width: number, height: number): void
     clearRect(x: number, y: number, width: number, height: number): void
 
-    transform(a: number, b: number, c: number, d: number, e: number, f: number): void
+    transform(a: number | IMatrixData, b?: number, c?: number, d?: number, e?: number, f?: number): void
     translate(x: number, y: number): void
     scale(x: number, y: number): void
     rotate(angle: number): void
@@ -117,6 +117,7 @@ interface ICanvasMethod {
     copyWorld(canvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData, blendMode?: string): void
     copyWorldToInner(canvas: ILeaferCanvas, fromWorld: IMatrixWithBoundsData, toInnerBounds: IBoundsData, blendMode?: string): void
     useMask(maskCanvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData): void
+    useEraser(eraserCanvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData): void
 
     fillWorld(bounds: IBoundsData, color: string | object, blendMode?: string): void
     strokeWorld(bounds: IBoundsData, color: string | object, blendMode?: string): void
@@ -139,16 +140,20 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     pixelRatio: number
     readonly pixelWidth: number
     readonly pixelHeight: number
+
     readonly allowBackgroundColor?: boolean
+    backgroundColor?: string
+    hittable?: boolean
 
     bounds: IBounds
+    clientBounds: IBoundsData
 
     config: ILeaferCanvasConfig
 
     autoLayout: boolean
 
-    view: unknown
-    parentView: unknown
+    view: any
+    parentView: any
 
     unreal?: boolean
 
@@ -162,14 +167,16 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
     init(): void
 
-    setBackgroundColor(color: string): void
-    setHittable(hittable: boolean): void
+    toBlob(type?: string, quality?: number): Promise<IBlob>
+    toDataURL(type?: string, quality?: number): string
+    saveAs(filename: string, quality?: number): Promise<boolean>
 
     startAutoLayout(autoBounds: IAutoBounds, listener: IResizeEventListener): void
     stopAutoLayout(): void
 
     resize(size: IScreenSizeData): void
-    setViewSize(size: IScreenSizeData): void
+    updateViewSize(): void
+    updateClientBounds(): void
 
     // other
     isSameSize(options: ILeaferCanvasConfig): boolean
@@ -182,4 +189,13 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 }
 
 
-export type IHitCanvas = ILeaferCanvas
+export interface IHitCanvas extends ILeaferCanvas {
+
+}
+
+
+export interface IBlobFunction {
+    (blob: IBlob | null): void
+}
+
+export type IBlob = any

package/src/canvas/ISkiaCanvas.ts

@@ -0,0 +1,20 @@
+import { IExportFileType, IExportImageType } from '../file/IFileType'
+
+export type ICanvasType = 'skia' | 'canvas' | 'wx'
+
+export 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
+}
+
+export interface ISkiaCanvasExportConfig {
+    page?: number,
+    matte?: string,
+    density?: number,
+    quality?: number,
+    outline?: boolean
+}

package/src/data/IData.ts

@@ -4,6 +4,9 @@ export type __String = string //  string  | other   will convert to string
 export type __Object = IObject // will convert to object
 export type __Value = __Number | __Boolean | __String | __Object  // 
 export type ITimer = any
+
+export type IPathString = string
+
 export interface IObject {
     [name: string]: any
 }

package/src/data/ILeafData.ts

@@ -5,6 +5,10 @@ export interface IDataProcessor extends IObject {
     __leaf: ILeaf
     __input: IObject
     __middle: IObject
+
+    __single: boolean
+    __checkSingle(): void
+
     __get(name: string): unknown
 
     __setInput(name: string, value: unknown): void
@@ -14,6 +18,7 @@ export interface IDataProcessor extends IObject {
 
     __setMiddle(name: string, value: unknown): void
     __getMiddle(name: string): unknown
+
     destroy(): void
 }
 

package/src/display/IBranch.ts

@@ -1,9 +1,9 @@
+import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { IRenderOptions } from '../renderer/IRenderer'
 import { ILeaf } from './ILeaf'
 
 export interface IBranch extends ILeaf {
     children: ILeaf[]
-
-    // __updateSortChildren(): void
-    // add(child: ILeaf, index?: number): void
-    // remove(child?: ILeaf): void
+    __renderBranch?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    removeAll(destroy?: boolean): void
 }

package/src/display/ILeaf.ts

@@ -35,6 +35,7 @@ export interface ILeafAttrData {
     opacity: __Number
     visible: __Boolean
     isMask: __Boolean
+    isEraser?: __Boolean
     zIndex: __Number
 
     // layout data
@@ -100,6 +101,7 @@ export interface ILeafInputData {
     opacity?: __Number
     visible?: __Boolean
     isMask?: __Boolean
+    isEraser?: __Boolean
     zIndex?: __Number
 
     // layout data
@@ -131,6 +133,7 @@ export interface ILeafComputedData {
     opacity?: number
     visible?: boolean
     isMask?: boolean
+    isEraser?: boolean
     zIndex?: number
 
     // layout data
@@ -155,6 +158,8 @@ export interface ILeafComputedData {
     // other
     __childBranchNumber?: number // 存在子分支的个数
     __complex?: boolean // 外观是否复杂
+    __naturalWidth?: number
+    __naturalHeight?: number
 }
 
 export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
@@ -195,6 +200,7 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __tempNumber?: number // 用于临时运算储存状态
 
     __hasMask?: boolean
+    __hasEraser?: boolean
     __hitCanvas?: IHitCanvas
 
     readonly __onlyHitMask: boolean
@@ -238,6 +244,7 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __onUpdateSize(): void
 
     // IBranchMask ->
+    __updateEraser(value?: boolean): void
     __updateMask(value?: boolean): void
     __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void
     __removeMask(child?: ILeaf): void
@@ -251,6 +258,10 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     worldToInner(world: IPointData, to?: IPointData, isMovePoint?: boolean): void
     innerToWorld(inner: IPointData, to?: IPointData, isMovePoint?: boolean): void
 
+    move(x: number, y?: number): void
+    scaleOf(origin: IPointData, x: number, y?: number): void
+    rotateOf(origin: IPointData, rotation: number): void
+
     // ILeafHit ->
     __hitWorld(point: IRadiusPointData): boolean
     __hit(local: IRadiusPointData): boolean
@@ -278,5 +289,5 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
 
     __updateSortChildren(): void
     add(child: ILeaf, index?: number): void
-    remove(child?: ILeaf): void
+    remove(child?: ILeaf, destroy?: boolean): void
 }

package/src/display/module/IBranchRender.ts

@@ -0,0 +1,10 @@
+import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
+import { IRenderOptions } from '../../renderer/IRenderer'
+import { IBranch } from '../IBranch'
+import { ILeafRender } from './ILeafRender'
+
+export type IBranchRenderModule = IBranchRender & ThisType<IBranch>
+
+export interface IBranchRender extends ILeafRender {
+    __renderBranch?(canvas: ILeaferCanvas, options: IRenderOptions): void
+}

package/src/display/module/ILeafMask.ts

@@ -4,6 +4,7 @@ import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
 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
     __removeMask?(child?: ILeaf): void

package/src/event/IEvent.ts

@@ -2,22 +2,22 @@ import { IEventer } from './IEventer'
 import { IWatchEventData } from '../watcher/IWatcher'
 import { ILayoutBlockData } from '../layouter/ILayouter'
 import { ILeaf } from '../display/ILeaf'
-import { IScreenSizeData } from '../math/IMath'
+import { IScreenSizeData, IPointData } from '../math/IMath'
 
 export interface IEvent {
-    type: string
-    target: IEventTarget
-    current: IEventTarget
+    type?: string
+    target?: IEventTarget
+    current?: IEventTarget
 
     bubbles?: boolean
     phase?: number
 
-    isStopDefault: boolean
-    isStop: boolean
-    isStopNow: boolean
-    stopDefault(): void
-    stopNow(): void
-    stop(): void
+    isStopDefault?: boolean
+    isStop?: boolean
+    isStopNow?: boolean
+    stopDefault?(): void
+    stopNow?(): void
+    stop?(): void
 }
 
 export interface IEventTarget extends IEventer {
@@ -32,6 +32,10 @@ export interface IRenderEvent {
 
 }
 
+export interface IAnimateEvent {
+
+}
+
 export interface IChildEvent extends IEvent {
     parent?: ILeaf
     child?: ILeaf
@@ -91,4 +95,17 @@ export interface ITransformEvent extends IEvent, ITransformEventData {
     readonly scaleY: number
     readonly rotation: number
 }
-export type TransformMode = 'move' | 'zoom' | 'rotate'
+export type TransformMode = 'move' | 'zoom' | 'rotate'
+
+
+export interface IMultiTouchData {
+    move: IPointData,
+    scale: number,
+    angle: number,
+    center: IPointData
+}
+
+export interface IKeepTouchData {
+    from: IPointData
+    to: IPointData
+}

package/src/event/IUIEvent.ts

@@ -2,38 +2,39 @@ import { IObject } from '../data/IData'
 import { ILeafList } from '../data/IList'
 import { IEvent } from './IEvent'
 import { ILeaferImage } from '../image/ILeaferImage'
+import { ILeaf } from '../display/ILeaf'
+import { IPointData } from '../math/IMath'
 
 export interface IUIEvent extends IEvent {
     x: number
     y: number
 
-    altKey: boolean
-    ctrlKey: boolean
-    shiftKey: boolean
-    metaKey: boolean
-    readonly spaceKey: boolean
+    altKey?: boolean
+    ctrlKey?: boolean
+    shiftKey?: boolean
+    metaKey?: boolean
+    readonly spaceKey?: boolean
 
-    readonly left: boolean
-    readonly right: boolean
-    readonly middle: boolean
-    buttons: number
+    readonly left?: boolean
+    readonly right?: boolean
+    readonly middle?: boolean
+    buttons?: number
 
-    path: ILeafList
+    path?: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
-    origin: IObject
+    origin?: IObject
 
-    stopDefault(): void
-    stopNow(): void
-    stop(): void
+    getInner?(target?: ILeaf): IPointData
+    getLocal?(target?: ILeaf): IPointData
 }
 
 
 export interface IPointerEvent extends IUIEvent {
-    width: number
-    height: number
-    pointerType: PointerType
-    pressure: number
+    width?: number
+    height?: number
+    pointerType?: PointerType
+    pressure?: number
     tangentialPressure?: number
     tiltX?: number
     tiltY?: number
@@ -46,6 +47,9 @@ export interface IDragEvent extends IPointerEvent {
     moveY: number
     totalX: number
     totalY: number
+
+    getInnerMove?(target?: ILeaf): IPointData
+    getLocalMove?(target?: ILeaf): IPointData
 }
 
 export interface IDropEvent extends IPointerEvent {
@@ -74,6 +78,8 @@ export interface IKeyEvent extends IUIEvent {
 }
 
 export interface IImageEvent extends IEvent {
-    image: ILeaferImage
-    error: string | IObject
+    image?: ILeaferImage
+    attrName?: string
+    attrValue?: IObject
+    error?: string | IObject
 }

package/src/file/IFileType.ts

@@ -0,0 +1,2 @@
+export type IExportImageType = 'jpg' | 'png' | 'webp'
+export type IExportFileType = IExportImageType | 'svg' | 'pdf' | 'json'

package/src/image/IImageManager.ts

@@ -1,7 +1,18 @@
 import { ILeaferImage, ILeaferImageConfig } from './ILeaferImage'
+import { ITaskProcessor } from '../task/ITaskProcessor'
 
+interface ILeaferImageMap {
+    [name: string]: ILeaferImage
+}
 
 export interface IImageManager {
+    map: ILeaferImageMap
+    recycledList: ILeaferImage[]
+    tasker: ITaskProcessor
+    patternTasker: ITaskProcessor
+    readonly isComplete: boolean
     get(config: ILeaferImageConfig): ILeaferImage
-    destory(): void
+    recycle(image: ILeaferImage): void
+    clearRecycled(): void
+    destroy(): void
 }

package/src/image/ILeaferImage.ts

@@ -1,4 +1,5 @@
 import { IObject } from '../data/IData'
+import { InnerId } from '../event/IEventer'
 
 export interface ILeaferImageConfig {
     url: string
@@ -14,12 +15,27 @@ export interface ILeaferImageOnError {
 }
 
 export interface ILeaferImage {
+    readonly innerId: InnerId
+    readonly url: string
+
     view: unknown
     width: number
     height: number
+
+    isSVG: boolean
+
+    readonly completed: boolean
     ready: boolean
-    load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): void
+    error: IObject
+    loading: boolean
+
+    use: number
+    config: ILeaferImageConfig
+
+    load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): number
+    unload(index: number): void
     getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): unknown
+    destroy(): void
 }
 
 export type IImageStatus = 'wait' | 'thumb-loading' | 'thumb-success' | 'thumb-error' | 'loading' | 'success' | 'error' 

package/src/index.ts

@@ -1,5 +1,5 @@
 export { IApp } from './app/IApp'
-export { ILeafer, ILeaferType, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
+export { ILeafer, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
 export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IBlendMode } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
@@ -15,6 +15,7 @@ export { ILeafHit, ILeafHitModule } from './display/module/ILeafHit'
 export { ILeafRender, ILeafRenderModule } from './display/module/ILeafRender'
 export { ILeafEventer, ILeafEventerModule } from './display/module/ILeafEventer'
 export { ILeafMask, ILeafMaskModule } from './display/module/ILeafMask'
+export { IBranchRender, IBranchRenderModule } from './display/module/IBranchRender'
 
 export { IRenderer, IRendererConfig, IRenderOptions } from './renderer/IRenderer'
 export { IWatcher, IWatchEventData, IWatcherConfig } from './watcher/IWatcher'
@@ -25,26 +26,30 @@ export { ICanvasManager } from './canvas/ICanvasManager'
 export { IHitCanvasManager } from './canvas/IHitCanvasManager'
 export { IImageManager } from './image/IImageManager'
 
+export { ITaskProcessor, ITaskProcessorConfig } from './task/ITaskProcessor'
+
 
 export { IControl } from './control/IControl'
-export { IPlatform } from './platform/IPlatform'
+export { IPlatform, IMiniapp, IMiniappSelect, IMiniappSizeView } from './platform/IPlatform'
 export { IPlugin } from './plugin/IPlugin'
 
 
-export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
+export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
+export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType } 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'
 
 export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnError } from './image/ILeaferImage'
+export { IExportFileType, IExportImageType } from './file/IFileType'
 
 export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
-export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode } from './event/IEvent'
+export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode, 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'
 
 
-export { __Number, __Boolean, __String, __Object, __Value, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { __Number, __Boolean, __String, __Object, __Value, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'
 export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataHandle, IOffsetBoundsData, ITwoPointBounds, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixDecompositionData, IMatrixDecompositionAttr } from './math/IMath'
 export { IFunction } from './function/IFunction'

package/src/interaction/IInteraction.ts

@@ -6,6 +6,9 @@ import { IPointData } from '../math/IMath'
 import { ISelector } from '../selector/ISelector'
 import { IBounds } from '../math/IMath'
 import { IControl } from '../control/IControl'
+import { IKeepTouchData } from '../event/IEvent'
+import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { IObject } from '../data/IData'
 
 export interface IInteraction extends IControl {
     target: ILeaf
@@ -23,12 +26,16 @@ export interface IInteraction extends IControl {
     downData: IPointerEvent
     downTime: number
 
-    pointerDown(data: IPointerEvent): void
+    receive(event: any): void
+
+    pointerDown(data: IPointerEvent, defaultPath?: boolean): void
     pointerMove(data: IPointerEvent): void
     pointerMoveReal(data: IPointerEvent): void
     pointerUp(data: IPointerEvent): void
     pointerCancel(): void
 
+    multiTouch(data: IUIEvent, list: IKeepTouchData[]): void
+
     move(data: IMoveEvent): void
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void
@@ -36,9 +43,8 @@ export interface IInteraction extends IControl {
     emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
 }
 
-export interface IInteractionCanvas {
-    bounds: IBounds
-    view: unknown
+export interface IInteractionCanvas extends ILeaferCanvas {
+
 }
 
 export interface IInteractionConfig {
@@ -46,6 +52,7 @@ export interface IInteractionConfig {
     pointer?: IPointerConfig
     zoom?: IZoomConfig
     move?: IMoveConfig
+    eventer?: IObject
 }
 
 export interface IZoomConfig {

package/src/layout/ILeafLayout.ts

@@ -10,7 +10,7 @@ export interface ILeafLayout {
 
     useZoomProxy: boolean
 
-    // local
+    // inner
 
     boxBounds: IBoundsData    //  | content + padding |
     strokeBounds: IBoundsData  //  | boxBounds + border |  
@@ -31,6 +31,7 @@ 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 数据更新
 
@@ -54,13 +55,14 @@ export interface ILeafLayout {
     // keep state
     affectScaleOrRotation: boolean
     affectRotation: boolean
+    affectChildrenSort?: boolean
 
     strokeSpread: number
     renderSpread: number
-    shapeStrokeSpread: number
-    shapeRenderSpread: number
+    strokeBoxSpread: number
+    renderShapeSpread: number
 
-    checkUpdate(): void
+    checkUpdate(force?: boolean): void
 
     getTransform(locationType: ILayoutLocationType): IMatrixData
     decomposeTransform(locationType: ILayoutLocationType): IMatrixDecompositionData
@@ -87,5 +89,7 @@ export interface ILeafLayout {
     surfaceChange(): void
     opacityChange(): void
 
+    childrenSortChange(): void
+
     destroy(): void
 }

package/src/math/IMath.ts

@@ -152,16 +152,16 @@ export interface IMatrix extends IMatrixData {
     translateInner(x: number, y: number): IMatrix
 
     scale(x: number, y?: number): IMatrix
-    scaleOf(center: IPointData, x: number, y?: number): IMatrix
-    scaleOfInner(center: IPointData, x: number, y?: number): IMatrix
+    scaleOfOuter(origin: IPointData, x: number, y?: number): IMatrix
+    scaleOfInner(origin: IPointData, x: number, y?: number): IMatrix
 
     rotate(angle: number): IMatrix
-    rotateOf(center: IPointData, angle: number): IMatrix
-    rotateOfInner(center: IPointData, angle: number): IMatrix
+    rotateOfOuter(origin: IPointData, angle: number): IMatrix
+    rotateOfInner(origin: IPointData, angle: number): IMatrix
 
     skew(x: number, y?: number): IMatrix
-    skewOf(center: IPointData, x: number, y?: number): IMatrix
-    skewOfInner(center: IPointData, x: number, y?: number): IMatrix
+    skewOfOuter(origin: IPointData, x: number, y?: number): IMatrix
+    skewOfInner(origin: IPointData, x: number, y?: number): IMatrix
 
     multiply(matrix: IMatrixData): IMatrix
     divide(matrix: IMatrixData): IMatrix

package/src/platform/IPlatform.ts

@@ -1,15 +1,46 @@
 import { IFunction } from '../function/IFunction'
 import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { ILeaf } from '../display/ILeaf'
+import { IExportFileType, IExportImageType } from '../file/IFileType'
+import { IBoundsData, ISizeData } from '../math/IMath'
+import { IObject } from '../data/IData'
 
 export interface IPlatform {
+    name?: 'web' | 'node' | 'miniapp'
+    os?: 'Mac' | 'Windows' | 'Linux'
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
     isWorker?: boolean
     devicePixelRatio?: number
-    intWheelDeltaY?: boolean // firxfox need
+    intWheelDeltaY?: boolean // firxfox / Windows need
     conicGradientSupport?: boolean
     conicGradientRotate90?: boolean // fixfox need rotate
     fullImageShadow?: boolean // safari need 
-    layout(target: ILeaf): void
+    layout?(target: ILeaf): void
+    realtimeLayout?: boolean
+    origin?: {
+        createCanvas(width: number, height: number, format?: 'svg' | 'pdf'): any
+        canvasToDataURL(canvas: any, type?: IExportImageType, quality?: number): string
+        canvasToBolb(canvas: any, type?: IExportFileType, quality?: number): Promise<any>
+        canvasSaveAs(canvas: any, filename: string, quality?: number): Promise<void>
+        loadImage(url: string): Promise<any>
+        noRepeat?: string  // fix: 微信小程序 createPattern 直接使用 no-repeat 有bug，导致无法显示
+    },
+    miniapp?: IMiniapp
+}
+
+
+export interface IMiniappSelect extends IObject { }
+
+export interface IMiniappSizeView extends ISizeData {
+    view: any
+}
+
+export interface IMiniapp {
+    select(name: string): IMiniappSelect
+    getBounds(select: IMiniappSelect): Promise<IBoundsData>
+    getSizeView(select: IMiniappSelect): Promise<IMiniappSizeView>
+    onWindowResize(fun: IFunction): void
+    offWindowResize(fun: IFunction): void
+    saveToAlbum(path: string): Promise<any>
 }

package/src/plugin/IPlugin.ts

@@ -1,11 +1,10 @@
+import { ILeafer } from '../app/ILeafer'
 import { IObject } from '../data/IData'
 
-export interface IPlugin {
-    name: string
-    version: string
-    author: string
-    license: string
-    description: string
-    dependencies: string[]
-    run(params: IObject): void
+export interface IPlugin extends IObject {
+    name?: string
+    importVersion: string
+    import: string[]
+    run(LeaferUI: IObject, config: IObject): void
+    onLeafer?(leafer: ILeafer): void
 }

package/src/task/ITaskProcessor.ts

@@ -0,0 +1,28 @@
+import { IFunction } from '../function/IFunction'
+
+export interface ITaskProcessorConfig {
+    onComplete?: IFunction
+    onTask?: IFunction
+    onError?: IFunction
+    parallel?: number
+}
+
+export interface ITaskProcessor {
+    config: ITaskProcessorConfig
+    running: boolean
+    isComplete: boolean
+    percent: number
+    total: number
+    index: number
+    finishedIndex: number
+    remain: number
+    start(): void
+    pause(): void
+    resume(): void
+    skip(): void
+    stop(): void
+    add(taskCallback: IFunction, taskTime?: number, start?: boolean): void
+    addParallel(taskCallback: IFunction, taskTime?: number, start?: boolean,): void
+    addEmpty(callback?: IFunction): void
+    destroy(): void
+}

package/src/watcher/IWatcher.ts

@@ -12,16 +12,18 @@ export interface IWatcherConfig {
 
 export interface IWatcher extends IControl {
     target: ILeaf
-    updatedList: ILeafList
 
     totalTimes: number
 
     disabled: boolean
     running: boolean
     changed: boolean
+    hasRemoved: boolean
 
     config: IWatcherConfig
 
+    updatedList: ILeafList
+
     disable(): void
 
     update(): void