@leafer/interface 1.0.0-alpha.7 → 1.0.0-bate

package/src/display/ILeaf.ts

@@ -5,15 +5,16 @@ import { ILeaferCanvas, IHitCanvas } from '../canvas/ILeaferCanvas'
 import { IRenderOptions } from '../renderer/IRenderer'
 
 import { IObject, __Number, __Boolean, __Value, __String } from '../data/IData'
-import { IMatrixWithBoundsData, IMatrix, IBoundsData, IRadiusPointData } from '../math/IMath'
+import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IMatrixData, IRadiusPointData, IMatrixDecompositionAttr } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
 
 import { ILeafDataProxy } from './module/ILeafDataProxy'
 import { ILeafMatrix } from './module/ILeafMatrix'
 import { ILeafBounds } from './module/ILeafBounds'
-import { ILeafLayout } from '../layout/ILeafLayout'
+import { ILeafLayout, ILayoutBoundsType, ILayoutLocationType } from '../layout/ILeafLayout'
 import { ILeafHit } from './module/ILeafHit'
 import { ILeafRender } from './module/ILeafRender'
+import { ILeafMask } from './module/ILeafMask'
 import { ILeafData } from '../data/ILeafData'
 
 
@@ -23,14 +24,17 @@ export interface ICachedLeaf {
     bounds: IBoundsData
 }
 
