@leafer/interface 1.0.0-alpha.23 → 1.0.0-alpha.30

package/package.json

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

package/src/app/IApp.ts

@@ -1,6 +1,6 @@
 import { ILeafer } from './ILeafer'
 
 export interface IApp extends ILeafer {
-    virtualCanvas: boolean
     children: ILeafer[]
+    realCanvas: boolean
 }

package/src/app/ILeafer.ts

@@ -2,40 +2,41 @@ import { ILeaf } from '../display/ILeaf'
 import { IRenderer, IRendererConfig } from '../renderer/IRenderer'
 import { IHitCanvas, ILeaferCanvas, ILeaferCanvasConfig, IHitCanvasConfig } from '../canvas/ILeaferCanvas'
 import { ILayouter, ILayouterConfig } from '../layouter/ILayouter'
-import { ISelector } from '../selector/ISelector'
+import { ISelector, ISelectorConfig } from '../selector/ISelector'
 import { IInteraction, IInteractionCanvas, IInteractionConfig } from '../interaction/IInteraction'
-import { IWatcher } from '../watcher/IWatcher'
+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'
+
 
 export type ILeaferType = 'draw' | 'design' | 'board' | 'document' | 'user'
 export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean
     type?: ILeaferType
-    virtualCanvas?: boolean
+    realCanvas?: boolean
 }
 