+
 export interface ILeafAttrData {
     // layer data
     id: __String
     name: __String
     className: __String
 
+    blendMode: IBlendMode
     opacity: __Number
     visible: __Boolean
+    isMask: __Boolean
     zIndex: __Number
 
     // layout data
@@ -45,16 +49,57 @@ export interface ILeafAttrData {
     skewY: __Number
 
     draggable: __Boolean
+
+    hittable: __Boolean
+    hitFill: IHitType
+    hitStroke: IHitType
+    hitChildren: __Boolean
+    hitSelf: __Boolean
 }
 
+export type IHitType =
+    | 'path'
+    | 'pixel'
+    | 'all'
+    | 'none'
+
+export 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'  // other
+    | 'source-in'
+    | 'source-out'
+    | 'source-atop'
+    | 'destination-over'
+    | 'destination-in'
+    | 'destination-out'
+    | 'destination-atop'
+
 export interface ILeafInputData {
     // layer data
     id?: __String
     name?: __String
     className?: __String
 
+    blendMode?: IBlendMode
     opacity?: __Number
     visible?: __Boolean
+    isMask?: __Boolean
     zIndex?: __Number
 
     // layout data
@@ -69,6 +114,12 @@ export interface ILeafInputData {
     skewY?: __Number
 
     draggable?: __Boolean
+
+    hittable?: __Boolean
+    hitFill?: IHitType
+    hitStroke?: IHitType
+    hitChildren?: __Boolean
+    hitSelf?: __Boolean
 }
 export interface ILeafComputedData {
     // layer data
@@ -76,8 +127,10 @@ export interface ILeafComputedData {
     name?: string
     className?: string
 
+    blendMode?: IBlendMode
     opacity?: number
     visible?: boolean
+    isMask?: boolean
     zIndex?: number
 
     // layout data
@@ -92,77 +145,116 @@ export interface ILeafComputedData {
     skewY?: number
 
     draggable?: boolean
+
+    hittable?: boolean
+    hitFill?: IHitType
+    hitStroke?: IHitType
+    hitChildren?: boolean
+    hitSelf?: boolean
+
+    // other
+    __childBranchNumber?: number // 存在子分支的个数
+    __complex?: boolean // 外观是否复杂
 }
 
-export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
-    readonly tag: string
+export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
+    tag: string
+    readonly __tag: string
+    readonly innerName: string
+
     readonly __DataProcessor: IObject // IDataProcessor
     readonly __LayoutProcessor: IObject // ILeafLayout
 
     leafer?: ILeafer
-    root?: ILeaf
     parent?: ILeaf
 
-    __interactionOff?: boolean
-    __childrenInteractionOff?: boolean
-
-    __isRoot?: boolean
-    __isBranch?: boolean
-    __isBranchLeaf?: boolean
+    readonly isApp?: boolean
+    isLeafer?: boolean
+    isBranch?: boolean
+    isBranchLeaf?: boolean
 
     __: ILeafData
     __layout: ILeafLayout
 
-    __relative: IMatrixWithBoundsData
+    __local: IMatrixWithBoundsData
     __world: IMatrixWithBoundsData
-
     __worldOpacity: number
-    __renderTime: number // μs 1000微秒 = 1毫秒
-    __complex: boolean // 外观是否复杂， 将调用__drawComplex()
+
+    readonly worldTransform: IMatrixData
+    readonly localTransform: IMatrixData
+
+    readonly worldBoxBounds: IBoundsData
+    readonly worldStrokeBounds: IBoundsData
+    readonly worldRenderBounds: IBoundsData
+
+    readonly worldOpacity: number
+
+    __renderTime?: number // μs 1000微秒 = 1毫秒
 
     __level: number // 图层级别 root(1) -> hight
     __tempNumber?: number // 用于临时运算储存状态
 
+    __hasMask?: boolean
     __hitCanvas?: IHitCanvas
 
+    readonly __onlyHitMask: boolean
+    readonly __ignoreHitWorld: boolean
+
     __parentWait?: IFunction[]
+    __leaferWait?: IFunction[]
 
-    __addParentWait(item: IFunction): void
-    __runParentWait(): void
+    waitParent(item: IFunction): void
+    waitLeafer(item: IFunction): void
 
-    __setAsLeafer(): void
-    __setAsRoot(): void
+    __bindLeafer(leafer: ILeafer | null): void
 
-    __bindRoot(root: ILeaf): void
+    set(data: IObject): void
+    get(attrNames?: string[]): IObject
 
     // ILeafData ->
-    __set(attrName: string, newValue: __Value): void
-    __get(attrName: string): __Value
-    __updateAttr(attrName: string): void
+    __setAttr(attrName: string, newValue: __Value): void
+    __getAttr(attrName: string): __Value
+
+    forceUpdate(attrName?: string): void
 
     // ILeafMatrix ->
     __updateWorldMatrix(): void
-    __updateRelativeMatrix(): void
+    __updateLocalMatrix(): void
 
     // ILeafBounds ->
     __updateWorldBounds(): void
 
-    __updateRelativeBoxBounds(): void
-    __updateRelativeEventBounds(): void
-    __updateRelativeRenderBounds(): void
+    __updateLocalBoxBounds(): void
+    __updateLocalStrokeBounds(): void
+    __updateLocalRenderBounds(): void
 
     __updateBoxBounds(): void
-    __updateEventBounds(): void
+    __updateStrokeBounds(): void
     __updateRenderBounds(): void
 
-    __updateEventBoundsSpreadWidth(): number
-    __updateRenderBoundsSpreadWidth(): number
+    __updateStrokeSpread(): number
+    __updateRenderSpread(): number
 
     __onUpdateSize(): void
 
+    // IBranchMask ->
+    __updateMask(value?: boolean): void
+    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void
+    __removeMask(child?: ILeaf): void
+
+    // convert
+    getWorld(attrName: IMatrixDecompositionAttr): number
+    getBounds(type: ILayoutBoundsType, locationType?: ILayoutLocationType): IBoundsData
+
+    worldToLocal(world: IPointData, to?: IPointData, isMovePoint?: boolean): void
+    localToWorld(local: IPointData, to?: IPointData, isMovePoint?: boolean): void
+    worldToInner(world: IPointData, to?: IPointData, isMovePoint?: boolean): void
+    innerToWorld(inner: IPointData, to?: IPointData, isMovePoint?: boolean): void
+
     // ILeafHit ->
     __hitWorld(point: IRadiusPointData): boolean
     __hit(local: IRadiusPointData): boolean
+    __drawHitPath(canvas: ILeaferCanvas): void
     __updateHitCanvas(): void
 
     // ILeafRender ->
@@ -170,6 +262,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void
 
+    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions): void
+
     __updateWorldOpacity(): void
     __updateChange(): void
 
@@ -181,11 +275,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     // branch
     children?: ILeaf[]
-    __childBranchNumber?: number // 存在子分支的个数
 
     __updateSortChildren(): void
     add(child: ILeaf, index?: number): void
     remove(child?: ILeaf): void
-}
-
-
+}

package/src/display/IView.ts

@@ -6,4 +6,5 @@ export interface IZoomView extends IBranch {
     zoomLayer?: ILeaf
     moveLayer?: ILeaf
     transformData?: ITransformEventData
+    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void
 }

package/src/display/module/ILeafBounds.ts

@@ -5,16 +5,16 @@ export type ILeafBoundsModule = ILeafBounds & ThisType<ILeaf>
 export interface ILeafBounds {
     __updateWorldBounds?(): void
 
-    __updateRelativeBoxBounds?(): void
-    __updateRelativeEventBounds?(): void
-    __updateRelativeRenderBounds?(): void
+    __updateLocalBoxBounds?(): void
+    __updateLocalStrokeBounds?(): void
+    __updateLocalRenderBounds?(): void
 
     __updateBoxBounds?(): void
-    __updateEventBounds?(): void
+    __updateStrokeBounds?(): void
     __updateRenderBounds?(): void
 
-    __updateEventBoundsSpreadWidth?(): number
-    __updateRenderBoundsSpreadWidth?(): number
+    __updateStrokeSpread?(): number
+    __updateRenderSpread?(): number
 
     __onUpdateSize?(): void
 }

package/src/display/module/ILeafDataProxy.ts

@@ -4,8 +4,7 @@ import { __Value } from '../../data/IData'
 export type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>
 
 export interface ILeafDataProxy {
-    __set?(attrName: string, newValue: __Value): void
-    __get?(attrName: string): __Value
-    __updateAttr?(attrName: string): void
+    __setAttr?(name: string, newValue: __Value): void
+    __getAttr?(name: string): __Value
 }
 

package/src/display/module/ILeafEventer.ts

@@ -9,8 +9,8 @@ export type ILeafEventerModule = ILeafEventer & ThisType<ILeaf>
 export interface ILeafEventer {
     on?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
     off?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
-    on__?(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
-    off__?(id: IEventListenerId | IEventListenerId[]): void
+    on_?(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
+    off_?(id: IEventListenerId | IEventListenerId[]): void
     once?(type: string | string[], listener: IEventListener, capture?: boolean): void
     emit?(type: string, event?: IEvent | IObject, capture?: boolean): void
     emitEvent?(event?: IEvent, capture?: boolean): void

package/src/display/module/ILeafHit.ts

@@ -1,10 +1,12 @@
 import { IRadiusPointData } from '../../math/IMath'
 import { ILeaf } from '../ILeaf'
+import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
 
 export type ILeafHitModule = ILeafHit & ThisType<ILeaf>
 
 export interface ILeafHit {
     __hitWorld?(point: IRadiusPointData): boolean
     __hit?(local: IRadiusPointData): boolean
+    __drawHitPath?(canvas: ILeaferCanvas): void
     __updateHitCanvas?(): void
 }

package/src/display/module/ILeafMask.ts

@@ -0,0 +1,11 @@
+import { ILeaf } from '../ILeaf'
+import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
+
+export type ILeafMaskModule = ILeafMask & ThisType<ILeaf>
+
+export interface ILeafMask {
+    __updateMask?(value?: boolean): void
+    __renderMask?(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void
+    __removeMask?(child?: ILeaf): void
+}
+

package/src/display/module/ILeafMatrix.ts

@@ -4,5 +4,5 @@ export type ILeafMatrixModule = ILeafMatrix & ThisType<ILeaf>
 
 export interface ILeafMatrix {
     __updateWorldMatrix?(): void
-    __updateRelativeMatrix?(): void
+    __updateLocalMatrix?(): void
 }

package/src/display/module/ILeafRender.ts

@@ -6,11 +6,10 @@ export type ILeafRenderModule = ILeafRender & ThisType<ILeaf>
 
 export interface ILeafRender {
     __render?(canvas: ILeaferCanvas, options: IRenderOptions): void
-    __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __draw?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    __drawBefore?(canvas: ILeaferCanvas, options: IRenderOptions): void
-    __drawAfter?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __renderShape?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     __updateWorldOpacity?(): void
     __updateChange?(): void

package/src/event/IEvent.ts

@@ -24,6 +24,10 @@ export interface IEventTarget extends IEventer {
 
 }
 
+export interface ILeaferEvent {
+
+}
+
 export interface IRenderEvent {
 
 }
@@ -52,7 +56,7 @@ export interface IUpdateEvent extends IEvent {
 
 }
 
-export interface IAttrEvent extends IEvent {
+export interface IPropertyEvent extends IEvent {
     readonly attrName: string
     readonly oldValue: unknown
     readonly newValue: unknown
@@ -60,6 +64,7 @@ export interface IAttrEvent extends IEvent {
 
 export interface ILayoutEvent extends IEvent {
     readonly data: ILayoutBlockData[]
+    readonly times: number
 }
 
 export interface IWatchEvent extends IEvent {

package/src/event/IEventer.ts

@@ -32,8 +32,8 @@ export interface IEventer extends ILeafEventer {
 
     on(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
     off(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
-    on__(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
-    off__(id: IEventListenerId | IEventListenerId[]): void
+    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
+    off_(id: IEventListenerId | IEventListenerId[]): void
     once(type: string | string[], listener: IEventListener): void
     emit(type: string, event?: IEvent | IObject, capture?: boolean): void
     emitEvent(event?: IEvent, capture?: boolean): void

package/src/event/IUIEvent.ts

@@ -1,5 +1,7 @@
+import { IObject } from '../data/IData'
 import { ILeafList } from '../data/IList'
 import { IEvent } from './IEvent'
+import { ILeaferImage } from '../image/ILeaferImage'
 
 export interface IUIEvent extends IEvent {
     x: number
@@ -19,6 +21,8 @@ export interface IUIEvent extends IEvent {
     path: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
+    origin: IObject
+
     stopDefault(): void
     stopNow(): void
     stop(): void
@@ -46,6 +50,7 @@ export interface IDragEvent extends IPointerEvent {
 
 export interface IDropEvent extends IPointerEvent {
     list: ILeafList
+    data?: IObject
 }
 
 export interface IRotateEvent extends IUIEvent {
@@ -66,4 +71,9 @@ export interface ISwipeEvent extends IDragEvent {
 
 export interface IKeyEvent extends IUIEvent {
 
+}
+
+export interface IImageEvent extends IEvent {
+    image: ILeaferImage
+    error: string | IObject
 }

package/src/image/IImageManager.ts

@@ -1,3 +1,7 @@
+import { ILeaferImage, ILeaferImageConfig } from './ILeaferImage'
+
+
 export interface IImageManager {
+    get(config: ILeaferImageConfig): ILeaferImage
     destory(): void
 }

package/src/image/ILeaferImage.ts

@@ -1,8 +1,25 @@
+import { IObject } from '../data/IData'
+
 export interface ILeaferImageConfig {
     url: string
     thumb?: string
 }
 
+export interface ILeaferImageOnLoaded {
+    (image?: ILeaferImage): any
+}
+
+export interface ILeaferImageOnError {
+    (error?: string | IObject, image?: ILeaferImage): any
+}
+
 export interface ILeaferImage {
+    view: unknown
+    width: number
+    height: number
+    ready: boolean
+    load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): void
+    getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): unknown
+}
 
-}
+export type IImageStatus = 'wait' | 'thumb-loading' | 'thumb-success' | 'thumb-error' | 'loading' | 'success' | 'error' 

package/src/index.ts

@@ -1,6 +1,6 @@
-export { ISupperLeafer } from './app/ISupperLeafer'
-export { ILeafer, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf } from './display/ILeaf'
+export { IApp } from './app/IApp'
+export { ILeafer, ILeaferType, 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'
 
@@ -14,35 +14,37 @@ export { ILeafBounds, ILeafBoundsModule } from './display/module/ILeafBounds'
 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 { IRenderer, IRendererConfig, IRenderOptions } from './renderer/IRenderer'
 export { IWatcher, IWatchEventData, IWatcherConfig } from './watcher/IWatcher'
 export { ILayouter, ILayoutChangedData, ILayoutBlockData, ILayouterConfig, IPartLayoutConfig } from './layouter/ILayouter'
-export { ISelector, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
+export { ISelector, ISelectorConfig, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
 
 export { ICanvasManager } from './canvas/ICanvasManager'
 export { IHitCanvasManager } from './canvas/IHitCanvasManager'
 export { IImageManager } from './image/IImageManager'
 
 
+export { IControl } from './control/IControl'
 export { IPlatform } from './platform/IPlatform'
 export { IPlugin } from './plugin/IPlugin'
 
 
-export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasContext, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
-export { ICanvasDrawPath } from './canvas/ICanvasPathDrawer'
-export { ICanvasFillRule as ICanvasFillRule, ICanvasRenderingContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
+export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
+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 } from './image/ILeaferImage'
+export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnError } from './image/ILeaferImage'
 
 export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
-export { IEventTarget, IEvent, IAttrEvent, ILayoutEvent, IRenderEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode } from './event/IEvent'
-export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent } from './event/IUIEvent'
-export { IInteraction, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
+export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode } 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, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { __Number, __Boolean, __String, __Object, __Value, 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 } from './math/IMath'
+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

@@ -1,20 +1,31 @@
 import { INumberFunction, IPointDataFunction } from '../function/IFunction'
-import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent } from '../event/IUIEvent'
+import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent } from '../event/IUIEvent'
 import { ILeaf } from '../display/ILeaf'
+import { ILeafList } from '../data/IList'
 import { IPointData } from '../math/IMath'
+import { ISelector } from '../selector/ISelector'
+import { IBounds } from '../math/IMath'
+import { IControl } from '../control/IControl'
 
-export interface IInteraction {
+export interface IInteraction extends IControl {
     target: ILeaf
-    config: IInteractionConfig
+    canvas: IInteractionCanvas
+    selector: ISelector
+
     running: boolean
+    readonly dragging: boolean
 
-    pointerMoveIgnore: boolean
+    config: IInteractionConfig
 
-    start(): void
-    stop(): void
+    readonly hitRadius: number
+    shrinkCanvasBounds: IBounds
+
+    downData: IPointerEvent
+    downTime: number
 
     pointerDown(data: IPointerEvent): void
     pointerMove(data: IPointerEvent): void
+    pointerMoveReal(data: IPointerEvent): void
     pointerUp(data: IPointerEvent): void
     pointerCancel(): void
 
@@ -22,13 +33,30 @@ export interface IInteraction {
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void
 
-    destroy(): void
+    emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
+}
+
+export interface IInteractionCanvas {
+    bounds: IBounds
+    view: unknown
 }
 
 export interface IInteractionConfig {
     wheel?: IWheelConfig
     pointer?: IPointerConfig
+    zoom?: IZoomConfig
+    move?: IMoveConfig
+}
+
+export interface IZoomConfig {
+    min?: number
+    max?: number
+}
 
+export interface IMoveConfig {
+    dragEmpty?: boolean
+    dragOut?: boolean
+    autoDistance?: number
 }
 
 export interface IWheelConfig {
@@ -36,18 +64,22 @@ export interface IWheelConfig {
     zoomSpeed?: number // 取值范围 0 ～ 1, 默认0.5
     moveSpeed?: number
     rotateSpeed?: number // 取值范围 0 ～ 1, 默认0.5
-    delta?: IPointData
+    delta?: IPointData  // 以chrome为基准, 鼠标滚动一格的距离
     getScale?: INumberFunction
     getMove?: IPointDataFunction
+    preventDefault?: boolean
 }
 
 export interface IPointerConfig {
     hitRadius?: number
     through?: boolean
-    clickTime?: number
+    tapMore?: boolean
+    tapTime?: number
     longPressTime?: number
     transformTime?: number
+    dragHover?: boolean
     dragDistance?: number
     swipeDistance?: number
-    autoMoveDistance?: number
+    ignoreMove?: boolean // 性能优化字段, 控制move事件触发次数
+    preventDefault?: boolean
 }