-export interface ILeafer extends IZoomView {
-
-    creator: ICreator
+export interface ILeafer extends IZoomView, IControl {
 
     readonly isApp: boolean
     parent?: IApp
 
     running: boolean
     ready: boolean
+    viewReady: boolean
 
-    startTimer: number
-
-    autoLayout?: IAutoBounds
+    pixelRatio: number
 
     view: unknown
+
     canvas: ILeaferCanvas
     renderer: IRenderer
 
@@ -49,23 +50,37 @@ export interface ILeafer extends IZoomView {
     hitCanvasManager?: IHitCanvasManager
     imageManager: IImageManager
 
+    autoLayout?: IAutoBounds
+
     config: ILeaferConfig
 
-    start(): void
-    stop(): void
+    __eventIds: IEventListenerId[]
+
+    init(userConfig?: ILeaferConfig, parentApp?: IApp): void
+
+    forceFullRender(): void
 
     resize(size: IScreenSizeData): void
 }
 
+export interface ILeaferTypeFunction {
+    (leafer: ILeafer): void
+}
+
+export interface ILeaferTypeList {
+    [key: string]: ILeaferTypeFunction
+}
+
+
 export interface ICreator {
     image?(options?: ILeaferImageConfig): ILeaferImage
     canvas?(options?: ILeaferCanvasConfig, manager?: ICanvasManager): ILeaferCanvas
     hitCanvas?(options?: IHitCanvasConfig, manager?: ICanvasManager): IHitCanvas
 
-    watcher?(target: ILeaf): IWatcher
-    layouter?(target: ILeaf): ILayouter
-    renderer?(target: ILeaf, canvas: ILeaferCanvas, options: IRendererConfig): IRenderer
-    selector?(target: ILeaf): ISelector
+    watcher?(target: ILeaf, options?: IWatcherConfig): IWatcher
+    layouter?(target: ILeaf, options?: ILayouterConfig): ILayouter
+    renderer?(target: ILeaf, canvas: ILeaferCanvas, options?: IRendererConfig): IRenderer
+    selector?(target: ILeaf, options?: ISelectorConfig): ISelector
 
     interaction?(target: ILeaf, canvas: IInteractionCanvas, selector: ISelector, options?: IInteractionConfig): IInteraction
 }

package/src/canvas/ICanvas.ts

@@ -81,11 +81,11 @@ interface CanvasImageSmoothing {
 }
 
 interface CanvasPath {
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void
     bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void
     closePath(): void
-    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void
     lineTo(x: number, y: number): void
     moveTo(x: number, y: number): void
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void

package/src/canvas/ILeaferCanvas.ts

@@ -10,6 +10,7 @@ export interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject
     fill?: string
     pixelRatio?: number
+    smooth?: boolean
     hittable?: boolean
     offscreen?: boolean
     webgl?: boolean
@@ -28,7 +29,7 @@ export interface ICanvasStrokeOptions {
     miterLimit?: number
 }
 
-export interface ICanvasAttr extends ICanvasStrokeOptions {
+export interface ICanvasAttr extends ICanvasStrokeOptions, IObject {
 
     smooth: boolean // imageSmoothingEnabled: boolean
     smoothLevel: string // imageSmoothingQuality: string
@@ -103,9 +104,10 @@ interface ICanvasMethod {
     restoreBlendMode(): void
 
     hitFill(point: IPointData, fillRule?: string): boolean
-    hitStroke(point: IPointData): boolean
+    hitStroke(point: IPointData, strokeWidth?: number): boolean
 
     setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void
+    setStrokeOptions(options: ICanvasStrokeOptions): void
 
     setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void
 
@@ -114,6 +116,8 @@ 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
+
     fillWorld(bounds: IBoundsData, color: string | object, blendMode?: string): void
     strokeWorld(bounds: IBoundsData, color: string | object, blendMode?: string): void
     clipWorld(bounds: IBoundsData, ceilPixel?: boolean): void
@@ -124,9 +128,10 @@ interface ICanvasMethod {
 
 export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
-    manager: ICanvasManager
-
     readonly innerId: InnerId
+    name: string
+
+    manager: ICanvasManager
 
     width: number
     height: number
@@ -134,24 +139,35 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     pixelRatio: number
     readonly pixelWidth: number
     readonly pixelHeight: number
+    readonly allowBackgroundColor?: boolean
 
     bounds: IBounds
 
+    config: ILeaferCanvasConfig
+
+    autoLayout: boolean
+
     view: unknown
     parentView: unknown
+
+    unreal?: boolean
+
     offscreen: boolean
 
     context: ICanvasContext2D
 
     recycled?: boolean
 
-    debug(): void
+    init(): void
+
+    setBackgroundColor(color: string): void
+    setHittable(hittable: boolean): void
 
     startAutoLayout(autoBounds: IAutoBounds, listener: IResizeEventListener): void
     stopAutoLayout(): void
 
     resize(size: IScreenSizeData): void
-    pixel(num: number): number
+    setViewSize(size: IScreenSizeData): void
 
     // other
     isSameSize(options: ILeaferCanvasConfig): boolean
@@ -160,7 +176,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     useSameTransform(canvas: ILeaferCanvas): void
     recycle(): void
 
-    unloadView(): void
+    unrealCanvas(): void
     destroy(): void
 }
 

package/src/control/IControl.ts

@@ -0,0 +1,5 @@
+export interface IControl {
+    start(): void
+    stop(): void
+    destroy(): void
+}

package/src/data/IData.ts

@@ -3,8 +3,7 @@ export type __Boolean = boolean // boolean | string  will convert to boolean
 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 interface IObject {
     [name: string]: any
 }

package/src/data/ILeafData.ts

@@ -6,9 +6,12 @@ export interface IDataProcessor extends IObject {
     __input: IObject
     __middle: IObject
     __get(name: string): unknown
+
     __setInput(name: string, value: unknown): void
     __getInput(name: string): unknown
+    __removeInput(name: string): void
     __getInputData(): IObject
+
     __setMiddle(name: string, value: unknown): void
     __getMiddle(name: string): unknown
     destroy(): void

package/src/display/ILeaf.ts

@@ -14,6 +14,7 @@ import { ILeafBounds } from './module/ILeafBounds'
 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'
 
 
@@ -50,17 +51,16 @@ export interface ILeafAttrData {
     draggable: __Boolean
 
     hittable: __Boolean
-    hitType: IHitType
+    hitFill: IHitType
+    hitStroke: IHitType
     hitChildren: __Boolean
+    hitSelf: __Boolean
 }
 
 export type IHitType =
     | 'visible'
-    | 'fill-visible'
-    | 'stroke-visible'
-    | 'all'
-    | 'fill'
-    | 'stroke'
+    | 'always'
+    | 'none'
 
 export type IBlendMode =
     | 'pass-through'
@@ -107,8 +107,10 @@ export interface ILeafInputData {
     draggable?: __Boolean
 
     hittable?: __Boolean
-    hitType?: IHitType
+    hitFill?: IHitType
+    hitStroke?: IHitType
     hitChildren?: __Boolean
+    hitSelf?: __Boolean
 }
 export interface ILeafComputedData {
     // layer data
@@ -136,17 +138,20 @@ export interface ILeafComputedData {
     draggable?: boolean
 
     hittable?: boolean
-    hitType?: IHitType
+    hitFill?: IHitType
+    hitStroke?: IHitType
     hitChildren?: boolean
+    hitSelf?: boolean
 
     // other
     __childBranchNumber?: number // 存在子分支的个数
     __complex?: boolean // 外观是否复杂
 }
 
-export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
+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
@@ -154,9 +159,10 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     leafer?: ILeafer
     parent?: ILeaf
 
+    readonly isApp?: boolean
     isLeafer?: boolean
-    __isBranch?: boolean
-    __isBranchLeaf?: boolean
+    isBranch?: boolean
+    isBranchLeaf?: boolean
 
     __: ILeafData
     __layout: ILeafLayout
@@ -182,12 +188,16 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __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
 
-    __bindLeafer(leafer: ILeafer): void
+    __bindLeafer(leafer: ILeafer | null): void
 
     set(data: IObject): void
     get(attrNames?: string[]): IObject
@@ -195,9 +205,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     // ILeafData ->
     __setAttr(attrName: string, newValue: __Value): void
     __getAttr(attrName: string): __Value
-    __updateAttr(attrName?: string, value?: __Value): void
 
-    forceUpdate(): void
+    forceUpdate(attrName?: string): void
 
     // ILeafMatrix ->
     __updateWorldMatrix(): void
@@ -219,6 +228,11 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     __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

package/src/display/module/ILeafDataProxy.ts

@@ -6,6 +6,5 @@ export type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>
 export interface ILeafDataProxy {
     __setAttr?(name: string, newValue: __Value): void
     __getAttr?(name: string): __Value
-    __updateAttr?(name?: string, value?: __Value): 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/event/IEvent.ts

@@ -64,6 +64,7 @@ export interface IPropertyEvent extends IEvent {
 
 export interface ILayoutEvent extends IEvent {
     readonly data: ILayoutBlockData[]
+    readonly times: number
 }
 
 export interface IWatchEvent extends IEvent {

package/src/index.ts

@@ -1,5 +1,5 @@
 export { IApp } from './app/IApp'
-export { ILeafer, ILeaferType, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
+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,23 +14,25 @@ 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, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
-export { IPathDrawer } from './path/IPathDrawer'
+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'
 
@@ -42,7 +44,7 @@ export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEve
 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, IMatrixDecompositionData, IMatrixDecompositionAttr } from './math/IMath'
 export { IFunction } from './function/IFunction'

package/src/interaction/IInteraction.ts

@@ -5,8 +5,9 @@ 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
     canvas: IInteractionCanvas
     selector: ISelector
@@ -20,9 +21,7 @@ export interface IInteraction {
     shrinkCanvasBounds: IBounds
 
     downData: IPointerEvent
-
-    start(): void
-    stop(): void
+    downTime: number
 
     pointerDown(data: IPointerEvent): void
     pointerMove(data: IPointerEvent): void
@@ -35,8 +34,6 @@ export interface IInteraction {
     rotate(data: IRotateEvent): void
 
     emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
-
-    destroy(): void
 }
 
 export interface IInteractionCanvas {
@@ -64,7 +61,7 @@ export interface IWheelConfig {
 export interface IPointerConfig {
     hitRadius?: number
     through?: boolean
-    tapMulti?: boolean
+    tapMore?: boolean
     tapTime?: number
     longPressTime?: number
     transformTime?: number

package/src/layout/ILeafLayout.ts

@@ -58,7 +58,7 @@ export interface ILeafLayout {
     renderBoundsSpreadWidth: number
     renderShapeBoundsSpreadWidth: number
 
-    update(): void
+    checkUpdate(): void
 
     getTransform(locationType: ILayoutLocationType): IMatrixData
     getMatrixDecompositionData(locationType: ILayoutLocationType): IMatrixDecompositionData

package/src/layouter/ILayouter.ts

@@ -1,6 +1,7 @@
 import { IBounds } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 import { ILeafList } from '../data/IList'
+import { IControl } from '../control/IControl'
 
 export interface ILayoutChangedData {
     matrixList: ILeaf[]
@@ -30,30 +31,30 @@ export interface ILayouterConfig {
     partLayout?: IPartLayoutConfig
 }
 
-export interface ILayouter {
+export interface ILayouter extends IControl {
     target: ILeaf
     layoutedBlocks: ILayoutBlockData[]
 
     totalTimes: number
     times: number
 
+    disabled: boolean
     running: boolean
-    changed: boolean
+    layouting: boolean
+
+    waitAgain: boolean
 
     config: ILayouterConfig
 
-    start(): void
-    stop(): void
-    update(): void
+    disable(): void
 
     layout(): void
+    layoutAgain(): void
     layoutOnce(): void
     partLayout(): void
     fullLayout(): void
 
     createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData
     getBlocks(list: ILeafList): ILayoutBlockData[]
-    setBlocks(current: ILayoutBlockData[]): void
-
-    destroy(): void
+    addBlocks(current: ILayoutBlockData[]): void
 }

package/src/math/IMath.ts

@@ -92,6 +92,7 @@ export interface ITwoPointBoundsData {
 
 export interface ITwoPointBounds extends ITwoPointBoundsData {
     addPoint(x: number, y: number): void
+    addBounds(x: number, y: number, width: number, height: number): void
     add(pointBounds: ITwoPointBoundsData): void
 }
 
@@ -164,6 +165,7 @@ export interface IMatrix extends IMatrixData {
 
     multiply(matrix: IMatrixData): IMatrix
     divide(matrix: IMatrixData): IMatrix
+    preMultiply(matrix: IMatrixData): IMatrix
     invert(): IMatrix
 
     toOuterPoint(inner: IPointData, to?: IPointData): void

package/src/path/IPathCommand.ts

@@ -34,14 +34,14 @@ type height = number
 type rotation = number
 type startAngle = number
 type endAngle = number
-type counterclockwise = boolean
+type anticlockwise = boolean
 type cornerRadius = number | number[]
 type radius = number
 
 export type RectCommandData = [Command, x, y, width, height]
 export type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]
-export type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, counterclockwise]
-export type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, counterclockwise]
+export type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]
+export type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]
 export type ArcToCommandData = [Command, x1, y1, x2, y2, radius]
 
 

package/src/path/IPathDrawer.ts

@@ -1,3 +1,4 @@
+import { IPathCommandData } from './IPathCommand'
 export interface IPathDrawer {
     beginPath?(): void
 
@@ -7,10 +8,29 @@ export interface IPathDrawer {
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void
     closePath(): void
 
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void
-    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void
 
     rect(x: number, y: number, width: number, height: number): void
     roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): void
+}
+
+export interface IPathCreator {
+    path: IPathCommandData
+
+    beginPath(): IPathCreator
+
+    moveTo(x: number, y: number): IPathCreator
+    lineTo(x: number, y: number): IPathCreator
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): IPathCreator
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): IPathCreator
+    closePath(): IPathCreator
+
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): IPathCreator
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator
+
+    rect(x: number, y: number, width: number, height: number): IPathCreator
+    roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): IPathCreator
 }

package/src/platform/IPlatform.ts

@@ -1,9 +1,11 @@
 import { IFunction } from '../function/IFunction'
 import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { ILeaf } from '../display/ILeaf'
 
 export interface IPlatform {
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
     isWorker?: boolean
     conicGradientRotate90?: boolean // fixfox need rotate
+    layout(target: ILeaf): void
 }

package/src/renderer/IRenderer.ts

@@ -2,6 +2,7 @@ import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { ILeaf } from '../display/ILeaf'
 import { IBounds, IMatrix } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
+import { IControl } from '../control/IControl'
 
 export interface IRenderOptions {
     bounds?: IBounds,
@@ -13,9 +14,10 @@ export interface IRenderOptions {
 export interface IRendererConfig {
     usePartRender?: boolean
     maxFPS?: number
+    fill?: string
 }
 
-export interface IRenderer {
+export interface IRenderer extends IControl {
     target: ILeaf
     canvas: ILeaferCanvas
     updateBlocks: IBounds[]
@@ -25,24 +27,27 @@ export interface IRenderer {
     times: number
 
     running: boolean
+    rendering: boolean
+
+    waitAgain: boolean
     changed: boolean
 
     config: IRendererConfig
 
-    start(): void
-    stop(): void
     update(): void
 
     requestLayout(): void
 
     render(callback?: IFunction): void
+    renderAgain(): void
     renderOnce(callback?: IFunction): void
     partRender(): void
     clipRender(bounds: IBounds): void
     fullRender(): void
 
+    renderHitView(options: IRenderOptions): void
+    renderBoundsView(options: IRenderOptions): void
+
     addBlock(block: IBounds): void
     mergeBlocks(): void
-
-    destroy(): void
 }

package/src/selector/ISelector.ts

@@ -9,15 +9,22 @@ export interface ISelectPathResult {
 }
 
 export interface ISelectPathOptions {
+    name?: string
     through?: boolean
     exclude?: ILeafList
+    ignoreHittable?: boolean
+}
+
+export interface ISelectorConfig {
+
 }
 
 export interface ISelector {
     target: ILeaf
-    defaultPath: ILeafList
 
-    getHitPointPath(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult
+    config: ISelectorConfig
+
+    getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult
 
     find(name: number | string, branch?: ILeaf): ILeaf | ILeaf[]
     getByInnerId(name: number, branch?: ILeaf): ILeaf

package/src/watcher/IWatcher.ts

@@ -1,5 +1,6 @@
 import { ILeaf } from '../display/ILeaf'
 import { ILeafList } from '../data/IList'
+import { IControl } from '../control/IControl'
 
 export interface IWatchEventData {
     updatedList: ILeafList
@@ -9,20 +10,19 @@ export interface IWatcherConfig {
 
 }
 
-export interface IWatcher {
+export interface IWatcher extends IControl {
     target: ILeaf
     updatedList: ILeafList
 
     totalTimes: number
 
+    disabled: boolean
     running: boolean
     changed: boolean
 
     config: IWatcherConfig
 
-    start(): void
-    stop(): void
+    disable(): void
 
     update(): void
-    destroy(): void
 }